projects / platform / upstream / linaro-gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: deac372)
* external/w3c_dom/Makefile.am: New file.
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 2 Feb 2005 00:42:32 +0000 (00:42 +0000)
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 2 Feb 2005 00:42:32 +0000 (00:42 +0000)
* external/w3c_dom/Makefile.in: New file.
* external/sax/Makefile.am: New file.
* external/sax/Makefile.in: New file.
* external/Makefile.in: New file.
* external/Makefile.am: New file.
* external/README: New file from Classpath.
* configure, aclocal.m4, Makefile.in: Rebuilt.
* configure.ac (AC_CONFIG_FILES): Create new Makefiles.
* Makefile.am (SUBDIRS): Added external.
(toolexeclib_LTLIBRARIES): Removed lib-org-xml-sax.la,
lib-org-w3c-dom.la, lib-org-ietf-gss.la.
(BOOTCLASSPATH): New variable.
(AM_GCJFLAGS): Use it.
(gnu_xml_source_files): New variable.
(libgcj_la_SOURCES): Use it.
(libgcj_la_LDADD): Include new convenience libraries.
(lib_org_ietf_jgss_la_SOURCES): Removed.
(lib_org_ietf_jgss_la_DEPENDENCIES): Likewise.
(lib_org_ietf_jgss_la_LIBADD): Likewise.
(lib_org_w3c_dom_la_SOURCES): Removed.
(lib_org_w3c_dom_la_DEPENDENCIES): Likewise.
(lib_org_w3c_dom_la_LIBADD): Likewise.
(lib_org_xml_sax_la_SOURCES): Removed.
(lib_org_xml_sax_la_DEPENDENCIES): Likewise.
(lib_org_xml_sax_la_LIBADD): Likewise.
(all_java_source_files): Updated.
(property_files): Likewise.
(libgcj-@gcc_version@.jar): Include classes from external/.
(javax_source_files): Updated.
(ordinary_java_source_files): Updated.
* javax/xml/XMLConstants.java,
javax/xml/datatype/DatatypeConfigurationException.java,
javax/xml/datatype/DatatypeConstants.java,
javax/xml/datatype/DatatypeFactory.java,
javax/xml/datatype/Duration.java,
javax/xml/datatype/XMLGregorianCalendar.java,
javax/xml/datatype/package.html,
javax/xml/namespace/NamespaceContext.java,
javax/xml/namespace/QName.java, javax/xml/namespace/package.html,
javax/xml/parsers/DocumentBuilder.java,
javax/xml/parsers/DocumentBuilderFactory.java,
javax/xml/parsers/FactoryConfigurationError.java,
javax/xml/parsers/ParserConfigurationException.java,
javax/xml/parsers/SAXParser.java,
javax/xml/parsers/SAXParserFactory.java,
javax/xml/parsers/package.html,
javax/xml/transform/ErrorListener.java,
javax/xml/transform/OutputKeys.java,
javax/xml/transform/Result.java, javax/xml/transform/Source.java,
javax/xml/transform/SourceLocator.java,
javax/xml/transform/Templates.java,
javax/xml/transform/Transformer.java,
javax/xml/transform/TransformerConfigurationException.java,
javax/xml/transform/TransformerException.java,
javax/xml/transform/TransformerFactory.java,
javax/xml/transform/TransformerFactoryConfigurationError.java,
javax/xml/transform/URIResolver.java,
javax/xml/transform/package.html,
javax/xml/transform/dom/DOMLocator.java,
javax/xml/transform/dom/DOMResult.java,
javax/xml/transform/dom/DOMSource.java,
javax/xml/transform/dom/package.html,
javax/xml/transform/sax/SAXResult.java,
javax/xml/transform/sax/SAXSource.java,
javax/xml/transform/sax/SAXTransformerFactory.java,
javax/xml/transform/sax/TemplatesHandler.java,
javax/xml/transform/sax/TransformerHandler.java,
javax/xml/transform/sax/package.html,
javax/xml/transform/stream/StreamResult.java,
javax/xml/transform/stream/StreamSource.java,
javax/xml/transform/stream/package.html,
javax/xml/validation/Schema.java,
javax/xml/validation/SchemaFactory.java,
javax/xml/validation/TypeInfoProvider.java,
javax/xml/validation/Validator.java,
javax/xml/validation/ValidatorHandler.java,
javax/xml/validation/package.html, javax/xml/xpath/XPath.java,
javax/xml/xpath/XPathConstants.java,
javax/xml/xpath/XPathException.java,
javax/xml/xpath/XPathExpression.java,
javax/xml/xpath/XPathExpressionException.java,
javax/xml/xpath/XPathFactory.java,
javax/xml/xpath/XPathFactoryConfigurationException.java,
javax/xml/xpath/XPathFunction.java,
javax/xml/xpath/XPathFunctionException.java,
javax/xml/xpath/XPathFunctionResolver.java,
javax/xml/xpath/XPathVariableResolver.java,
javax/xml/xpath/package.html: New files, from GNU JAXP.
* org/w3c/dom/Attr.java, org/w3c/dom/CDATASection.java,
org/w3c/dom/CharacterData.java, org/w3c/dom/Comment.java,
org/w3c/dom/DOMException.java, org/w3c/dom/DOMImplementation.java,
org/w3c/dom/Document.java, org/w3c/dom/DocumentFragment.java,
org/w3c/dom/DocumentType.java, org/w3c/dom/Element.java,
org/w3c/dom/Entity.java, org/w3c/dom/EntityReference.java,
org/w3c/dom/NamedNodeMap.java, org/w3c/dom/Node.java,
org/w3c/dom/NodeList.java, org/w3c/dom/Notation.java,
org/w3c/dom/ProcessingInstruction.java, org/w3c/dom/Text.java,
org/w3c/dom/ranges/DocumentRange.java,
org/w3c/dom/ranges/Range.java,
org/w3c/dom/ranges/RangeException.java,
org/w3c/dom/traversal/DocumentTraversal.java,
org/w3c/dom/traversal/NodeFilter.java,
org/w3c/dom/traversal/NodeIterator.java,
org/w3c/dom/traversal/TreeWalker.java,
org/xml/sax/AttributeList.java, org/xml/sax/Attributes.java,
org/xml/sax/ContentHandler.java, org/xml/sax/DTDHandler.java,
org/xml/sax/DocumentHandler.java, org/xml/sax/EntityResolver.java,
org/xml/sax/ErrorHandler.java, org/xml/sax/HandlerBase.java,
org/xml/sax/InputSource.java, org/xml/sax/Locator.java,
org/xml/sax/Parser.java, org/xml/sax/SAXException.java,
org/xml/sax/SAXNotRecognizedException.java,
org/xml/sax/SAXNotSupportedException.java,
org/xml/sax/SAXParseException.java, org/xml/sax/XMLFilter.java,
org/xml/sax/XMLReader.java, org/xml/sax/package.html,
org/xml/sax/ext/DeclHandler.java,
org/xml/sax/ext/LexicalHandler.java, org/xml/sax/ext/package.html,
org/xml/sax/helpers/AttributeListImpl.java,
org/xml/sax/helpers/AttributesImpl.java,
org/xml/sax/helpers/DefaultHandler.java,
org/xml/sax/helpers/LocatorImpl.java,
org/xml/sax/helpers/NamespaceSupport.java,
org/xml/sax/helpers/NewInstance.java,
org/xml/sax/helpers/ParserAdapter.java,
org/xml/sax/helpers/ParserFactory.java,
org/xml/sax/helpers/XMLFilterImpl.java,
org/xml/sax/helpers/XMLReaderAdapter.java,
org/xml/sax/helpers/XMLReaderFactory.java,
org/xml/sax/helpers/package.html: Moved to external/.
* external/sax/README,
external/sax/org/xml/sax/AttributeList.java,
external/sax/org/xml/sax/Attributes.java,
external/sax/org/xml/sax/ContentHandler.java,
external/sax/org/xml/sax/DTDHandler.java,
external/sax/org/xml/sax/DocumentHandler.java,
external/sax/org/xml/sax/EntityResolver.java,
external/sax/org/xml/sax/ErrorHandler.java,
external/sax/org/xml/sax/HandlerBase.java,
external/sax/org/xml/sax/InputSource.java,
external/sax/org/xml/sax/Locator.java,
external/sax/org/xml/sax/Parser.java,
external/sax/org/xml/sax/SAXException.java,
external/sax/org/xml/sax/SAXNotRecognizedException.java,
external/sax/org/xml/sax/SAXNotSupportedException.java,
external/sax/org/xml/sax/SAXParseException.java,
external/sax/org/xml/sax/XMLFilter.java,
external/sax/org/xml/sax/XMLReader.java,
external/sax/org/xml/sax/package.html,
external/sax/org/xml/sax/ext/Attributes2.java,
external/sax/org/xml/sax/ext/Attributes2Impl.java,
external/sax/org/xml/sax/ext/DeclHandler.java,
external/sax/org/xml/sax/ext/DefaultHandler2.java,
external/sax/org/xml/sax/ext/EntityResolver2.java,
external/sax/org/xml/sax/ext/LexicalHandler.java,
external/sax/org/xml/sax/ext/Locator2.java,
external/sax/org/xml/sax/ext/Locator2Impl.java,
external/sax/org/xml/sax/ext/package.html,
external/sax/org/xml/sax/helpers/AttributeListImpl.java,
external/sax/org/xml/sax/helpers/AttributesImpl.java,
external/sax/org/xml/sax/helpers/DefaultHandler.java,
external/sax/org/xml/sax/helpers/LocatorImpl.java,
external/sax/org/xml/sax/helpers/NamespaceSupport.java,
external/sax/org/xml/sax/helpers/NewInstance.java,
external/sax/org/xml/sax/helpers/ParserAdapter.java,
external/sax/org/xml/sax/helpers/ParserFactory.java,
external/sax/org/xml/sax/helpers/XMLFilterImpl.java,
external/sax/org/xml/sax/helpers/XMLReaderAdapter.java,
external/sax/org/xml/sax/helpers/XMLReaderFactory.java,
external/sax/org/xml/sax/helpers/package.html,
external/w3c_dom/COPYRIGHT.html, external/w3c_dom/README,
external/w3c_dom/org/w3c/dom/Attr.java,
external/w3c_dom/org/w3c/dom/CDATASection.java,
external/w3c_dom/org/w3c/dom/CharacterData.java,
external/w3c_dom/org/w3c/dom/Comment.java,
external/w3c_dom/org/w3c/dom/DOMConfiguration.java,
external/w3c_dom/org/w3c/dom/DOMError.java,
external/w3c_dom/org/w3c/dom/DOMErrorHandler.java,
external/w3c_dom/org/w3c/dom/DOMException.java,
external/w3c_dom/org/w3c/dom/DOMImplementation.java,
external/w3c_dom/org/w3c/dom/DOMImplementationList.java,
external/w3c_dom/org/w3c/dom/DOMImplementationSource.java,
external/w3c_dom/org/w3c/dom/DOMLocator.java,
external/w3c_dom/org/w3c/dom/DOMStringList.java,
external/w3c_dom/org/w3c/dom/Document.java,
external/w3c_dom/org/w3c/dom/DocumentFragment.java,
external/w3c_dom/org/w3c/dom/DocumentType.java,
external/w3c_dom/org/w3c/dom/Element.java,
external/w3c_dom/org/w3c/dom/Entity.java,
external/w3c_dom/org/w3c/dom/EntityReference.java,
external/w3c_dom/org/w3c/dom/NameList.java,
external/w3c_dom/org/w3c/dom/NamedNodeMap.java,
external/w3c_dom/org/w3c/dom/Node.java,
external/w3c_dom/org/w3c/dom/NodeList.java,
external/w3c_dom/org/w3c/dom/Notation.java,
external/w3c_dom/org/w3c/dom/ProcessingInstruction.java,
external/w3c_dom/org/w3c/dom/Text.java,
external/w3c_dom/org/w3c/dom/TypeInfo.java,
external/w3c_dom/org/w3c/dom/UserDataHandler.java,
external/w3c_dom/org/w3c/dom/bootstrap/DOMImplementationRegistry.java,
external/w3c_dom/org/w3c/dom/css/CSS2Properties.java,
external/w3c_dom/org/w3c/dom/css/CSSCharsetRule.java,
external/w3c_dom/org/w3c/dom/css/CSSFontFaceRule.java,
external/w3c_dom/org/w3c/dom/css/CSSImportRule.java,
external/w3c_dom/org/w3c/dom/css/CSSMediaRule.java,
external/w3c_dom/org/w3c/dom/css/CSSPageRule.java,
external/w3c_dom/org/w3c/dom/css/CSSPrimitiveValue.java,
external/w3c_dom/org/w3c/dom/css/CSSRule.java,
external/w3c_dom/org/w3c/dom/css/CSSRuleList.java,
external/w3c_dom/org/w3c/dom/css/CSSStyleDeclaration.java,
external/w3c_dom/org/w3c/dom/css/CSSStyleRule.java,
external/w3c_dom/org/w3c/dom/css/CSSStyleSheet.java,
external/w3c_dom/org/w3c/dom/css/CSSUnknownRule.java,
external/w3c_dom/org/w3c/dom/css/CSSValue.java,
external/w3c_dom/org/w3c/dom/css/CSSValueList.java,
external/w3c_dom/org/w3c/dom/css/Counter.java,
external/w3c_dom/org/w3c/dom/css/DOMImplementationCSS.java,
external/w3c_dom/org/w3c/dom/css/DocumentCSS.java,
external/w3c_dom/org/w3c/dom/css/ElementCSSInlineStyle.java,
external/w3c_dom/org/w3c/dom/css/RGBColor.java,
external/w3c_dom/org/w3c/dom/css/Rect.java,
external/w3c_dom/org/w3c/dom/css/ViewCSS.java,
external/w3c_dom/org/w3c/dom/events/DocumentEvent.java,
external/w3c_dom/org/w3c/dom/events/Event.java,
external/w3c_dom/org/w3c/dom/events/EventException.java,
external/w3c_dom/org/w3c/dom/events/EventListener.java,
external/w3c_dom/org/w3c/dom/events/EventTarget.java,
external/w3c_dom/org/w3c/dom/events/MouseEvent.java,
external/w3c_dom/org/w3c/dom/events/MutationEvent.java,
external/w3c_dom/org/w3c/dom/events/UIEvent.java,
external/w3c_dom/org/w3c/dom/html2/HTMLAnchorElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLAppletElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLAreaElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLBRElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLBaseElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLBaseFontElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLBodyElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLButtonElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLCollection.java,
external/w3c_dom/org/w3c/dom/html2/HTMLDListElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLDirectoryElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLDivElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLDocument.java,
external/w3c_dom/org/w3c/dom/html2/HTMLElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLFieldSetElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLFontElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLFormElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLFrameElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLFrameSetElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLHRElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLHeadElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLHeadingElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLHtmlElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLIFrameElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLImageElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLInputElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLIsIndexElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLLIElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLLabelElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLLegendElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLLinkElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLMapElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLMenuElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLMetaElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLModElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLOListElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLObjectElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLOptGroupElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLOptionElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLOptionsCollection.java,
external/w3c_dom/org/w3c/dom/html2/HTMLParagraphElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLParamElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLPreElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLQuoteElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLScriptElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLSelectElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLStyleElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLTableCaptionElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLTableCellElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLTableColElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLTableElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLTableRowElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLTableSectionElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLTextAreaElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLTitleElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLUListElement.java,
external/w3c_dom/org/w3c/dom/ls/DOMImplementationLS.java,
external/w3c_dom/org/w3c/dom/ls/LSException.java,
external/w3c_dom/org/w3c/dom/ls/LSInput.java,
external/w3c_dom/org/w3c/dom/ls/LSLoadEvent.java,
external/w3c_dom/org/w3c/dom/ls/LSOutput.java,
external/w3c_dom/org/w3c/dom/ls/LSParser.java,
external/w3c_dom/org/w3c/dom/ls/LSParserFilter.java,
external/w3c_dom/org/w3c/dom/ls/LSProgressEvent.java,
external/w3c_dom/org/w3c/dom/ls/LSResourceResolver.java,
external/w3c_dom/org/w3c/dom/ls/LSSerializer.java,
external/w3c_dom/org/w3c/dom/ls/LSSerializerFilter.java,
external/w3c_dom/org/w3c/dom/ranges/DocumentRange.java,
external/w3c_dom/org/w3c/dom/ranges/Range.java,
external/w3c_dom/org/w3c/dom/ranges/RangeException.java,
external/w3c_dom/org/w3c/dom/stylesheets/DocumentStyle.java,
external/w3c_dom/org/w3c/dom/stylesheets/LinkStyle.java,
external/w3c_dom/org/w3c/dom/stylesheets/MediaList.java,
external/w3c_dom/org/w3c/dom/stylesheets/StyleSheet.java,
external/w3c_dom/org/w3c/dom/stylesheets/StyleSheetList.java,
external/w3c_dom/org/w3c/dom/traversal/DocumentTraversal.java,
external/w3c_dom/org/w3c/dom/traversal/NodeFilter.java,
external/w3c_dom/org/w3c/dom/traversal/NodeIterator.java,
external/w3c_dom/org/w3c/dom/traversal/TreeWalker.java,
external/w3c_dom/org/w3c/dom/views/AbstractView.java,
external/w3c_dom/org/w3c/dom/views/DocumentView.java,
external/w3c_dom/org/w3c/dom/xpath/XPathEvaluator.java,
external/w3c_dom/org/w3c/dom/xpath/XPathException.java,
external/w3c_dom/org/w3c/dom/xpath/XPathExpression.java,
external/w3c_dom/org/w3c/dom/xpath/XPathNSResolver.java,
external/w3c_dom/org/w3c/dom/xpath/XPathNamespace.java,
external/w3c_dom/org/w3c/dom/xpath/XPathResult.java: New files
from Classpath.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@94577 138bc75d-0d04-0410-961f-82ee72b054a4

453 files changed:
libjava/ChangeLog patch | blob | history
libjava/Makefile.am patch | blob | history
libjava/Makefile.in patch | blob | history
libjava/configure patch | blob | history
libjava/configure.ac patch | blob | history
libjava/external/Makefile.am [new file with mode: 0644] patch | blob
libjava/external/Makefile.in [new file with mode: 0644] patch | blob
libjava/external/README [new file with mode: 0644] patch | blob
libjava/external/sax/Makefile.am [new file with mode: 0644] patch | blob
libjava/external/sax/Makefile.in [new file with mode: 0644] patch | blob
libjava/external/sax/README [new file with mode: 0644] patch | blob
libjava/external/sax/org/xml/sax/AttributeList.java [moved from libjava/org/xml/sax/AttributeList.java with 98% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/Attributes.java [moved from libjava/org/xml/sax/Attributes.java with 83% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/ContentHandler.java [moved from libjava/org/xml/sax/ContentHandler.java with 77% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/DTDHandler.java [moved from libjava/org/xml/sax/DTDHandler.java with 98% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/DocumentHandler.java [moved from libjava/org/xml/sax/DocumentHandler.java with 99% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/EntityResolver.java [moved from libjava/org/xml/sax/EntityResolver.java with 98% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/ErrorHandler.java [moved from libjava/org/xml/sax/ErrorHandler.java with 69% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/HandlerBase.java [moved from libjava/org/xml/sax/HandlerBase.java with 98% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/InputSource.java [moved from libjava/org/xml/sax/InputSource.java with 99% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/Locator.java [moved from libjava/org/xml/sax/Locator.java with 98% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/Parser.java [moved from libjava/org/xml/sax/Parser.java with 99% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/SAXException.java [moved from libjava/org/xml/sax/SAXException.java with 98% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/SAXNotRecognizedException.java [moved from libjava/org/xml/sax/SAXNotRecognizedException.java with 93% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/SAXNotSupportedException.java [moved from libjava/org/xml/sax/SAXNotSupportedException.java with 94% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/SAXParseException.java [moved from libjava/org/xml/sax/SAXParseException.java with 95% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/XMLFilter.java [moved from libjava/org/xml/sax/XMLFilter.java with 96% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/XMLReader.java [moved from libjava/org/xml/sax/XMLReader.java with 96% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/ext/Attributes2.java [new file with mode: 0644] patch | blob
libjava/external/sax/org/xml/sax/ext/Attributes2Impl.java [new file with mode: 0644] patch | blob
libjava/external/sax/org/xml/sax/ext/DeclHandler.java [moved from libjava/org/xml/sax/ext/DeclHandler.java with 93% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/ext/DefaultHandler2.java [new file with mode: 0644] patch | blob
libjava/external/sax/org/xml/sax/ext/EntityResolver2.java [new file with mode: 0644] patch | blob
libjava/external/sax/org/xml/sax/ext/LexicalHandler.java [moved from libjava/org/xml/sax/ext/LexicalHandler.java with 99% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/ext/Locator2.java [new file with mode: 0644] patch | blob
libjava/external/sax/org/xml/sax/ext/Locator2Impl.java [new file with mode: 0644] patch | blob
libjava/external/sax/org/xml/sax/ext/package.html [moved from libjava/org/xml/sax/ext/package.html with 51% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/helpers/AttributeListImpl.java [moved from libjava/org/xml/sax/helpers/AttributeListImpl.java with 99% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/helpers/AttributesImpl.java [moved from libjava/org/xml/sax/helpers/AttributesImpl.java with 99% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/helpers/DefaultHandler.java [moved from libjava/org/xml/sax/helpers/DefaultHandler.java with 99% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/helpers/LocatorImpl.java [moved from libjava/org/xml/sax/helpers/LocatorImpl.java with 98% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/helpers/NamespaceSupport.java [moved from libjava/org/xml/sax/helpers/NamespaceSupport.java with 84% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/helpers/NewInstance.java [moved from libjava/org/xml/sax/helpers/NewInstance.java with 97% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/helpers/ParserAdapter.java [moved from libjava/org/xml/sax/helpers/ParserAdapter.java with 95% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/helpers/ParserFactory.java [moved from libjava/org/xml/sax/helpers/ParserFactory.java with 98% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/helpers/XMLFilterImpl.java [moved from libjava/org/xml/sax/helpers/XMLFilterImpl.java with 98% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java [moved from libjava/org/xml/sax/helpers/XMLReaderAdapter.java with 99% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/helpers/XMLReaderFactory.java [moved from libjava/org/xml/sax/helpers/XMLReaderFactory.java with 98% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/helpers/package.html [moved from libjava/org/xml/sax/helpers/package.html with 77% similarity] patch | blob | history
libjava/external/sax/org/xml/sax/package.html [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/COPYRIGHT.html [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/Makefile.am [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/Makefile.in [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/README [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/Attr.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/CDATASection.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/CharacterData.java [moved from libjava/org/w3c/dom/CharacterData.java with 76% similarity] patch | blob | history
libjava/external/w3c_dom/org/w3c/dom/Comment.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/DOMConfiguration.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/DOMError.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/DOMErrorHandler.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/DOMException.java [moved from libjava/org/w3c/dom/DOMException.java with 60% similarity] patch | blob | history
libjava/external/w3c_dom/org/w3c/dom/DOMImplementation.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/DOMImplementationList.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/DOMImplementationSource.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/DOMLocator.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/DOMStringList.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/Document.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/DocumentFragment.java [moved from libjava/org/w3c/dom/DocumentFragment.java with 74% similarity] patch | blob | history
libjava/external/w3c_dom/org/w3c/dom/DocumentType.java [moved from libjava/org/w3c/dom/DocumentType.java with 66% similarity] patch | blob | history
libjava/external/w3c_dom/org/w3c/dom/Element.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/Entity.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/EntityReference.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/NameList.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/NamedNodeMap.java [moved from libjava/org/w3c/dom/NamedNodeMap.java with 62% similarity] patch | blob | history
libjava/external/w3c_dom/org/w3c/dom/Node.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/NodeList.java [moved from libjava/org/w3c/dom/NodeList.java with 53% similarity] patch | blob | history
libjava/external/w3c_dom/org/w3c/dom/Notation.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/ProcessingInstruction.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/Text.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/TypeInfo.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/UserDataHandler.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/bootstrap/DOMImplementationRegistry.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/CSS2Properties.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/CSSCharsetRule.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/CSSFontFaceRule.java [moved from libjava/org/w3c/dom/Comment.java with 53% similarity] patch | blob | history
libjava/external/w3c_dom/org/w3c/dom/css/CSSImportRule.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/CSSMediaRule.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/CSSPageRule.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/CSSPrimitiveValue.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/CSSRule.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/CSSRuleList.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/CSSStyleDeclaration.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/CSSStyleRule.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/CSSStyleSheet.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/CSSUnknownRule.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/CSSValue.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/CSSValueList.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/Counter.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/DOMImplementationCSS.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/DocumentCSS.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/ElementCSSInlineStyle.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/RGBColor.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/Rect.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/css/ViewCSS.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/events/DocumentEvent.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/events/Event.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/events/EventException.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/events/EventListener.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/events/EventTarget.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/events/MouseEvent.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/events/MutationEvent.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/events/UIEvent.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLAnchorElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLAppletElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLAreaElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLBRElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLBaseElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLBaseFontElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLBodyElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLButtonElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLCollection.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLDListElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLDirectoryElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLDivElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLDocument.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFieldSetElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFontElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFormElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFrameElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFrameSetElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLHRElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLHeadElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLHeadingElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLHtmlElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLIFrameElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLImageElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLInputElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLIsIndexElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLLIElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLLabelElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLLegendElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLLinkElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLMapElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLMenuElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLMetaElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLModElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLOListElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLObjectElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLOptGroupElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLOptionElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLOptionsCollection.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLParagraphElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLParamElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLPreElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLQuoteElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLScriptElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLSelectElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLStyleElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableCaptionElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableCellElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableColElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableRowElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableSectionElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTextAreaElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTitleElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/html2/HTMLUListElement.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/ls/DOMImplementationLS.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/ls/LSException.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/ls/LSInput.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/ls/LSLoadEvent.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/ls/LSOutput.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/ls/LSParser.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/ls/LSParserFilter.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/ls/LSProgressEvent.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/ls/LSResourceResolver.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/ls/LSSerializer.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/ls/LSSerializerFilter.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/ranges/DocumentRange.java [moved from libjava/org/w3c/dom/ranges/DocumentRange.java with 97% similarity] patch | blob | history
libjava/external/w3c_dom/org/w3c/dom/ranges/Range.java [moved from libjava/org/w3c/dom/ranges/Range.java with 88% similarity] patch | blob | history
libjava/external/w3c_dom/org/w3c/dom/ranges/RangeException.java [moved from libjava/org/w3c/dom/ranges/RangeException.java with 97% similarity] patch | blob | history
libjava/external/w3c_dom/org/w3c/dom/stylesheets/DocumentStyle.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/stylesheets/LinkStyle.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/stylesheets/MediaList.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/stylesheets/StyleSheet.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/stylesheets/StyleSheetList.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/traversal/DocumentTraversal.java [moved from libjava/org/w3c/dom/traversal/DocumentTraversal.java with 60% similarity] patch | blob | history
libjava/external/w3c_dom/org/w3c/dom/traversal/NodeFilter.java [moved from libjava/org/w3c/dom/traversal/NodeFilter.java with 79% similarity] patch | blob | history
libjava/external/w3c_dom/org/w3c/dom/traversal/NodeIterator.java [moved from libjava/org/w3c/dom/traversal/NodeIterator.java with 64% similarity] patch | blob | history
libjava/external/w3c_dom/org/w3c/dom/traversal/TreeWalker.java [moved from libjava/org/w3c/dom/traversal/TreeWalker.java with 89% similarity] patch | blob | history
libjava/external/w3c_dom/org/w3c/dom/views/AbstractView.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/views/DocumentView.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/xpath/XPathEvaluator.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/xpath/XPathException.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/xpath/XPathExpression.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/xpath/XPathNSResolver.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/xpath/XPathNamespace.java [new file with mode: 0644] patch | blob
libjava/external/w3c_dom/org/w3c/dom/xpath/XPathResult.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/aelfred2/ContentHandler2.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/aelfred2/JAXPFactory.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/aelfred2/SAXDriver.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/aelfred2/XmlParser.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/aelfred2/XmlReader.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/aelfred2/package.html [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/Consumer.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DTDAttributeTypeInfo.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DTDElementTypeInfo.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomAttr.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomCDATA.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomCharacterData.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomComment.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomDoctype.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomDocument.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomDocumentBuilder.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomDocumentBuilderFactory.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomDocumentConfiguration.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomElement.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomEntity.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomEntityReference.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomEvent.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomEx.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomExtern.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomFragment.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomImpl.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomIterator.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomNSResolverContext.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomNamedNodeMap.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomNodeIterator.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomNotation.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomNsNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomPI.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomText.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomXPathExpression.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomXPathNSResolver.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/DomXPathResult.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/ImplementationList.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/ImplementationSource.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/JAXPFactory.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/ls/DomLSEx.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/ls/DomLSInput.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/ls/DomLSOutput.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/ls/DomLSParser.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/ls/DomLSSerializer.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/ls/FilteredSAXEventSink.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/ls/ReaderInputStream.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/ls/SAXEventSink.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/ls/WriterOutputStream.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/dom/package.html [new file with mode: 0644] patch | blob
libjava/gnu/xml/pipeline/CallFilter.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/pipeline/DomConsumer.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/pipeline/EventConsumer.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/pipeline/EventFilter.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/pipeline/LinkFilter.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/pipeline/NSFilter.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/pipeline/PipelineFactory.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/pipeline/TeeConsumer.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/pipeline/TextConsumer.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/pipeline/ValidationConsumer.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/pipeline/WellFormednessFilter.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/pipeline/XIncludeFilter.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/pipeline/XsltFilter.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/pipeline/package.html [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/AbstractNumberNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/ApplyImportsNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/ApplyTemplatesNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/AttributeNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/AttributeSet.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/Bindings.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/CallTemplateNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/ChooseNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/CommentNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/CopyNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/CopyOfNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/CurrentFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/DOMSourceLocator.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/DocumentFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/ElementAvailableFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/ElementNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/ErrorListenerErrorHandler.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/ForEachNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/FormatNumberFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/FunctionAvailableFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/GenerateIdFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/IfNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/Key.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/KeyFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/LiteralNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/MessageNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/NodeNumberNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/NumberNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/OtherwiseNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/ParameterNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/ProcessingInstructionNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/SAXSerializer.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/SortKey.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/StreamSerializer.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/Stylesheet.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/SystemPropertyFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/Template.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/TemplateNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/TemplatesImpl.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/TextNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/TransformerFactoryImpl.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/TransformerImpl.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/TransformerOutputProperties.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/URIResolverEntityResolver.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/UnparsedEntityUriFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/ValueOfNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/WhenNode.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/WithParam.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/XSLComparator.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/XSLURIResolver.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/transform/package.html [new file with mode: 0644] patch | blob
libjava/gnu/xml/util/DoParse.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/util/DomParser.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/util/Resolver.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/util/SAXNullTransformerFactory.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/util/XCat.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/util/XHTMLWriter.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/util/XMLWriter.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/util/package.html [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/AndExpr.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/ArithmeticExpr.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/BooleanFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/CeilingFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/ConcatFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/Constant.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/ContainsFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/CountFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/DocumentOrderComparator.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/EqualityExpr.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/Expr.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/FalseFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/FloorFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/Function.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/FunctionCall.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/IdFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/LangFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/LastFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/LocalNameFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/NameFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/NameTest.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/NamespaceTest.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/NamespaceUriFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/NegativeExpr.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/NodeTypeTest.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/NormalizeSpaceFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/NotFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/NumberFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/OrExpr.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/ParenthesizedExpr.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/Path.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/Pattern.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/PositionFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/Predicate.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/RelationalExpr.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/Root.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/RoundFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/Selector.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/StartsWithFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/Steps.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/StringFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/StringLengthFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/SubstringAfterFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/SubstringBeforeFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/SubstringFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/SumFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/Test.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/TranslateFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/TrueFunction.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/UnionExpr.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/VariableReference.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/XPathFactoryImpl.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/XPathImpl.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/XPathParser.java [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/XPathParser.y [new file with mode: 0644] patch | blob
libjava/gnu/xml/xpath/XPathTokenizer.java [new file with mode: 0644] patch | blob
libjava/javax/xml/XMLConstants.java [new file with mode: 0644] patch | blob
libjava/javax/xml/datatype/DatatypeConfigurationException.java [new file with mode: 0644] patch | blob
libjava/javax/xml/datatype/DatatypeConstants.java [new file with mode: 0644] patch | blob
libjava/javax/xml/datatype/DatatypeFactory.java [new file with mode: 0644] patch | blob
libjava/javax/xml/datatype/Duration.java [new file with mode: 0644] patch | blob
libjava/javax/xml/datatype/XMLGregorianCalendar.java [new file with mode: 0644] patch | blob
libjava/javax/xml/datatype/package.html [new file with mode: 0644] patch | blob
libjava/javax/xml/namespace/NamespaceContext.java [new file with mode: 0644] patch | blob
libjava/javax/xml/namespace/QName.java [new file with mode: 0644] patch | blob
libjava/javax/xml/namespace/package.html [new file with mode: 0644] patch | blob
libjava/javax/xml/parsers/DocumentBuilder.java [new file with mode: 0644] patch | blob
libjava/javax/xml/parsers/DocumentBuilderFactory.java [new file with mode: 0644] patch | blob
libjava/javax/xml/parsers/FactoryConfigurationError.java [new file with mode: 0644] patch | blob
libjava/javax/xml/parsers/ParserConfigurationException.java [new file with mode: 0644] patch | blob
libjava/javax/xml/parsers/SAXParser.java [new file with mode: 0644] patch | blob
libjava/javax/xml/parsers/SAXParserFactory.java [new file with mode: 0644] patch | blob
libjava/javax/xml/parsers/package.html [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/ErrorListener.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/OutputKeys.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/Result.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/Source.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/SourceLocator.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/Templates.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/Transformer.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/TransformerConfigurationException.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/TransformerException.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/TransformerFactory.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/TransformerFactoryConfigurationError.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/URIResolver.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/dom/DOMLocator.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/dom/DOMResult.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/dom/DOMSource.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/dom/package.html [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/package.html [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/sax/SAXResult.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/sax/SAXSource.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/sax/SAXTransformerFactory.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/sax/TemplatesHandler.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/sax/TransformerHandler.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/sax/package.html [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/stream/StreamResult.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/stream/StreamSource.java [new file with mode: 0644] patch | blob
libjava/javax/xml/transform/stream/package.html [new file with mode: 0644] patch | blob
libjava/javax/xml/validation/Schema.java [new file with mode: 0644] patch | blob
libjava/javax/xml/validation/SchemaFactory.java [new file with mode: 0644] patch | blob
libjava/javax/xml/validation/TypeInfoProvider.java [new file with mode: 0644] patch | blob
libjava/javax/xml/validation/Validator.java [new file with mode: 0644] patch | blob
libjava/javax/xml/validation/ValidatorHandler.java [new file with mode: 0644] patch | blob
libjava/javax/xml/validation/package.html [new file with mode: 0644] patch | blob
libjava/javax/xml/xpath/XPath.java [new file with mode: 0644] patch | blob
libjava/javax/xml/xpath/XPathConstants.java [new file with mode: 0644] patch | blob
libjava/javax/xml/xpath/XPathException.java [new file with mode: 0644] patch | blob
libjava/javax/xml/xpath/XPathExpression.java [new file with mode: 0644] patch | blob
libjava/javax/xml/xpath/XPathExpressionException.java [new file with mode: 0644] patch | blob
libjava/javax/xml/xpath/XPathFactory.java [new file with mode: 0644] patch | blob
libjava/javax/xml/xpath/XPathFactoryConfigurationException.java [new file with mode: 0644] patch | blob
libjava/javax/xml/xpath/XPathFunction.java [new file with mode: 0644] patch | blob
libjava/javax/xml/xpath/XPathFunctionException.java [new file with mode: 0644] patch | blob
libjava/javax/xml/xpath/XPathFunctionResolver.java [new file with mode: 0644] patch | blob
libjava/javax/xml/xpath/XPathVariableResolver.java [new file with mode: 0644] patch | blob
libjava/javax/xml/xpath/package.html [new file with mode: 0644] patch | blob
libjava/org/w3c/dom/Attr.java [deleted file] patch | blob | history
libjava/org/w3c/dom/CDATASection.java [deleted file] patch | blob | history
libjava/org/w3c/dom/DOMImplementation.java [deleted file] patch | blob | history
libjava/org/w3c/dom/Document.java [deleted file] patch | blob | history
libjava/org/w3c/dom/Element.java [deleted file] patch | blob | history
libjava/org/w3c/dom/Entity.java [deleted file] patch | blob | history
libjava/org/w3c/dom/EntityReference.java [deleted file] patch | blob | history
libjava/org/w3c/dom/Node.java [deleted file] patch | blob | history
libjava/org/w3c/dom/Notation.java [deleted file] patch | blob | history
libjava/org/w3c/dom/ProcessingInstruction.java [deleted file] patch | blob | history
libjava/org/w3c/dom/Text.java [deleted file] patch | blob | history
libjava/org/xml/sax/package.html [deleted file] patch | blob | history

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 972745b..c75db1b 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,323 @@
+2005-02-01  Tom Tromey  <tromey@redhat.com>
+
+       * external/w3c_dom/Makefile.am: New file.
+       * external/w3c_dom/Makefile.in: New file.
+       * external/sax/Makefile.am: New file.
+       * external/sax/Makefile.in: New file.
+       * external/Makefile.in: New file.
+       * external/Makefile.am: New file.
+       * external/README: New file from Classpath.
+       * configure, aclocal.m4, Makefile.in: Rebuilt.
+       * configure.ac (AC_CONFIG_FILES): Create new Makefiles.
+       * Makefile.am (SUBDIRS): Added external.
+       (toolexeclib_LTLIBRARIES): Removed lib-org-xml-sax.la,
+       lib-org-w3c-dom.la, lib-org-ietf-gss.la.
+       (BOOTCLASSPATH): New variable.
+       (AM_GCJFLAGS): Use it.
+       (gnu_xml_source_files): New variable.
+       (libgcj_la_SOURCES): Use it.
+       (libgcj_la_LDADD): Include new convenience libraries.
+       (lib_org_ietf_jgss_la_SOURCES): Removed.
+       (lib_org_ietf_jgss_la_DEPENDENCIES): Likewise.
+       (lib_org_ietf_jgss_la_LIBADD): Likewise.
+       (lib_org_w3c_dom_la_SOURCES): Removed.
+       (lib_org_w3c_dom_la_DEPENDENCIES): Likewise.
+       (lib_org_w3c_dom_la_LIBADD): Likewise.
+       (lib_org_xml_sax_la_SOURCES): Removed.
+       (lib_org_xml_sax_la_DEPENDENCIES): Likewise.
+       (lib_org_xml_sax_la_LIBADD): Likewise.
+       (all_java_source_files): Updated.
+       (property_files): Likewise.
+       (libgcj-@gcc_version@.jar): Include classes from external/.
+       (javax_source_files): Updated.
+       (ordinary_java_source_files): Updated.
+       * javax/xml/XMLConstants.java,
+       javax/xml/datatype/DatatypeConfigurationException.java,
+       javax/xml/datatype/DatatypeConstants.java,
+       javax/xml/datatype/DatatypeFactory.java,
+       javax/xml/datatype/Duration.java,
+       javax/xml/datatype/XMLGregorianCalendar.java,
+       javax/xml/datatype/package.html,
+       javax/xml/namespace/NamespaceContext.java,
+       javax/xml/namespace/QName.java, javax/xml/namespace/package.html,
+       javax/xml/parsers/DocumentBuilder.java,
+       javax/xml/parsers/DocumentBuilderFactory.java,
+       javax/xml/parsers/FactoryConfigurationError.java,
+       javax/xml/parsers/ParserConfigurationException.java,
+       javax/xml/parsers/SAXParser.java,
+       javax/xml/parsers/SAXParserFactory.java,
+       javax/xml/parsers/package.html,
+       javax/xml/transform/ErrorListener.java,
+       javax/xml/transform/OutputKeys.java,
+       javax/xml/transform/Result.java, javax/xml/transform/Source.java,
+       javax/xml/transform/SourceLocator.java,
+       javax/xml/transform/Templates.java,
+       javax/xml/transform/Transformer.java,
+       javax/xml/transform/TransformerConfigurationException.java,
+       javax/xml/transform/TransformerException.java,
+       javax/xml/transform/TransformerFactory.java,
+       javax/xml/transform/TransformerFactoryConfigurationError.java,
+       javax/xml/transform/URIResolver.java,
+       javax/xml/transform/package.html,
+       javax/xml/transform/dom/DOMLocator.java,
+       javax/xml/transform/dom/DOMResult.java,
+       javax/xml/transform/dom/DOMSource.java,
+       javax/xml/transform/dom/package.html,
+       javax/xml/transform/sax/SAXResult.java,
+       javax/xml/transform/sax/SAXSource.java,
+       javax/xml/transform/sax/SAXTransformerFactory.java,
+       javax/xml/transform/sax/TemplatesHandler.java,
+       javax/xml/transform/sax/TransformerHandler.java,
+       javax/xml/transform/sax/package.html,
+       javax/xml/transform/stream/StreamResult.java,
+       javax/xml/transform/stream/StreamSource.java,
+       javax/xml/transform/stream/package.html,
+       javax/xml/validation/Schema.java,
+       javax/xml/validation/SchemaFactory.java,
+       javax/xml/validation/TypeInfoProvider.java,
+       javax/xml/validation/Validator.java,
+       javax/xml/validation/ValidatorHandler.java,
+       javax/xml/validation/package.html, javax/xml/xpath/XPath.java,
+       javax/xml/xpath/XPathConstants.java,
+       javax/xml/xpath/XPathException.java,
+       javax/xml/xpath/XPathExpression.java,
+       javax/xml/xpath/XPathExpressionException.java,
+       javax/xml/xpath/XPathFactory.java,
+       javax/xml/xpath/XPathFactoryConfigurationException.java,
+       javax/xml/xpath/XPathFunction.java,
+       javax/xml/xpath/XPathFunctionException.java,
+       javax/xml/xpath/XPathFunctionResolver.java,
+       javax/xml/xpath/XPathVariableResolver.java,
+       javax/xml/xpath/package.html: New files, from GNU JAXP.
+       * org/w3c/dom/Attr.java, org/w3c/dom/CDATASection.java,
+       org/w3c/dom/CharacterData.java, org/w3c/dom/Comment.java,
+       org/w3c/dom/DOMException.java, org/w3c/dom/DOMImplementation.java,
+       org/w3c/dom/Document.java, org/w3c/dom/DocumentFragment.java,
+       org/w3c/dom/DocumentType.java, org/w3c/dom/Element.java,
+       org/w3c/dom/Entity.java, org/w3c/dom/EntityReference.java,
+       org/w3c/dom/NamedNodeMap.java, org/w3c/dom/Node.java,
+       org/w3c/dom/NodeList.java, org/w3c/dom/Notation.java,
+       org/w3c/dom/ProcessingInstruction.java, org/w3c/dom/Text.java,
+       org/w3c/dom/ranges/DocumentRange.java,
+       org/w3c/dom/ranges/Range.java,
+       org/w3c/dom/ranges/RangeException.java,
+       org/w3c/dom/traversal/DocumentTraversal.java,
+       org/w3c/dom/traversal/NodeFilter.java,
+       org/w3c/dom/traversal/NodeIterator.java,
+       org/w3c/dom/traversal/TreeWalker.java,
+       org/xml/sax/AttributeList.java, org/xml/sax/Attributes.java,
+       org/xml/sax/ContentHandler.java, org/xml/sax/DTDHandler.java,
+       org/xml/sax/DocumentHandler.java, org/xml/sax/EntityResolver.java,
+       org/xml/sax/ErrorHandler.java, org/xml/sax/HandlerBase.java,
+       org/xml/sax/InputSource.java, org/xml/sax/Locator.java,
+       org/xml/sax/Parser.java, org/xml/sax/SAXException.java,
+       org/xml/sax/SAXNotRecognizedException.java,
+       org/xml/sax/SAXNotSupportedException.java,
+       org/xml/sax/SAXParseException.java, org/xml/sax/XMLFilter.java,
+       org/xml/sax/XMLReader.java, org/xml/sax/package.html,
+       org/xml/sax/ext/DeclHandler.java,
+       org/xml/sax/ext/LexicalHandler.java, org/xml/sax/ext/package.html,
+       org/xml/sax/helpers/AttributeListImpl.java,
+       org/xml/sax/helpers/AttributesImpl.java,
+       org/xml/sax/helpers/DefaultHandler.java,
+       org/xml/sax/helpers/LocatorImpl.java,
+       org/xml/sax/helpers/NamespaceSupport.java,
+       org/xml/sax/helpers/NewInstance.java,
+       org/xml/sax/helpers/ParserAdapter.java,
+       org/xml/sax/helpers/ParserFactory.java,
+       org/xml/sax/helpers/XMLFilterImpl.java,
+       org/xml/sax/helpers/XMLReaderAdapter.java,
+       org/xml/sax/helpers/XMLReaderFactory.java,
+       org/xml/sax/helpers/package.html: Moved to external/.
+       * external/sax/README,
+       external/sax/org/xml/sax/AttributeList.java,
+       external/sax/org/xml/sax/Attributes.java,
+       external/sax/org/xml/sax/ContentHandler.java,
+       external/sax/org/xml/sax/DTDHandler.java,
+       external/sax/org/xml/sax/DocumentHandler.java,
+       external/sax/org/xml/sax/EntityResolver.java,
+       external/sax/org/xml/sax/ErrorHandler.java,
+       external/sax/org/xml/sax/HandlerBase.java,
+       external/sax/org/xml/sax/InputSource.java,
+       external/sax/org/xml/sax/Locator.java,
+       external/sax/org/xml/sax/Parser.java,
+       external/sax/org/xml/sax/SAXException.java,
+       external/sax/org/xml/sax/SAXNotRecognizedException.java,
+       external/sax/org/xml/sax/SAXNotSupportedException.java,
+       external/sax/org/xml/sax/SAXParseException.java,
+       external/sax/org/xml/sax/XMLFilter.java,
+       external/sax/org/xml/sax/XMLReader.java,
+       external/sax/org/xml/sax/package.html,
+       external/sax/org/xml/sax/ext/Attributes2.java,
+       external/sax/org/xml/sax/ext/Attributes2Impl.java,
+       external/sax/org/xml/sax/ext/DeclHandler.java,
+       external/sax/org/xml/sax/ext/DefaultHandler2.java,
+       external/sax/org/xml/sax/ext/EntityResolver2.java,
+       external/sax/org/xml/sax/ext/LexicalHandler.java,
+       external/sax/org/xml/sax/ext/Locator2.java,
+       external/sax/org/xml/sax/ext/Locator2Impl.java,
+       external/sax/org/xml/sax/ext/package.html,
+       external/sax/org/xml/sax/helpers/AttributeListImpl.java,
+       external/sax/org/xml/sax/helpers/AttributesImpl.java,
+       external/sax/org/xml/sax/helpers/DefaultHandler.java,
+       external/sax/org/xml/sax/helpers/LocatorImpl.java,
+       external/sax/org/xml/sax/helpers/NamespaceSupport.java,
+       external/sax/org/xml/sax/helpers/NewInstance.java,
+       external/sax/org/xml/sax/helpers/ParserAdapter.java,
+       external/sax/org/xml/sax/helpers/ParserFactory.java,
+       external/sax/org/xml/sax/helpers/XMLFilterImpl.java,
+       external/sax/org/xml/sax/helpers/XMLReaderAdapter.java,
+       external/sax/org/xml/sax/helpers/XMLReaderFactory.java,
+       external/sax/org/xml/sax/helpers/package.html,
+       external/w3c_dom/COPYRIGHT.html, external/w3c_dom/README,
+       external/w3c_dom/org/w3c/dom/Attr.java,
+       external/w3c_dom/org/w3c/dom/CDATASection.java,
+       external/w3c_dom/org/w3c/dom/CharacterData.java,
+       external/w3c_dom/org/w3c/dom/Comment.java,
+       external/w3c_dom/org/w3c/dom/DOMConfiguration.java,
+       external/w3c_dom/org/w3c/dom/DOMError.java,
+       external/w3c_dom/org/w3c/dom/DOMErrorHandler.java,
+       external/w3c_dom/org/w3c/dom/DOMException.java,
+       external/w3c_dom/org/w3c/dom/DOMImplementation.java,
+       external/w3c_dom/org/w3c/dom/DOMImplementationList.java,
+       external/w3c_dom/org/w3c/dom/DOMImplementationSource.java,
+       external/w3c_dom/org/w3c/dom/DOMLocator.java,
+       external/w3c_dom/org/w3c/dom/DOMStringList.java,
+       external/w3c_dom/org/w3c/dom/Document.java,
+       external/w3c_dom/org/w3c/dom/DocumentFragment.java,
+       external/w3c_dom/org/w3c/dom/DocumentType.java,
+       external/w3c_dom/org/w3c/dom/Element.java,
+       external/w3c_dom/org/w3c/dom/Entity.java,
+       external/w3c_dom/org/w3c/dom/EntityReference.java,
+       external/w3c_dom/org/w3c/dom/NameList.java,
+       external/w3c_dom/org/w3c/dom/NamedNodeMap.java,
+       external/w3c_dom/org/w3c/dom/Node.java,
+       external/w3c_dom/org/w3c/dom/NodeList.java,
+       external/w3c_dom/org/w3c/dom/Notation.java,
+       external/w3c_dom/org/w3c/dom/ProcessingInstruction.java,
+       external/w3c_dom/org/w3c/dom/Text.java,
+       external/w3c_dom/org/w3c/dom/TypeInfo.java,
+       external/w3c_dom/org/w3c/dom/UserDataHandler.java,
+       external/w3c_dom/org/w3c/dom/bootstrap/DOMImplementationRegistry.java,
+       external/w3c_dom/org/w3c/dom/css/CSS2Properties.java,
+       external/w3c_dom/org/w3c/dom/css/CSSCharsetRule.java,
+       external/w3c_dom/org/w3c/dom/css/CSSFontFaceRule.java,
+       external/w3c_dom/org/w3c/dom/css/CSSImportRule.java,
+       external/w3c_dom/org/w3c/dom/css/CSSMediaRule.java,
+       external/w3c_dom/org/w3c/dom/css/CSSPageRule.java,
+       external/w3c_dom/org/w3c/dom/css/CSSPrimitiveValue.java,
+       external/w3c_dom/org/w3c/dom/css/CSSRule.java,
+       external/w3c_dom/org/w3c/dom/css/CSSRuleList.java,
+       external/w3c_dom/org/w3c/dom/css/CSSStyleDeclaration.java,
+       external/w3c_dom/org/w3c/dom/css/CSSStyleRule.java,
+       external/w3c_dom/org/w3c/dom/css/CSSStyleSheet.java,
+       external/w3c_dom/org/w3c/dom/css/CSSUnknownRule.java,
+       external/w3c_dom/org/w3c/dom/css/CSSValue.java,
+       external/w3c_dom/org/w3c/dom/css/CSSValueList.java,
+       external/w3c_dom/org/w3c/dom/css/Counter.java,
+       external/w3c_dom/org/w3c/dom/css/DOMImplementationCSS.java,
+       external/w3c_dom/org/w3c/dom/css/DocumentCSS.java,
+       external/w3c_dom/org/w3c/dom/css/ElementCSSInlineStyle.java,
+       external/w3c_dom/org/w3c/dom/css/RGBColor.java,
+       external/w3c_dom/org/w3c/dom/css/Rect.java,
+       external/w3c_dom/org/w3c/dom/css/ViewCSS.java,
+       external/w3c_dom/org/w3c/dom/events/DocumentEvent.java,
+       external/w3c_dom/org/w3c/dom/events/Event.java,
+       external/w3c_dom/org/w3c/dom/events/EventException.java,
+       external/w3c_dom/org/w3c/dom/events/EventListener.java,
+       external/w3c_dom/org/w3c/dom/events/EventTarget.java,
+       external/w3c_dom/org/w3c/dom/events/MouseEvent.java,
+       external/w3c_dom/org/w3c/dom/events/MutationEvent.java,
+       external/w3c_dom/org/w3c/dom/events/UIEvent.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLAnchorElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLAppletElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLAreaElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLBRElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLBaseElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLBaseFontElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLBodyElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLButtonElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLCollection.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLDListElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLDirectoryElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLDivElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLDocument.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLFieldSetElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLFontElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLFormElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLFrameElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLFrameSetElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLHRElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLHeadElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLHeadingElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLHtmlElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLIFrameElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLImageElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLInputElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLIsIndexElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLLIElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLLabelElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLLegendElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLLinkElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLMapElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLMenuElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLMetaElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLModElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLOListElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLObjectElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLOptGroupElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLOptionElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLOptionsCollection.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLParagraphElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLParamElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLPreElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLQuoteElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLScriptElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLSelectElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLStyleElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLTableCaptionElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLTableCellElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLTableColElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLTableElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLTableRowElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLTableSectionElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLTextAreaElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLTitleElement.java,
+       external/w3c_dom/org/w3c/dom/html2/HTMLUListElement.java,
+       external/w3c_dom/org/w3c/dom/ls/DOMImplementationLS.java,
+       external/w3c_dom/org/w3c/dom/ls/LSException.java,
+       external/w3c_dom/org/w3c/dom/ls/LSInput.java,
+       external/w3c_dom/org/w3c/dom/ls/LSLoadEvent.java,
+       external/w3c_dom/org/w3c/dom/ls/LSOutput.java,
+       external/w3c_dom/org/w3c/dom/ls/LSParser.java,
+       external/w3c_dom/org/w3c/dom/ls/LSParserFilter.java,
+       external/w3c_dom/org/w3c/dom/ls/LSProgressEvent.java,
+       external/w3c_dom/org/w3c/dom/ls/LSResourceResolver.java,
+       external/w3c_dom/org/w3c/dom/ls/LSSerializer.java,
+       external/w3c_dom/org/w3c/dom/ls/LSSerializerFilter.java,
+       external/w3c_dom/org/w3c/dom/ranges/DocumentRange.java,
+       external/w3c_dom/org/w3c/dom/ranges/Range.java,
+       external/w3c_dom/org/w3c/dom/ranges/RangeException.java,
+       external/w3c_dom/org/w3c/dom/stylesheets/DocumentStyle.java,
+       external/w3c_dom/org/w3c/dom/stylesheets/LinkStyle.java,
+       external/w3c_dom/org/w3c/dom/stylesheets/MediaList.java,
+       external/w3c_dom/org/w3c/dom/stylesheets/StyleSheet.java,
+       external/w3c_dom/org/w3c/dom/stylesheets/StyleSheetList.java,
+       external/w3c_dom/org/w3c/dom/traversal/DocumentTraversal.java,
+       external/w3c_dom/org/w3c/dom/traversal/NodeFilter.java,
+       external/w3c_dom/org/w3c/dom/traversal/NodeIterator.java,
+       external/w3c_dom/org/w3c/dom/traversal/TreeWalker.java,
+       external/w3c_dom/org/w3c/dom/views/AbstractView.java,
+       external/w3c_dom/org/w3c/dom/views/DocumentView.java,
+       external/w3c_dom/org/w3c/dom/xpath/XPathEvaluator.java,
+       external/w3c_dom/org/w3c/dom/xpath/XPathException.java,
+       external/w3c_dom/org/w3c/dom/xpath/XPathExpression.java,
+       external/w3c_dom/org/w3c/dom/xpath/XPathNSResolver.java,
+       external/w3c_dom/org/w3c/dom/xpath/XPathNamespace.java,
+       external/w3c_dom/org/w3c/dom/xpath/XPathResult.java: New files
+       from Classpath.
+
 2005-01-31  Anthony Green  <green@redhat.com>
 
        * gnu/java/net/natPlainDatagramSocketImplPosix.cc (getOption):
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index e212c3b..db764eb 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -64,9 +64,9 @@ endif
 
 ## Testsuite conditional.
 if TESTSUBDIR
-SUBDIRS = $(DIRLTDL) testsuite gcj include
+SUBDIRS = $(DIRLTDL) testsuite gcj include external
 else
-SUBDIRS = $(DIRLTDL) gcj include
+SUBDIRS = $(DIRLTDL) gcj include external
 endif
 
 ## Darwin uses the jcr section, but doesn't use crtstuff.
@@ -106,8 +106,7 @@ else
 cond_gtk_ltlibrary =
 endif
 
-toolexeclib_LTLIBRARIES = libgcj.la libgij.la lib-org-xml-sax.la \
-       lib-org-w3c-dom.la lib-org-ietf-jgss.la \
+toolexeclib_LTLIBRARIES = libgcj.la libgij.la \
     $(cond_gtk_ltlibrary) $(cond_xlib_ltlibrary)
 toolexecmainlib_DATA = libgcj.spec
 
@@ -174,7 +173,7 @@ AM_CXXFLAGS = \
 
 AM_GCJFLAGS = \
        @LIBGCJ_JAVAFLAGS@ \
-       -fclasspath= -fbootclasspath=$(here) \
+       -fclasspath= -fbootclasspath=$(BOOTCLASSPATH) \
        --encoding=UTF-8 \
        -Wno-deprecated
 
@@ -196,6 +195,8 @@ AM_CPPFLAGS = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
        $(GCINCS) $(THREADINCS) $(INCLTDL) \
        $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS)
 
+BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)
+
 ## ################################################################
 
 ##
@@ -213,7 +214,7 @@ libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
 libgcj_la_SOURCES = prims.cc jni.cc exception.cc \
        link.cc defineclass.cc interpret.cc verify.cc \
        $(nat_source_files) $(math_c_source_files) $(java_source_files) \
-       $(built_java_source_files) \
+       $(gnu_xml_source_files) $(built_java_source_files) \
        $(BOEHMGC_SRC) $(NOGC_SRC) \
        $(BACKTRACE_SRC) \
        $(POSIX_PLATFORM_SRC) $(WIN32_PLATFORM_SRC) $(ECOS_PLATFORM_SRC) \
@@ -233,7 +234,10 @@ xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
 libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \
        $(LIBLTDL) $(SYS_ZLIBS) \
        -version-info `grep -v '^\#' $(srcdir)/libtool-version`
-libgcj_la_LIBADD = $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files)
+libgcj_la_LIBADD = \
+       external/sax/libsax_convenience.la \
+       external/w3c_dom/libw3c_convenience.la \
+       $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files)
 libgcj_la_LINK = $(LIBLINK)
 
 # Gtk/Cairo JNI sources.
@@ -456,93 +460,6 @@ lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \
         -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
 lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK)
 
-lib_org_ietf_jgss_la_SOURCES = \
-org/ietf/jgss/ChannelBinding.java \
-org/ietf/jgss/GSSContext.java \
-org/ietf/jgss/GSSCredential.java \
-org/ietf/jgss/GSSException.java \
-org/ietf/jgss/GSSManager.java \
-org/ietf/jgss/GSSName.java \
-org/ietf/jgss/MessageProp.java \
-org/ietf/jgss/Oid.java
-
-lib_org_ietf_jgss_la_DEPENDENCIES= $(jgss_propertyo_files) \
-       libgcj-@gcc_version@.jar libgcj.la libgcj.spec
-## See jv_convert_LDADD.
-lib_org_ietf_jgss_la_LIBADD = -L$(here)/.libs  $(jgss_propertyo_files) \
-       libgcj.la
-
-## The mysterious backslash in the grep pattern is consumed by make.
-lib_org_ietf_jgss_la_LDFLAGS = -rpath $(toolexeclibdir) \
-       -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
-
-lib_org_w3c_dom_la_SOURCES = org/w3c/dom/Attr.java \
-org/w3c/dom/CDATASection.java \
-org/w3c/dom/CharacterData.java \
-org/w3c/dom/Comment.java \
-org/w3c/dom/DOMException.java \
-org/w3c/dom/DOMImplementation.java \
-org/w3c/dom/Document.java \
-org/w3c/dom/DocumentFragment.java \
-org/w3c/dom/DocumentType.java \
-org/w3c/dom/Element.java \
-org/w3c/dom/Entity.java \
-org/w3c/dom/EntityReference.java \
-org/w3c/dom/NamedNodeMap.java \
-org/w3c/dom/Node.java \
-org/w3c/dom/NodeList.java \
-org/w3c/dom/Notation.java \
-org/w3c/dom/ProcessingInstruction.java \
-org/w3c/dom/Text.java \
-org/w3c/dom/ranges/DocumentRange.java \
-org/w3c/dom/ranges/Range.java \
-org/w3c/dom/ranges/RangeException.java \
-org/w3c/dom/traversal/DocumentTraversal.java \
-org/w3c/dom/traversal/NodeFilter.java \
-org/w3c/dom/traversal/NodeIterator.java \
-org/w3c/dom/traversal/TreeWalker.java
-## See jv_convert_LDADD.
-lib_org_w3c_dom_la_LIBADD = -L$(here)/.libs libgcj.la
-## The mysterious backslash in the grep pattern is consumed by make.
-lib_org_w3c_dom_la_LDFLAGS = -rpath $(toolexeclibdir) \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
-
-lib_org_xml_sax_la_SOURCES = org/xml/sax/ext/DeclHandler.java \
-org/xml/sax/ext/LexicalHandler.java \
-org/xml/sax/helpers/AttributeListImpl.java \
-org/xml/sax/helpers/AttributesImpl.java \
-org/xml/sax/helpers/DefaultHandler.java \
-org/xml/sax/helpers/LocatorImpl.java \
-org/xml/sax/helpers/NamespaceSupport.java \
-org/xml/sax/helpers/NewInstance.java \
-org/xml/sax/helpers/ParserAdapter.java \
-org/xml/sax/helpers/ParserFactory.java \
-org/xml/sax/helpers/XMLFilterImpl.java \
-org/xml/sax/helpers/XMLReaderAdapter.java \
-org/xml/sax/helpers/XMLReaderFactory.java \
-org/xml/sax/AttributeList.java \
-org/xml/sax/Attributes.java \
-org/xml/sax/ContentHandler.java \
-org/xml/sax/DTDHandler.java \
-org/xml/sax/DocumentHandler.java \
-org/xml/sax/EntityResolver.java \
-org/xml/sax/ErrorHandler.java \
-org/xml/sax/HandlerBase.java \
-org/xml/sax/InputSource.java \
-org/xml/sax/Locator.java \
-org/xml/sax/Parser.java \
-org/xml/sax/SAXException.java \
-org/xml/sax/SAXNotRecognizedException.java \
-org/xml/sax/SAXNotSupportedException.java \
-org/xml/sax/SAXParseException.java \
-org/xml/sax/XMLFilter.java \
-org/xml/sax/XMLReader.java
-## See jv_convert_LDADD.
-lib_org_xml_sax_la_LIBADD = -L$(here)/.libs libgcj.la
-## The mysterious backslash in the grep pattern is consumed by make.
-lib_org_xml_sax_la_LDFLAGS = -rpath $(toolexeclibdir) \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
-
 lib_gnu_awt_xlib_la_SOURCES = \
        $(xlib_java_source_files) \
        $(xlib_nat_source_files)
@@ -563,11 +480,9 @@ lib_gnu_awt_xlib_la_LINK = $(LIBLINK)
 all_java_source_files = \
     $(java_source_files) \
     $(built_java_source_files) \
-    $(lib_org_ietf_jgss_la_SOURCES) \
-    $(lib_org_xml_sax_la_SOURCES) \
-    $(lib_org_w3c_dom_la_SOURCES) \
     $(gtk_awt_peer_sources) \
-    $(xlib_java_source_files)
+    $(xlib_java_source_files) \
+    $(gnu_xml_source_files)
 
 all_java_class_files = $(all_java_source_files:.java=.class)
 
@@ -577,18 +492,10 @@ all_property_files = $(property_files) $(jgss_property_files) \
 ## Build property files into the library.
 property_files = \
 gnu/regexp/MessagesBundle.properties \
-gnu/regexp/MessagesBundle_fr.properties
-
-propertyo_files = $(property_files:.properties=.properties.lo) 
-
-%.properties.lo: %.properties
-       $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"`
-
-## Build property files into the lib-org-ietf-jgss library.
-jgss_property_files = \
+gnu/regexp/MessagesBundle_fr.properties \
 org/ietf/jgss/MessagesBundle.properties
 
-jgss_propertyo_files = $(jgss_property_files:.properties=.properties.lo)
+propertyo_files = $(property_files:.properties=.properties.lo) 
 
 %.properties.lo: %.properties
        $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"`
@@ -601,7 +508,7 @@ libgcj-@gcc_version@.jar: $(all_java_source_files)
        -@rm -f libgcj-@gcc_version@.jar
        @echo Compiling Java sourcefiles...
        @: $(call write_entries_to_file,$?,libgcj.sourcelist)
-       $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir) -d $(here) @libgcj.sourcelist
+       $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(BOOTCLASSPATH) -d $(here) @libgcj.sourcelist
 ## Note that we explicitly want to include directory information.
        (find java gnu javax org -type d -o -type f -name '*.class'; \
 ## Ugly code to avoid "echo -C".  Must separate each entry by a newline
@@ -613,6 +520,16 @@ libgcj-@gcc_version@.jar: $(all_java_source_files)
        done) | \
          sed -e '/\/xlib/d' -e '/\/\.libs/d' -e '/\/\.deps/d' | \
          $(ZIP) -cfM0E@ $@
+## Now include the classes from external/.
+       for dir in sax w3c_dom; do \
+         (cd external/$$dir; \
+         find org -type f -name '*.class' -print | while read file; do \
+           echo "x-C" | sed -e 's/^.//'; \
+           echo external/$$dir; \
+           echo $$file; \
+          done) | \
+         $(ZIP) -ufM0E@ $@; \
+       done
 
 # This next rule seems backward, but reflects the fact
 # that 1) all classfiles are compiled in one go when the
@@ -641,6 +558,16 @@ libgcj-@gcc_version@.jar: $(all_java_class_files) $(all_property_files)
        done) | \
          sed -e '/\/xlib/d' -e '/\/\.libs/d' -e '/\/\.deps/d' | \
          $(ZIP) -cfM0E@ $@
+## Now include the classes from external/.
+       for dir in sax w3c_dom; do \
+         (cd external/$$dir; \
+         find org -type f -name '*.class' -print | while read file; do \
+           echo "x-C" | sed -e 's/^.//'; \
+           echo external/$$dir; \
+           echo $$file; \
+          done) | \
+         $(ZIP) -ufM0E@ $@; \
+       done
 
 endif
 
@@ -669,10 +596,10 @@ SUFFIXES = .class .java .h .properties
 
 ## Note: we omit StackTrace here, since it has an explicit rule a bit
 ## later, and GNU make will warn in this case.
-$(filter-out gnu/gcj/runtime/StackTrace.lo, $(javao_files)) $(xlib_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_ietf_jgss_la_OBJECTS): %.lo: %.java
+$(filter-out gnu/gcj/runtime/StackTrace.lo, $(javao_files)) $(xlib_javao_files): %.lo: %.java
        $(LTGCJCOMPILE) -o $@ -c $<
 
-$(gtk_awt_peer_sources:.java=.lo): %.lo: %.java
+$(gtk_awt_peer_sources:.java=.lo) $(gnu_xml_source_files:.java=.lo): %.lo: %.java
        $(LTGCJCOMPILE) -fjni -o $@ -c $<
 
 ## A special case.  The sibcall optimization can change the number of
@@ -702,12 +629,13 @@ lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPEND
 ## How to build header files.
 ##
 
-.class.h:
+%.h: %.class
        $(GCJH) -classpath '' -bootclasspath $(top_builddir) $(basename $<)
 
 ## Header files used when compiling some of the nat* files.
-ordinary_nat_headers = $(ordinary_java_source_files:.java=.h) \
-       $(built_java_source_files:.java=.h)
+ordinary_nat_headers = \
+    $(ordinary_java_source_files:.java=.h) \
+    $(built_java_source_files:.java=.h)
 
 inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \
        java/io/ObjectInputStream$$GetField.h \
@@ -2005,426 +1933,663 @@ gnu/java/rmi/server/UnicastServer.java \
 gnu/java/rmi/server/UnicastServerRef.java
 
 javax_source_files = \
-javax/accessibility/Accessible.java \
-javax/accessibility/AccessibleAction.java \
-javax/accessibility/AccessibleBundle.java \
-javax/accessibility/AccessibleComponent.java \
-javax/accessibility/AccessibleContext.java \
-javax/accessibility/AccessibleEditableText.java \
-javax/accessibility/AccessibleExtendedComponent.java \
-javax/accessibility/AccessibleExtendedTable.java \
-javax/accessibility/AccessibleHyperlink.java \
-javax/accessibility/AccessibleHypertext.java \
-javax/accessibility/AccessibleIcon.java \
-javax/accessibility/AccessibleKeyBinding.java \
-javax/accessibility/AccessibleRelation.java \
-javax/accessibility/AccessibleRelationSet.java \
-javax/accessibility/AccessibleResourceBundle.java \
-javax/accessibility/AccessibleRole.java \
-javax/accessibility/AccessibleSelection.java \
-javax/accessibility/AccessibleState.java \
-javax/accessibility/AccessibleStateSet.java \
-javax/accessibility/AccessibleTable.java \
-javax/accessibility/AccessibleTableModelChange.java \
-javax/accessibility/AccessibleText.java \
-javax/accessibility/AccessibleValue.java \
-javax/crypto/BadPaddingException.java \
-javax/crypto/Cipher.java \
-javax/crypto/CipherInputStream.java \
-javax/crypto/CipherOutputStream.java \
-javax/crypto/CipherSpi.java \
-javax/crypto/EncryptedPrivateKeyInfo.java \
-javax/crypto/KeyGeneratorSpi.java \
-javax/crypto/ExemptionMechanism.java \
-javax/crypto/ExemptionMechanismException.java \
-javax/crypto/ExemptionMechanismSpi.java \
-javax/crypto/IllegalBlockSizeException.java \
-javax/crypto/KeyAgreement.java \
-javax/crypto/KeyAgreementSpi.java \
-javax/crypto/KeyGenerator.java \
-javax/crypto/Mac.java \
-javax/crypto/MacSpi.java \
-javax/crypto/NoSuchPaddingException.java \
-javax/crypto/NullCipher.java \
-javax/crypto/NullCipherImpl.java \
-javax/crypto/SealedObject.java \
-javax/crypto/SecretKey.java \
-javax/crypto/SecretKeyFactory.java \
-javax/crypto/SecretKeyFactorySpi.java \
-javax/crypto/ShortBufferException.java \
-javax/crypto/interfaces/DHKey.java \
-javax/crypto/interfaces/DHPrivateKey.java \
-javax/crypto/interfaces/DHPublicKey.java \
-javax/crypto/interfaces/PBEKey.java \
-javax/crypto/spec/DESKeySpec.java \
-javax/crypto/spec/DESedeKeySpec.java \
-javax/crypto/spec/DHGenParameterSpec.java \
-javax/crypto/spec/DHParameterSpec.java \
-javax/crypto/spec/DHPrivateKeySpec.java \
-javax/crypto/spec/DHPublicKeySpec.java \
-javax/crypto/spec/IvParameterSpec.java \
-javax/crypto/spec/PBEKeySpec.java \
-javax/crypto/spec/PBEParameterSpec.java \
-javax/crypto/spec/RC2ParameterSpec.java \
-javax/crypto/spec/RC5ParameterSpec.java \
-javax/crypto/spec/SecretKeySpec.java \
-javax/imageio/IIOException.java \
-javax/imageio/IIOImage.java \
-javax/imageio/IIOParam.java \
-javax/imageio/IIOParamController.java \
-javax/imageio/ImageIO.java \
-javax/imageio/ImageReadParam.java \
-javax/imageio/ImageReader.java \
-javax/imageio/ImageTranscoder.java \
-javax/imageio/ImageTypeSpecifier.java \
 javax/imageio/ImageWriteParam.java \
+javax/imageio/ImageReader.java \
 javax/imageio/ImageWriter.java \
-javax/imageio/event/IIOReadProgressListener.java \
-javax/imageio/event/IIOReadUpdateListener.java \
-javax/imageio/event/IIOReadWarningListener.java \
-javax/imageio/event/IIOWriteProgressListener.java \
-javax/imageio/event/IIOWriteWarningListener.java \
-javax/imageio/metadata/IIOInvalidTreeException.java \
-javax/imageio/metadata/IIOMetadata.java \
-javax/imageio/metadata/IIOMetadataController.java \
-javax/imageio/metadata/IIOMetadataFormat.java \
-javax/imageio/metadata/IIOMetadataFormatImpl.java \
-javax/imageio/metadata/IIOMetadataNode.java \
-javax/imageio/spi/IIOServiceProvider.java \
+javax/imageio/IIOException.java        \
+javax/imageio/IIOParamController.java \
+javax/imageio/ImageReadParam.java \
+javax/imageio/IIOParam.java \
 javax/imageio/spi/IIORegistry.java \
-javax/imageio/spi/ImageInputStreamSpi.java \
+javax/imageio/spi/ImageWriterSpi.java \
 javax/imageio/spi/ImageOutputStreamSpi.java \
+javax/imageio/spi/ServiceRegistry.java \
+javax/imageio/spi/ImageTranscoderSpi.java \
 javax/imageio/spi/ImageReaderSpi.java \
+javax/imageio/spi/IIOServiceProvider.java \
 javax/imageio/spi/ImageReaderWriterSpi.java \
-javax/imageio/spi/ImageTranscoderSpi.java \
+javax/imageio/spi/ImageInputStreamSpi.java \
 javax/imageio/spi/RegisterableService.java \
-javax/imageio/spi/ServiceRegistry.java \
-javax/imageio/spi/ImageWriterSpi.java \
-javax/imageio/stream/FileCacheImageInputStream.java \
-javax/imageio/stream/FileCacheImageOutputStream.java \
-javax/imageio/stream/FileImageInputStream.java \
-javax/imageio/stream/FileImageOutputStream.java \
-javax/imageio/stream/IIOByteBuffer.java \
+javax/imageio/metadata/IIOMetadataFormatImpl.java \
+javax/imageio/metadata/IIOInvalidTreeException.java \
+javax/imageio/metadata/IIOMetadataFormat.java \
+javax/imageio/metadata/IIOMetadataController.java \
+javax/imageio/metadata/IIOMetadataNode.java \
+javax/imageio/metadata/IIOMetadata.java        \
+javax/imageio/stream/FileImageOutputStream.java        \
 javax/imageio/stream/ImageInputStream.java \
+javax/imageio/stream/IIOByteBuffer.java        \
+javax/imageio/stream/FileCacheImageInputStream.java \
 javax/imageio/stream/ImageInputStreamImpl.java \
-javax/imageio/stream/ImageOutputStream.java \
-javax/imageio/stream/ImageOutputStreamImpl.java \
+javax/imageio/stream/ImageOutputStreamImpl.java        \
 javax/imageio/stream/MemoryCacheImageInputStream.java \
+javax/imageio/stream/FileCacheImageOutputStream.java \
+javax/imageio/stream/ImageOutputStream.java \
 javax/imageio/stream/MemoryCacheImageOutputStream.java \
-javax/naming/directory/Attribute.java \
-javax/naming/directory/AttributeInUseException.java \
-javax/naming/directory/AttributeModificationException.java \
-javax/naming/directory/Attributes.java \
-javax/naming/directory/DirContext.java \
-javax/naming/directory/InvalidAttributeIdentifierException.java        \
-javax/naming/directory/InvalidAttributeValueException.java \
-javax/naming/directory/InvalidAttributesException.java \
-javax/naming/directory/InvalidSearchControlsException.java \
-javax/naming/directory/InvalidSearchFilterException.java \
-javax/naming/directory/NoSuchAttributeException.java \
-javax/naming/directory/SchemaViolationException.java \
-javax/naming/directory/BasicAttribute.java \
-javax/naming/directory/BasicAttributes.java \
-javax/naming/directory/ModificationItem.java \
-javax/naming/directory/SearchControls.java \
-javax/naming/directory/SearchResult.java \
-javax/naming/directory/InitialDirContext.java \
-javax/naming/AuthenticationException.java \
-javax/naming/AuthenticationNotSupportedException.java \
-javax/naming/CannotProceedException.java \
-javax/naming/CommunicationException.java \
-javax/naming/ConfigurationException.java \
-javax/naming/Context.java \
-javax/naming/ContextNotEmptyException.java \
-javax/naming/InsufficientResourcesException.java \
-javax/naming/InterruptedNamingException.java \
-javax/naming/BinaryRefAddr.java        \
-javax/naming/LimitExceededException.java \
-javax/naming/LinkException.java        \
-javax/naming/LinkLoopException.java \
-javax/naming/MalformedLinkException.java \
-javax/naming/Name.java \
-javax/naming/NameAlreadyBoundException.java \
-javax/naming/NameNotFoundException.java        \
-javax/naming/NameParser.java \
-javax/naming/NamingEnumeration.java \
-javax/naming/InitialContext.java \
-javax/naming/NamingSecurityException.java \
-javax/naming/NoInitialContextException.java \
-javax/naming/NoPermissionException.java        \
-javax/naming/NotContextException.java \
-javax/naming/NamingException.java \
-javax/naming/PartialResultException.java \
-javax/naming/event/EventContext.java \
-javax/naming/event/EventDirContext.java        \
-javax/naming/event/NamespaceChangeListener.java        \
-javax/naming/event/NamingEvent.java \
-javax/naming/event/NamingExceptionEvent.java \
-javax/naming/event/NamingListener.java \
-javax/naming/event/ObjectChangeListener.java \
-javax/naming/RefAddr.java \
-javax/naming/Reference.java \
-javax/naming/Referenceable.java        \
-javax/naming/ReferralException.java \
-javax/naming/ServiceUnavailableException.java \
-javax/naming/SizeLimitExceededException.java \
-javax/naming/StringRefAddr.java        \
-javax/naming/TimeLimitExceededException.java \
-javax/naming/spi/InitialContextFactory.java \
-javax/naming/spi/InitialContextFactoryBuilder.java \
-javax/naming/spi/NamingManager.java \
-javax/naming/spi/ObjectFactory.java \
-javax/naming/spi/Resolver.java \
-javax/naming/spi/DirObjectFactory.java \
-javax/naming/spi/DirStateFactory.java \
-javax/naming/spi/DirectoryManager.java \
-javax/naming/spi/ObjectFactoryBuilder.java \
-javax/naming/spi/ResolveResult.java \
-javax/naming/spi/StateFactory.java \
-javax/naming/InvalidNameException.java \
-javax/naming/Binding.java \
-javax/naming/CompositeName.java        \
-javax/naming/CompoundName.java \
-javax/naming/LinkRef.java \
-javax/naming/NameClassPair.java        \
-javax/naming/ldap/Control.java \
-javax/naming/ldap/ControlFactory.java \
-javax/naming/ldap/ExtendedRequest.java \
-javax/naming/ldap/ExtendedResponse.java        \
-javax/naming/ldap/HasControls.java \
-javax/naming/ldap/InitialLdapContext.java \
-javax/naming/ldap/LdapContext.java \
-javax/naming/ldap/LdapReferralException.java \
-javax/naming/ldap/UnsolicitedNotification.java \
-javax/naming/ldap/UnsolicitedNotificationEvent.java \
-javax/naming/ldap/UnsolicitedNotificationListener.java \
-javax/naming/OperationNotSupportedException.java \
-javax/net/ServerSocketFactory.java \
-javax/net/SocketFactory.java \
-javax/net/ssl/HandshakeCompletedEvent.java \
-javax/net/ssl/HandshakeCompletedListener.java \
-javax/net/ssl/HostnameVerifier.java \
-javax/net/ssl/HttpsURLConnection.java \
-javax/net/ssl/KeyManager.java \
-javax/net/ssl/KeyManagerFactory.java \
-javax/net/ssl/KeyManagerFactorySpi.java \
-javax/net/ssl/ManagerFactoryParameters.java \
-javax/net/ssl/SSLProtocolException.java \
-javax/net/ssl/SSLContext.java \
-javax/net/ssl/SSLContextSpi.java \
-javax/net/ssl/SSLException.java \
-javax/net/ssl/SSLHandshakeException.java \
+javax/imageio/stream/FileImageInputStream.java \
+javax/imageio/event/IIOReadProgressListener.java \
+javax/imageio/event/IIOWriteWarningListener.java \
+javax/imageio/event/IIOReadWarningListener.java        \
+javax/imageio/event/IIOReadUpdateListener.java \
+javax/imageio/event/IIOWriteProgressListener.java \
+javax/imageio/ImageTranscoder.java \
+javax/imageio/ImageTypeSpecifier.java \
+javax/imageio/ImageIO.java \
+javax/imageio/IIOImage.java \
+javax/net/VanillaSocketFactory.java \
+javax/net/ssl/TrustManagerFactorySpi.java \
 javax/net/ssl/SSLKeyException.java \
-javax/net/ssl/SSLPeerUnverifiedException.java \
-javax/net/ssl/SSLPermission.java \
+javax/net/ssl/TrustManager.java        \
 javax/net/ssl/SSLServerSocket.java \
+javax/net/ssl/TrustManagerFactory.java \
+javax/net/ssl/KeyManager.java \
+javax/net/ssl/SSLSocketFactory.java \
+javax/net/ssl/SSLPermission.java \
+javax/net/ssl/SSLContext.java \
+javax/net/ssl/TrivialHostnameVerifier.java \
+javax/net/ssl/X509KeyManager.java \
 javax/net/ssl/SSLServerSocketFactory.java \
-javax/net/ssl/SSLSession.java \
-javax/net/ssl/SSLSessionBindingEvent.java \
 javax/net/ssl/SSLSessionBindingListener.java \
 javax/net/ssl/SSLSessionContext.java \
+javax/net/ssl/KeyManagerFactory.java \
+javax/net/ssl/SSLProtocolException.java        \
 javax/net/ssl/SSLSocket.java \
-javax/net/ssl/SSLSocketFactory.java \
-javax/net/ssl/TrivialHostnameVerifier.java \
-javax/net/ssl/TrustManager.java \
-javax/net/ssl/TrustManagerFactory.java \
-javax/net/ssl/TrustManagerFactorySpi.java \
-javax/net/ssl/X509KeyManager.java \
+javax/net/ssl/HostnameVerifier.java \
+javax/net/ssl/HandshakeCompletedListener.java \
+javax/net/ssl/HttpsURLConnection.java \
+javax/net/ssl/KeyManagerFactorySpi.java        \
+javax/net/ssl/SSLHandshakeException.java \
+javax/net/ssl/SSLPeerUnverifiedException.java \
 javax/net/ssl/X509TrustManager.java \
-javax/net/VanillaSocketFactory.java \
+javax/net/ssl/SSLSession.java \
+javax/net/ssl/SSLContextSpi.java \
+javax/net/ssl/HandshakeCompletedEvent.java \
+javax/net/ssl/SSLSessionBindingEvent.java \
+javax/net/ssl/SSLException.java        \
+javax/net/ssl/ManagerFactoryParameters.java \
+javax/net/SocketFactory.java \
 javax/net/VanillaServerSocketFactory.java \
-javax/print/AttributeException.java \
-javax/print/CancelablePrintJob.java \
-javax/print/Doc.java \
-javax/print/DocFlavor.java \
-javax/print/DocPrintJob.java \
-javax/print/FlavorException.java \
-javax/print/MultiDoc.java \
-javax/print/MultiDocPrintJob.java \
-javax/print/MultiDocPrintService.java \
-javax/print/PrintException.java \
-javax/print/PrintService.java \
-javax/print/PrintServiceLookup.java \
-javax/print/ServiceUIFactory.java \
-javax/print/StreamPrintService.java \
-javax/print/URIException.java \
+javax/net/ServerSocketFactory.java \
+javax/print/attribute/HashPrintServiceAttributeSet.java        \
 javax/print/attribute/Attribute.java \
-javax/print/attribute/AttributeSet.java \
-javax/print/attribute/AttributeSetUtilities.java \
-javax/print/attribute/DateTimeSyntax.java \
-javax/print/attribute/DocAttribute.java \
 javax/print/attribute/DocAttributeSet.java \
-javax/print/attribute/EnumSyntax.java \
-javax/print/attribute/HashAttributeSet.java \
-javax/print/attribute/HashDocAttributeSet.java \
-javax/print/attribute/HashPrintJobAttributeSet.java \
-javax/print/attribute/HashPrintRequestAttributeSet.java \
-javax/print/attribute/HashPrintServiceAttributeSet.java \
-javax/print/attribute/IntegerSyntax.java \
-javax/print/attribute/PrintJobAttribute.java \
-javax/print/attribute/PrintJobAttributeSet.java \
-javax/print/attribute/PrintRequestAttribute.java \
 javax/print/attribute/PrintRequestAttributeSet.java \
-javax/print/attribute/PrintServiceAttribute.java \
-javax/print/attribute/PrintServiceAttributeSet.java \
-javax/print/attribute/ResolutionSyntax.java \
-javax/print/attribute/SetOfIntegerSyntax.java \
-javax/print/attribute/Size2DSyntax.java \
-javax/print/attribute/SupportedValuesAttribute.java \
-javax/print/attribute/TextSyntax.java \
-javax/print/attribute/UnmodifiableSetException.java \
-javax/print/attribute/URISyntax.java \
-javax/print/attribute/standard/ColorSupported.java \
-javax/print/attribute/standard/Compression.java \
-javax/print/attribute/standard/Copies.java \
-javax/print/attribute/standard/CopiesSupported.java \
-javax/print/attribute/standard/DateTimeAtCompleted.java \
-javax/print/attribute/standard/DateTimeAtCreation.java \
-javax/print/attribute/standard/DateTimeAtProcessing.java \
-javax/print/attribute/standard/DocumentName.java \
-javax/print/attribute/standard/Fidelity.java \
-javax/print/attribute/standard/Finishings.java \
-javax/print/attribute/standard/JobHoldUntil.java \
+javax/print/attribute/standard/NumberOfInterveningJobs.java \
+javax/print/attribute/standard/PrinterMakeAndModel.java        \
+javax/print/attribute/standard/PrinterStateReason.java \
 javax/print/attribute/standard/JobImpressions.java \
-javax/print/attribute/standard/JobImpressionsCompleted.java \
-javax/print/attribute/standard/JobImpressionsSupported.java \
-javax/print/attribute/standard/JobKOctets.java \
-javax/print/attribute/standard/JobKOctetsProcessed.java \
-javax/print/attribute/standard/JobKOctetsSupported.java \
+javax/print/attribute/standard/JobHoldUntil.java \
+javax/print/attribute/standard/JobKOctetsSupported.java        \
+javax/print/attribute/standard/JobPriority.java        \
+javax/print/attribute/standard/QueuedJobCount.java \
+javax/print/attribute/standard/JobOriginatingUserName.java \
+javax/print/attribute/standard/PrinterName.java        \
+javax/print/attribute/standard/PDLOverrideSupported.java \
+javax/print/attribute/standard/PrinterStateReasons.java        \
 javax/print/attribute/standard/JobMediaSheets.java \
-javax/print/attribute/standard/JobMediaSheetsCompleted.java \
-javax/print/attribute/standard/JobMediaSheetsSupported.java \
+javax/print/attribute/standard/JobKOctets.java \
+javax/print/attribute/standard/MultipleDocumentHandling.java \
+javax/print/attribute/standard/PrinterMessageFromOperator.java \
+javax/print/attribute/standard/Severity.java \
+javax/print/attribute/standard/ReferenceUriSchemesSupported.java \
+javax/print/attribute/standard/DocumentName.java \
+javax/print/attribute/standard/PrinterMoreInfo.java \
 javax/print/attribute/standard/JobMessageFromOperator.java \
-javax/print/attribute/standard/JobName.java \
-javax/print/attribute/standard/JobOriginatingUserName.java \
-javax/print/attribute/standard/JobPriority.java \
-javax/print/attribute/standard/JobPrioritySupported.java \
-javax/print/attribute/standard/JobSheets.java \
-javax/print/attribute/standard/JobState.java \
-javax/print/attribute/standard/JobStateReason.java \
 javax/print/attribute/standard/JobStateReasons.java \
-javax/print/attribute/standard/Media.java \
-javax/print/attribute/standard/MediaSizeName.java \
-javax/print/attribute/standard/MultipleDocumentHandling.java \
-javax/print/attribute/standard/NumberOfDocuments.java \
-javax/print/attribute/standard/NumberOfInterveningJobs.java \
-javax/print/attribute/standard/NumberUp.java \
-javax/print/attribute/standard/NumberUpSupported.java \
-javax/print/attribute/standard/OrientationRequested.java \
-javax/print/attribute/standard/OutputDeviceAssigned.java \
-javax/print/attribute/standard/PDLOverrideSupported.java \
-javax/print/attribute/standard/PageRanges.java \
+javax/print/attribute/standard/PrinterIsAcceptingJobs.java \
+javax/print/attribute/standard/DateTimeAtProcessing.java \
 javax/print/attribute/standard/PagesPerMinute.java \
-javax/print/attribute/standard/PagesPerMinuteColor.java \
-javax/print/attribute/standard/PresentationDirection.java \
+javax/print/attribute/standard/PrinterResolution.java \
+javax/print/attribute/standard/JobMediaSheetsSupported.java \
+javax/print/attribute/standard/NumberUpSupported.java \
+javax/print/attribute/standard/Finishings.java \
+javax/print/attribute/standard/DateTimeAtCompleted.java        \
+javax/print/attribute/standard/NumberOfDocuments.java \
+javax/print/attribute/standard/PrinterInfo.java        \
 javax/print/attribute/standard/PrintQuality.java \
-javax/print/attribute/standard/PrinterInfo.java \
-javax/print/attribute/standard/PrinterIsAcceptingJobs.java \
+javax/print/attribute/standard/JobSheets.java \
+javax/print/attribute/standard/Media.java \
+javax/print/attribute/standard/Fidelity.java \
 javax/print/attribute/standard/PrinterLocation.java \
-javax/print/attribute/standard/PrinterMakeAndModel.java \
-javax/print/attribute/standard/PrinterMessageFromOperator.java \
-javax/print/attribute/standard/PrinterMoreInfo.java \
-javax/print/attribute/standard/PrinterMoreInfoManufacturer.java \
-javax/print/attribute/standard/PrinterName.java \
-javax/print/attribute/standard/PrinterResolution.java \
-javax/print/attribute/standard/PrinterState.java \
-javax/print/attribute/standard/PrinterStateReason.java \
-javax/print/attribute/standard/PrinterStateReasons.java \
+javax/print/attribute/standard/PrinterMoreInfoManufacturer.java        \
+javax/print/attribute/standard/OrientationRequested.java \
+javax/print/attribute/standard/JobState.java \
+javax/print/attribute/standard/DateTimeAtCreation.java \
+javax/print/attribute/standard/PresentationDirection.java \
+javax/print/attribute/standard/JobName.java \
+javax/print/attribute/standard/PagesPerMinuteColor.java        \
+javax/print/attribute/standard/CopiesSupported.java \
 javax/print/attribute/standard/PrinterURI.java \
-javax/print/attribute/standard/QueuedJobCount.java \
-javax/print/attribute/standard/ReferenceUriSchemesSupported.java \
+javax/print/attribute/standard/PageRanges.java \
 javax/print/attribute/standard/RequestingUserName.java \
-javax/print/attribute/standard/Severity.java \
-javax/print/attribute/standard/SheetCollate.java \
+javax/print/attribute/standard/JobPrioritySupported.java \
+javax/print/attribute/standard/JobMediaSheetsCompleted.java \
+javax/print/attribute/standard/JobKOctetsProcessed.java        \
+javax/print/attribute/standard/JobImpressionsCompleted.java \
+javax/print/attribute/standard/Compression.java        \
+javax/print/attribute/standard/JobImpressionsSupported.java \
 javax/print/attribute/standard/Sides.java \
+javax/print/attribute/standard/JobStateReason.java \
+javax/print/attribute/standard/SheetCollate.java \
+javax/print/attribute/standard/Copies.java \
+javax/print/attribute/standard/MediaSizeName.java \
+javax/print/attribute/standard/OutputDeviceAssigned.java \
+javax/print/attribute/standard/PrinterState.java \
+javax/print/attribute/standard/NumberUp.java \
+javax/print/attribute/standard/ColorSupported.java \
+javax/print/attribute/HashAttributeSet.java \
+javax/print/attribute/SetOfIntegerSyntax.java \
+javax/print/attribute/HashDocAttributeSet.java \
+javax/print/attribute/PrintRequestAttribute.java \
+javax/print/attribute/DateTimeSyntax.java \
+javax/print/attribute/PrintServiceAttribute.java \
+javax/print/attribute/UnmodifiableSetException.java \
+javax/print/attribute/HashPrintJobAttributeSet.java \
+javax/print/attribute/PrintJobAttribute.java \
+javax/print/attribute/AttributeSet.java        \
+javax/print/attribute/ResolutionSyntax.java \
+javax/print/attribute/URISyntax.java \
+javax/print/attribute/AttributeSetUtilities.java \
+javax/print/attribute/HashPrintRequestAttributeSet.java        \
+javax/print/attribute/TextSyntax.java \
+javax/print/attribute/PrintJobAttributeSet.java        \
+javax/print/attribute/SupportedValuesAttribute.java \
+javax/print/attribute/EnumSyntax.java \
+javax/print/attribute/DocAttribute.java        \
+javax/print/attribute/Size2DSyntax.java        \
+javax/print/attribute/IntegerSyntax.java \
+javax/print/attribute/PrintServiceAttributeSet.java \
+javax/print/PrintService.java \
+javax/print/DocFlavor.java \
+javax/print/DocPrintJob.java \
 javax/print/event/PrintEvent.java \
 javax/print/event/PrintJobAdapter.java \
-javax/print/event/PrintJobAttributeEvent.java \
-javax/print/event/PrintJobAttributeListener.java \
-javax/print/event/PrintJobEvent.java \
-javax/print/event/PrintJobListener.java \
 javax/print/event/PrintServiceAttributeEvent.java \
+javax/print/event/PrintJobAttributeEvent.java \
 javax/print/event/PrintServiceAttributeListener.java \
-javax/security/auth/AuthPermission.java \
+javax/print/event/PrintJobEvent.java \
+javax/print/event/PrintJobListener.java        \
+javax/print/event/PrintJobAttributeListener.java \
+javax/print/PrintServiceLookup.java \
+javax/print/URIException.java \
+javax/print/StreamPrintService.java \
+javax/print/MultiDoc.java \
+javax/print/FlavorException.java \
+javax/print/Doc.java \
+javax/print/MultiDocPrintJob.java \
+javax/print/CancelablePrintJob.java \
+javax/print/MultiDocPrintService.java \
+javax/print/ServiceUIFactory.java \
+javax/print/AttributeException.java \
+javax/print/PrintException.java        \
+javax/naming/ServiceUnavailableException.java \
+javax/naming/directory/Attribute.java \
+javax/naming/directory/SchemaViolationException.java \
+javax/naming/directory/InitialDirContext.java \
+javax/naming/directory/BasicAttribute.java \
+javax/naming/directory/NoSuchAttributeException.java \
+javax/naming/directory/InvalidAttributesException.java \
+javax/naming/directory/InvalidAttributeValueException.java \
+javax/naming/directory/BasicAttributes.java \
+javax/naming/directory/AttributeModificationException.java \
+javax/naming/directory/InvalidAttributeIdentifierException.java        \
+javax/naming/directory/DirContext.java \
+javax/naming/directory/Attributes.java \
+javax/naming/directory/InvalidSearchControlsException.java \
+javax/naming/directory/SearchControls.java \
+javax/naming/directory/AttributeInUseException.java \
+javax/naming/directory/InvalidSearchFilterException.java \
+javax/naming/directory/ModificationItem.java \
+javax/naming/directory/SearchResult.java \
+javax/naming/Binding.java \
+javax/naming/ContextNotEmptyException.java \
+javax/naming/Referenceable.java        \
+javax/naming/InterruptedNamingException.java \
+javax/naming/CommunicationException.java \
+javax/naming/LinkException.java        \
+javax/naming/BinaryRefAddr.java        \
+javax/naming/LinkLoopException.java \
+javax/naming/AuthenticationException.java \
+javax/naming/NameAlreadyBoundException.java \
+javax/naming/MalformedLinkException.java \
+javax/naming/NotContextException.java \
+javax/naming/spi/DirStateFactory.java \
+javax/naming/spi/ResolveResult.java \
+javax/naming/spi/ObjectFactoryBuilder.java \
+javax/naming/spi/DirObjectFactory.java \
+javax/naming/spi/DirectoryManager.java \
+javax/naming/spi/InitialContextFactoryBuilder.java \
+javax/naming/spi/ObjectFactory.java \
+javax/naming/spi/Resolver.java \
+javax/naming/spi/StateFactory.java \
+javax/naming/spi/InitialContextFactory.java \
+javax/naming/spi/NamingManager.java \
+javax/naming/InvalidNameException.java \
+javax/naming/NamingEnumeration.java \
+javax/naming/LinkRef.java \
+javax/naming/event/NamingListener.java \
+javax/naming/event/NamingEvent.java \
+javax/naming/event/NamespaceChangeListener.java        \
+javax/naming/event/ObjectChangeListener.java \
+javax/naming/event/EventContext.java \
+javax/naming/event/NamingExceptionEvent.java \
+javax/naming/event/EventDirContext.java        \
+javax/naming/NamingException.java \
+javax/naming/CannotProceedException.java \
+javax/naming/PartialResultException.java \
+javax/naming/TimeLimitExceededException.java \
+javax/naming/NoPermissionException.java        \
+javax/naming/CompoundName.java \
+javax/naming/SizeLimitExceededException.java \
+javax/naming/NoInitialContextException.java \
+javax/naming/NameNotFoundException.java        \
+javax/naming/InitialContext.java \
+javax/naming/NamingSecurityException.java \
+javax/naming/Context.java \
+javax/naming/ConfigurationException.java \
+javax/naming/InsufficientResourcesException.java \
+javax/naming/AuthenticationNotSupportedException.java \
+javax/naming/StringRefAddr.java        \
+javax/naming/ldap/InitialLdapContext.java \
+javax/naming/ldap/ExtendedRequest.java \
+javax/naming/ldap/Control.java \
+javax/naming/ldap/UnsolicitedNotificationListener.java \
+javax/naming/ldap/LdapReferralException.java \
+javax/naming/ldap/UnsolicitedNotificationEvent.java \
+javax/naming/ldap/HasControls.java \
+javax/naming/ldap/LdapContext.java \
+javax/naming/ldap/ExtendedResponse.java        \
+javax/naming/ldap/UnsolicitedNotification.java \
+javax/naming/ldap/ControlFactory.java \
+javax/naming/OperationNotSupportedException.java \
+javax/naming/ReferralException.java \
+javax/naming/LimitExceededException.java \
+javax/naming/Reference.java \
+javax/naming/NameParser.java \
+javax/naming/NameClassPair.java        \
+javax/naming/RefAddr.java \
+javax/naming/CompositeName.java        \
+javax/naming/Name.java \
+javax/xml/xpath/XPathConstants.java \
+javax/xml/xpath/XPathFunction.java \
+javax/xml/xpath/XPathVariableResolver.java \
+javax/xml/xpath/XPathExpressionException.java \
+javax/xml/xpath/XPathFunctionResolver.java \
+javax/xml/xpath/XPath.java \
+javax/xml/xpath/XPathFactoryConfigurationException.java        \
+javax/xml/xpath/XPathFactory.java \
+javax/xml/xpath/XPathException.java \
+javax/xml/xpath/XPathExpression.java \
+javax/xml/xpath/XPathFunctionException.java \
+javax/xml/validation/ValidatorHandler.java \
+javax/xml/validation/Validator.java \
+javax/xml/validation/TypeInfoProvider.java \
+javax/xml/validation/SchemaFactory.java        \
+javax/xml/validation/Schema.java \
+javax/xml/parsers/SAXParserFactory.java        \
+javax/xml/parsers/FactoryConfigurationError.java \
+javax/xml/parsers/SAXParser.java \
+javax/xml/parsers/DocumentBuilderFactory.java \
+javax/xml/parsers/ParserConfigurationException.java \
+javax/xml/parsers/DocumentBuilder.java \
+javax/xml/datatype/DatatypeFactory.java        \
+javax/xml/datatype/XMLGregorianCalendar.java \
+javax/xml/datatype/Duration.java \
+javax/xml/datatype/DatatypeConfigurationException.java \
+javax/xml/datatype/DatatypeConstants.java \
+javax/xml/XMLConstants.java \
+javax/xml/namespace/NamespaceContext.java \
+javax/xml/namespace/QName.java \
+javax/xml/transform/TransformerException.java \
+javax/xml/transform/TransformerFactoryConfigurationError.java \
+javax/xml/transform/sax/SAXResult.java \
+javax/xml/transform/sax/TransformerHandler.java        \
+javax/xml/transform/sax/SAXTransformerFactory.java \
+javax/xml/transform/sax/SAXSource.java \
+javax/xml/transform/sax/TemplatesHandler.java \
+javax/xml/transform/OutputKeys.java \
+javax/xml/transform/stream/StreamResult.java \
+javax/xml/transform/stream/StreamSource.java \
+javax/xml/transform/Source.java        \
+javax/xml/transform/SourceLocator.java \
+javax/xml/transform/ErrorListener.java \
+javax/xml/transform/TransformerConfigurationException.java \
+javax/xml/transform/Templates.java \
+javax/xml/transform/Result.java        \
+javax/xml/transform/URIResolver.java \
+javax/xml/transform/dom/DOMSource.java \
+javax/xml/transform/dom/DOMLocator.java        \
+javax/xml/transform/dom/DOMResult.java \
+javax/xml/transform/Transformer.java \
+javax/xml/transform/TransformerFactory.java \
+javax/security/cert/CertificateNotYetValidException.java \
+javax/security/cert/Certificate.java \
+javax/security/cert/X509Certificate.java \
+javax/security/cert/X509CertBridge.java        \
+javax/security/cert/CertificateEncodingException.java \
+javax/security/cert/CertificateExpiredException.java \
+javax/security/cert/CertificateException.java \
+javax/security/cert/CertificateParsingException.java \
 javax/security/auth/Destroyable.java \
-javax/security/auth/DestroyFailedException.java \
+javax/security/auth/x500/X500PrivateCredential.java \
+javax/security/auth/x500/X500Principal.java \
+javax/security/auth/spi/LoginModule.java \
+javax/security/auth/DestroyFailedException.java        \
+javax/security/auth/SubjectDomainCombiner.java \
+javax/security/auth/AuthPermission.java        \
+javax/security/auth/login/CredentialExpiredException.java \
+javax/security/auth/login/NullConfiguration.java \
 javax/security/auth/login/AccountExpiredException.java \
+javax/security/auth/login/LoginException.java \
 javax/security/auth/login/AppConfigurationEntry.java \
 javax/security/auth/login/Configuration.java \
-javax/security/auth/login/CredentialExpiredException.java \
-javax/security/auth/login/FailedLoginException.java \
 javax/security/auth/login/LoginContext.java \
-javax/security/auth/login/LoginException.java \
-javax/security/auth/login/NullConfiguration.java \
-javax/security/auth/spi/LoginModule.java \
-javax/security/auth/Policy.java \
+javax/security/auth/login/FailedLoginException.java \
 javax/security/auth/PrivateCredentialPermission.java \
-javax/security/auth/Refreshable.java \
-javax/security/auth/RefreshFailedException.java \
 javax/security/auth/Subject.java \
-javax/security/auth/SubjectDomainCombiner.java \
-javax/security/auth/x500/X500Principal.java \
-javax/security/auth/x500/X500PrivateCredential.java \
+javax/security/auth/Policy.java        \
+javax/security/auth/Refreshable.java \
+javax/security/auth/callback/TextInputCallback.java \
+javax/security/auth/callback/LanguageCallback.java \
+javax/security/auth/callback/TextOutputCallback.java \
+javax/security/auth/callback/UnsupportedCallbackException.java \
 javax/security/auth/callback/Callback.java \
-javax/security/auth/callback/CallbackHandler.java \
-javax/security/auth/callback/ChoiceCallback.java \
 javax/security/auth/callback/ConfirmationCallback.java \
-javax/security/auth/callback/LanguageCallback.java \
+javax/security/auth/callback/ChoiceCallback.java \
 javax/security/auth/callback/NameCallback.java \
 javax/security/auth/callback/PasswordCallback.java \
-javax/security/auth/callback/TextInputCallback.java \
-javax/security/auth/callback/TextOutputCallback.java \
-javax/security/auth/callback/UnsupportedCallbackException.java \
-javax/security/cert/Certificate.java \
-javax/security/cert/CertificateEncodingException.java \
-javax/security/cert/CertificateException.java \
-javax/security/cert/CertificateExpiredException.java \
-javax/security/cert/CertificateNotYetValidException.java \
-javax/security/cert/CertificateParsingException.java \
-javax/security/cert/X509CertBridge.java \
-javax/security/cert/X509Certificate.java \
-javax/security/sasl/AuthenticationException.java \
-javax/security/sasl/AuthorizeCallback.java \
+javax/security/auth/callback/CallbackHandler.java \
+javax/security/auth/RefreshFailedException.java        \
 javax/security/sasl/RealmCallback.java \
+javax/security/sasl/SaslClient.java \
 javax/security/sasl/RealmChoiceCallback.java \
+javax/security/sasl/AuthenticationException.java \
 javax/security/sasl/Sasl.java \
-javax/security/sasl/SaslClient.java \
 javax/security/sasl/SaslClientFactory.java \
+javax/security/sasl/AuthorizeCallback.java \
+javax/security/sasl/SaslServerFactory.java \
 javax/security/sasl/SaslException.java \
 javax/security/sasl/SaslServer.java \
-javax/security/sasl/SaslServerFactory.java \
-javax/sql/ConnectionEvent.java \
-javax/sql/ConnectionEventListener.java \
-javax/sql/ConnectionPoolDataSource.java \
-javax/sql/DataSource.java \
-javax/sql/PooledConnection.java \
-javax/sql/RowSetEvent.java \
-javax/sql/RowSetInternal.java \
-javax/sql/RowSet.java \
-javax/sql/RowSetListener.java \
-javax/sql/RowSetMetaData.java \
-javax/sql/RowSetReader.java \
-javax/sql/RowSetWriter.java \
-javax/sql/XAConnection.java \
-javax/sql/XADataSource.java \
-javax/transaction/xa/XAException.java \
-javax/transaction/xa/XAResource.java \
-javax/transaction/xa/Xid.java \
-javax/transaction/HeuristicCommitException.java        \
-javax/transaction/HeuristicMixedException.java \
-javax/transaction/HeuristicRollbackException.java \
-javax/transaction/InvalidTransactionException.java \
-javax/transaction/NotSupportedException.java \
+javax/transaction/TransactionRolledbackException.java \
+javax/transaction/Synchronization.java \
+javax/transaction/TransactionRequiredException.java \
 javax/transaction/RollbackException.java \
 javax/transaction/Status.java \
-javax/transaction/Synchronization.java \
+javax/transaction/HeuristicMixedException.java \
+javax/transaction/HeuristicRollbackException.java \
 javax/transaction/SystemException.java \
+javax/transaction/UserTransaction.java \
+javax/transaction/NotSupportedException.java \
+javax/transaction/HeuristicCommitException.java        \
 javax/transaction/Transaction.java \
 javax/transaction/TransactionManager.java \
-javax/transaction/TransactionRequiredException.java \
-javax/transaction/TransactionRolledbackException.java \
-javax/transaction/UserTransaction.java
+javax/transaction/InvalidTransactionException.java \
+javax/transaction/xa/XAException.java \
+javax/transaction/xa/XAResource.java \
+javax/transaction/xa/Xid.java \
+javax/accessibility/AccessibleValue.java \
+javax/accessibility/AccessibleBundle.java \
+javax/accessibility/AccessibleContext.java \
+javax/accessibility/AccessibleRelationSet.java \
+javax/accessibility/Accessible.java \
+javax/accessibility/AccessibleTableModelChange.java \
+javax/accessibility/AccessibleState.java \
+javax/accessibility/AccessibleIcon.java        \
+javax/accessibility/AccessibleHypertext.java \
+javax/accessibility/AccessibleComponent.java \
+javax/accessibility/AccessibleText.java        \
+javax/accessibility/AccessibleRole.java        \
+javax/accessibility/AccessibleEditableText.java        \
+javax/accessibility/AccessibleRelation.java \
+javax/accessibility/AccessibleTable.java \
+javax/accessibility/AccessibleStateSet.java \
+javax/accessibility/AccessibleSelection.java \
+javax/accessibility/AccessibleExtendedTable.java \
+javax/accessibility/AccessibleResourceBundle.java \
+javax/accessibility/AccessibleExtendedComponent.java \
+javax/accessibility/AccessibleHyperlink.java \
+javax/accessibility/AccessibleKeyBinding.java \
+javax/accessibility/AccessibleAction.java \
+javax/sql/ConnectionEventListener.java \
+javax/sql/RowSetEvent.java \
+javax/sql/ConnectionPoolDataSource.java        \
+javax/sql/RowSetWriter.java \
+javax/sql/XAConnection.java \
+javax/sql/RowSet.java \
+javax/sql/DataSource.java \
+javax/sql/RowSetInternal.java \
+javax/sql/RowSetReader.java \
+javax/sql/RowSetMetaData.java \
+javax/sql/PooledConnection.java        \
+javax/sql/XADataSource.java \
+javax/sql/RowSetListener.java \
+javax/sql/ConnectionEvent.java \
+javax/crypto/Cipher.java \
+javax/crypto/IllegalBlockSizeException.java \
+javax/crypto/MacSpi.java \
+javax/crypto/SecretKeyFactorySpi.java \
+javax/crypto/ShortBufferException.java \
+javax/crypto/KeyAgreement.java \
+javax/crypto/ExemptionMechanism.java \
+javax/crypto/CipherOutputStream.java \
+javax/crypto/SealedObject.java \
+javax/crypto/NullCipher.java \
+javax/crypto/KeyAgreementSpi.java \
+javax/crypto/SecretKeyFactory.java \
+javax/crypto/SecretKey.java \
+javax/crypto/NullCipherImpl.java \
+javax/crypto/spec/DESKeySpec.java \
+javax/crypto/spec/DHPrivateKeySpec.java        \
+javax/crypto/spec/DHParameterSpec.java \
+javax/crypto/spec/PBEParameterSpec.java        \
+javax/crypto/spec/DESedeKeySpec.java \
+javax/crypto/spec/DHGenParameterSpec.java \
+javax/crypto/spec/DHPublicKeySpec.java \
+javax/crypto/spec/PBEKeySpec.java \
+javax/crypto/spec/RC5ParameterSpec.java        \
+javax/crypto/spec/RC2ParameterSpec.java        \
+javax/crypto/spec/IvParameterSpec.java \
+javax/crypto/spec/SecretKeySpec.java \
+javax/crypto/interfaces/DHPublicKey.java \
+javax/crypto/interfaces/DHKey.java \
+javax/crypto/interfaces/DHPrivateKey.java \
+javax/crypto/interfaces/PBEKey.java \
+javax/crypto/NoSuchPaddingException.java \
+javax/crypto/KeyGeneratorSpi.java \
+javax/crypto/BadPaddingException.java \
+javax/crypto/CipherSpi.java \
+javax/crypto/KeyGenerator.java \
+javax/crypto/CipherInputStream.java \
+javax/crypto/ExemptionMechanismException.java \
+javax/crypto/ExemptionMechanismSpi.java        \
+javax/crypto/EncryptedPrivateKeyInfo.java \
+javax/crypto/Mac.java
 
+org_source_files = \
+org/ietf/jgss/GSSManager.java \
+org/ietf/jgss/GSSException.java        \
+org/ietf/jgss/MessageProp.java \
+org/ietf/jgss/GSSName.java \
+org/ietf/jgss/GSSContext.java \
+org/ietf/jgss/Oid.java \
+org/ietf/jgss/GSSCredential.java \
+org/ietf/jgss/ChannelBinding.java
+
+gnu_xml_source_files = \
+gnu/xml/xpath/EqualityExpr.java        \
+gnu/xml/xpath/NumberFunction.java \
+gnu/xml/xpath/StringLengthFunction.java        \
+gnu/xml/xpath/NameFunction.java        \
+gnu/xml/xpath/SumFunction.java \
+gnu/xml/xpath/Pattern.java \
+gnu/xml/xpath/StringFunction.java \
+gnu/xml/xpath/NegativeExpr.java        \
+gnu/xml/xpath/UnionExpr.java \
+gnu/xml/xpath/SubstringFunction.java \
+gnu/xml/xpath/Expr.java        \
+gnu/xml/xpath/XPathFactoryImpl.java \
+gnu/xml/xpath/NormalizeSpaceFunction.java \
+gnu/xml/xpath/Constant.java \
+gnu/xml/xpath/Predicate.java \
+gnu/xml/xpath/Path.java        \
+gnu/xml/xpath/OrExpr.java \
+gnu/xml/xpath/LangFunction.java        \
+gnu/xml/xpath/StartsWithFunction.java \
+gnu/xml/xpath/SubstringAfterFunction.java \
+gnu/xml/xpath/FloorFunction.java \
+gnu/xml/xpath/NotFunction.java \
+gnu/xml/xpath/Root.java        \
+gnu/xml/xpath/PositionFunction.java \
+gnu/xml/xpath/VariableReference.java \
+gnu/xml/xpath/DocumentOrderComparator.java \
+gnu/xml/xpath/LocalNameFunction.java \
+gnu/xml/xpath/NamespaceUriFunction.java        \
+gnu/xml/xpath/TranslateFunction.java \
+gnu/xml/xpath/FalseFunction.java \
+gnu/xml/xpath/AndExpr.java \
+gnu/xml/xpath/XPathParser.java \
+gnu/xml/xpath/NamespaceTest.java \
+gnu/xml/xpath/ConcatFunction.java \
+gnu/xml/xpath/NameTest.java \
+gnu/xml/xpath/CountFunction.java \
+gnu/xml/xpath/IdFunction.java \
+gnu/xml/xpath/LastFunction.java        \
+gnu/xml/xpath/XPathTokenizer.java \
+gnu/xml/xpath/Steps.java \
+gnu/xml/xpath/TrueFunction.java        \
+gnu/xml/xpath/BooleanFunction.java \
+gnu/xml/xpath/ParenthesizedExpr.java \
+gnu/xml/xpath/XPathImpl.java \
+gnu/xml/xpath/Selector.java \
+gnu/xml/xpath/RoundFunction.java \
+gnu/xml/xpath/SubstringBeforeFunction.java \
+gnu/xml/xpath/Function.java \
+gnu/xml/xpath/CeilingFunction.java \
+gnu/xml/xpath/RelationalExpr.java \
+gnu/xml/xpath/FunctionCall.java        \
+gnu/xml/xpath/NodeTypeTest.java        \
+gnu/xml/xpath/ArithmeticExpr.java \
+gnu/xml/xpath/Test.java        \
+gnu/xml/xpath/ContainsFunction.java \
+gnu/xml/pipeline/EventFilter.java \
+gnu/xml/pipeline/NSFilter.java \
+gnu/xml/pipeline/XsltFilter.java \
+gnu/xml/pipeline/ValidationConsumer.java \
+gnu/xml/pipeline/PipelineFactory.java \
+gnu/xml/pipeline/TextConsumer.java \
+gnu/xml/pipeline/LinkFilter.java \
+gnu/xml/pipeline/TeeConsumer.java \
+gnu/xml/pipeline/DomConsumer.java \
+gnu/xml/pipeline/EventConsumer.java \
+gnu/xml/pipeline/WellFormednessFilter.java \
+gnu/xml/pipeline/XIncludeFilter.java \
+gnu/xml/pipeline/CallFilter.java \
+gnu/xml/aelfred2/XmlParser.java        \
+gnu/xml/aelfred2/XmlReader.java        \
+gnu/xml/aelfred2/JAXPFactory.java \
+gnu/xml/aelfred2/ContentHandler2.java \
+gnu/xml/aelfred2/SAXDriver.java        \
+gnu/xml/util/XCat.java \
+gnu/xml/util/DomParser.java \
+gnu/xml/util/XMLWriter.java \
+gnu/xml/util/Resolver.java \
+gnu/xml/util/DoParse.java \
+gnu/xml/util/XHTMLWriter.java \
+gnu/xml/util/SAXNullTransformerFactory.java \
+gnu/xml/dom/DomCDATA.java \
+gnu/xml/dom/DomXPathNSResolver.java \
+gnu/xml/dom/ls/DomLSEx.java \
+gnu/xml/dom/ls/FilteredSAXEventSink.java \
+gnu/xml/dom/ls/DomLSSerializer.java \
+gnu/xml/dom/ls/DomLSInput.java \
+gnu/xml/dom/ls/DomLSOutput.java        \
+gnu/xml/dom/ls/SAXEventSink.java \
+gnu/xml/dom/ls/DomLSParser.java        \
+gnu/xml/dom/ls/ReaderInputStream.java \
+gnu/xml/dom/ls/WriterOutputStream.java \
+gnu/xml/dom/DomElement.java \
+gnu/xml/dom/DomNsNode.java \
+gnu/xml/dom/DomAttr.java \
+gnu/xml/dom/DomPI.java \
+gnu/xml/dom/DTDAttributeTypeInfo.java \
+gnu/xml/dom/DomDocumentBuilder.java \
+gnu/xml/dom/DTDElementTypeInfo.java \
+gnu/xml/dom/DomEx.java \
+gnu/xml/dom/DomDocument.java \
+gnu/xml/dom/DomXPathExpression.java \
+gnu/xml/dom/DomDocumentConfiguration.java \
+gnu/xml/dom/Consumer.java \
+gnu/xml/dom/DomComment.java \
+gnu/xml/dom/DomCharacterData.java \
+gnu/xml/dom/DomExtern.java \
+gnu/xml/dom/DomEntityReference.java \
+gnu/xml/dom/DomNamedNodeMap.java \
+gnu/xml/dom/ImplementationList.java \
+gnu/xml/dom/ImplementationSource.java \
+gnu/xml/dom/DomImpl.java \
+gnu/xml/dom/DomDoctype.java \
+gnu/xml/dom/DomNode.java \
+gnu/xml/dom/DomXPathResult.java        \
+gnu/xml/dom/DomDocumentBuilderFactory.java \
+gnu/xml/dom/DomText.java \
+gnu/xml/dom/DomNSResolverContext.java \
+gnu/xml/dom/DomNodeIterator.java \
+gnu/xml/dom/DomNotation.java \
+gnu/xml/dom/JAXPFactory.java \
+gnu/xml/dom/DomIterator.java \
+gnu/xml/dom/DomFragment.java \
+gnu/xml/dom/DomEvent.java \
+gnu/xml/dom/DomEntity.java \
+gnu/xml/transform/GenerateIdFunction.java \
+gnu/xml/transform/FormatNumberFunction.java \
+gnu/xml/transform/ValueOfNode.java \
+gnu/xml/transform/ApplyImportsNode.java        \
+gnu/xml/transform/WithParam.java \
+gnu/xml/transform/DocumentFunction.java        \
+gnu/xml/transform/SAXSerializer.java \
+gnu/xml/transform/FunctionAvailableFunction.java \
+gnu/xml/transform/ElementAvailableFunction.java        \
+gnu/xml/transform/IfNode.java \
+gnu/xml/transform/ApplyTemplatesNode.java \
+gnu/xml/transform/SortKey.java \
+gnu/xml/transform/Key.java \
+gnu/xml/transform/ElementNode.java \
+gnu/xml/transform/CurrentFunction.java \
+gnu/xml/transform/XSLComparator.java \
+gnu/xml/transform/CallTemplateNode.java        \
+gnu/xml/transform/TemplatesImpl.java \
+gnu/xml/transform/ChooseNode.java \
+gnu/xml/transform/NumberNode.java \
+gnu/xml/transform/CopyOfNode.java \
+gnu/xml/transform/ParameterNode.java \
+gnu/xml/transform/TransformerFactoryImpl.java \
+gnu/xml/transform/TextNode.java        \
+gnu/xml/transform/CopyNode.java        \
+gnu/xml/transform/SystemPropertyFunction.java \
+gnu/xml/transform/Stylesheet.java \
+gnu/xml/transform/ProcessingInstructionNode.java \
+gnu/xml/transform/UnparsedEntityUriFunction.java \
+gnu/xml/transform/URIResolverEntityResolver.java \
+gnu/xml/transform/ErrorListenerErrorHandler.java \
+gnu/xml/transform/Bindings.java        \
+gnu/xml/transform/AttributeSet.java \
+gnu/xml/transform/Template.java        \
+gnu/xml/transform/MessageNode.java \
+gnu/xml/transform/LiteralNode.java \
+gnu/xml/transform/StreamSerializer.java        \
+gnu/xml/transform/XSLURIResolver.java \
+gnu/xml/transform/AttributeNode.java \
+gnu/xml/transform/CommentNode.java \
+gnu/xml/transform/ForEachNode.java \
+gnu/xml/transform/KeyFunction.java \
+gnu/xml/transform/TransformerImpl.java \
+gnu/xml/transform/WhenNode.java        \
+gnu/xml/transform/NodeNumberNode.java \
+gnu/xml/transform/OtherwiseNode.java \
+gnu/xml/transform/AbstractNumberNode.java \
+gnu/xml/transform/TemplateNode.java \
+gnu/xml/transform/TransformerOutputProperties.java \
+gnu/xml/transform/DOMSourceLocator.java
 
 ## Java files which are created by configure and thus are in the build
 ## directory.
@@ -3401,7 +3566,8 @@ java/util/zip/ZipOutputStream.java \
 $(rmi_java_source_files) \
 $(awt_java_source_files) \
 $(convert_source_files) \
-$(javax_source_files)
+$(javax_source_files) \
+$(org_source_files)
 
 
 java_source_files = $(special_java_source_files) $(ordinary_java_source_files)
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 433039d..7822ebf 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -17,7 +17,7 @@
 
 
 
-SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(lib_gnu_java_awt_peer_gtk_la_SOURCES) $(lib_org_ietf_jgss_la_SOURCES) $(lib_org_w3c_dom_la_SOURCES) $(lib_org_xml_sax_la_SOURCES) $(libgcj_la_SOURCES) $(libgij_la_SOURCES) $(gcj_dbtool_SOURCES) $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
+SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(lib_gnu_java_awt_peer_gtk_la_SOURCES) $(libgcj_la_SOURCES) $(libgij_la_SOURCES) $(gcj_dbtool_SOURCES) $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -322,60 +322,10 @@ lib_gnu_java_awt_peer_gtk_la_OBJECTS =  \
        $(am_lib_gnu_java_awt_peer_gtk_la_OBJECTS)
 @GTK_AWT_TRUE@am_lib_gnu_java_awt_peer_gtk_la_rpath = -rpath \
 @GTK_AWT_TRUE@ $(toolexeclibdir)
-am__DEPENDENCIES_2 = org/ietf/jgss/MessagesBundle.properties.lo
+am__DEPENDENCIES_2 = gnu/regexp/MessagesBundle.properties.lo \
+       gnu/regexp/MessagesBundle_fr.properties.lo \
+       org/ietf/jgss/MessagesBundle.properties.lo
 am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2)
-am_lib_org_ietf_jgss_la_OBJECTS = org/ietf/jgss/ChannelBinding.lo \
-       org/ietf/jgss/GSSContext.lo org/ietf/jgss/GSSCredential.lo \
-       org/ietf/jgss/GSSException.lo org/ietf/jgss/GSSManager.lo \
-       org/ietf/jgss/GSSName.lo org/ietf/jgss/MessageProp.lo \
-       org/ietf/jgss/Oid.lo
-lib_org_ietf_jgss_la_OBJECTS = $(am_lib_org_ietf_jgss_la_OBJECTS)
-lib_org_w3c_dom_la_DEPENDENCIES = libgcj.la
-am_lib_org_w3c_dom_la_OBJECTS = org/w3c/dom/Attr.lo \
-       org/w3c/dom/CDATASection.lo org/w3c/dom/CharacterData.lo \
-       org/w3c/dom/Comment.lo org/w3c/dom/DOMException.lo \
-       org/w3c/dom/DOMImplementation.lo org/w3c/dom/Document.lo \
-       org/w3c/dom/DocumentFragment.lo org/w3c/dom/DocumentType.lo \
-       org/w3c/dom/Element.lo org/w3c/dom/Entity.lo \
-       org/w3c/dom/EntityReference.lo org/w3c/dom/NamedNodeMap.lo \
-       org/w3c/dom/Node.lo org/w3c/dom/NodeList.lo \
-       org/w3c/dom/Notation.lo org/w3c/dom/ProcessingInstruction.lo \
-       org/w3c/dom/Text.lo org/w3c/dom/ranges/DocumentRange.lo \
-       org/w3c/dom/ranges/Range.lo \
-       org/w3c/dom/ranges/RangeException.lo \
-       org/w3c/dom/traversal/DocumentTraversal.lo \
-       org/w3c/dom/traversal/NodeFilter.lo \
-       org/w3c/dom/traversal/NodeIterator.lo \
-       org/w3c/dom/traversal/TreeWalker.lo
-lib_org_w3c_dom_la_OBJECTS = $(am_lib_org_w3c_dom_la_OBJECTS)
-lib_org_xml_sax_la_DEPENDENCIES = libgcj.la
-am_lib_org_xml_sax_la_OBJECTS = org/xml/sax/ext/DeclHandler.lo \
-       org/xml/sax/ext/LexicalHandler.lo \
-       org/xml/sax/helpers/AttributeListImpl.lo \
-       org/xml/sax/helpers/AttributesImpl.lo \
-       org/xml/sax/helpers/DefaultHandler.lo \
-       org/xml/sax/helpers/LocatorImpl.lo \
-       org/xml/sax/helpers/NamespaceSupport.lo \
-       org/xml/sax/helpers/NewInstance.lo \
-       org/xml/sax/helpers/ParserAdapter.lo \
-       org/xml/sax/helpers/ParserFactory.lo \
-       org/xml/sax/helpers/XMLFilterImpl.lo \
-       org/xml/sax/helpers/XMLReaderAdapter.lo \
-       org/xml/sax/helpers/XMLReaderFactory.lo \
-       org/xml/sax/AttributeList.lo org/xml/sax/Attributes.lo \
-       org/xml/sax/ContentHandler.lo org/xml/sax/DTDHandler.lo \
-       org/xml/sax/DocumentHandler.lo org/xml/sax/EntityResolver.lo \
-       org/xml/sax/ErrorHandler.lo org/xml/sax/HandlerBase.lo \
-       org/xml/sax/InputSource.lo org/xml/sax/Locator.lo \
-       org/xml/sax/Parser.lo org/xml/sax/SAXException.lo \
-       org/xml/sax/SAXNotRecognizedException.lo \
-       org/xml/sax/SAXNotSupportedException.lo \
-       org/xml/sax/SAXParseException.lo org/xml/sax/XMLFilter.lo \
-       org/xml/sax/XMLReader.lo
-lib_org_xml_sax_la_OBJECTS = $(am_lib_org_xml_sax_la_OBJECTS)
-am__DEPENDENCIES_4 = gnu/regexp/MessagesBundle.properties.lo \
-       gnu/regexp/MessagesBundle_fr.properties.lo
-am__DEPENDENCIES_5 = $(am__DEPENDENCIES_4)
 am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc link.cc \
        defineclass.cc interpret.cc verify.cc gnu/gcj/natCore.cc \
        gnu/gcj/convert/JIS0208_to_Unicode.cc \
@@ -1970,405 +1920,601 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc link.cc \
        gnu/gcj/convert/Output_UTF8.java \
        gnu/gcj/convert/Output_iconv.java \
        gnu/gcj/convert/UnicodeToBytes.java \
-       javax/accessibility/Accessible.java \
-       javax/accessibility/AccessibleAction.java \
-       javax/accessibility/AccessibleBundle.java \
-       javax/accessibility/AccessibleComponent.java \
-       javax/accessibility/AccessibleContext.java \
-       javax/accessibility/AccessibleEditableText.java \
-       javax/accessibility/AccessibleExtendedComponent.java \
-       javax/accessibility/AccessibleExtendedTable.java \
-       javax/accessibility/AccessibleHyperlink.java \
-       javax/accessibility/AccessibleHypertext.java \
-       javax/accessibility/AccessibleIcon.java \
-       javax/accessibility/AccessibleKeyBinding.java \
-       javax/accessibility/AccessibleRelation.java \
-       javax/accessibility/AccessibleRelationSet.java \
-       javax/accessibility/AccessibleResourceBundle.java \
-       javax/accessibility/AccessibleRole.java \
-       javax/accessibility/AccessibleSelection.java \
-       javax/accessibility/AccessibleState.java \
-       javax/accessibility/AccessibleStateSet.java \
-       javax/accessibility/AccessibleTable.java \
-       javax/accessibility/AccessibleTableModelChange.java \
-       javax/accessibility/AccessibleText.java \
-       javax/accessibility/AccessibleValue.java \
-       javax/crypto/BadPaddingException.java javax/crypto/Cipher.java \
-       javax/crypto/CipherInputStream.java \
-       javax/crypto/CipherOutputStream.java \
-       javax/crypto/CipherSpi.java \
-       javax/crypto/EncryptedPrivateKeyInfo.java \
-       javax/crypto/KeyGeneratorSpi.java \
-       javax/crypto/ExemptionMechanism.java \
-       javax/crypto/ExemptionMechanismException.java \
-       javax/crypto/ExemptionMechanismSpi.java \
-       javax/crypto/IllegalBlockSizeException.java \
-       javax/crypto/KeyAgreement.java \
-       javax/crypto/KeyAgreementSpi.java \
-       javax/crypto/KeyGenerator.java javax/crypto/Mac.java \
-       javax/crypto/MacSpi.java \
-       javax/crypto/NoSuchPaddingException.java \
-       javax/crypto/NullCipher.java javax/crypto/NullCipherImpl.java \
-       javax/crypto/SealedObject.java javax/crypto/SecretKey.java \
-       javax/crypto/SecretKeyFactory.java \
-       javax/crypto/SecretKeyFactorySpi.java \
-       javax/crypto/ShortBufferException.java \
-       javax/crypto/interfaces/DHKey.java \
-       javax/crypto/interfaces/DHPrivateKey.java \
-       javax/crypto/interfaces/DHPublicKey.java \
-       javax/crypto/interfaces/PBEKey.java \
-       javax/crypto/spec/DESKeySpec.java \
-       javax/crypto/spec/DESedeKeySpec.java \
-       javax/crypto/spec/DHGenParameterSpec.java \
-       javax/crypto/spec/DHParameterSpec.java \
-       javax/crypto/spec/DHPrivateKeySpec.java \
-       javax/crypto/spec/DHPublicKeySpec.java \
-       javax/crypto/spec/IvParameterSpec.java \
-       javax/crypto/spec/PBEKeySpec.java \
-       javax/crypto/spec/PBEParameterSpec.java \
-       javax/crypto/spec/RC2ParameterSpec.java \
-       javax/crypto/spec/RC5ParameterSpec.java \
-       javax/crypto/spec/SecretKeySpec.java \
-       javax/imageio/IIOException.java javax/imageio/IIOImage.java \
-       javax/imageio/IIOParam.java \
-       javax/imageio/IIOParamController.java \
-       javax/imageio/ImageIO.java javax/imageio/ImageReadParam.java \
-       javax/imageio/ImageReader.java \
-       javax/imageio/ImageTranscoder.java \
-       javax/imageio/ImageTypeSpecifier.java \
        javax/imageio/ImageWriteParam.java \
-       javax/imageio/ImageWriter.java \
-       javax/imageio/event/IIOReadProgressListener.java \
-       javax/imageio/event/IIOReadUpdateListener.java \
-       javax/imageio/event/IIOReadWarningListener.java \
-       javax/imageio/event/IIOWriteProgressListener.java \
-       javax/imageio/event/IIOWriteWarningListener.java \
-       javax/imageio/metadata/IIOInvalidTreeException.java \
-       javax/imageio/metadata/IIOMetadata.java \
-       javax/imageio/metadata/IIOMetadataController.java \
-       javax/imageio/metadata/IIOMetadataFormat.java \
-       javax/imageio/metadata/IIOMetadataFormatImpl.java \
-       javax/imageio/metadata/IIOMetadataNode.java \
-       javax/imageio/spi/IIOServiceProvider.java \
+       javax/imageio/ImageReader.java javax/imageio/ImageWriter.java \
+       javax/imageio/IIOException.java \
+       javax/imageio/IIOParamController.java \
+       javax/imageio/ImageReadParam.java javax/imageio/IIOParam.java \
        javax/imageio/spi/IIORegistry.java \
-       javax/imageio/spi/ImageInputStreamSpi.java \
+       javax/imageio/spi/ImageWriterSpi.java \
        javax/imageio/spi/ImageOutputStreamSpi.java \
+       javax/imageio/spi/ServiceRegistry.java \
+       javax/imageio/spi/ImageTranscoderSpi.java \
        javax/imageio/spi/ImageReaderSpi.java \
+       javax/imageio/spi/IIOServiceProvider.java \
        javax/imageio/spi/ImageReaderWriterSpi.java \
-       javax/imageio/spi/ImageTranscoderSpi.java \
+       javax/imageio/spi/ImageInputStreamSpi.java \
        javax/imageio/spi/RegisterableService.java \
-       javax/imageio/spi/ServiceRegistry.java \
-       javax/imageio/spi/ImageWriterSpi.java \
-       javax/imageio/stream/FileCacheImageInputStream.java \
-       javax/imageio/stream/FileCacheImageOutputStream.java \
-       javax/imageio/stream/FileImageInputStream.java \
+       javax/imageio/metadata/IIOMetadataFormatImpl.java \
+       javax/imageio/metadata/IIOInvalidTreeException.java \
+       javax/imageio/metadata/IIOMetadataFormat.java \
+       javax/imageio/metadata/IIOMetadataController.java \
+       javax/imageio/metadata/IIOMetadataNode.java \
+       javax/imageio/metadata/IIOMetadata.java \
        javax/imageio/stream/FileImageOutputStream.java \
-       javax/imageio/stream/IIOByteBuffer.java \
        javax/imageio/stream/ImageInputStream.java \
+       javax/imageio/stream/IIOByteBuffer.java \
+       javax/imageio/stream/FileCacheImageInputStream.java \
        javax/imageio/stream/ImageInputStreamImpl.java \
-       javax/imageio/stream/ImageOutputStream.java \
        javax/imageio/stream/ImageOutputStreamImpl.java \
        javax/imageio/stream/MemoryCacheImageInputStream.java \
+       javax/imageio/stream/FileCacheImageOutputStream.java \
+       javax/imageio/stream/ImageOutputStream.java \
        javax/imageio/stream/MemoryCacheImageOutputStream.java \
-       javax/naming/directory/Attribute.java \
-       javax/naming/directory/AttributeInUseException.java \
-       javax/naming/directory/AttributeModificationException.java \
-       javax/naming/directory/Attributes.java \
-       javax/naming/directory/DirContext.java \
-       javax/naming/directory/InvalidAttributeIdentifierException.java \
-       javax/naming/directory/InvalidAttributeValueException.java \
-       javax/naming/directory/InvalidAttributesException.java \
-       javax/naming/directory/InvalidSearchControlsException.java \
-       javax/naming/directory/InvalidSearchFilterException.java \
-       javax/naming/directory/NoSuchAttributeException.java \
-       javax/naming/directory/SchemaViolationException.java \
-       javax/naming/directory/BasicAttribute.java \
-       javax/naming/directory/BasicAttributes.java \
-       javax/naming/directory/ModificationItem.java \
-       javax/naming/directory/SearchControls.java \
-       javax/naming/directory/SearchResult.java \
-       javax/naming/directory/InitialDirContext.java \
-       javax/naming/AuthenticationException.java \
-       javax/naming/AuthenticationNotSupportedException.java \
-       javax/naming/CannotProceedException.java \
-       javax/naming/CommunicationException.java \
-       javax/naming/ConfigurationException.java \
-       javax/naming/Context.java \
-       javax/naming/ContextNotEmptyException.java \
-       javax/naming/InsufficientResourcesException.java \
-       javax/naming/InterruptedNamingException.java \
-       javax/naming/BinaryRefAddr.java \
-       javax/naming/LimitExceededException.java \
-       javax/naming/LinkException.java \
-       javax/naming/LinkLoopException.java \
-       javax/naming/MalformedLinkException.java \
-       javax/naming/Name.java \
-       javax/naming/NameAlreadyBoundException.java \
-       javax/naming/NameNotFoundException.java \
-       javax/naming/NameParser.java \
-       javax/naming/NamingEnumeration.java \
-       javax/naming/InitialContext.java \
-       javax/naming/NamingSecurityException.java \
-       javax/naming/NoInitialContextException.java \
-       javax/naming/NoPermissionException.java \
-       javax/naming/NotContextException.java \
-       javax/naming/NamingException.java \
-       javax/naming/PartialResultException.java \
-       javax/naming/event/EventContext.java \
-       javax/naming/event/EventDirContext.java \
-       javax/naming/event/NamespaceChangeListener.java \
-       javax/naming/event/NamingEvent.java \
-       javax/naming/event/NamingExceptionEvent.java \
-       javax/naming/event/NamingListener.java \
-       javax/naming/event/ObjectChangeListener.java \
-       javax/naming/RefAddr.java javax/naming/Reference.java \
-       javax/naming/Referenceable.java \
-       javax/naming/ReferralException.java \
-       javax/naming/ServiceUnavailableException.java \
-       javax/naming/SizeLimitExceededException.java \
-       javax/naming/StringRefAddr.java \
-       javax/naming/TimeLimitExceededException.java \
-       javax/naming/spi/InitialContextFactory.java \
-       javax/naming/spi/InitialContextFactoryBuilder.java \
-       javax/naming/spi/NamingManager.java \
-       javax/naming/spi/ObjectFactory.java \
-       javax/naming/spi/Resolver.java \
-       javax/naming/spi/DirObjectFactory.java \
-       javax/naming/spi/DirStateFactory.java \
-       javax/naming/spi/DirectoryManager.java \
-       javax/naming/spi/ObjectFactoryBuilder.java \
-       javax/naming/spi/ResolveResult.java \
-       javax/naming/spi/StateFactory.java \
-       javax/naming/InvalidNameException.java \
-       javax/naming/Binding.java javax/naming/CompositeName.java \
-       javax/naming/CompoundName.java javax/naming/LinkRef.java \
-       javax/naming/NameClassPair.java javax/naming/ldap/Control.java \
-       javax/naming/ldap/ControlFactory.java \
-       javax/naming/ldap/ExtendedRequest.java \
-       javax/naming/ldap/ExtendedResponse.java \
-       javax/naming/ldap/HasControls.java \
-       javax/naming/ldap/InitialLdapContext.java \
-       javax/naming/ldap/LdapContext.java \
-       javax/naming/ldap/LdapReferralException.java \
-       javax/naming/ldap/UnsolicitedNotification.java \
-       javax/naming/ldap/UnsolicitedNotificationEvent.java \
-       javax/naming/ldap/UnsolicitedNotificationListener.java \
-       javax/naming/OperationNotSupportedException.java \
-       javax/net/ServerSocketFactory.java \
-       javax/net/SocketFactory.java \
-       javax/net/ssl/HandshakeCompletedEvent.java \
-       javax/net/ssl/HandshakeCompletedListener.java \
-       javax/net/ssl/HostnameVerifier.java \
-       javax/net/ssl/HttpsURLConnection.java \
-       javax/net/ssl/KeyManager.java \
-       javax/net/ssl/KeyManagerFactory.java \
-       javax/net/ssl/KeyManagerFactorySpi.java \
-       javax/net/ssl/ManagerFactoryParameters.java \
-       javax/net/ssl/SSLProtocolException.java \
-       javax/net/ssl/SSLContext.java javax/net/ssl/SSLContextSpi.java \
-       javax/net/ssl/SSLException.java \
-       javax/net/ssl/SSLHandshakeException.java \
+       javax/imageio/stream/FileImageInputStream.java \
+       javax/imageio/event/IIOReadProgressListener.java \
+       javax/imageio/event/IIOWriteWarningListener.java \
+       javax/imageio/event/IIOReadWarningListener.java \
+       javax/imageio/event/IIOReadUpdateListener.java \
+       javax/imageio/event/IIOWriteProgressListener.java \
+       javax/imageio/ImageTranscoder.java \
+       javax/imageio/ImageTypeSpecifier.java \
+       javax/imageio/ImageIO.java javax/imageio/IIOImage.java \
+       javax/net/VanillaSocketFactory.java \
+       javax/net/ssl/TrustManagerFactorySpi.java \
        javax/net/ssl/SSLKeyException.java \
-       javax/net/ssl/SSLPeerUnverifiedException.java \
-       javax/net/ssl/SSLPermission.java \
+       javax/net/ssl/TrustManager.java \
        javax/net/ssl/SSLServerSocket.java \
+       javax/net/ssl/TrustManagerFactory.java \
+       javax/net/ssl/KeyManager.java \
+       javax/net/ssl/SSLSocketFactory.java \
+       javax/net/ssl/SSLPermission.java javax/net/ssl/SSLContext.java \
+       javax/net/ssl/TrivialHostnameVerifier.java \
+       javax/net/ssl/X509KeyManager.java \
        javax/net/ssl/SSLServerSocketFactory.java \
-       javax/net/ssl/SSLSession.java \
-       javax/net/ssl/SSLSessionBindingEvent.java \
        javax/net/ssl/SSLSessionBindingListener.java \
        javax/net/ssl/SSLSessionContext.java \
+       javax/net/ssl/KeyManagerFactory.java \
+       javax/net/ssl/SSLProtocolException.java \
        javax/net/ssl/SSLSocket.java \
-       javax/net/ssl/SSLSocketFactory.java \
-       javax/net/ssl/TrivialHostnameVerifier.java \
-       javax/net/ssl/TrustManager.java \
-       javax/net/ssl/TrustManagerFactory.java \
-       javax/net/ssl/TrustManagerFactorySpi.java \
-       javax/net/ssl/X509KeyManager.java \
+       javax/net/ssl/HostnameVerifier.java \
+       javax/net/ssl/HandshakeCompletedListener.java \
+       javax/net/ssl/HttpsURLConnection.java \
+       javax/net/ssl/KeyManagerFactorySpi.java \
+       javax/net/ssl/SSLHandshakeException.java \
+       javax/net/ssl/SSLPeerUnverifiedException.java \
        javax/net/ssl/X509TrustManager.java \
-       javax/net/VanillaSocketFactory.java \
+       javax/net/ssl/SSLSession.java javax/net/ssl/SSLContextSpi.java \
+       javax/net/ssl/HandshakeCompletedEvent.java \
+       javax/net/ssl/SSLSessionBindingEvent.java \
+       javax/net/ssl/SSLException.java \
+       javax/net/ssl/ManagerFactoryParameters.java \
+       javax/net/SocketFactory.java \
        javax/net/VanillaServerSocketFactory.java \
-       javax/print/AttributeException.java \
-       javax/print/CancelablePrintJob.java javax/print/Doc.java \
-       javax/print/DocFlavor.java javax/print/DocPrintJob.java \
-       javax/print/FlavorException.java javax/print/MultiDoc.java \
-       javax/print/MultiDocPrintJob.java \
-       javax/print/MultiDocPrintService.java \
-       javax/print/PrintException.java javax/print/PrintService.java \
-       javax/print/PrintServiceLookup.java \
-       javax/print/ServiceUIFactory.java \
-       javax/print/StreamPrintService.java \
-       javax/print/URIException.java \
+       javax/net/ServerSocketFactory.java \
+       javax/print/attribute/HashPrintServiceAttributeSet.java \
        javax/print/attribute/Attribute.java \
-       javax/print/attribute/AttributeSet.java \
-       javax/print/attribute/AttributeSetUtilities.java \
-       javax/print/attribute/DateTimeSyntax.java \
-       javax/print/attribute/DocAttribute.java \
        javax/print/attribute/DocAttributeSet.java \
-       javax/print/attribute/EnumSyntax.java \
-       javax/print/attribute/HashAttributeSet.java \
-       javax/print/attribute/HashDocAttributeSet.java \
-       javax/print/attribute/HashPrintJobAttributeSet.java \
-       javax/print/attribute/HashPrintRequestAttributeSet.java \
-       javax/print/attribute/HashPrintServiceAttributeSet.java \
-       javax/print/attribute/IntegerSyntax.java \
-       javax/print/attribute/PrintJobAttribute.java \
-       javax/print/attribute/PrintJobAttributeSet.java \
-       javax/print/attribute/PrintRequestAttribute.java \
        javax/print/attribute/PrintRequestAttributeSet.java \
-       javax/print/attribute/PrintServiceAttribute.java \
-       javax/print/attribute/PrintServiceAttributeSet.java \
-       javax/print/attribute/ResolutionSyntax.java \
-       javax/print/attribute/SetOfIntegerSyntax.java \
-       javax/print/attribute/Size2DSyntax.java \
-       javax/print/attribute/SupportedValuesAttribute.java \
-       javax/print/attribute/TextSyntax.java \
-       javax/print/attribute/UnmodifiableSetException.java \
-       javax/print/attribute/URISyntax.java \
-       javax/print/attribute/standard/ColorSupported.java \
-       javax/print/attribute/standard/Compression.java \
-       javax/print/attribute/standard/Copies.java \
-       javax/print/attribute/standard/CopiesSupported.java \
-       javax/print/attribute/standard/DateTimeAtCompleted.java \
-       javax/print/attribute/standard/DateTimeAtCreation.java \
-       javax/print/attribute/standard/DateTimeAtProcessing.java \
-       javax/print/attribute/standard/DocumentName.java \
-       javax/print/attribute/standard/Fidelity.java \
-       javax/print/attribute/standard/Finishings.java \
-       javax/print/attribute/standard/JobHoldUntil.java \
+       javax/print/attribute/standard/NumberOfInterveningJobs.java \
+       javax/print/attribute/standard/PrinterMakeAndModel.java \
+       javax/print/attribute/standard/PrinterStateReason.java \
        javax/print/attribute/standard/JobImpressions.java \
-       javax/print/attribute/standard/JobImpressionsCompleted.java \
-       javax/print/attribute/standard/JobImpressionsSupported.java \
-       javax/print/attribute/standard/JobKOctets.java \
-       javax/print/attribute/standard/JobKOctetsProcessed.java \
+       javax/print/attribute/standard/JobHoldUntil.java \
        javax/print/attribute/standard/JobKOctetsSupported.java \
+       javax/print/attribute/standard/JobPriority.java \
+       javax/print/attribute/standard/QueuedJobCount.java \
+       javax/print/attribute/standard/JobOriginatingUserName.java \
+       javax/print/attribute/standard/PrinterName.java \
+       javax/print/attribute/standard/PDLOverrideSupported.java \
+       javax/print/attribute/standard/PrinterStateReasons.java \
        javax/print/attribute/standard/JobMediaSheets.java \
-       javax/print/attribute/standard/JobMediaSheetsCompleted.java \
-       javax/print/attribute/standard/JobMediaSheetsSupported.java \
+       javax/print/attribute/standard/JobKOctets.java \
+       javax/print/attribute/standard/MultipleDocumentHandling.java \
+       javax/print/attribute/standard/PrinterMessageFromOperator.java \
+       javax/print/attribute/standard/Severity.java \
+       javax/print/attribute/standard/ReferenceUriSchemesSupported.java \
+       javax/print/attribute/standard/DocumentName.java \
+       javax/print/attribute/standard/PrinterMoreInfo.java \
        javax/print/attribute/standard/JobMessageFromOperator.java \
-       javax/print/attribute/standard/JobName.java \
-       javax/print/attribute/standard/JobOriginatingUserName.java \
-       javax/print/attribute/standard/JobPriority.java \
-       javax/print/attribute/standard/JobPrioritySupported.java \
-       javax/print/attribute/standard/JobSheets.java \
-       javax/print/attribute/standard/JobState.java \
-       javax/print/attribute/standard/JobStateReason.java \
        javax/print/attribute/standard/JobStateReasons.java \
-       javax/print/attribute/standard/Media.java \
-       javax/print/attribute/standard/MediaSizeName.java \
-       javax/print/attribute/standard/MultipleDocumentHandling.java \
-       javax/print/attribute/standard/NumberOfDocuments.java \
-       javax/print/attribute/standard/NumberOfInterveningJobs.java \
-       javax/print/attribute/standard/NumberUp.java \
-       javax/print/attribute/standard/NumberUpSupported.java \
-       javax/print/attribute/standard/OrientationRequested.java \
-       javax/print/attribute/standard/OutputDeviceAssigned.java \
-       javax/print/attribute/standard/PDLOverrideSupported.java \
-       javax/print/attribute/standard/PageRanges.java \
+       javax/print/attribute/standard/PrinterIsAcceptingJobs.java \
+       javax/print/attribute/standard/DateTimeAtProcessing.java \
        javax/print/attribute/standard/PagesPerMinute.java \
-       javax/print/attribute/standard/PagesPerMinuteColor.java \
-       javax/print/attribute/standard/PresentationDirection.java \
-       javax/print/attribute/standard/PrintQuality.java \
+       javax/print/attribute/standard/PrinterResolution.java \
+       javax/print/attribute/standard/JobMediaSheetsSupported.java \
+       javax/print/attribute/standard/NumberUpSupported.java \
+       javax/print/attribute/standard/Finishings.java \
+       javax/print/attribute/standard/DateTimeAtCompleted.java \
+       javax/print/attribute/standard/NumberOfDocuments.java \
        javax/print/attribute/standard/PrinterInfo.java \
-       javax/print/attribute/standard/PrinterIsAcceptingJobs.java \
+       javax/print/attribute/standard/PrintQuality.java \
+       javax/print/attribute/standard/JobSheets.java \
+       javax/print/attribute/standard/Media.java \
+       javax/print/attribute/standard/Fidelity.java \
        javax/print/attribute/standard/PrinterLocation.java \
-       javax/print/attribute/standard/PrinterMakeAndModel.java \
-       javax/print/attribute/standard/PrinterMessageFromOperator.java \
-       javax/print/attribute/standard/PrinterMoreInfo.java \
        javax/print/attribute/standard/PrinterMoreInfoManufacturer.java \
-       javax/print/attribute/standard/PrinterName.java \
-       javax/print/attribute/standard/PrinterResolution.java \
-       javax/print/attribute/standard/PrinterState.java \
-       javax/print/attribute/standard/PrinterStateReason.java \
-       javax/print/attribute/standard/PrinterStateReasons.java \
+       javax/print/attribute/standard/OrientationRequested.java \
+       javax/print/attribute/standard/JobState.java \
+       javax/print/attribute/standard/DateTimeAtCreation.java \
+       javax/print/attribute/standard/PresentationDirection.java \
+       javax/print/attribute/standard/JobName.java \
+       javax/print/attribute/standard/PagesPerMinuteColor.java \
+       javax/print/attribute/standard/CopiesSupported.java \
        javax/print/attribute/standard/PrinterURI.java \
-       javax/print/attribute/standard/QueuedJobCount.java \
-       javax/print/attribute/standard/ReferenceUriSchemesSupported.java \
+       javax/print/attribute/standard/PageRanges.java \
        javax/print/attribute/standard/RequestingUserName.java \
-       javax/print/attribute/standard/Severity.java \
-       javax/print/attribute/standard/SheetCollate.java \
+       javax/print/attribute/standard/JobPrioritySupported.java \
+       javax/print/attribute/standard/JobMediaSheetsCompleted.java \
+       javax/print/attribute/standard/JobKOctetsProcessed.java \
+       javax/print/attribute/standard/JobImpressionsCompleted.java \
+       javax/print/attribute/standard/Compression.java \
+       javax/print/attribute/standard/JobImpressionsSupported.java \
        javax/print/attribute/standard/Sides.java \
-       javax/print/event/PrintEvent.java \
+       javax/print/attribute/standard/JobStateReason.java \
+       javax/print/attribute/standard/SheetCollate.java \
+       javax/print/attribute/standard/Copies.java \
+       javax/print/attribute/standard/MediaSizeName.java \
+       javax/print/attribute/standard/OutputDeviceAssigned.java \
+       javax/print/attribute/standard/PrinterState.java \
+       javax/print/attribute/standard/NumberUp.java \
+       javax/print/attribute/standard/ColorSupported.java \
+       javax/print/attribute/HashAttributeSet.java \
+       javax/print/attribute/SetOfIntegerSyntax.java \
+       javax/print/attribute/HashDocAttributeSet.java \
+       javax/print/attribute/PrintRequestAttribute.java \
+       javax/print/attribute/DateTimeSyntax.java \
+       javax/print/attribute/PrintServiceAttribute.java \
+       javax/print/attribute/UnmodifiableSetException.java \
+       javax/print/attribute/HashPrintJobAttributeSet.java \
+       javax/print/attribute/PrintJobAttribute.java \
+       javax/print/attribute/AttributeSet.java \
+       javax/print/attribute/ResolutionSyntax.java \
+       javax/print/attribute/URISyntax.java \
+       javax/print/attribute/AttributeSetUtilities.java \
+       javax/print/attribute/HashPrintRequestAttributeSet.java \
+       javax/print/attribute/TextSyntax.java \
+       javax/print/attribute/PrintJobAttributeSet.java \
+       javax/print/attribute/SupportedValuesAttribute.java \
+       javax/print/attribute/EnumSyntax.java \
+       javax/print/attribute/DocAttribute.java \
+       javax/print/attribute/Size2DSyntax.java \
+       javax/print/attribute/IntegerSyntax.java \
+       javax/print/attribute/PrintServiceAttributeSet.java \
+       javax/print/PrintService.java javax/print/DocFlavor.java \
+       javax/print/DocPrintJob.java javax/print/event/PrintEvent.java \
        javax/print/event/PrintJobAdapter.java \
+       javax/print/event/PrintServiceAttributeEvent.java \
        javax/print/event/PrintJobAttributeEvent.java \
-       javax/print/event/PrintJobAttributeListener.java \
+       javax/print/event/PrintServiceAttributeListener.java \
        javax/print/event/PrintJobEvent.java \
        javax/print/event/PrintJobListener.java \
-       javax/print/event/PrintServiceAttributeEvent.java \
-       javax/print/event/PrintServiceAttributeListener.java \
-       javax/security/auth/AuthPermission.java \
+       javax/print/event/PrintJobAttributeListener.java \
+       javax/print/PrintServiceLookup.java \
+       javax/print/URIException.java \
+       javax/print/StreamPrintService.java javax/print/MultiDoc.java \
+       javax/print/FlavorException.java javax/print/Doc.java \
+       javax/print/MultiDocPrintJob.java \
+       javax/print/CancelablePrintJob.java \
+       javax/print/MultiDocPrintService.java \
+       javax/print/ServiceUIFactory.java \
+       javax/print/AttributeException.java \
+       javax/print/PrintException.java \
+       javax/naming/ServiceUnavailableException.java \
+       javax/naming/directory/Attribute.java \
+       javax/naming/directory/SchemaViolationException.java \
+       javax/naming/directory/InitialDirContext.java \
+       javax/naming/directory/BasicAttribute.java \
+       javax/naming/directory/NoSuchAttributeException.java \
+       javax/naming/directory/InvalidAttributesException.java \
+       javax/naming/directory/InvalidAttributeValueException.java \
+       javax/naming/directory/BasicAttributes.java \
+       javax/naming/directory/AttributeModificationException.java \
+       javax/naming/directory/InvalidAttributeIdentifierException.java \
+       javax/naming/directory/DirContext.java \
+       javax/naming/directory/Attributes.java \
+       javax/naming/directory/InvalidSearchControlsException.java \
+       javax/naming/directory/SearchControls.java \
+       javax/naming/directory/AttributeInUseException.java \
+       javax/naming/directory/InvalidSearchFilterException.java \
+       javax/naming/directory/ModificationItem.java \
+       javax/naming/directory/SearchResult.java \
+       javax/naming/Binding.java \
+       javax/naming/ContextNotEmptyException.java \
+       javax/naming/Referenceable.java \
+       javax/naming/InterruptedNamingException.java \
+       javax/naming/CommunicationException.java \
+       javax/naming/LinkException.java \
+       javax/naming/BinaryRefAddr.java \
+       javax/naming/LinkLoopException.java \
+       javax/naming/AuthenticationException.java \
+       javax/naming/NameAlreadyBoundException.java \
+       javax/naming/MalformedLinkException.java \
+       javax/naming/NotContextException.java \
+       javax/naming/spi/DirStateFactory.java \
+       javax/naming/spi/ResolveResult.java \
+       javax/naming/spi/ObjectFactoryBuilder.java \
+       javax/naming/spi/DirObjectFactory.java \
+       javax/naming/spi/DirectoryManager.java \
+       javax/naming/spi/InitialContextFactoryBuilder.java \
+       javax/naming/spi/ObjectFactory.java \
+       javax/naming/spi/Resolver.java \
+       javax/naming/spi/StateFactory.java \
+       javax/naming/spi/InitialContextFactory.java \
+       javax/naming/spi/NamingManager.java \
+       javax/naming/InvalidNameException.java \
+       javax/naming/NamingEnumeration.java javax/naming/LinkRef.java \
+       javax/naming/event/NamingListener.java \
+       javax/naming/event/NamingEvent.java \
+       javax/naming/event/NamespaceChangeListener.java \
+       javax/naming/event/ObjectChangeListener.java \
+       javax/naming/event/EventContext.java \
+       javax/naming/event/NamingExceptionEvent.java \
+       javax/naming/event/EventDirContext.java \
+       javax/naming/NamingException.java \
+       javax/naming/CannotProceedException.java \
+       javax/naming/PartialResultException.java \
+       javax/naming/TimeLimitExceededException.java \
+       javax/naming/NoPermissionException.java \
+       javax/naming/CompoundName.java \
+       javax/naming/SizeLimitExceededException.java \
+       javax/naming/NoInitialContextException.java \
+       javax/naming/NameNotFoundException.java \
+       javax/naming/InitialContext.java \
+       javax/naming/NamingSecurityException.java \
+       javax/naming/Context.java \
+       javax/naming/ConfigurationException.java \
+       javax/naming/InsufficientResourcesException.java \
+       javax/naming/AuthenticationNotSupportedException.java \
+       javax/naming/StringRefAddr.java \
+       javax/naming/ldap/InitialLdapContext.java \
+       javax/naming/ldap/ExtendedRequest.java \
+       javax/naming/ldap/Control.java \
+       javax/naming/ldap/UnsolicitedNotificationListener.java \
+       javax/naming/ldap/LdapReferralException.java \
+       javax/naming/ldap/UnsolicitedNotificationEvent.java \
+       javax/naming/ldap/HasControls.java \
+       javax/naming/ldap/LdapContext.java \
+       javax/naming/ldap/ExtendedResponse.java \
+       javax/naming/ldap/UnsolicitedNotification.java \
+       javax/naming/ldap/ControlFactory.java \
+       javax/naming/OperationNotSupportedException.java \
+       javax/naming/ReferralException.java \
+       javax/naming/LimitExceededException.java \
+       javax/naming/Reference.java javax/naming/NameParser.java \
+       javax/naming/NameClassPair.java javax/naming/RefAddr.java \
+       javax/naming/CompositeName.java javax/naming/Name.java \
+       javax/xml/xpath/XPathConstants.java \
+       javax/xml/xpath/XPathFunction.java \
+       javax/xml/xpath/XPathVariableResolver.java \
+       javax/xml/xpath/XPathExpressionException.java \
+       javax/xml/xpath/XPathFunctionResolver.java \
+       javax/xml/xpath/XPath.java \
+       javax/xml/xpath/XPathFactoryConfigurationException.java \
+       javax/xml/xpath/XPathFactory.java \
+       javax/xml/xpath/XPathException.java \
+       javax/xml/xpath/XPathExpression.java \
+       javax/xml/xpath/XPathFunctionException.java \
+       javax/xml/validation/ValidatorHandler.java \
+       javax/xml/validation/Validator.java \
+       javax/xml/validation/TypeInfoProvider.java \
+       javax/xml/validation/SchemaFactory.java \
+       javax/xml/validation/Schema.java \
+       javax/xml/parsers/SAXParserFactory.java \
+       javax/xml/parsers/FactoryConfigurationError.java \
+       javax/xml/parsers/SAXParser.java \
+       javax/xml/parsers/DocumentBuilderFactory.java \
+       javax/xml/parsers/ParserConfigurationException.java \
+       javax/xml/parsers/DocumentBuilder.java \
+       javax/xml/datatype/DatatypeFactory.java \
+       javax/xml/datatype/XMLGregorianCalendar.java \
+       javax/xml/datatype/Duration.java \
+       javax/xml/datatype/DatatypeConfigurationException.java \
+       javax/xml/datatype/DatatypeConstants.java \
+       javax/xml/XMLConstants.java \
+       javax/xml/namespace/NamespaceContext.java \
+       javax/xml/namespace/QName.java \
+       javax/xml/transform/TransformerException.java \
+       javax/xml/transform/TransformerFactoryConfigurationError.java \
+       javax/xml/transform/sax/SAXResult.java \
+       javax/xml/transform/sax/TransformerHandler.java \
+       javax/xml/transform/sax/SAXTransformerFactory.java \
+       javax/xml/transform/sax/SAXSource.java \
+       javax/xml/transform/sax/TemplatesHandler.java \
+       javax/xml/transform/OutputKeys.java \
+       javax/xml/transform/stream/StreamResult.java \
+       javax/xml/transform/stream/StreamSource.java \
+       javax/xml/transform/Source.java \
+       javax/xml/transform/SourceLocator.java \
+       javax/xml/transform/ErrorListener.java \
+       javax/xml/transform/TransformerConfigurationException.java \
+       javax/xml/transform/Templates.java \
+       javax/xml/transform/Result.java \
+       javax/xml/transform/URIResolver.java \
+       javax/xml/transform/dom/DOMSource.java \
+       javax/xml/transform/dom/DOMLocator.java \
+       javax/xml/transform/dom/DOMResult.java \
+       javax/xml/transform/Transformer.java \
+       javax/xml/transform/TransformerFactory.java \
+       javax/security/cert/CertificateNotYetValidException.java \
+       javax/security/cert/Certificate.java \
+       javax/security/cert/X509Certificate.java \
+       javax/security/cert/X509CertBridge.java \
+       javax/security/cert/CertificateEncodingException.java \
+       javax/security/cert/CertificateExpiredException.java \
+       javax/security/cert/CertificateException.java \
+       javax/security/cert/CertificateParsingException.java \
        javax/security/auth/Destroyable.java \
+       javax/security/auth/x500/X500PrivateCredential.java \
+       javax/security/auth/x500/X500Principal.java \
+       javax/security/auth/spi/LoginModule.java \
        javax/security/auth/DestroyFailedException.java \
+       javax/security/auth/SubjectDomainCombiner.java \
+       javax/security/auth/AuthPermission.java \
+       javax/security/auth/login/CredentialExpiredException.java \
+       javax/security/auth/login/NullConfiguration.java \
        javax/security/auth/login/AccountExpiredException.java \
+       javax/security/auth/login/LoginException.java \
        javax/security/auth/login/AppConfigurationEntry.java \
        javax/security/auth/login/Configuration.java \
-       javax/security/auth/login/CredentialExpiredException.java \
-       javax/security/auth/login/FailedLoginException.java \
        javax/security/auth/login/LoginContext.java \
-       javax/security/auth/login/LoginException.java \
-       javax/security/auth/login/NullConfiguration.java \
-       javax/security/auth/spi/LoginModule.java \
-       javax/security/auth/Policy.java \
+       javax/security/auth/login/FailedLoginException.java \
        javax/security/auth/PrivateCredentialPermission.java \
-       javax/security/auth/Refreshable.java \
-       javax/security/auth/RefreshFailedException.java \
        javax/security/auth/Subject.java \
-       javax/security/auth/SubjectDomainCombiner.java \
-       javax/security/auth/x500/X500Principal.java \
-       javax/security/auth/x500/X500PrivateCredential.java \
+       javax/security/auth/Policy.java \
+       javax/security/auth/Refreshable.java \
+       javax/security/auth/callback/TextInputCallback.java \
+       javax/security/auth/callback/LanguageCallback.java \
+       javax/security/auth/callback/TextOutputCallback.java \
+       javax/security/auth/callback/UnsupportedCallbackException.java \
        javax/security/auth/callback/Callback.java \
-       javax/security/auth/callback/CallbackHandler.java \
-       javax/security/auth/callback/ChoiceCallback.java \
        javax/security/auth/callback/ConfirmationCallback.java \
-       javax/security/auth/callback/LanguageCallback.java \
+       javax/security/auth/callback/ChoiceCallback.java \
        javax/security/auth/callback/NameCallback.java \
        javax/security/auth/callback/PasswordCallback.java \
-       javax/security/auth/callback/TextInputCallback.java \
-       javax/security/auth/callback/TextOutputCallback.java \
-       javax/security/auth/callback/UnsupportedCallbackException.java \
-       javax/security/cert/Certificate.java \
-       javax/security/cert/CertificateEncodingException.java \
-       javax/security/cert/CertificateException.java \
-       javax/security/cert/CertificateExpiredException.java \
-       javax/security/cert/CertificateNotYetValidException.java \
-       javax/security/cert/CertificateParsingException.java \
-       javax/security/cert/X509CertBridge.java \
-       javax/security/cert/X509Certificate.java \
-       javax/security/sasl/AuthenticationException.java \
-       javax/security/sasl/AuthorizeCallback.java \
+       javax/security/auth/callback/CallbackHandler.java \
+       javax/security/auth/RefreshFailedException.java \
        javax/security/sasl/RealmCallback.java \
+       javax/security/sasl/SaslClient.java \
        javax/security/sasl/RealmChoiceCallback.java \
+       javax/security/sasl/AuthenticationException.java \
        javax/security/sasl/Sasl.java \
-       javax/security/sasl/SaslClient.java \
        javax/security/sasl/SaslClientFactory.java \
+       javax/security/sasl/AuthorizeCallback.java \
+       javax/security/sasl/SaslServerFactory.java \
        javax/security/sasl/SaslException.java \
        javax/security/sasl/SaslServer.java \
-       javax/security/sasl/SaslServerFactory.java \
-       javax/sql/ConnectionEvent.java \
-       javax/sql/ConnectionEventListener.java \
-       javax/sql/ConnectionPoolDataSource.java \
-       javax/sql/DataSource.java javax/sql/PooledConnection.java \
-       javax/sql/RowSetEvent.java javax/sql/RowSetInternal.java \
-       javax/sql/RowSet.java javax/sql/RowSetListener.java \
-       javax/sql/RowSetMetaData.java javax/sql/RowSetReader.java \
-       javax/sql/RowSetWriter.java javax/sql/XAConnection.java \
-       javax/sql/XADataSource.java \
-       javax/transaction/xa/XAException.java \
-       javax/transaction/xa/XAResource.java \
-       javax/transaction/xa/Xid.java \
-       javax/transaction/HeuristicCommitException.java \
-       javax/transaction/HeuristicMixedException.java \
-       javax/transaction/HeuristicRollbackException.java \
-       javax/transaction/InvalidTransactionException.java \
-       javax/transaction/NotSupportedException.java \
+       javax/transaction/TransactionRolledbackException.java \
+       javax/transaction/Synchronization.java \
+       javax/transaction/TransactionRequiredException.java \
        javax/transaction/RollbackException.java \
        javax/transaction/Status.java \
-       javax/transaction/Synchronization.java \
+       javax/transaction/HeuristicMixedException.java \
+       javax/transaction/HeuristicRollbackException.java \
        javax/transaction/SystemException.java \
+       javax/transaction/UserTransaction.java \
+       javax/transaction/NotSupportedException.java \
+       javax/transaction/HeuristicCommitException.java \
        javax/transaction/Transaction.java \
        javax/transaction/TransactionManager.java \
-       javax/transaction/TransactionRequiredException.java \
-       javax/transaction/TransactionRolledbackException.java \
-       javax/transaction/UserTransaction.java \
+       javax/transaction/InvalidTransactionException.java \
+       javax/transaction/xa/XAException.java \
+       javax/transaction/xa/XAResource.java \
+       javax/transaction/xa/Xid.java \
+       javax/accessibility/AccessibleValue.java \
+       javax/accessibility/AccessibleBundle.java \
+       javax/accessibility/AccessibleContext.java \
+       javax/accessibility/AccessibleRelationSet.java \
+       javax/accessibility/Accessible.java \
+       javax/accessibility/AccessibleTableModelChange.java \
+       javax/accessibility/AccessibleState.java \
+       javax/accessibility/AccessibleIcon.java \
+       javax/accessibility/AccessibleHypertext.java \
+       javax/accessibility/AccessibleComponent.java \
+       javax/accessibility/AccessibleText.java \
+       javax/accessibility/AccessibleRole.java \
+       javax/accessibility/AccessibleEditableText.java \
+       javax/accessibility/AccessibleRelation.java \
+       javax/accessibility/AccessibleTable.java \
+       javax/accessibility/AccessibleStateSet.java \
+       javax/accessibility/AccessibleSelection.java \
+       javax/accessibility/AccessibleExtendedTable.java \
+       javax/accessibility/AccessibleResourceBundle.java \
+       javax/accessibility/AccessibleExtendedComponent.java \
+       javax/accessibility/AccessibleHyperlink.java \
+       javax/accessibility/AccessibleKeyBinding.java \
+       javax/accessibility/AccessibleAction.java \
+       javax/sql/ConnectionEventListener.java \
+       javax/sql/RowSetEvent.java \
+       javax/sql/ConnectionPoolDataSource.java \
+       javax/sql/RowSetWriter.java javax/sql/XAConnection.java \
+       javax/sql/RowSet.java javax/sql/DataSource.java \
+       javax/sql/RowSetInternal.java javax/sql/RowSetReader.java \
+       javax/sql/RowSetMetaData.java javax/sql/PooledConnection.java \
+       javax/sql/XADataSource.java javax/sql/RowSetListener.java \
+       javax/sql/ConnectionEvent.java javax/crypto/Cipher.java \
+       javax/crypto/IllegalBlockSizeException.java \
+       javax/crypto/MacSpi.java javax/crypto/SecretKeyFactorySpi.java \
+       javax/crypto/ShortBufferException.java \
+       javax/crypto/KeyAgreement.java \
+       javax/crypto/ExemptionMechanism.java \
+       javax/crypto/CipherOutputStream.java \
+       javax/crypto/SealedObject.java javax/crypto/NullCipher.java \
+       javax/crypto/KeyAgreementSpi.java \
+       javax/crypto/SecretKeyFactory.java javax/crypto/SecretKey.java \
+       javax/crypto/NullCipherImpl.java \
+       javax/crypto/spec/DESKeySpec.java \
+       javax/crypto/spec/DHPrivateKeySpec.java \
+       javax/crypto/spec/DHParameterSpec.java \
+       javax/crypto/spec/PBEParameterSpec.java \
+       javax/crypto/spec/DESedeKeySpec.java \
+       javax/crypto/spec/DHGenParameterSpec.java \
+       javax/crypto/spec/DHPublicKeySpec.java \
+       javax/crypto/spec/PBEKeySpec.java \
+       javax/crypto/spec/RC5ParameterSpec.java \
+       javax/crypto/spec/RC2ParameterSpec.java \
+       javax/crypto/spec/IvParameterSpec.java \
+       javax/crypto/spec/SecretKeySpec.java \
+       javax/crypto/interfaces/DHPublicKey.java \
+       javax/crypto/interfaces/DHKey.java \
+       javax/crypto/interfaces/DHPrivateKey.java \
+       javax/crypto/interfaces/PBEKey.java \
+       javax/crypto/NoSuchPaddingException.java \
+       javax/crypto/KeyGeneratorSpi.java \
+       javax/crypto/BadPaddingException.java \
+       javax/crypto/CipherSpi.java javax/crypto/KeyGenerator.java \
+       javax/crypto/CipherInputStream.java \
+       javax/crypto/ExemptionMechanismException.java \
+       javax/crypto/ExemptionMechanismSpi.java \
+       javax/crypto/EncryptedPrivateKeyInfo.java \
+       javax/crypto/Mac.java org/ietf/jgss/GSSManager.java \
+       org/ietf/jgss/GSSException.java org/ietf/jgss/MessageProp.java \
+       org/ietf/jgss/GSSName.java org/ietf/jgss/GSSContext.java \
+       org/ietf/jgss/Oid.java org/ietf/jgss/GSSCredential.java \
+       org/ietf/jgss/ChannelBinding.java \
+       gnu/xml/xpath/EqualityExpr.java \
+       gnu/xml/xpath/NumberFunction.java \
+       gnu/xml/xpath/StringLengthFunction.java \
+       gnu/xml/xpath/NameFunction.java gnu/xml/xpath/SumFunction.java \
+       gnu/xml/xpath/Pattern.java gnu/xml/xpath/StringFunction.java \
+       gnu/xml/xpath/NegativeExpr.java gnu/xml/xpath/UnionExpr.java \
+       gnu/xml/xpath/SubstringFunction.java gnu/xml/xpath/Expr.java \
+       gnu/xml/xpath/XPathFactoryImpl.java \
+       gnu/xml/xpath/NormalizeSpaceFunction.java \
+       gnu/xml/xpath/Constant.java gnu/xml/xpath/Predicate.java \
+       gnu/xml/xpath/Path.java gnu/xml/xpath/OrExpr.java \
+       gnu/xml/xpath/LangFunction.java \
+       gnu/xml/xpath/StartsWithFunction.java \
+       gnu/xml/xpath/SubstringAfterFunction.java \
+       gnu/xml/xpath/FloorFunction.java \
+       gnu/xml/xpath/NotFunction.java gnu/xml/xpath/Root.java \
+       gnu/xml/xpath/PositionFunction.java \
+       gnu/xml/xpath/VariableReference.java \
+       gnu/xml/xpath/DocumentOrderComparator.java \
+       gnu/xml/xpath/LocalNameFunction.java \
+       gnu/xml/xpath/NamespaceUriFunction.java \
+       gnu/xml/xpath/TranslateFunction.java \
+       gnu/xml/xpath/FalseFunction.java gnu/xml/xpath/AndExpr.java \
+       gnu/xml/xpath/XPathParser.java \
+       gnu/xml/xpath/NamespaceTest.java \
+       gnu/xml/xpath/ConcatFunction.java gnu/xml/xpath/NameTest.java \
+       gnu/xml/xpath/CountFunction.java gnu/xml/xpath/IdFunction.java \
+       gnu/xml/xpath/LastFunction.java \
+       gnu/xml/xpath/XPathTokenizer.java gnu/xml/xpath/Steps.java \
+       gnu/xml/xpath/TrueFunction.java \
+       gnu/xml/xpath/BooleanFunction.java \
+       gnu/xml/xpath/ParenthesizedExpr.java \
+       gnu/xml/xpath/XPathImpl.java gnu/xml/xpath/Selector.java \
+       gnu/xml/xpath/RoundFunction.java \
+       gnu/xml/xpath/SubstringBeforeFunction.java \
+       gnu/xml/xpath/Function.java gnu/xml/xpath/CeilingFunction.java \
+       gnu/xml/xpath/RelationalExpr.java \
+       gnu/xml/xpath/FunctionCall.java \
+       gnu/xml/xpath/NodeTypeTest.java \
+       gnu/xml/xpath/ArithmeticExpr.java gnu/xml/xpath/Test.java \
+       gnu/xml/xpath/ContainsFunction.java \
+       gnu/xml/pipeline/EventFilter.java \
+       gnu/xml/pipeline/NSFilter.java \
+       gnu/xml/pipeline/XsltFilter.java \
+       gnu/xml/pipeline/ValidationConsumer.java \
+       gnu/xml/pipeline/PipelineFactory.java \
+       gnu/xml/pipeline/TextConsumer.java \
+       gnu/xml/pipeline/LinkFilter.java \
+       gnu/xml/pipeline/TeeConsumer.java \
+       gnu/xml/pipeline/DomConsumer.java \
+       gnu/xml/pipeline/EventConsumer.java \
+       gnu/xml/pipeline/WellFormednessFilter.java \
+       gnu/xml/pipeline/XIncludeFilter.java \
+       gnu/xml/pipeline/CallFilter.java \
+       gnu/xml/aelfred2/XmlParser.java \
+       gnu/xml/aelfred2/XmlReader.java \
+       gnu/xml/aelfred2/JAXPFactory.java \
+       gnu/xml/aelfred2/ContentHandler2.java \
+       gnu/xml/aelfred2/SAXDriver.java gnu/xml/util/XCat.java \
+       gnu/xml/util/DomParser.java gnu/xml/util/XMLWriter.java \
+       gnu/xml/util/Resolver.java gnu/xml/util/DoParse.java \
+       gnu/xml/util/XHTMLWriter.java \
+       gnu/xml/util/SAXNullTransformerFactory.java \
+       gnu/xml/dom/DomCDATA.java gnu/xml/dom/DomXPathNSResolver.java \
+       gnu/xml/dom/ls/DomLSEx.java \
+       gnu/xml/dom/ls/FilteredSAXEventSink.java \
+       gnu/xml/dom/ls/DomLSSerializer.java \
+       gnu/xml/dom/ls/DomLSInput.java gnu/xml/dom/ls/DomLSOutput.java \
+       gnu/xml/dom/ls/SAXEventSink.java \
+       gnu/xml/dom/ls/DomLSParser.java \
+       gnu/xml/dom/ls/ReaderInputStream.java \
+       gnu/xml/dom/ls/WriterOutputStream.java \
+       gnu/xml/dom/DomElement.java gnu/xml/dom/DomNsNode.java \
+       gnu/xml/dom/DomAttr.java gnu/xml/dom/DomPI.java \
+       gnu/xml/dom/DTDAttributeTypeInfo.java \
+       gnu/xml/dom/DomDocumentBuilder.java \
+       gnu/xml/dom/DTDElementTypeInfo.java gnu/xml/dom/DomEx.java \
+       gnu/xml/dom/DomDocument.java \
+       gnu/xml/dom/DomXPathExpression.java \
+       gnu/xml/dom/DomDocumentConfiguration.java \
+       gnu/xml/dom/Consumer.java gnu/xml/dom/DomComment.java \
+       gnu/xml/dom/DomCharacterData.java gnu/xml/dom/DomExtern.java \
+       gnu/xml/dom/DomEntityReference.java \
+       gnu/xml/dom/DomNamedNodeMap.java \
+       gnu/xml/dom/ImplementationList.java \
+       gnu/xml/dom/ImplementationSource.java gnu/xml/dom/DomImpl.java \
+       gnu/xml/dom/DomDoctype.java gnu/xml/dom/DomNode.java \
+       gnu/xml/dom/DomXPathResult.java \
+       gnu/xml/dom/DomDocumentBuilderFactory.java \
+       gnu/xml/dom/DomText.java gnu/xml/dom/DomNSResolverContext.java \
+       gnu/xml/dom/DomNodeIterator.java gnu/xml/dom/DomNotation.java \
+       gnu/xml/dom/JAXPFactory.java gnu/xml/dom/DomIterator.java \
+       gnu/xml/dom/DomFragment.java gnu/xml/dom/DomEvent.java \
+       gnu/xml/dom/DomEntity.java \
+       gnu/xml/transform/GenerateIdFunction.java \
+       gnu/xml/transform/FormatNumberFunction.java \
+       gnu/xml/transform/ValueOfNode.java \
+       gnu/xml/transform/ApplyImportsNode.java \
+       gnu/xml/transform/WithParam.java \
+       gnu/xml/transform/DocumentFunction.java \
+       gnu/xml/transform/SAXSerializer.java \
+       gnu/xml/transform/FunctionAvailableFunction.java \
+       gnu/xml/transform/ElementAvailableFunction.java \
+       gnu/xml/transform/IfNode.java \
+       gnu/xml/transform/ApplyTemplatesNode.java \
+       gnu/xml/transform/SortKey.java gnu/xml/transform/Key.java \
+       gnu/xml/transform/ElementNode.java \
+       gnu/xml/transform/CurrentFunction.java \
+       gnu/xml/transform/XSLComparator.java \
+       gnu/xml/transform/CallTemplateNode.java \
+       gnu/xml/transform/TemplatesImpl.java \
+       gnu/xml/transform/ChooseNode.java \
+       gnu/xml/transform/NumberNode.java \
+       gnu/xml/transform/CopyOfNode.java \
+       gnu/xml/transform/ParameterNode.java \
+       gnu/xml/transform/TransformerFactoryImpl.java \
+       gnu/xml/transform/TextNode.java \
+       gnu/xml/transform/CopyNode.java \
+       gnu/xml/transform/SystemPropertyFunction.java \
+       gnu/xml/transform/Stylesheet.java \
+       gnu/xml/transform/ProcessingInstructionNode.java \
+       gnu/xml/transform/UnparsedEntityUriFunction.java \
+       gnu/xml/transform/URIResolverEntityResolver.java \
+       gnu/xml/transform/ErrorListenerErrorHandler.java \
+       gnu/xml/transform/Bindings.java \
+       gnu/xml/transform/AttributeSet.java \
+       gnu/xml/transform/Template.java \
+       gnu/xml/transform/MessageNode.java \
+       gnu/xml/transform/LiteralNode.java \
+       gnu/xml/transform/StreamSerializer.java \
+       gnu/xml/transform/XSLURIResolver.java \
+       gnu/xml/transform/AttributeNode.java \
+       gnu/xml/transform/CommentNode.java \
+       gnu/xml/transform/ForEachNode.java \
+       gnu/xml/transform/KeyFunction.java \
+       gnu/xml/transform/TransformerImpl.java \
+       gnu/xml/transform/WhenNode.java \
+       gnu/xml/transform/NodeNumberNode.java \
+       gnu/xml/transform/OtherwiseNode.java \
+       gnu/xml/transform/AbstractNumberNode.java \
+       gnu/xml/transform/TemplateNode.java \
+       gnu/xml/transform/TransformerOutputProperties.java \
+       gnu/xml/transform/DOMSourceLocator.java \
        java/lang/ConcreteProcess.java \
        gnu/classpath/Configuration.java boehm.cc nogc.cc \
        sysdep/dwarf2-backtrace.cc posix.cc win32.cc darwin.cc \
@@ -3268,389 +3414,444 @@ am__objects_12 = gnu/gcj/convert/BytesToUnicode.lo \
        gnu/gcj/convert/Output_UnicodeLittleUnmarked.lo \
        gnu/gcj/convert/Output_UTF8.lo gnu/gcj/convert/Output_iconv.lo \
        gnu/gcj/convert/UnicodeToBytes.lo
-am__objects_13 = javax/accessibility/Accessible.lo \
-       javax/accessibility/AccessibleAction.lo \
-       javax/accessibility/AccessibleBundle.lo \
-       javax/accessibility/AccessibleComponent.lo \
-       javax/accessibility/AccessibleContext.lo \
-       javax/accessibility/AccessibleEditableText.lo \
-       javax/accessibility/AccessibleExtendedComponent.lo \
-       javax/accessibility/AccessibleExtendedTable.lo \
-       javax/accessibility/AccessibleHyperlink.lo \
-       javax/accessibility/AccessibleHypertext.lo \
-       javax/accessibility/AccessibleIcon.lo \
-       javax/accessibility/AccessibleKeyBinding.lo \
-       javax/accessibility/AccessibleRelation.lo \
-       javax/accessibility/AccessibleRelationSet.lo \
-       javax/accessibility/AccessibleResourceBundle.lo \
-       javax/accessibility/AccessibleRole.lo \
-       javax/accessibility/AccessibleSelection.lo \
-       javax/accessibility/AccessibleState.lo \
-       javax/accessibility/AccessibleStateSet.lo \
-       javax/accessibility/AccessibleTable.lo \
-       javax/accessibility/AccessibleTableModelChange.lo \
-       javax/accessibility/AccessibleText.lo \
-       javax/accessibility/AccessibleValue.lo \
-       javax/crypto/BadPaddingException.lo javax/crypto/Cipher.lo \
-       javax/crypto/CipherInputStream.lo \
-       javax/crypto/CipherOutputStream.lo javax/crypto/CipherSpi.lo \
-       javax/crypto/EncryptedPrivateKeyInfo.lo \
-       javax/crypto/KeyGeneratorSpi.lo \
-       javax/crypto/ExemptionMechanism.lo \
-       javax/crypto/ExemptionMechanismException.lo \
-       javax/crypto/ExemptionMechanismSpi.lo \
-       javax/crypto/IllegalBlockSizeException.lo \
-       javax/crypto/KeyAgreement.lo javax/crypto/KeyAgreementSpi.lo \
-       javax/crypto/KeyGenerator.lo javax/crypto/Mac.lo \
-       javax/crypto/MacSpi.lo javax/crypto/NoSuchPaddingException.lo \
-       javax/crypto/NullCipher.lo javax/crypto/NullCipherImpl.lo \
-       javax/crypto/SealedObject.lo javax/crypto/SecretKey.lo \
-       javax/crypto/SecretKeyFactory.lo \
-       javax/crypto/SecretKeyFactorySpi.lo \
-       javax/crypto/ShortBufferException.lo \
-       javax/crypto/interfaces/DHKey.lo \
-       javax/crypto/interfaces/DHPrivateKey.lo \
-       javax/crypto/interfaces/DHPublicKey.lo \
-       javax/crypto/interfaces/PBEKey.lo \
-       javax/crypto/spec/DESKeySpec.lo \
-       javax/crypto/spec/DESedeKeySpec.lo \
-       javax/crypto/spec/DHGenParameterSpec.lo \
-       javax/crypto/spec/DHParameterSpec.lo \
-       javax/crypto/spec/DHPrivateKeySpec.lo \
-       javax/crypto/spec/DHPublicKeySpec.lo \
-       javax/crypto/spec/IvParameterSpec.lo \
-       javax/crypto/spec/PBEKeySpec.lo \
-       javax/crypto/spec/PBEParameterSpec.lo \
-       javax/crypto/spec/RC2ParameterSpec.lo \
-       javax/crypto/spec/RC5ParameterSpec.lo \
-       javax/crypto/spec/SecretKeySpec.lo \
-       javax/imageio/IIOException.lo javax/imageio/IIOImage.lo \
-       javax/imageio/IIOParam.lo javax/imageio/IIOParamController.lo \
-       javax/imageio/ImageIO.lo javax/imageio/ImageReadParam.lo \
-       javax/imageio/ImageReader.lo javax/imageio/ImageTranscoder.lo \
-       javax/imageio/ImageTypeSpecifier.lo \
-       javax/imageio/ImageWriteParam.lo javax/imageio/ImageWriter.lo \
-       javax/imageio/event/IIOReadProgressListener.lo \
-       javax/imageio/event/IIOReadUpdateListener.lo \
-       javax/imageio/event/IIOReadWarningListener.lo \
-       javax/imageio/event/IIOWriteProgressListener.lo \
-       javax/imageio/event/IIOWriteWarningListener.lo \
-       javax/imageio/metadata/IIOInvalidTreeException.lo \
-       javax/imageio/metadata/IIOMetadata.lo \
-       javax/imageio/metadata/IIOMetadataController.lo \
-       javax/imageio/metadata/IIOMetadataFormat.lo \
-       javax/imageio/metadata/IIOMetadataFormatImpl.lo \
-       javax/imageio/metadata/IIOMetadataNode.lo \
-       javax/imageio/spi/IIOServiceProvider.lo \
+am__objects_13 = javax/imageio/ImageWriteParam.lo \
+       javax/imageio/ImageReader.lo javax/imageio/ImageWriter.lo \
+       javax/imageio/IIOException.lo \
+       javax/imageio/IIOParamController.lo \
+       javax/imageio/ImageReadParam.lo javax/imageio/IIOParam.lo \
        javax/imageio/spi/IIORegistry.lo \
-       javax/imageio/spi/ImageInputStreamSpi.lo \
+       javax/imageio/spi/ImageWriterSpi.lo \
        javax/imageio/spi/ImageOutputStreamSpi.lo \
+       javax/imageio/spi/ServiceRegistry.lo \
+       javax/imageio/spi/ImageTranscoderSpi.lo \
        javax/imageio/spi/ImageReaderSpi.lo \
+       javax/imageio/spi/IIOServiceProvider.lo \
        javax/imageio/spi/ImageReaderWriterSpi.lo \
-       javax/imageio/spi/ImageTranscoderSpi.lo \
+       javax/imageio/spi/ImageInputStreamSpi.lo \
        javax/imageio/spi/RegisterableService.lo \
-       javax/imageio/spi/ServiceRegistry.lo \
-       javax/imageio/spi/ImageWriterSpi.lo \
-       javax/imageio/stream/FileCacheImageInputStream.lo \
-       javax/imageio/stream/FileCacheImageOutputStream.lo \
-       javax/imageio/stream/FileImageInputStream.lo \
+       javax/imageio/metadata/IIOMetadataFormatImpl.lo \
+       javax/imageio/metadata/IIOInvalidTreeException.lo \
+       javax/imageio/metadata/IIOMetadataFormat.lo \
+       javax/imageio/metadata/IIOMetadataController.lo \
+       javax/imageio/metadata/IIOMetadataNode.lo \
+       javax/imageio/metadata/IIOMetadata.lo \
        javax/imageio/stream/FileImageOutputStream.lo \
-       javax/imageio/stream/IIOByteBuffer.lo \
        javax/imageio/stream/ImageInputStream.lo \
+       javax/imageio/stream/IIOByteBuffer.lo \
+       javax/imageio/stream/FileCacheImageInputStream.lo \
        javax/imageio/stream/ImageInputStreamImpl.lo \
-       javax/imageio/stream/ImageOutputStream.lo \
        javax/imageio/stream/ImageOutputStreamImpl.lo \
        javax/imageio/stream/MemoryCacheImageInputStream.lo \
+       javax/imageio/stream/FileCacheImageOutputStream.lo \
+       javax/imageio/stream/ImageOutputStream.lo \
        javax/imageio/stream/MemoryCacheImageOutputStream.lo \
-       javax/naming/directory/Attribute.lo \
-       javax/naming/directory/AttributeInUseException.lo \
-       javax/naming/directory/AttributeModificationException.lo \
-       javax/naming/directory/Attributes.lo \
-       javax/naming/directory/DirContext.lo \
-       javax/naming/directory/InvalidAttributeIdentifierException.lo \
-       javax/naming/directory/InvalidAttributeValueException.lo \
-       javax/naming/directory/InvalidAttributesException.lo \
-       javax/naming/directory/InvalidSearchControlsException.lo \
-       javax/naming/directory/InvalidSearchFilterException.lo \
-       javax/naming/directory/NoSuchAttributeException.lo \
-       javax/naming/directory/SchemaViolationException.lo \
-       javax/naming/directory/BasicAttribute.lo \
-       javax/naming/directory/BasicAttributes.lo \
-       javax/naming/directory/ModificationItem.lo \
-       javax/naming/directory/SearchControls.lo \
-       javax/naming/directory/SearchResult.lo \
-       javax/naming/directory/InitialDirContext.lo \
-       javax/naming/AuthenticationException.lo \
-       javax/naming/AuthenticationNotSupportedException.lo \
-       javax/naming/CannotProceedException.lo \
-       javax/naming/CommunicationException.lo \
-       javax/naming/ConfigurationException.lo javax/naming/Context.lo \
-       javax/naming/ContextNotEmptyException.lo \
-       javax/naming/InsufficientResourcesException.lo \
-       javax/naming/InterruptedNamingException.lo \
-       javax/naming/BinaryRefAddr.lo \
-       javax/naming/LimitExceededException.lo \
-       javax/naming/LinkException.lo \
-       javax/naming/LinkLoopException.lo \
-       javax/naming/MalformedLinkException.lo javax/naming/Name.lo \
-       javax/naming/NameAlreadyBoundException.lo \
-       javax/naming/NameNotFoundException.lo \
-       javax/naming/NameParser.lo javax/naming/NamingEnumeration.lo \
-       javax/naming/InitialContext.lo \
-       javax/naming/NamingSecurityException.lo \
-       javax/naming/NoInitialContextException.lo \
-       javax/naming/NoPermissionException.lo \
-       javax/naming/NotContextException.lo \
-       javax/naming/NamingException.lo \
-       javax/naming/PartialResultException.lo \
-       javax/naming/event/EventContext.lo \
-       javax/naming/event/EventDirContext.lo \
-       javax/naming/event/NamespaceChangeListener.lo \
-       javax/naming/event/NamingEvent.lo \
-       javax/naming/event/NamingExceptionEvent.lo \
-       javax/naming/event/NamingListener.lo \
-       javax/naming/event/ObjectChangeListener.lo \
-       javax/naming/RefAddr.lo javax/naming/Reference.lo \
-       javax/naming/Referenceable.lo \
-       javax/naming/ReferralException.lo \
-       javax/naming/ServiceUnavailableException.lo \
-       javax/naming/SizeLimitExceededException.lo \
-       javax/naming/StringRefAddr.lo \
-       javax/naming/TimeLimitExceededException.lo \
-       javax/naming/spi/InitialContextFactory.lo \
-       javax/naming/spi/InitialContextFactoryBuilder.lo \
-       javax/naming/spi/NamingManager.lo \
-       javax/naming/spi/ObjectFactory.lo javax/naming/spi/Resolver.lo \
-       javax/naming/spi/DirObjectFactory.lo \
-       javax/naming/spi/DirStateFactory.lo \
-       javax/naming/spi/DirectoryManager.lo \
-       javax/naming/spi/ObjectFactoryBuilder.lo \
-       javax/naming/spi/ResolveResult.lo \
-       javax/naming/spi/StateFactory.lo \
-       javax/naming/InvalidNameException.lo javax/naming/Binding.lo \
-       javax/naming/CompositeName.lo javax/naming/CompoundName.lo \
-       javax/naming/LinkRef.lo javax/naming/NameClassPair.lo \
-       javax/naming/ldap/Control.lo \
-       javax/naming/ldap/ControlFactory.lo \
-       javax/naming/ldap/ExtendedRequest.lo \
-       javax/naming/ldap/ExtendedResponse.lo \
-       javax/naming/ldap/HasControls.lo \
-       javax/naming/ldap/InitialLdapContext.lo \
-       javax/naming/ldap/LdapContext.lo \
-       javax/naming/ldap/LdapReferralException.lo \
-       javax/naming/ldap/UnsolicitedNotification.lo \
-       javax/naming/ldap/UnsolicitedNotificationEvent.lo \
-       javax/naming/ldap/UnsolicitedNotificationListener.lo \
-       javax/naming/OperationNotSupportedException.lo \
-       javax/net/ServerSocketFactory.lo javax/net/SocketFactory.lo \
-       javax/net/ssl/HandshakeCompletedEvent.lo \
+       javax/imageio/stream/FileImageInputStream.lo \
+       javax/imageio/event/IIOReadProgressListener.lo \
+       javax/imageio/event/IIOWriteWarningListener.lo \
+       javax/imageio/event/IIOReadWarningListener.lo \
+       javax/imageio/event/IIOReadUpdateListener.lo \
+       javax/imageio/event/IIOWriteProgressListener.lo \
+       javax/imageio/ImageTranscoder.lo \
+       javax/imageio/ImageTypeSpecifier.lo javax/imageio/ImageIO.lo \
+       javax/imageio/IIOImage.lo javax/net/VanillaSocketFactory.lo \
+       javax/net/ssl/TrustManagerFactorySpi.lo \
+       javax/net/ssl/SSLKeyException.lo javax/net/ssl/TrustManager.lo \
+       javax/net/ssl/SSLServerSocket.lo \
+       javax/net/ssl/TrustManagerFactory.lo \
+       javax/net/ssl/KeyManager.lo javax/net/ssl/SSLSocketFactory.lo \
+       javax/net/ssl/SSLPermission.lo javax/net/ssl/SSLContext.lo \
+       javax/net/ssl/TrivialHostnameVerifier.lo \
+       javax/net/ssl/X509KeyManager.lo \
+       javax/net/ssl/SSLServerSocketFactory.lo \
+       javax/net/ssl/SSLSessionBindingListener.lo \
+       javax/net/ssl/SSLSessionContext.lo \
+       javax/net/ssl/KeyManagerFactory.lo \
+       javax/net/ssl/SSLProtocolException.lo \
+       javax/net/ssl/SSLSocket.lo javax/net/ssl/HostnameVerifier.lo \
        javax/net/ssl/HandshakeCompletedListener.lo \
-       javax/net/ssl/HostnameVerifier.lo \
        javax/net/ssl/HttpsURLConnection.lo \
-       javax/net/ssl/KeyManager.lo javax/net/ssl/KeyManagerFactory.lo \
        javax/net/ssl/KeyManagerFactorySpi.lo \
-       javax/net/ssl/ManagerFactoryParameters.lo \
-       javax/net/ssl/SSLProtocolException.lo \
-       javax/net/ssl/SSLContext.lo javax/net/ssl/SSLContextSpi.lo \
-       javax/net/ssl/SSLException.lo \
        javax/net/ssl/SSLHandshakeException.lo \
-       javax/net/ssl/SSLKeyException.lo \
        javax/net/ssl/SSLPeerUnverifiedException.lo \
-       javax/net/ssl/SSLPermission.lo \
-       javax/net/ssl/SSLServerSocket.lo \
-       javax/net/ssl/SSLServerSocketFactory.lo \
-       javax/net/ssl/SSLSession.lo \
+       javax/net/ssl/X509TrustManager.lo javax/net/ssl/SSLSession.lo \
+       javax/net/ssl/SSLContextSpi.lo \
+       javax/net/ssl/HandshakeCompletedEvent.lo \
        javax/net/ssl/SSLSessionBindingEvent.lo \
-       javax/net/ssl/SSLSessionBindingListener.lo \
-       javax/net/ssl/SSLSessionContext.lo javax/net/ssl/SSLSocket.lo \
-       javax/net/ssl/SSLSocketFactory.lo \
-       javax/net/ssl/TrivialHostnameVerifier.lo \
-       javax/net/ssl/TrustManager.lo \
-       javax/net/ssl/TrustManagerFactory.lo \
-       javax/net/ssl/TrustManagerFactorySpi.lo \
-       javax/net/ssl/X509KeyManager.lo \
-       javax/net/ssl/X509TrustManager.lo \
-       javax/net/VanillaSocketFactory.lo \
+       javax/net/ssl/SSLException.lo \
+       javax/net/ssl/ManagerFactoryParameters.lo \
+       javax/net/SocketFactory.lo \
        javax/net/VanillaServerSocketFactory.lo \
-       javax/print/AttributeException.lo \
-       javax/print/CancelablePrintJob.lo javax/print/Doc.lo \
-       javax/print/DocFlavor.lo javax/print/DocPrintJob.lo \
-       javax/print/FlavorException.lo javax/print/MultiDoc.lo \
-       javax/print/MultiDocPrintJob.lo \
-       javax/print/MultiDocPrintService.lo \
-       javax/print/PrintException.lo javax/print/PrintService.lo \
-       javax/print/PrintServiceLookup.lo \
-       javax/print/ServiceUIFactory.lo \
-       javax/print/StreamPrintService.lo javax/print/URIException.lo \
+       javax/net/ServerSocketFactory.lo \
+       javax/print/attribute/HashPrintServiceAttributeSet.lo \
        javax/print/attribute/Attribute.lo \
-       javax/print/attribute/AttributeSet.lo \
-       javax/print/attribute/AttributeSetUtilities.lo \
-       javax/print/attribute/DateTimeSyntax.lo \
-       javax/print/attribute/DocAttribute.lo \
        javax/print/attribute/DocAttributeSet.lo \
-       javax/print/attribute/EnumSyntax.lo \
-       javax/print/attribute/HashAttributeSet.lo \
-       javax/print/attribute/HashDocAttributeSet.lo \
-       javax/print/attribute/HashPrintJobAttributeSet.lo \
-       javax/print/attribute/HashPrintRequestAttributeSet.lo \
-       javax/print/attribute/HashPrintServiceAttributeSet.lo \
-       javax/print/attribute/IntegerSyntax.lo \
-       javax/print/attribute/PrintJobAttribute.lo \
-       javax/print/attribute/PrintJobAttributeSet.lo \
-       javax/print/attribute/PrintRequestAttribute.lo \
        javax/print/attribute/PrintRequestAttributeSet.lo \
-       javax/print/attribute/PrintServiceAttribute.lo \
-       javax/print/attribute/PrintServiceAttributeSet.lo \
-       javax/print/attribute/ResolutionSyntax.lo \
-       javax/print/attribute/SetOfIntegerSyntax.lo \
-       javax/print/attribute/Size2DSyntax.lo \
-       javax/print/attribute/SupportedValuesAttribute.lo \
-       javax/print/attribute/TextSyntax.lo \
-       javax/print/attribute/UnmodifiableSetException.lo \
-       javax/print/attribute/URISyntax.lo \
-       javax/print/attribute/standard/ColorSupported.lo \
-       javax/print/attribute/standard/Compression.lo \
-       javax/print/attribute/standard/Copies.lo \
-       javax/print/attribute/standard/CopiesSupported.lo \
-       javax/print/attribute/standard/DateTimeAtCompleted.lo \
-       javax/print/attribute/standard/DateTimeAtCreation.lo \
-       javax/print/attribute/standard/DateTimeAtProcessing.lo \
-       javax/print/attribute/standard/DocumentName.lo \
-       javax/print/attribute/standard/Fidelity.lo \
-       javax/print/attribute/standard/Finishings.lo \
-       javax/print/attribute/standard/JobHoldUntil.lo \
+       javax/print/attribute/standard/NumberOfInterveningJobs.lo \
+       javax/print/attribute/standard/PrinterMakeAndModel.lo \
+       javax/print/attribute/standard/PrinterStateReason.lo \
        javax/print/attribute/standard/JobImpressions.lo \
-       javax/print/attribute/standard/JobImpressionsCompleted.lo \
-       javax/print/attribute/standard/JobImpressionsSupported.lo \
-       javax/print/attribute/standard/JobKOctets.lo \
-       javax/print/attribute/standard/JobKOctetsProcessed.lo \
+       javax/print/attribute/standard/JobHoldUntil.lo \
        javax/print/attribute/standard/JobKOctetsSupported.lo \
+       javax/print/attribute/standard/JobPriority.lo \
+       javax/print/attribute/standard/QueuedJobCount.lo \
+       javax/print/attribute/standard/JobOriginatingUserName.lo \
+       javax/print/attribute/standard/PrinterName.lo \
+       javax/print/attribute/standard/PDLOverrideSupported.lo \
+       javax/print/attribute/standard/PrinterStateReasons.lo \
        javax/print/attribute/standard/JobMediaSheets.lo \
-       javax/print/attribute/standard/JobMediaSheetsCompleted.lo \
-       javax/print/attribute/standard/JobMediaSheetsSupported.lo \
+       javax/print/attribute/standard/JobKOctets.lo \
+       javax/print/attribute/standard/MultipleDocumentHandling.lo \
+       javax/print/attribute/standard/PrinterMessageFromOperator.lo \
+       javax/print/attribute/standard/Severity.lo \
+       javax/print/attribute/standard/ReferenceUriSchemesSupported.lo \
+       javax/print/attribute/standard/DocumentName.lo \
+       javax/print/attribute/standard/PrinterMoreInfo.lo \
        javax/print/attribute/standard/JobMessageFromOperator.lo \
-       javax/print/attribute/standard/JobName.lo \
-       javax/print/attribute/standard/JobOriginatingUserName.lo \
-       javax/print/attribute/standard/JobPriority.lo \
-       javax/print/attribute/standard/JobPrioritySupported.lo \
-       javax/print/attribute/standard/JobSheets.lo \
-       javax/print/attribute/standard/JobState.lo \
-       javax/print/attribute/standard/JobStateReason.lo \
        javax/print/attribute/standard/JobStateReasons.lo \
-       javax/print/attribute/standard/Media.lo \
-       javax/print/attribute/standard/MediaSizeName.lo \
-       javax/print/attribute/standard/MultipleDocumentHandling.lo \
-       javax/print/attribute/standard/NumberOfDocuments.lo \
-       javax/print/attribute/standard/NumberOfInterveningJobs.lo \
-       javax/print/attribute/standard/NumberUp.lo \
-       javax/print/attribute/standard/NumberUpSupported.lo \
-       javax/print/attribute/standard/OrientationRequested.lo \
-       javax/print/attribute/standard/OutputDeviceAssigned.lo \
-       javax/print/attribute/standard/PDLOverrideSupported.lo \
-       javax/print/attribute/standard/PageRanges.lo \
+       javax/print/attribute/standard/PrinterIsAcceptingJobs.lo \
+       javax/print/attribute/standard/DateTimeAtProcessing.lo \
        javax/print/attribute/standard/PagesPerMinute.lo \
-       javax/print/attribute/standard/PagesPerMinuteColor.lo \
-       javax/print/attribute/standard/PresentationDirection.lo \
-       javax/print/attribute/standard/PrintQuality.lo \
+       javax/print/attribute/standard/PrinterResolution.lo \
+       javax/print/attribute/standard/JobMediaSheetsSupported.lo \
+       javax/print/attribute/standard/NumberUpSupported.lo \
+       javax/print/attribute/standard/Finishings.lo \
+       javax/print/attribute/standard/DateTimeAtCompleted.lo \
+       javax/print/attribute/standard/NumberOfDocuments.lo \
        javax/print/attribute/standard/PrinterInfo.lo \
-       javax/print/attribute/standard/PrinterIsAcceptingJobs.lo \
+       javax/print/attribute/standard/PrintQuality.lo \
+       javax/print/attribute/standard/JobSheets.lo \
+       javax/print/attribute/standard/Media.lo \
+       javax/print/attribute/standard/Fidelity.lo \
        javax/print/attribute/standard/PrinterLocation.lo \
-       javax/print/attribute/standard/PrinterMakeAndModel.lo \
-       javax/print/attribute/standard/PrinterMessageFromOperator.lo \
-       javax/print/attribute/standard/PrinterMoreInfo.lo \
        javax/print/attribute/standard/PrinterMoreInfoManufacturer.lo \
-       javax/print/attribute/standard/PrinterName.lo \
-       javax/print/attribute/standard/PrinterResolution.lo \
-       javax/print/attribute/standard/PrinterState.lo \
-       javax/print/attribute/standard/PrinterStateReason.lo \
-       javax/print/attribute/standard/PrinterStateReasons.lo \
+       javax/print/attribute/standard/OrientationRequested.lo \
+       javax/print/attribute/standard/JobState.lo \
+       javax/print/attribute/standard/DateTimeAtCreation.lo \
+       javax/print/attribute/standard/PresentationDirection.lo \
+       javax/print/attribute/standard/JobName.lo \
+       javax/print/attribute/standard/PagesPerMinuteColor.lo \
+       javax/print/attribute/standard/CopiesSupported.lo \
        javax/print/attribute/standard/PrinterURI.lo \
-       javax/print/attribute/standard/QueuedJobCount.lo \
-       javax/print/attribute/standard/ReferenceUriSchemesSupported.lo \
+       javax/print/attribute/standard/PageRanges.lo \
        javax/print/attribute/standard/RequestingUserName.lo \
-       javax/print/attribute/standard/Severity.lo \
-       javax/print/attribute/standard/SheetCollate.lo \
+       javax/print/attribute/standard/JobPrioritySupported.lo \
+       javax/print/attribute/standard/JobMediaSheetsCompleted.lo \
+       javax/print/attribute/standard/JobKOctetsProcessed.lo \
+       javax/print/attribute/standard/JobImpressionsCompleted.lo \
+       javax/print/attribute/standard/Compression.lo \
+       javax/print/attribute/standard/JobImpressionsSupported.lo \
        javax/print/attribute/standard/Sides.lo \
-       javax/print/event/PrintEvent.lo \
+       javax/print/attribute/standard/JobStateReason.lo \
+       javax/print/attribute/standard/SheetCollate.lo \
+       javax/print/attribute/standard/Copies.lo \
+       javax/print/attribute/standard/MediaSizeName.lo \
+       javax/print/attribute/standard/OutputDeviceAssigned.lo \
+       javax/print/attribute/standard/PrinterState.lo \
+       javax/print/attribute/standard/NumberUp.lo \
+       javax/print/attribute/standard/ColorSupported.lo \
+       javax/print/attribute/HashAttributeSet.lo \
+       javax/print/attribute/SetOfIntegerSyntax.lo \
+       javax/print/attribute/HashDocAttributeSet.lo \
+       javax/print/attribute/PrintRequestAttribute.lo \
+       javax/print/attribute/DateTimeSyntax.lo \
+       javax/print/attribute/PrintServiceAttribute.lo \
+       javax/print/attribute/UnmodifiableSetException.lo \
+       javax/print/attribute/HashPrintJobAttributeSet.lo \
+       javax/print/attribute/PrintJobAttribute.lo \
+       javax/print/attribute/AttributeSet.lo \
+       javax/print/attribute/ResolutionSyntax.lo \
+       javax/print/attribute/URISyntax.lo \
+       javax/print/attribute/AttributeSetUtilities.lo \
+       javax/print/attribute/HashPrintRequestAttributeSet.lo \
+       javax/print/attribute/TextSyntax.lo \
+       javax/print/attribute/PrintJobAttributeSet.lo \
+       javax/print/attribute/SupportedValuesAttribute.lo \
+       javax/print/attribute/EnumSyntax.lo \
+       javax/print/attribute/DocAttribute.lo \
+       javax/print/attribute/Size2DSyntax.lo \
+       javax/print/attribute/IntegerSyntax.lo \
+       javax/print/attribute/PrintServiceAttributeSet.lo \
+       javax/print/PrintService.lo javax/print/DocFlavor.lo \
+       javax/print/DocPrintJob.lo javax/print/event/PrintEvent.lo \
        javax/print/event/PrintJobAdapter.lo \
+       javax/print/event/PrintServiceAttributeEvent.lo \
        javax/print/event/PrintJobAttributeEvent.lo \
-       javax/print/event/PrintJobAttributeListener.lo \
+       javax/print/event/PrintServiceAttributeListener.lo \
        javax/print/event/PrintJobEvent.lo \
        javax/print/event/PrintJobListener.lo \
-       javax/print/event/PrintServiceAttributeEvent.lo \
-       javax/print/event/PrintServiceAttributeListener.lo \
-       javax/security/auth/AuthPermission.lo \
+       javax/print/event/PrintJobAttributeListener.lo \
+       javax/print/PrintServiceLookup.lo javax/print/URIException.lo \
+       javax/print/StreamPrintService.lo javax/print/MultiDoc.lo \
+       javax/print/FlavorException.lo javax/print/Doc.lo \
+       javax/print/MultiDocPrintJob.lo \
+       javax/print/CancelablePrintJob.lo \
+       javax/print/MultiDocPrintService.lo \
+       javax/print/ServiceUIFactory.lo \
+       javax/print/AttributeException.lo \
+       javax/print/PrintException.lo \
+       javax/naming/ServiceUnavailableException.lo \
+       javax/naming/directory/Attribute.lo \
+       javax/naming/directory/SchemaViolationException.lo \
+       javax/naming/directory/InitialDirContext.lo \
+       javax/naming/directory/BasicAttribute.lo \
+       javax/naming/directory/NoSuchAttributeException.lo \
+       javax/naming/directory/InvalidAttributesException.lo \
+       javax/naming/directory/InvalidAttributeValueException.lo \
+       javax/naming/directory/BasicAttributes.lo \
+       javax/naming/directory/AttributeModificationException.lo \
+       javax/naming/directory/InvalidAttributeIdentifierException.lo \
+       javax/naming/directory/DirContext.lo \
+       javax/naming/directory/Attributes.lo \
+       javax/naming/directory/InvalidSearchControlsException.lo \
+       javax/naming/directory/SearchControls.lo \
+       javax/naming/directory/AttributeInUseException.lo \
+       javax/naming/directory/InvalidSearchFilterException.lo \
+       javax/naming/directory/ModificationItem.lo \
+       javax/naming/directory/SearchResult.lo javax/naming/Binding.lo \
+       javax/naming/ContextNotEmptyException.lo \
+       javax/naming/Referenceable.lo \
+       javax/naming/InterruptedNamingException.lo \
+       javax/naming/CommunicationException.lo \
+       javax/naming/LinkException.lo javax/naming/BinaryRefAddr.lo \
+       javax/naming/LinkLoopException.lo \
+       javax/naming/AuthenticationException.lo \
+       javax/naming/NameAlreadyBoundException.lo \
+       javax/naming/MalformedLinkException.lo \
+       javax/naming/NotContextException.lo \
+       javax/naming/spi/DirStateFactory.lo \
+       javax/naming/spi/ResolveResult.lo \
+       javax/naming/spi/ObjectFactoryBuilder.lo \
+       javax/naming/spi/DirObjectFactory.lo \
+       javax/naming/spi/DirectoryManager.lo \
+       javax/naming/spi/InitialContextFactoryBuilder.lo \
+       javax/naming/spi/ObjectFactory.lo javax/naming/spi/Resolver.lo \
+       javax/naming/spi/StateFactory.lo \
+       javax/naming/spi/InitialContextFactory.lo \
+       javax/naming/spi/NamingManager.lo \
+       javax/naming/InvalidNameException.lo \
+       javax/naming/NamingEnumeration.lo javax/naming/LinkRef.lo \
+       javax/naming/event/NamingListener.lo \
+       javax/naming/event/NamingEvent.lo \
+       javax/naming/event/NamespaceChangeListener.lo \
+       javax/naming/event/ObjectChangeListener.lo \
+       javax/naming/event/EventContext.lo \
+       javax/naming/event/NamingExceptionEvent.lo \
+       javax/naming/event/EventDirContext.lo \
+       javax/naming/NamingException.lo \
+       javax/naming/CannotProceedException.lo \
+       javax/naming/PartialResultException.lo \
+       javax/naming/TimeLimitExceededException.lo \
+       javax/naming/NoPermissionException.lo \
+       javax/naming/CompoundName.lo \
+       javax/naming/SizeLimitExceededException.lo \
+       javax/naming/NoInitialContextException.lo \
+       javax/naming/NameNotFoundException.lo \
+       javax/naming/InitialContext.lo \
+       javax/naming/NamingSecurityException.lo \
+       javax/naming/Context.lo javax/naming/ConfigurationException.lo \
+       javax/naming/InsufficientResourcesException.lo \
+       javax/naming/AuthenticationNotSupportedException.lo \
+       javax/naming/StringRefAddr.lo \
+       javax/naming/ldap/InitialLdapContext.lo \
+       javax/naming/ldap/ExtendedRequest.lo \
+       javax/naming/ldap/Control.lo \
+       javax/naming/ldap/UnsolicitedNotificationListener.lo \
+       javax/naming/ldap/LdapReferralException.lo \
+       javax/naming/ldap/UnsolicitedNotificationEvent.lo \
+       javax/naming/ldap/HasControls.lo \
+       javax/naming/ldap/LdapContext.lo \
+       javax/naming/ldap/ExtendedResponse.lo \
+       javax/naming/ldap/UnsolicitedNotification.lo \
+       javax/naming/ldap/ControlFactory.lo \
+       javax/naming/OperationNotSupportedException.lo \
+       javax/naming/ReferralException.lo \
+       javax/naming/LimitExceededException.lo \
+       javax/naming/Reference.lo javax/naming/NameParser.lo \
+       javax/naming/NameClassPair.lo javax/naming/RefAddr.lo \
+       javax/naming/CompositeName.lo javax/naming/Name.lo \
+       javax/xml/xpath/XPathConstants.lo \
+       javax/xml/xpath/XPathFunction.lo \
+       javax/xml/xpath/XPathVariableResolver.lo \
+       javax/xml/xpath/XPathExpressionException.lo \
+       javax/xml/xpath/XPathFunctionResolver.lo \
+       javax/xml/xpath/XPath.lo \
+       javax/xml/xpath/XPathFactoryConfigurationException.lo \
+       javax/xml/xpath/XPathFactory.lo \
+       javax/xml/xpath/XPathException.lo \
+       javax/xml/xpath/XPathExpression.lo \
+       javax/xml/xpath/XPathFunctionException.lo \
+       javax/xml/validation/ValidatorHandler.lo \
+       javax/xml/validation/Validator.lo \
+       javax/xml/validation/TypeInfoProvider.lo \
+       javax/xml/validation/SchemaFactory.lo \
+       javax/xml/validation/Schema.lo \
+       javax/xml/parsers/SAXParserFactory.lo \
+       javax/xml/parsers/FactoryConfigurationError.lo \
+       javax/xml/parsers/SAXParser.lo \
+       javax/xml/parsers/DocumentBuilderFactory.lo \
+       javax/xml/parsers/ParserConfigurationException.lo \
+       javax/xml/parsers/DocumentBuilder.lo \
+       javax/xml/datatype/DatatypeFactory.lo \
+       javax/xml/datatype/XMLGregorianCalendar.lo \
+       javax/xml/datatype/Duration.lo \
+       javax/xml/datatype/DatatypeConfigurationException.lo \
+       javax/xml/datatype/DatatypeConstants.lo \
+       javax/xml/XMLConstants.lo \
+       javax/xml/namespace/NamespaceContext.lo \
+       javax/xml/namespace/QName.lo \
+       javax/xml/transform/TransformerException.lo \
+       javax/xml/transform/TransformerFactoryConfigurationError.lo \
+       javax/xml/transform/sax/SAXResult.lo \
+       javax/xml/transform/sax/TransformerHandler.lo \
+       javax/xml/transform/sax/SAXTransformerFactory.lo \
+       javax/xml/transform/sax/SAXSource.lo \
+       javax/xml/transform/sax/TemplatesHandler.lo \
+       javax/xml/transform/OutputKeys.lo \
+       javax/xml/transform/stream/StreamResult.lo \
+       javax/xml/transform/stream/StreamSource.lo \
+       javax/xml/transform/Source.lo \
+       javax/xml/transform/SourceLocator.lo \
+       javax/xml/transform/ErrorListener.lo \
+       javax/xml/transform/TransformerConfigurationException.lo \
+       javax/xml/transform/Templates.lo javax/xml/transform/Result.lo \
+       javax/xml/transform/URIResolver.lo \
+       javax/xml/transform/dom/DOMSource.lo \
+       javax/xml/transform/dom/DOMLocator.lo \
+       javax/xml/transform/dom/DOMResult.lo \
+       javax/xml/transform/Transformer.lo \
+       javax/xml/transform/TransformerFactory.lo \
+       javax/security/cert/CertificateNotYetValidException.lo \
+       javax/security/cert/Certificate.lo \
+       javax/security/cert/X509Certificate.lo \
+       javax/security/cert/X509CertBridge.lo \
+       javax/security/cert/CertificateEncodingException.lo \
+       javax/security/cert/CertificateExpiredException.lo \
+       javax/security/cert/CertificateException.lo \
+       javax/security/cert/CertificateParsingException.lo \
        javax/security/auth/Destroyable.lo \
-       javax/security/auth/DestroyFailedException.lo \
-       javax/security/auth/login/AccountExpiredException.lo \
+       javax/security/auth/x500/X500PrivateCredential.lo \
+       javax/security/auth/x500/X500Principal.lo \
+       javax/security/auth/spi/LoginModule.lo \
+       javax/security/auth/DestroyFailedException.lo \
+       javax/security/auth/SubjectDomainCombiner.lo \
+       javax/security/auth/AuthPermission.lo \
+       javax/security/auth/login/CredentialExpiredException.lo \
+       javax/security/auth/login/NullConfiguration.lo \
+       javax/security/auth/login/AccountExpiredException.lo \
+       javax/security/auth/login/LoginException.lo \
        javax/security/auth/login/AppConfigurationEntry.lo \
        javax/security/auth/login/Configuration.lo \
-       javax/security/auth/login/CredentialExpiredException.lo \
-       javax/security/auth/login/FailedLoginException.lo \
        javax/security/auth/login/LoginContext.lo \
-       javax/security/auth/login/LoginException.lo \
-       javax/security/auth/login/NullConfiguration.lo \
-       javax/security/auth/spi/LoginModule.lo \
-       javax/security/auth/Policy.lo \
+       javax/security/auth/login/FailedLoginException.lo \
        javax/security/auth/PrivateCredentialPermission.lo \
+       javax/security/auth/Subject.lo javax/security/auth/Policy.lo \
        javax/security/auth/Refreshable.lo \
-       javax/security/auth/RefreshFailedException.lo \
-       javax/security/auth/Subject.lo \
-       javax/security/auth/SubjectDomainCombiner.lo \
-       javax/security/auth/x500/X500Principal.lo \
-       javax/security/auth/x500/X500PrivateCredential.lo \
+       javax/security/auth/callback/TextInputCallback.lo \
+       javax/security/auth/callback/LanguageCallback.lo \
+       javax/security/auth/callback/TextOutputCallback.lo \
+       javax/security/auth/callback/UnsupportedCallbackException.lo \
        javax/security/auth/callback/Callback.lo \
-       javax/security/auth/callback/CallbackHandler.lo \
-       javax/security/auth/callback/ChoiceCallback.lo \
        javax/security/auth/callback/ConfirmationCallback.lo \
-       javax/security/auth/callback/LanguageCallback.lo \
+       javax/security/auth/callback/ChoiceCallback.lo \
        javax/security/auth/callback/NameCallback.lo \
        javax/security/auth/callback/PasswordCallback.lo \
-       javax/security/auth/callback/TextInputCallback.lo \
-       javax/security/auth/callback/TextOutputCallback.lo \
-       javax/security/auth/callback/UnsupportedCallbackException.lo \
-       javax/security/cert/Certificate.lo \
-       javax/security/cert/CertificateEncodingException.lo \
-       javax/security/cert/CertificateException.lo \
-       javax/security/cert/CertificateExpiredException.lo \
-       javax/security/cert/CertificateNotYetValidException.lo \
-       javax/security/cert/CertificateParsingException.lo \
-       javax/security/cert/X509CertBridge.lo \
-       javax/security/cert/X509Certificate.lo \
-       javax/security/sasl/AuthenticationException.lo \
-       javax/security/sasl/AuthorizeCallback.lo \
+       javax/security/auth/callback/CallbackHandler.lo \
+       javax/security/auth/RefreshFailedException.lo \
        javax/security/sasl/RealmCallback.lo \
+       javax/security/sasl/SaslClient.lo \
        javax/security/sasl/RealmChoiceCallback.lo \
-       javax/security/sasl/Sasl.lo javax/security/sasl/SaslClient.lo \
+       javax/security/sasl/AuthenticationException.lo \
+       javax/security/sasl/Sasl.lo \
        javax/security/sasl/SaslClientFactory.lo \
+       javax/security/sasl/AuthorizeCallback.lo \
+       javax/security/sasl/SaslServerFactory.lo \
        javax/security/sasl/SaslException.lo \
        javax/security/sasl/SaslServer.lo \
-       javax/security/sasl/SaslServerFactory.lo \
-       javax/sql/ConnectionEvent.lo \
-       javax/sql/ConnectionEventListener.lo \
-       javax/sql/ConnectionPoolDataSource.lo javax/sql/DataSource.lo \
-       javax/sql/PooledConnection.lo javax/sql/RowSetEvent.lo \
-       javax/sql/RowSetInternal.lo javax/sql/RowSet.lo \
-       javax/sql/RowSetListener.lo javax/sql/RowSetMetaData.lo \
-       javax/sql/RowSetReader.lo javax/sql/RowSetWriter.lo \
-       javax/sql/XAConnection.lo javax/sql/XADataSource.lo \
-       javax/transaction/xa/XAException.lo \
-       javax/transaction/xa/XAResource.lo javax/transaction/xa/Xid.lo \
-       javax/transaction/HeuristicCommitException.lo \
-       javax/transaction/HeuristicMixedException.lo \
-       javax/transaction/HeuristicRollbackException.lo \
-       javax/transaction/InvalidTransactionException.lo \
-       javax/transaction/NotSupportedException.lo \
+       javax/transaction/TransactionRolledbackException.lo \
+       javax/transaction/Synchronization.lo \
+       javax/transaction/TransactionRequiredException.lo \
        javax/transaction/RollbackException.lo \
        javax/transaction/Status.lo \
-       javax/transaction/Synchronization.lo \
+       javax/transaction/HeuristicMixedException.lo \
+       javax/transaction/HeuristicRollbackException.lo \
        javax/transaction/SystemException.lo \
+       javax/transaction/UserTransaction.lo \
+       javax/transaction/NotSupportedException.lo \
+       javax/transaction/HeuristicCommitException.lo \
        javax/transaction/Transaction.lo \
        javax/transaction/TransactionManager.lo \
-       javax/transaction/TransactionRequiredException.lo \
-       javax/transaction/TransactionRolledbackException.lo \
-       javax/transaction/UserTransaction.lo
-am__objects_14 = $(am__objects_9) gnu/classpath/ServiceFactory.lo \
+       javax/transaction/InvalidTransactionException.lo \
+       javax/transaction/xa/XAException.lo \
+       javax/transaction/xa/XAResource.lo javax/transaction/xa/Xid.lo \
+       javax/accessibility/AccessibleValue.lo \
+       javax/accessibility/AccessibleBundle.lo \
+       javax/accessibility/AccessibleContext.lo \
+       javax/accessibility/AccessibleRelationSet.lo \
+       javax/accessibility/Accessible.lo \
+       javax/accessibility/AccessibleTableModelChange.lo \
+       javax/accessibility/AccessibleState.lo \
+       javax/accessibility/AccessibleIcon.lo \
+       javax/accessibility/AccessibleHypertext.lo \
+       javax/accessibility/AccessibleComponent.lo \
+       javax/accessibility/AccessibleText.lo \
+       javax/accessibility/AccessibleRole.lo \
+       javax/accessibility/AccessibleEditableText.lo \
+       javax/accessibility/AccessibleRelation.lo \
+       javax/accessibility/AccessibleTable.lo \
+       javax/accessibility/AccessibleStateSet.lo \
+       javax/accessibility/AccessibleSelection.lo \
+       javax/accessibility/AccessibleExtendedTable.lo \
+       javax/accessibility/AccessibleResourceBundle.lo \
+       javax/accessibility/AccessibleExtendedComponent.lo \
+       javax/accessibility/AccessibleHyperlink.lo \
+       javax/accessibility/AccessibleKeyBinding.lo \
+       javax/accessibility/AccessibleAction.lo \
+       javax/sql/ConnectionEventListener.lo javax/sql/RowSetEvent.lo \
+       javax/sql/ConnectionPoolDataSource.lo \
+       javax/sql/RowSetWriter.lo javax/sql/XAConnection.lo \
+       javax/sql/RowSet.lo javax/sql/DataSource.lo \
+       javax/sql/RowSetInternal.lo javax/sql/RowSetReader.lo \
+       javax/sql/RowSetMetaData.lo javax/sql/PooledConnection.lo \
+       javax/sql/XADataSource.lo javax/sql/RowSetListener.lo \
+       javax/sql/ConnectionEvent.lo javax/crypto/Cipher.lo \
+       javax/crypto/IllegalBlockSizeException.lo \
+       javax/crypto/MacSpi.lo javax/crypto/SecretKeyFactorySpi.lo \
+       javax/crypto/ShortBufferException.lo \
+       javax/crypto/KeyAgreement.lo \
+       javax/crypto/ExemptionMechanism.lo \
+       javax/crypto/CipherOutputStream.lo \
+       javax/crypto/SealedObject.lo javax/crypto/NullCipher.lo \
+       javax/crypto/KeyAgreementSpi.lo \
+       javax/crypto/SecretKeyFactory.lo javax/crypto/SecretKey.lo \
+       javax/crypto/NullCipherImpl.lo javax/crypto/spec/DESKeySpec.lo \
+       javax/crypto/spec/DHPrivateKeySpec.lo \
+       javax/crypto/spec/DHParameterSpec.lo \
+       javax/crypto/spec/PBEParameterSpec.lo \
+       javax/crypto/spec/DESedeKeySpec.lo \
+       javax/crypto/spec/DHGenParameterSpec.lo \
+       javax/crypto/spec/DHPublicKeySpec.lo \
+       javax/crypto/spec/PBEKeySpec.lo \
+       javax/crypto/spec/RC5ParameterSpec.lo \
+       javax/crypto/spec/RC2ParameterSpec.lo \
+       javax/crypto/spec/IvParameterSpec.lo \
+       javax/crypto/spec/SecretKeySpec.lo \
+       javax/crypto/interfaces/DHPublicKey.lo \
+       javax/crypto/interfaces/DHKey.lo \
+       javax/crypto/interfaces/DHPrivateKey.lo \
+       javax/crypto/interfaces/PBEKey.lo \
+       javax/crypto/NoSuchPaddingException.lo \
+       javax/crypto/KeyGeneratorSpi.lo \
+       javax/crypto/BadPaddingException.lo javax/crypto/CipherSpi.lo \
+       javax/crypto/KeyGenerator.lo javax/crypto/CipherInputStream.lo \
+       javax/crypto/ExemptionMechanismException.lo \
+       javax/crypto/ExemptionMechanismSpi.lo \
+       javax/crypto/EncryptedPrivateKeyInfo.lo javax/crypto/Mac.lo
+am__objects_14 = org/ietf/jgss/GSSManager.lo \
+       org/ietf/jgss/GSSException.lo org/ietf/jgss/MessageProp.lo \
+       org/ietf/jgss/GSSName.lo org/ietf/jgss/GSSContext.lo \
+       org/ietf/jgss/Oid.lo org/ietf/jgss/GSSCredential.lo \
+       org/ietf/jgss/ChannelBinding.lo
+am__objects_15 = $(am__objects_9) gnu/classpath/ServiceFactory.lo \
        gnu/classpath/ServiceProviderLoadingAction.lo gnu/gcj/Core.lo \
        gnu/gcj/RawData.lo gnu/gcj/RawDataManaged.lo \
        gnu/gcj/io/DefaultMimeTypes.lo gnu/gcj/io/MimeTypes.lo \
@@ -4233,27 +4434,156 @@ am__objects_14 = $(am__objects_9) gnu/classpath/ServiceFactory.lo \
        java/util/zip/ZipException.lo java/util/zip/ZipFile.lo \
        java/util/zip/ZipInputStream.lo \
        java/util/zip/ZipOutputStream.lo $(am__objects_10) \
-       $(am__objects_11) $(am__objects_12) $(am__objects_13)
-am__objects_15 = $(am__objects_8) $(am__objects_14)
-am__objects_16 = java/lang/ConcreteProcess.lo \
+       $(am__objects_11) $(am__objects_12) $(am__objects_13) \
+       $(am__objects_14)
+am__objects_16 = $(am__objects_8) $(am__objects_15)
+am__objects_17 = gnu/xml/xpath/EqualityExpr.lo \
+       gnu/xml/xpath/NumberFunction.lo \
+       gnu/xml/xpath/StringLengthFunction.lo \
+       gnu/xml/xpath/NameFunction.lo gnu/xml/xpath/SumFunction.lo \
+       gnu/xml/xpath/Pattern.lo gnu/xml/xpath/StringFunction.lo \
+       gnu/xml/xpath/NegativeExpr.lo gnu/xml/xpath/UnionExpr.lo \
+       gnu/xml/xpath/SubstringFunction.lo gnu/xml/xpath/Expr.lo \
+       gnu/xml/xpath/XPathFactoryImpl.lo \
+       gnu/xml/xpath/NormalizeSpaceFunction.lo \
+       gnu/xml/xpath/Constant.lo gnu/xml/xpath/Predicate.lo \
+       gnu/xml/xpath/Path.lo gnu/xml/xpath/OrExpr.lo \
+       gnu/xml/xpath/LangFunction.lo \
+       gnu/xml/xpath/StartsWithFunction.lo \
+       gnu/xml/xpath/SubstringAfterFunction.lo \
+       gnu/xml/xpath/FloorFunction.lo gnu/xml/xpath/NotFunction.lo \
+       gnu/xml/xpath/Root.lo gnu/xml/xpath/PositionFunction.lo \
+       gnu/xml/xpath/VariableReference.lo \
+       gnu/xml/xpath/DocumentOrderComparator.lo \
+       gnu/xml/xpath/LocalNameFunction.lo \
+       gnu/xml/xpath/NamespaceUriFunction.lo \
+       gnu/xml/xpath/TranslateFunction.lo \
+       gnu/xml/xpath/FalseFunction.lo gnu/xml/xpath/AndExpr.lo \
+       gnu/xml/xpath/XPathParser.lo gnu/xml/xpath/NamespaceTest.lo \
+       gnu/xml/xpath/ConcatFunction.lo gnu/xml/xpath/NameTest.lo \
+       gnu/xml/xpath/CountFunction.lo gnu/xml/xpath/IdFunction.lo \
+       gnu/xml/xpath/LastFunction.lo gnu/xml/xpath/XPathTokenizer.lo \
+       gnu/xml/xpath/Steps.lo gnu/xml/xpath/TrueFunction.lo \
+       gnu/xml/xpath/BooleanFunction.lo \
+       gnu/xml/xpath/ParenthesizedExpr.lo gnu/xml/xpath/XPathImpl.lo \
+       gnu/xml/xpath/Selector.lo gnu/xml/xpath/RoundFunction.lo \
+       gnu/xml/xpath/SubstringBeforeFunction.lo \
+       gnu/xml/xpath/Function.lo gnu/xml/xpath/CeilingFunction.lo \
+       gnu/xml/xpath/RelationalExpr.lo gnu/xml/xpath/FunctionCall.lo \
+       gnu/xml/xpath/NodeTypeTest.lo gnu/xml/xpath/ArithmeticExpr.lo \
+       gnu/xml/xpath/Test.lo gnu/xml/xpath/ContainsFunction.lo \
+       gnu/xml/pipeline/EventFilter.lo gnu/xml/pipeline/NSFilter.lo \
+       gnu/xml/pipeline/XsltFilter.lo \
+       gnu/xml/pipeline/ValidationConsumer.lo \
+       gnu/xml/pipeline/PipelineFactory.lo \
+       gnu/xml/pipeline/TextConsumer.lo \
+       gnu/xml/pipeline/LinkFilter.lo gnu/xml/pipeline/TeeConsumer.lo \
+       gnu/xml/pipeline/DomConsumer.lo \
+       gnu/xml/pipeline/EventConsumer.lo \
+       gnu/xml/pipeline/WellFormednessFilter.lo \
+       gnu/xml/pipeline/XIncludeFilter.lo \
+       gnu/xml/pipeline/CallFilter.lo gnu/xml/aelfred2/XmlParser.lo \
+       gnu/xml/aelfred2/XmlReader.lo gnu/xml/aelfred2/JAXPFactory.lo \
+       gnu/xml/aelfred2/ContentHandler2.lo \
+       gnu/xml/aelfred2/SAXDriver.lo gnu/xml/util/XCat.lo \
+       gnu/xml/util/DomParser.lo gnu/xml/util/XMLWriter.lo \
+       gnu/xml/util/Resolver.lo gnu/xml/util/DoParse.lo \
+       gnu/xml/util/XHTMLWriter.lo \
+       gnu/xml/util/SAXNullTransformerFactory.lo \
+       gnu/xml/dom/DomCDATA.lo gnu/xml/dom/DomXPathNSResolver.lo \
+       gnu/xml/dom/ls/DomLSEx.lo \
+       gnu/xml/dom/ls/FilteredSAXEventSink.lo \
+       gnu/xml/dom/ls/DomLSSerializer.lo gnu/xml/dom/ls/DomLSInput.lo \
+       gnu/xml/dom/ls/DomLSOutput.lo gnu/xml/dom/ls/SAXEventSink.lo \
+       gnu/xml/dom/ls/DomLSParser.lo \
+       gnu/xml/dom/ls/ReaderInputStream.lo \
+       gnu/xml/dom/ls/WriterOutputStream.lo gnu/xml/dom/DomElement.lo \
+       gnu/xml/dom/DomNsNode.lo gnu/xml/dom/DomAttr.lo \
+       gnu/xml/dom/DomPI.lo gnu/xml/dom/DTDAttributeTypeInfo.lo \
+       gnu/xml/dom/DomDocumentBuilder.lo \
+       gnu/xml/dom/DTDElementTypeInfo.lo gnu/xml/dom/DomEx.lo \
+       gnu/xml/dom/DomDocument.lo gnu/xml/dom/DomXPathExpression.lo \
+       gnu/xml/dom/DomDocumentConfiguration.lo \
+       gnu/xml/dom/Consumer.lo gnu/xml/dom/DomComment.lo \
+       gnu/xml/dom/DomCharacterData.lo gnu/xml/dom/DomExtern.lo \
+       gnu/xml/dom/DomEntityReference.lo \
+       gnu/xml/dom/DomNamedNodeMap.lo \
+       gnu/xml/dom/ImplementationList.lo \
+       gnu/xml/dom/ImplementationSource.lo gnu/xml/dom/DomImpl.lo \
+       gnu/xml/dom/DomDoctype.lo gnu/xml/dom/DomNode.lo \
+       gnu/xml/dom/DomXPathResult.lo \
+       gnu/xml/dom/DomDocumentBuilderFactory.lo \
+       gnu/xml/dom/DomText.lo gnu/xml/dom/DomNSResolverContext.lo \
+       gnu/xml/dom/DomNodeIterator.lo gnu/xml/dom/DomNotation.lo \
+       gnu/xml/dom/JAXPFactory.lo gnu/xml/dom/DomIterator.lo \
+       gnu/xml/dom/DomFragment.lo gnu/xml/dom/DomEvent.lo \
+       gnu/xml/dom/DomEntity.lo \
+       gnu/xml/transform/GenerateIdFunction.lo \
+       gnu/xml/transform/FormatNumberFunction.lo \
+       gnu/xml/transform/ValueOfNode.lo \
+       gnu/xml/transform/ApplyImportsNode.lo \
+       gnu/xml/transform/WithParam.lo \
+       gnu/xml/transform/DocumentFunction.lo \
+       gnu/xml/transform/SAXSerializer.lo \
+       gnu/xml/transform/FunctionAvailableFunction.lo \
+       gnu/xml/transform/ElementAvailableFunction.lo \
+       gnu/xml/transform/IfNode.lo \
+       gnu/xml/transform/ApplyTemplatesNode.lo \
+       gnu/xml/transform/SortKey.lo gnu/xml/transform/Key.lo \
+       gnu/xml/transform/ElementNode.lo \
+       gnu/xml/transform/CurrentFunction.lo \
+       gnu/xml/transform/XSLComparator.lo \
+       gnu/xml/transform/CallTemplateNode.lo \
+       gnu/xml/transform/TemplatesImpl.lo \
+       gnu/xml/transform/ChooseNode.lo \
+       gnu/xml/transform/NumberNode.lo \
+       gnu/xml/transform/CopyOfNode.lo \
+       gnu/xml/transform/ParameterNode.lo \
+       gnu/xml/transform/TransformerFactoryImpl.lo \
+       gnu/xml/transform/TextNode.lo gnu/xml/transform/CopyNode.lo \
+       gnu/xml/transform/SystemPropertyFunction.lo \
+       gnu/xml/transform/Stylesheet.lo \
+       gnu/xml/transform/ProcessingInstructionNode.lo \
+       gnu/xml/transform/UnparsedEntityUriFunction.lo \
+       gnu/xml/transform/URIResolverEntityResolver.lo \
+       gnu/xml/transform/ErrorListenerErrorHandler.lo \
+       gnu/xml/transform/Bindings.lo \
+       gnu/xml/transform/AttributeSet.lo \
+       gnu/xml/transform/Template.lo gnu/xml/transform/MessageNode.lo \
+       gnu/xml/transform/LiteralNode.lo \
+       gnu/xml/transform/StreamSerializer.lo \
+       gnu/xml/transform/XSLURIResolver.lo \
+       gnu/xml/transform/AttributeNode.lo \
+       gnu/xml/transform/CommentNode.lo \
+       gnu/xml/transform/ForEachNode.lo \
+       gnu/xml/transform/KeyFunction.lo \
+       gnu/xml/transform/TransformerImpl.lo \
+       gnu/xml/transform/WhenNode.lo \
+       gnu/xml/transform/NodeNumberNode.lo \
+       gnu/xml/transform/OtherwiseNode.lo \
+       gnu/xml/transform/AbstractNumberNode.lo \
+       gnu/xml/transform/TemplateNode.lo \
+       gnu/xml/transform/TransformerOutputProperties.lo \
+       gnu/xml/transform/DOMSourceLocator.lo
+am__objects_18 = java/lang/ConcreteProcess.lo \
        gnu/classpath/Configuration.lo
-@USING_BOEHMGC_TRUE@am__objects_17 = boehm.lo
-@USING_NOGC_TRUE@am__objects_18 = nogc.lo
-@SUPPLY_BACKTRACE_TRUE@am__objects_19 = sysdep/dwarf2-backtrace.lo
-@USING_POSIX_PLATFORM_TRUE@am__objects_20 = posix.lo
-@USING_WIN32_PLATFORM_TRUE@am__objects_21 = win32.lo
-@USING_ECOS_PLATFORM_TRUE@am__objects_22 = posix.lo
-@USING_DARWIN_CRT_TRUE@am__objects_23 = darwin.lo
-@USING_POSIX_THREADS_TRUE@am__objects_24 = posix-threads.lo
-@USING_WIN32_THREADS_TRUE@am__objects_25 = win32-threads.lo
-@USING_NO_THREADS_TRUE@am__objects_26 = no-threads.lo
+@USING_BOEHMGC_TRUE@am__objects_19 = boehm.lo
+@USING_NOGC_TRUE@am__objects_20 = nogc.lo
+@SUPPLY_BACKTRACE_TRUE@am__objects_21 = sysdep/dwarf2-backtrace.lo
+@USING_POSIX_PLATFORM_TRUE@am__objects_22 = posix.lo
+@USING_WIN32_PLATFORM_TRUE@am__objects_23 = win32.lo
+@USING_ECOS_PLATFORM_TRUE@am__objects_24 = posix.lo
+@USING_DARWIN_CRT_TRUE@am__objects_25 = darwin.lo
+@USING_POSIX_THREADS_TRUE@am__objects_26 = posix-threads.lo
+@USING_WIN32_THREADS_TRUE@am__objects_27 = win32-threads.lo
+@USING_NO_THREADS_TRUE@am__objects_28 = no-threads.lo
 am_libgcj_la_OBJECTS = prims.lo jni.lo exception.lo link.lo \
        defineclass.lo interpret.lo verify.lo $(am__objects_6) \
-       $(am__objects_7) $(am__objects_15) $(am__objects_16) \
-       $(am__objects_17) $(am__objects_18) $(am__objects_19) \
-       $(am__objects_20) $(am__objects_21) $(am__objects_22) \
-       $(am__objects_23) $(am__objects_24) $(am__objects_25) \
-       $(am__objects_26)
+       $(am__objects_7) $(am__objects_16) $(am__objects_17) \
+       $(am__objects_18) $(am__objects_19) $(am__objects_20) \
+       $(am__objects_21) $(am__objects_22) $(am__objects_23) \
+       $(am__objects_24) $(am__objects_25) $(am__objects_26) \
+       $(am__objects_27) $(am__objects_28)
 libgcj_la_OBJECTS = $(am_libgcj_la_OBJECTS)
 am_libgij_la_OBJECTS = gij.lo
 libgij_la_OBJECTS = $(am_libgij_la_OBJECTS)
@@ -4301,19 +4631,16 @@ LTGCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) $(AM_GCJFLAGS) \
        $(GCJFLAGS)
 GCJLD = $(GCJ)
 SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \
-       $(lib_gnu_java_awt_peer_gtk_la_SOURCES) \
-       $(lib_org_ietf_jgss_la_SOURCES) $(lib_org_w3c_dom_la_SOURCES) \
-       $(lib_org_xml_sax_la_SOURCES) $(libgcj_la_SOURCES) \
+       $(lib_gnu_java_awt_peer_gtk_la_SOURCES) $(libgcj_la_SOURCES) \
        $(libgij_la_SOURCES) $(gcj_dbtool_SOURCES) \
        $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(grmic_SOURCES) \
        $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
 DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \
        $(am__lib_gnu_java_awt_peer_gtk_la_SOURCES_DIST) \
-       $(lib_org_ietf_jgss_la_SOURCES) $(lib_org_w3c_dom_la_SOURCES) \
-       $(lib_org_xml_sax_la_SOURCES) $(am__libgcj_la_SOURCES_DIST) \
-       $(libgij_la_SOURCES) $(gcj_dbtool_SOURCES) \
-       $(am__gen_from_JIS_SOURCES_DIST) $(gij_SOURCES) \
-       $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
+       $(am__libgcj_la_SOURCES_DIST) $(libgij_la_SOURCES) \
+       $(gcj_dbtool_SOURCES) $(am__gen_from_JIS_SOURCES_DIST) \
+       $(gij_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) \
+       $(jv_convert_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        html-recursive info-recursive install-data-recursive \
        install-exec-recursive install-info-recursive \
@@ -4326,7 +4653,7 @@ toolexecmainlibDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(jar_DATA) $(pkgconfig_DATA) $(toolexecmainlib_DATA)
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = @DIRLTDL@ gcj include testsuite
+DIST_SUBDIRS = @DIRLTDL@ gcj include external testsuite
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -4581,8 +4908,8 @@ ACLOCAL_AMFLAGS = -I . -I ../config
 @USING_WIN32_THREADS_TRUE@WIN32_THREAD_SRC = win32-threads.cc
 @USING_NO_THREADS_FALSE@NO_THREAD_SRC = 
 @USING_NO_THREADS_TRUE@NO_THREAD_SRC = no-threads.cc
-@TESTSUBDIR_FALSE@SUBDIRS = $(DIRLTDL) gcj include
-@TESTSUBDIR_TRUE@SUBDIRS = $(DIRLTDL) testsuite gcj include
+@TESTSUBDIR_FALSE@SUBDIRS = $(DIRLTDL) gcj include external
+@TESTSUBDIR_TRUE@SUBDIRS = $(DIRLTDL) testsuite gcj include external
 @USING_DARWIN_CRT_FALSE@DARWIN_CRT_SRC = 
 @USING_DARWIN_CRT_TRUE@DARWIN_CRT_SRC = darwin.cc
 
@@ -4598,8 +4925,7 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach o
 @XLIB_AWT_TRUE@cond_xlib_ltlibrary = lib-gnu-awt-xlib.la
 @GTK_AWT_FALSE@cond_gtk_ltlibrary = 
 @GTK_AWT_TRUE@cond_gtk_ltlibrary = lib-gnu-java-awt-peer-gtk.la
-toolexeclib_LTLIBRARIES = libgcj.la libgij.la lib-org-xml-sax.la \
-       lib-org-w3c-dom.la lib-org-ietf-jgss.la \
+toolexeclib_LTLIBRARIES = libgcj.la libgij.la \
     $(cond_gtk_ltlibrary) $(cond_xlib_ltlibrary)
 
 toolexecmainlib_DATA = libgcj.spec
@@ -4633,7 +4959,7 @@ AM_CXXFLAGS = \
 
 AM_GCJFLAGS = \
        @LIBGCJ_JAVAFLAGS@ \
-       -fclasspath= -fbootclasspath=$(here) \
+       -fclasspath= -fbootclasspath=$(BOOTCLASSPATH) \
        --encoding=UTF-8 \
        -Wno-deprecated
 
@@ -4646,15 +4972,17 @@ AM_CPPFLAGS = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
        $(GCINCS) $(THREADINCS) $(INCLTDL) \
        $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS)
 
+BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)
 libgij_la_SOURCES = gij.cc
 libgij_la_DEPENDENCIES = libgcj.la libgcj.spec
 libgij_la_LIBADD = -L$(here)/.libs libgcj.la
 libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
         -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
+
 libgcj_la_SOURCES = prims.cc jni.cc exception.cc \
        link.cc defineclass.cc interpret.cc verify.cc \
        $(nat_source_files) $(math_c_source_files) $(java_source_files) \
-       $(built_java_source_files) \
+       $(gnu_xml_source_files) $(built_java_source_files) \
        $(BOEHMGC_SRC) $(NOGC_SRC) \
        $(BACKTRACE_SRC) \
        $(POSIX_PLATFORM_SRC) $(WIN32_PLATFORM_SRC) $(ECOS_PLATFORM_SRC) \
@@ -4674,7 +5002,11 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \
        $(LIBLTDL) $(SYS_ZLIBS) \
        -version-info `grep -v '^\#' $(srcdir)/libtool-version`
 
-libgcj_la_LIBADD = $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files)
+libgcj_la_LIBADD = \
+       external/sax/libsax_convenience.la \
+       external/w3c_dom/libw3c_convenience.la \
+       $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files)
+
 libgcj_la_LINK = $(LIBLINK)
 @GTK_CAIRO_FALSE@gtk_cairo_c_source_files = 
 
@@ -4796,90 +5128,6 @@ lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \
         -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
 
 lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK)
-lib_org_ietf_jgss_la_SOURCES = \
-org/ietf/jgss/ChannelBinding.java \
-org/ietf/jgss/GSSContext.java \
-org/ietf/jgss/GSSCredential.java \
-org/ietf/jgss/GSSException.java \
-org/ietf/jgss/GSSManager.java \
-org/ietf/jgss/GSSName.java \
-org/ietf/jgss/MessageProp.java \
-org/ietf/jgss/Oid.java
-
-lib_org_ietf_jgss_la_DEPENDENCIES = $(jgss_propertyo_files) \
-       libgcj-@gcc_version@.jar libgcj.la libgcj.spec
-
-lib_org_ietf_jgss_la_LIBADD = -L$(here)/.libs  $(jgss_propertyo_files) \
-       libgcj.la
-
-lib_org_ietf_jgss_la_LDFLAGS = -rpath $(toolexeclibdir) \
-       -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
-
-lib_org_w3c_dom_la_SOURCES = org/w3c/dom/Attr.java \
-org/w3c/dom/CDATASection.java \
-org/w3c/dom/CharacterData.java \
-org/w3c/dom/Comment.java \
-org/w3c/dom/DOMException.java \
-org/w3c/dom/DOMImplementation.java \
-org/w3c/dom/Document.java \
-org/w3c/dom/DocumentFragment.java \
-org/w3c/dom/DocumentType.java \
-org/w3c/dom/Element.java \
-org/w3c/dom/Entity.java \
-org/w3c/dom/EntityReference.java \
-org/w3c/dom/NamedNodeMap.java \
-org/w3c/dom/Node.java \
-org/w3c/dom/NodeList.java \
-org/w3c/dom/Notation.java \
-org/w3c/dom/ProcessingInstruction.java \
-org/w3c/dom/Text.java \
-org/w3c/dom/ranges/DocumentRange.java \
-org/w3c/dom/ranges/Range.java \
-org/w3c/dom/ranges/RangeException.java \
-org/w3c/dom/traversal/DocumentTraversal.java \
-org/w3c/dom/traversal/NodeFilter.java \
-org/w3c/dom/traversal/NodeIterator.java \
-org/w3c/dom/traversal/TreeWalker.java
-
-lib_org_w3c_dom_la_LIBADD = -L$(here)/.libs libgcj.la
-lib_org_w3c_dom_la_LDFLAGS = -rpath $(toolexeclibdir) \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
-
-lib_org_xml_sax_la_SOURCES = org/xml/sax/ext/DeclHandler.java \
-org/xml/sax/ext/LexicalHandler.java \
-org/xml/sax/helpers/AttributeListImpl.java \
-org/xml/sax/helpers/AttributesImpl.java \
-org/xml/sax/helpers/DefaultHandler.java \
-org/xml/sax/helpers/LocatorImpl.java \
-org/xml/sax/helpers/NamespaceSupport.java \
-org/xml/sax/helpers/NewInstance.java \
-org/xml/sax/helpers/ParserAdapter.java \
-org/xml/sax/helpers/ParserFactory.java \
-org/xml/sax/helpers/XMLFilterImpl.java \
-org/xml/sax/helpers/XMLReaderAdapter.java \
-org/xml/sax/helpers/XMLReaderFactory.java \
-org/xml/sax/AttributeList.java \
-org/xml/sax/Attributes.java \
-org/xml/sax/ContentHandler.java \
-org/xml/sax/DTDHandler.java \
-org/xml/sax/DocumentHandler.java \
-org/xml/sax/EntityResolver.java \
-org/xml/sax/ErrorHandler.java \
-org/xml/sax/HandlerBase.java \
-org/xml/sax/InputSource.java \
-org/xml/sax/Locator.java \
-org/xml/sax/Parser.java \
-org/xml/sax/SAXException.java \
-org/xml/sax/SAXNotRecognizedException.java \
-org/xml/sax/SAXNotSupportedException.java \
-org/xml/sax/SAXParseException.java \
-org/xml/sax/XMLFilter.java \
-org/xml/sax/XMLReader.java
-
-lib_org_xml_sax_la_LIBADD = -L$(here)/.libs libgcj.la
-lib_org_xml_sax_la_LDFLAGS = -rpath $(toolexeclibdir) \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
-
 lib_gnu_awt_xlib_la_SOURCES = \
        $(xlib_java_source_files) \
        $(xlib_nat_source_files)
@@ -4900,11 +5148,9 @@ lib_gnu_awt_xlib_la_LINK = $(LIBLINK)
 all_java_source_files = \
     $(java_source_files) \
     $(built_java_source_files) \
-    $(lib_org_ietf_jgss_la_SOURCES) \
-    $(lib_org_xml_sax_la_SOURCES) \
-    $(lib_org_w3c_dom_la_SOURCES) \
     $(gtk_awt_peer_sources) \
-    $(xlib_java_source_files)
+    $(xlib_java_source_files) \
+    $(gnu_xml_source_files)
 
 all_java_class_files = $(all_java_source_files:.java=.class)
 all_property_files = $(property_files) $(jgss_property_files) \
@@ -4912,17 +5158,15 @@ all_property_files = $(property_files) $(jgss_property_files) \
 
 property_files = \
 gnu/regexp/MessagesBundle.properties \
-gnu/regexp/MessagesBundle_fr.properties
-
-propertyo_files = $(property_files:.properties=.properties.lo) 
-jgss_property_files = \
+gnu/regexp/MessagesBundle_fr.properties \
 org/ietf/jgss/MessagesBundle.properties
 
-jgss_propertyo_files = $(jgss_property_files:.properties=.properties.lo)
+propertyo_files = $(property_files:.properties=.properties.lo) 
 CLEANFILES = libgcj-@gcc_version@.jar
 SUFFIXES = .class .java .h .properties
-ordinary_nat_headers = $(ordinary_java_source_files:.java=.h) \
-       $(built_java_source_files:.java=.h)
+ordinary_nat_headers = \
+    $(ordinary_java_source_files:.java=.h) \
+    $(built_java_source_files:.java=.h)
 
 inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \
        java/io/ObjectInputStream$$GetField.h \
@@ -5892,428 +6136,666 @@ gnu/java/rmi/server/UnicastServer.java \
 gnu/java/rmi/server/UnicastServerRef.java
 
 javax_source_files = \
-javax/accessibility/Accessible.java \
-javax/accessibility/AccessibleAction.java \
-javax/accessibility/AccessibleBundle.java \
-javax/accessibility/AccessibleComponent.java \
-javax/accessibility/AccessibleContext.java \
-javax/accessibility/AccessibleEditableText.java \
-javax/accessibility/AccessibleExtendedComponent.java \
-javax/accessibility/AccessibleExtendedTable.java \
-javax/accessibility/AccessibleHyperlink.java \
-javax/accessibility/AccessibleHypertext.java \
-javax/accessibility/AccessibleIcon.java \
-javax/accessibility/AccessibleKeyBinding.java \
-javax/accessibility/AccessibleRelation.java \
-javax/accessibility/AccessibleRelationSet.java \
-javax/accessibility/AccessibleResourceBundle.java \
-javax/accessibility/AccessibleRole.java \
-javax/accessibility/AccessibleSelection.java \
-javax/accessibility/AccessibleState.java \
-javax/accessibility/AccessibleStateSet.java \
-javax/accessibility/AccessibleTable.java \
-javax/accessibility/AccessibleTableModelChange.java \
-javax/accessibility/AccessibleText.java \
-javax/accessibility/AccessibleValue.java \
-javax/crypto/BadPaddingException.java \
-javax/crypto/Cipher.java \
-javax/crypto/CipherInputStream.java \
-javax/crypto/CipherOutputStream.java \
-javax/crypto/CipherSpi.java \
-javax/crypto/EncryptedPrivateKeyInfo.java \
-javax/crypto/KeyGeneratorSpi.java \
-javax/crypto/ExemptionMechanism.java \
-javax/crypto/ExemptionMechanismException.java \
-javax/crypto/ExemptionMechanismSpi.java \
-javax/crypto/IllegalBlockSizeException.java \
-javax/crypto/KeyAgreement.java \
-javax/crypto/KeyAgreementSpi.java \
-javax/crypto/KeyGenerator.java \
-javax/crypto/Mac.java \
-javax/crypto/MacSpi.java \
-javax/crypto/NoSuchPaddingException.java \
-javax/crypto/NullCipher.java \
-javax/crypto/NullCipherImpl.java \
-javax/crypto/SealedObject.java \
-javax/crypto/SecretKey.java \
-javax/crypto/SecretKeyFactory.java \
-javax/crypto/SecretKeyFactorySpi.java \
-javax/crypto/ShortBufferException.java \
-javax/crypto/interfaces/DHKey.java \
-javax/crypto/interfaces/DHPrivateKey.java \
-javax/crypto/interfaces/DHPublicKey.java \
-javax/crypto/interfaces/PBEKey.java \
-javax/crypto/spec/DESKeySpec.java \
-javax/crypto/spec/DESedeKeySpec.java \
-javax/crypto/spec/DHGenParameterSpec.java \
-javax/crypto/spec/DHParameterSpec.java \
-javax/crypto/spec/DHPrivateKeySpec.java \
-javax/crypto/spec/DHPublicKeySpec.java \
-javax/crypto/spec/IvParameterSpec.java \
-javax/crypto/spec/PBEKeySpec.java \
-javax/crypto/spec/PBEParameterSpec.java \
-javax/crypto/spec/RC2ParameterSpec.java \
-javax/crypto/spec/RC5ParameterSpec.java \
-javax/crypto/spec/SecretKeySpec.java \
-javax/imageio/IIOException.java \
-javax/imageio/IIOImage.java \
-javax/imageio/IIOParam.java \
-javax/imageio/IIOParamController.java \
-javax/imageio/ImageIO.java \
-javax/imageio/ImageReadParam.java \
-javax/imageio/ImageReader.java \
-javax/imageio/ImageTranscoder.java \
-javax/imageio/ImageTypeSpecifier.java \
 javax/imageio/ImageWriteParam.java \
+javax/imageio/ImageReader.java \
 javax/imageio/ImageWriter.java \
-javax/imageio/event/IIOReadProgressListener.java \
-javax/imageio/event/IIOReadUpdateListener.java \
-javax/imageio/event/IIOReadWarningListener.java \
-javax/imageio/event/IIOWriteProgressListener.java \
-javax/imageio/event/IIOWriteWarningListener.java \
-javax/imageio/metadata/IIOInvalidTreeException.java \
-javax/imageio/metadata/IIOMetadata.java \
-javax/imageio/metadata/IIOMetadataController.java \
-javax/imageio/metadata/IIOMetadataFormat.java \
-javax/imageio/metadata/IIOMetadataFormatImpl.java \
-javax/imageio/metadata/IIOMetadataNode.java \
-javax/imageio/spi/IIOServiceProvider.java \
+javax/imageio/IIOException.java        \
+javax/imageio/IIOParamController.java \
+javax/imageio/ImageReadParam.java \
+javax/imageio/IIOParam.java \
 javax/imageio/spi/IIORegistry.java \
-javax/imageio/spi/ImageInputStreamSpi.java \
+javax/imageio/spi/ImageWriterSpi.java \
 javax/imageio/spi/ImageOutputStreamSpi.java \
+javax/imageio/spi/ServiceRegistry.java \
+javax/imageio/spi/ImageTranscoderSpi.java \
 javax/imageio/spi/ImageReaderSpi.java \
+javax/imageio/spi/IIOServiceProvider.java \
 javax/imageio/spi/ImageReaderWriterSpi.java \
-javax/imageio/spi/ImageTranscoderSpi.java \
+javax/imageio/spi/ImageInputStreamSpi.java \
 javax/imageio/spi/RegisterableService.java \
-javax/imageio/spi/ServiceRegistry.java \
-javax/imageio/spi/ImageWriterSpi.java \
-javax/imageio/stream/FileCacheImageInputStream.java \
-javax/imageio/stream/FileCacheImageOutputStream.java \
-javax/imageio/stream/FileImageInputStream.java \
-javax/imageio/stream/FileImageOutputStream.java \
-javax/imageio/stream/IIOByteBuffer.java \
+javax/imageio/metadata/IIOMetadataFormatImpl.java \
+javax/imageio/metadata/IIOInvalidTreeException.java \
+javax/imageio/metadata/IIOMetadataFormat.java \
+javax/imageio/metadata/IIOMetadataController.java \
+javax/imageio/metadata/IIOMetadataNode.java \
+javax/imageio/metadata/IIOMetadata.java        \
+javax/imageio/stream/FileImageOutputStream.java        \
 javax/imageio/stream/ImageInputStream.java \
+javax/imageio/stream/IIOByteBuffer.java        \
+javax/imageio/stream/FileCacheImageInputStream.java \
 javax/imageio/stream/ImageInputStreamImpl.java \
-javax/imageio/stream/ImageOutputStream.java \
-javax/imageio/stream/ImageOutputStreamImpl.java \
+javax/imageio/stream/ImageOutputStreamImpl.java        \
 javax/imageio/stream/MemoryCacheImageInputStream.java \
+javax/imageio/stream/FileCacheImageOutputStream.java \
+javax/imageio/stream/ImageOutputStream.java \
 javax/imageio/stream/MemoryCacheImageOutputStream.java \
-javax/naming/directory/Attribute.java \
-javax/naming/directory/AttributeInUseException.java \
-javax/naming/directory/AttributeModificationException.java \
-javax/naming/directory/Attributes.java \
-javax/naming/directory/DirContext.java \
-javax/naming/directory/InvalidAttributeIdentifierException.java        \
-javax/naming/directory/InvalidAttributeValueException.java \
-javax/naming/directory/InvalidAttributesException.java \
-javax/naming/directory/InvalidSearchControlsException.java \
-javax/naming/directory/InvalidSearchFilterException.java \
-javax/naming/directory/NoSuchAttributeException.java \
-javax/naming/directory/SchemaViolationException.java \
-javax/naming/directory/BasicAttribute.java \
-javax/naming/directory/BasicAttributes.java \
-javax/naming/directory/ModificationItem.java \
-javax/naming/directory/SearchControls.java \
-javax/naming/directory/SearchResult.java \
-javax/naming/directory/InitialDirContext.java \
-javax/naming/AuthenticationException.java \
-javax/naming/AuthenticationNotSupportedException.java \
-javax/naming/CannotProceedException.java \
-javax/naming/CommunicationException.java \
-javax/naming/ConfigurationException.java \
-javax/naming/Context.java \
-javax/naming/ContextNotEmptyException.java \
-javax/naming/InsufficientResourcesException.java \
-javax/naming/InterruptedNamingException.java \
-javax/naming/BinaryRefAddr.java        \
-javax/naming/LimitExceededException.java \
-javax/naming/LinkException.java        \
-javax/naming/LinkLoopException.java \
-javax/naming/MalformedLinkException.java \
-javax/naming/Name.java \
-javax/naming/NameAlreadyBoundException.java \
-javax/naming/NameNotFoundException.java        \
-javax/naming/NameParser.java \
-javax/naming/NamingEnumeration.java \
-javax/naming/InitialContext.java \
-javax/naming/NamingSecurityException.java \
-javax/naming/NoInitialContextException.java \
-javax/naming/NoPermissionException.java        \
-javax/naming/NotContextException.java \
-javax/naming/NamingException.java \
-javax/naming/PartialResultException.java \
-javax/naming/event/EventContext.java \
-javax/naming/event/EventDirContext.java        \
-javax/naming/event/NamespaceChangeListener.java        \
-javax/naming/event/NamingEvent.java \
-javax/naming/event/NamingExceptionEvent.java \
-javax/naming/event/NamingListener.java \
-javax/naming/event/ObjectChangeListener.java \
-javax/naming/RefAddr.java \
-javax/naming/Reference.java \
-javax/naming/Referenceable.java        \
-javax/naming/ReferralException.java \
-javax/naming/ServiceUnavailableException.java \
-javax/naming/SizeLimitExceededException.java \
-javax/naming/StringRefAddr.java        \
-javax/naming/TimeLimitExceededException.java \
-javax/naming/spi/InitialContextFactory.java \
-javax/naming/spi/InitialContextFactoryBuilder.java \
-javax/naming/spi/NamingManager.java \
-javax/naming/spi/ObjectFactory.java \
-javax/naming/spi/Resolver.java \
-javax/naming/spi/DirObjectFactory.java \
-javax/naming/spi/DirStateFactory.java \
-javax/naming/spi/DirectoryManager.java \
-javax/naming/spi/ObjectFactoryBuilder.java \
-javax/naming/spi/ResolveResult.java \
-javax/naming/spi/StateFactory.java \
-javax/naming/InvalidNameException.java \
-javax/naming/Binding.java \
-javax/naming/CompositeName.java        \
-javax/naming/CompoundName.java \
-javax/naming/LinkRef.java \
-javax/naming/NameClassPair.java        \
-javax/naming/ldap/Control.java \
-javax/naming/ldap/ControlFactory.java \
-javax/naming/ldap/ExtendedRequest.java \
-javax/naming/ldap/ExtendedResponse.java        \
-javax/naming/ldap/HasControls.java \
-javax/naming/ldap/InitialLdapContext.java \
-javax/naming/ldap/LdapContext.java \
-javax/naming/ldap/LdapReferralException.java \
-javax/naming/ldap/UnsolicitedNotification.java \
-javax/naming/ldap/UnsolicitedNotificationEvent.java \
-javax/naming/ldap/UnsolicitedNotificationListener.java \
-javax/naming/OperationNotSupportedException.java \
-javax/net/ServerSocketFactory.java \
-javax/net/SocketFactory.java \
-javax/net/ssl/HandshakeCompletedEvent.java \
-javax/net/ssl/HandshakeCompletedListener.java \
-javax/net/ssl/HostnameVerifier.java \
-javax/net/ssl/HttpsURLConnection.java \
-javax/net/ssl/KeyManager.java \
-javax/net/ssl/KeyManagerFactory.java \
-javax/net/ssl/KeyManagerFactorySpi.java \
-javax/net/ssl/ManagerFactoryParameters.java \
-javax/net/ssl/SSLProtocolException.java \
-javax/net/ssl/SSLContext.java \
-javax/net/ssl/SSLContextSpi.java \
-javax/net/ssl/SSLException.java \
-javax/net/ssl/SSLHandshakeException.java \
+javax/imageio/stream/FileImageInputStream.java \
+javax/imageio/event/IIOReadProgressListener.java \
+javax/imageio/event/IIOWriteWarningListener.java \
+javax/imageio/event/IIOReadWarningListener.java        \
+javax/imageio/event/IIOReadUpdateListener.java \
+javax/imageio/event/IIOWriteProgressListener.java \
+javax/imageio/ImageTranscoder.java \
+javax/imageio/ImageTypeSpecifier.java \
+javax/imageio/ImageIO.java \
+javax/imageio/IIOImage.java \
+javax/net/VanillaSocketFactory.java \
+javax/net/ssl/TrustManagerFactorySpi.java \
 javax/net/ssl/SSLKeyException.java \
-javax/net/ssl/SSLPeerUnverifiedException.java \
-javax/net/ssl/SSLPermission.java \
+javax/net/ssl/TrustManager.java        \
 javax/net/ssl/SSLServerSocket.java \
+javax/net/ssl/TrustManagerFactory.java \
+javax/net/ssl/KeyManager.java \
+javax/net/ssl/SSLSocketFactory.java \
+javax/net/ssl/SSLPermission.java \
+javax/net/ssl/SSLContext.java \
+javax/net/ssl/TrivialHostnameVerifier.java \
+javax/net/ssl/X509KeyManager.java \
 javax/net/ssl/SSLServerSocketFactory.java \
-javax/net/ssl/SSLSession.java \
-javax/net/ssl/SSLSessionBindingEvent.java \
 javax/net/ssl/SSLSessionBindingListener.java \
 javax/net/ssl/SSLSessionContext.java \
+javax/net/ssl/KeyManagerFactory.java \
+javax/net/ssl/SSLProtocolException.java        \
 javax/net/ssl/SSLSocket.java \
-javax/net/ssl/SSLSocketFactory.java \
-javax/net/ssl/TrivialHostnameVerifier.java \
-javax/net/ssl/TrustManager.java \
-javax/net/ssl/TrustManagerFactory.java \
-javax/net/ssl/TrustManagerFactorySpi.java \
-javax/net/ssl/X509KeyManager.java \
+javax/net/ssl/HostnameVerifier.java \
+javax/net/ssl/HandshakeCompletedListener.java \
+javax/net/ssl/HttpsURLConnection.java \
+javax/net/ssl/KeyManagerFactorySpi.java        \
+javax/net/ssl/SSLHandshakeException.java \
+javax/net/ssl/SSLPeerUnverifiedException.java \
 javax/net/ssl/X509TrustManager.java \
-javax/net/VanillaSocketFactory.java \
+javax/net/ssl/SSLSession.java \
+javax/net/ssl/SSLContextSpi.java \
+javax/net/ssl/HandshakeCompletedEvent.java \
+javax/net/ssl/SSLSessionBindingEvent.java \
+javax/net/ssl/SSLException.java        \
+javax/net/ssl/ManagerFactoryParameters.java \
+javax/net/SocketFactory.java \
 javax/net/VanillaServerSocketFactory.java \
-javax/print/AttributeException.java \
-javax/print/CancelablePrintJob.java \
-javax/print/Doc.java \
-javax/print/DocFlavor.java \
-javax/print/DocPrintJob.java \
-javax/print/FlavorException.java \
-javax/print/MultiDoc.java \
-javax/print/MultiDocPrintJob.java \
-javax/print/MultiDocPrintService.java \
-javax/print/PrintException.java \
-javax/print/PrintService.java \
-javax/print/PrintServiceLookup.java \
-javax/print/ServiceUIFactory.java \
-javax/print/StreamPrintService.java \
-javax/print/URIException.java \
+javax/net/ServerSocketFactory.java \
+javax/print/attribute/HashPrintServiceAttributeSet.java        \
 javax/print/attribute/Attribute.java \
-javax/print/attribute/AttributeSet.java \
-javax/print/attribute/AttributeSetUtilities.java \
-javax/print/attribute/DateTimeSyntax.java \
-javax/print/attribute/DocAttribute.java \
 javax/print/attribute/DocAttributeSet.java \
-javax/print/attribute/EnumSyntax.java \
-javax/print/attribute/HashAttributeSet.java \
-javax/print/attribute/HashDocAttributeSet.java \
-javax/print/attribute/HashPrintJobAttributeSet.java \
-javax/print/attribute/HashPrintRequestAttributeSet.java \
-javax/print/attribute/HashPrintServiceAttributeSet.java \
-javax/print/attribute/IntegerSyntax.java \
-javax/print/attribute/PrintJobAttribute.java \
-javax/print/attribute/PrintJobAttributeSet.java \
-javax/print/attribute/PrintRequestAttribute.java \
 javax/print/attribute/PrintRequestAttributeSet.java \
-javax/print/attribute/PrintServiceAttribute.java \
-javax/print/attribute/PrintServiceAttributeSet.java \
-javax/print/attribute/ResolutionSyntax.java \
-javax/print/attribute/SetOfIntegerSyntax.java \
-javax/print/attribute/Size2DSyntax.java \
-javax/print/attribute/SupportedValuesAttribute.java \
-javax/print/attribute/TextSyntax.java \
-javax/print/attribute/UnmodifiableSetException.java \
-javax/print/attribute/URISyntax.java \
-javax/print/attribute/standard/ColorSupported.java \
-javax/print/attribute/standard/Compression.java \
-javax/print/attribute/standard/Copies.java \
-javax/print/attribute/standard/CopiesSupported.java \
-javax/print/attribute/standard/DateTimeAtCompleted.java \
-javax/print/attribute/standard/DateTimeAtCreation.java \
-javax/print/attribute/standard/DateTimeAtProcessing.java \
-javax/print/attribute/standard/DocumentName.java \
-javax/print/attribute/standard/Fidelity.java \
-javax/print/attribute/standard/Finishings.java \
-javax/print/attribute/standard/JobHoldUntil.java \
+javax/print/attribute/standard/NumberOfInterveningJobs.java \
+javax/print/attribute/standard/PrinterMakeAndModel.java        \
+javax/print/attribute/standard/PrinterStateReason.java \
 javax/print/attribute/standard/JobImpressions.java \
-javax/print/attribute/standard/JobImpressionsCompleted.java \
-javax/print/attribute/standard/JobImpressionsSupported.java \
-javax/print/attribute/standard/JobKOctets.java \
-javax/print/attribute/standard/JobKOctetsProcessed.java \
-javax/print/attribute/standard/JobKOctetsSupported.java \
+javax/print/attribute/standard/JobHoldUntil.java \
+javax/print/attribute/standard/JobKOctetsSupported.java        \
+javax/print/attribute/standard/JobPriority.java        \
+javax/print/attribute/standard/QueuedJobCount.java \
+javax/print/attribute/standard/JobOriginatingUserName.java \
+javax/print/attribute/standard/PrinterName.java        \
+javax/print/attribute/standard/PDLOverrideSupported.java \
+javax/print/attribute/standard/PrinterStateReasons.java        \
 javax/print/attribute/standard/JobMediaSheets.java \
-javax/print/attribute/standard/JobMediaSheetsCompleted.java \
-javax/print/attribute/standard/JobMediaSheetsSupported.java \
+javax/print/attribute/standard/JobKOctets.java \
+javax/print/attribute/standard/MultipleDocumentHandling.java \
+javax/print/attribute/standard/PrinterMessageFromOperator.java \
+javax/print/attribute/standard/Severity.java \
+javax/print/attribute/standard/ReferenceUriSchemesSupported.java \
+javax/print/attribute/standard/DocumentName.java \
+javax/print/attribute/standard/PrinterMoreInfo.java \
 javax/print/attribute/standard/JobMessageFromOperator.java \
-javax/print/attribute/standard/JobName.java \
-javax/print/attribute/standard/JobOriginatingUserName.java \
-javax/print/attribute/standard/JobPriority.java \
-javax/print/attribute/standard/JobPrioritySupported.java \
-javax/print/attribute/standard/JobSheets.java \
-javax/print/attribute/standard/JobState.java \
-javax/print/attribute/standard/JobStateReason.java \
 javax/print/attribute/standard/JobStateReasons.java \
-javax/print/attribute/standard/Media.java \
-javax/print/attribute/standard/MediaSizeName.java \
-javax/print/attribute/standard/MultipleDocumentHandling.java \
-javax/print/attribute/standard/NumberOfDocuments.java \
-javax/print/attribute/standard/NumberOfInterveningJobs.java \
-javax/print/attribute/standard/NumberUp.java \
-javax/print/attribute/standard/NumberUpSupported.java \
-javax/print/attribute/standard/OrientationRequested.java \
-javax/print/attribute/standard/OutputDeviceAssigned.java \
-javax/print/attribute/standard/PDLOverrideSupported.java \
-javax/print/attribute/standard/PageRanges.java \
+javax/print/attribute/standard/PrinterIsAcceptingJobs.java \
+javax/print/attribute/standard/DateTimeAtProcessing.java \
 javax/print/attribute/standard/PagesPerMinute.java \
-javax/print/attribute/standard/PagesPerMinuteColor.java \
-javax/print/attribute/standard/PresentationDirection.java \
+javax/print/attribute/standard/PrinterResolution.java \
+javax/print/attribute/standard/JobMediaSheetsSupported.java \
+javax/print/attribute/standard/NumberUpSupported.java \
+javax/print/attribute/standard/Finishings.java \
+javax/print/attribute/standard/DateTimeAtCompleted.java        \
+javax/print/attribute/standard/NumberOfDocuments.java \
+javax/print/attribute/standard/PrinterInfo.java        \
 javax/print/attribute/standard/PrintQuality.java \
-javax/print/attribute/standard/PrinterInfo.java \
-javax/print/attribute/standard/PrinterIsAcceptingJobs.java \
+javax/print/attribute/standard/JobSheets.java \
+javax/print/attribute/standard/Media.java \
+javax/print/attribute/standard/Fidelity.java \
 javax/print/attribute/standard/PrinterLocation.java \
-javax/print/attribute/standard/PrinterMakeAndModel.java \
-javax/print/attribute/standard/PrinterMessageFromOperator.java \
-javax/print/attribute/standard/PrinterMoreInfo.java \
-javax/print/attribute/standard/PrinterMoreInfoManufacturer.java \
-javax/print/attribute/standard/PrinterName.java \
-javax/print/attribute/standard/PrinterResolution.java \
-javax/print/attribute/standard/PrinterState.java \
-javax/print/attribute/standard/PrinterStateReason.java \
-javax/print/attribute/standard/PrinterStateReasons.java \
+javax/print/attribute/standard/PrinterMoreInfoManufacturer.java        \
+javax/print/attribute/standard/OrientationRequested.java \
+javax/print/attribute/standard/JobState.java \
+javax/print/attribute/standard/DateTimeAtCreation.java \
+javax/print/attribute/standard/PresentationDirection.java \
+javax/print/attribute/standard/JobName.java \
+javax/print/attribute/standard/PagesPerMinuteColor.java        \
+javax/print/attribute/standard/CopiesSupported.java \
 javax/print/attribute/standard/PrinterURI.java \
-javax/print/attribute/standard/QueuedJobCount.java \
-javax/print/attribute/standard/ReferenceUriSchemesSupported.java \
+javax/print/attribute/standard/PageRanges.java \
 javax/print/attribute/standard/RequestingUserName.java \
-javax/print/attribute/standard/Severity.java \
-javax/print/attribute/standard/SheetCollate.java \
+javax/print/attribute/standard/JobPrioritySupported.java \
+javax/print/attribute/standard/JobMediaSheetsCompleted.java \
+javax/print/attribute/standard/JobKOctetsProcessed.java        \
+javax/print/attribute/standard/JobImpressionsCompleted.java \
+javax/print/attribute/standard/Compression.java        \
+javax/print/attribute/standard/JobImpressionsSupported.java \
 javax/print/attribute/standard/Sides.java \
+javax/print/attribute/standard/JobStateReason.java \
+javax/print/attribute/standard/SheetCollate.java \
+javax/print/attribute/standard/Copies.java \
+javax/print/attribute/standard/MediaSizeName.java \
+javax/print/attribute/standard/OutputDeviceAssigned.java \
+javax/print/attribute/standard/PrinterState.java \
+javax/print/attribute/standard/NumberUp.java \
+javax/print/attribute/standard/ColorSupported.java \
+javax/print/attribute/HashAttributeSet.java \
+javax/print/attribute/SetOfIntegerSyntax.java \
+javax/print/attribute/HashDocAttributeSet.java \
+javax/print/attribute/PrintRequestAttribute.java \
+javax/print/attribute/DateTimeSyntax.java \
+javax/print/attribute/PrintServiceAttribute.java \
+javax/print/attribute/UnmodifiableSetException.java \
+javax/print/attribute/HashPrintJobAttributeSet.java \
+javax/print/attribute/PrintJobAttribute.java \
+javax/print/attribute/AttributeSet.java        \
+javax/print/attribute/ResolutionSyntax.java \
+javax/print/attribute/URISyntax.java \
+javax/print/attribute/AttributeSetUtilities.java \
+javax/print/attribute/HashPrintRequestAttributeSet.java        \
+javax/print/attribute/TextSyntax.java \
+javax/print/attribute/PrintJobAttributeSet.java        \
+javax/print/attribute/SupportedValuesAttribute.java \
+javax/print/attribute/EnumSyntax.java \
+javax/print/attribute/DocAttribute.java        \
+javax/print/attribute/Size2DSyntax.java        \
+javax/print/attribute/IntegerSyntax.java \
+javax/print/attribute/PrintServiceAttributeSet.java \
+javax/print/PrintService.java \
+javax/print/DocFlavor.java \
+javax/print/DocPrintJob.java \
 javax/print/event/PrintEvent.java \
 javax/print/event/PrintJobAdapter.java \
-javax/print/event/PrintJobAttributeEvent.java \
-javax/print/event/PrintJobAttributeListener.java \
-javax/print/event/PrintJobEvent.java \
-javax/print/event/PrintJobListener.java \
 javax/print/event/PrintServiceAttributeEvent.java \
+javax/print/event/PrintJobAttributeEvent.java \
 javax/print/event/PrintServiceAttributeListener.java \
-javax/security/auth/AuthPermission.java \
-javax/security/auth/Destroyable.java \
-javax/security/auth/DestroyFailedException.java \
-javax/security/auth/login/AccountExpiredException.java \
-javax/security/auth/login/AppConfigurationEntry.java \
-javax/security/auth/login/Configuration.java \
-javax/security/auth/login/CredentialExpiredException.java \
-javax/security/auth/login/FailedLoginException.java \
-javax/security/auth/login/LoginContext.java \
-javax/security/auth/login/LoginException.java \
-javax/security/auth/login/NullConfiguration.java \
-javax/security/auth/spi/LoginModule.java \
-javax/security/auth/Policy.java \
-javax/security/auth/PrivateCredentialPermission.java \
-javax/security/auth/Refreshable.java \
-javax/security/auth/RefreshFailedException.java \
-javax/security/auth/Subject.java \
-javax/security/auth/SubjectDomainCombiner.java \
-javax/security/auth/x500/X500Principal.java \
+javax/print/event/PrintJobEvent.java \
+javax/print/event/PrintJobListener.java        \
+javax/print/event/PrintJobAttributeListener.java \
+javax/print/PrintServiceLookup.java \
+javax/print/URIException.java \
+javax/print/StreamPrintService.java \
+javax/print/MultiDoc.java \
+javax/print/FlavorException.java \
+javax/print/Doc.java \
+javax/print/MultiDocPrintJob.java \
+javax/print/CancelablePrintJob.java \
+javax/print/MultiDocPrintService.java \
+javax/print/ServiceUIFactory.java \
+javax/print/AttributeException.java \
+javax/print/PrintException.java        \
+javax/naming/ServiceUnavailableException.java \
+javax/naming/directory/Attribute.java \
+javax/naming/directory/SchemaViolationException.java \
+javax/naming/directory/InitialDirContext.java \
+javax/naming/directory/BasicAttribute.java \
+javax/naming/directory/NoSuchAttributeException.java \
+javax/naming/directory/InvalidAttributesException.java \
+javax/naming/directory/InvalidAttributeValueException.java \
+javax/naming/directory/BasicAttributes.java \
+javax/naming/directory/AttributeModificationException.java \
+javax/naming/directory/InvalidAttributeIdentifierException.java        \
+javax/naming/directory/DirContext.java \
+javax/naming/directory/Attributes.java \
+javax/naming/directory/InvalidSearchControlsException.java \
+javax/naming/directory/SearchControls.java \
+javax/naming/directory/AttributeInUseException.java \
+javax/naming/directory/InvalidSearchFilterException.java \
+javax/naming/directory/ModificationItem.java \
+javax/naming/directory/SearchResult.java \
+javax/naming/Binding.java \
+javax/naming/ContextNotEmptyException.java \
+javax/naming/Referenceable.java        \
+javax/naming/InterruptedNamingException.java \
+javax/naming/CommunicationException.java \
+javax/naming/LinkException.java        \
+javax/naming/BinaryRefAddr.java        \
+javax/naming/LinkLoopException.java \
+javax/naming/AuthenticationException.java \
+javax/naming/NameAlreadyBoundException.java \
+javax/naming/MalformedLinkException.java \
+javax/naming/NotContextException.java \
+javax/naming/spi/DirStateFactory.java \
+javax/naming/spi/ResolveResult.java \
+javax/naming/spi/ObjectFactoryBuilder.java \
+javax/naming/spi/DirObjectFactory.java \
+javax/naming/spi/DirectoryManager.java \
+javax/naming/spi/InitialContextFactoryBuilder.java \
+javax/naming/spi/ObjectFactory.java \
+javax/naming/spi/Resolver.java \
+javax/naming/spi/StateFactory.java \
+javax/naming/spi/InitialContextFactory.java \
+javax/naming/spi/NamingManager.java \
+javax/naming/InvalidNameException.java \
+javax/naming/NamingEnumeration.java \
+javax/naming/LinkRef.java \
+javax/naming/event/NamingListener.java \
+javax/naming/event/NamingEvent.java \
+javax/naming/event/NamespaceChangeListener.java        \
+javax/naming/event/ObjectChangeListener.java \
+javax/naming/event/EventContext.java \
+javax/naming/event/NamingExceptionEvent.java \
+javax/naming/event/EventDirContext.java        \
+javax/naming/NamingException.java \
+javax/naming/CannotProceedException.java \
+javax/naming/PartialResultException.java \
+javax/naming/TimeLimitExceededException.java \
+javax/naming/NoPermissionException.java        \
+javax/naming/CompoundName.java \
+javax/naming/SizeLimitExceededException.java \
+javax/naming/NoInitialContextException.java \
+javax/naming/NameNotFoundException.java        \
+javax/naming/InitialContext.java \
+javax/naming/NamingSecurityException.java \
+javax/naming/Context.java \
+javax/naming/ConfigurationException.java \
+javax/naming/InsufficientResourcesException.java \
+javax/naming/AuthenticationNotSupportedException.java \
+javax/naming/StringRefAddr.java        \
+javax/naming/ldap/InitialLdapContext.java \
+javax/naming/ldap/ExtendedRequest.java \
+javax/naming/ldap/Control.java \
+javax/naming/ldap/UnsolicitedNotificationListener.java \
+javax/naming/ldap/LdapReferralException.java \
+javax/naming/ldap/UnsolicitedNotificationEvent.java \
+javax/naming/ldap/HasControls.java \
+javax/naming/ldap/LdapContext.java \
+javax/naming/ldap/ExtendedResponse.java        \
+javax/naming/ldap/UnsolicitedNotification.java \
+javax/naming/ldap/ControlFactory.java \
+javax/naming/OperationNotSupportedException.java \
+javax/naming/ReferralException.java \
+javax/naming/LimitExceededException.java \
+javax/naming/Reference.java \
+javax/naming/NameParser.java \
+javax/naming/NameClassPair.java        \
+javax/naming/RefAddr.java \
+javax/naming/CompositeName.java        \
+javax/naming/Name.java \
+javax/xml/xpath/XPathConstants.java \
+javax/xml/xpath/XPathFunction.java \
+javax/xml/xpath/XPathVariableResolver.java \
+javax/xml/xpath/XPathExpressionException.java \
+javax/xml/xpath/XPathFunctionResolver.java \
+javax/xml/xpath/XPath.java \
+javax/xml/xpath/XPathFactoryConfigurationException.java        \
+javax/xml/xpath/XPathFactory.java \
+javax/xml/xpath/XPathException.java \
+javax/xml/xpath/XPathExpression.java \
+javax/xml/xpath/XPathFunctionException.java \
+javax/xml/validation/ValidatorHandler.java \
+javax/xml/validation/Validator.java \
+javax/xml/validation/TypeInfoProvider.java \
+javax/xml/validation/SchemaFactory.java        \
+javax/xml/validation/Schema.java \
+javax/xml/parsers/SAXParserFactory.java        \
+javax/xml/parsers/FactoryConfigurationError.java \
+javax/xml/parsers/SAXParser.java \
+javax/xml/parsers/DocumentBuilderFactory.java \
+javax/xml/parsers/ParserConfigurationException.java \
+javax/xml/parsers/DocumentBuilder.java \
+javax/xml/datatype/DatatypeFactory.java        \
+javax/xml/datatype/XMLGregorianCalendar.java \
+javax/xml/datatype/Duration.java \
+javax/xml/datatype/DatatypeConfigurationException.java \
+javax/xml/datatype/DatatypeConstants.java \
+javax/xml/XMLConstants.java \
+javax/xml/namespace/NamespaceContext.java \
+javax/xml/namespace/QName.java \
+javax/xml/transform/TransformerException.java \
+javax/xml/transform/TransformerFactoryConfigurationError.java \
+javax/xml/transform/sax/SAXResult.java \
+javax/xml/transform/sax/TransformerHandler.java        \
+javax/xml/transform/sax/SAXTransformerFactory.java \
+javax/xml/transform/sax/SAXSource.java \
+javax/xml/transform/sax/TemplatesHandler.java \
+javax/xml/transform/OutputKeys.java \
+javax/xml/transform/stream/StreamResult.java \
+javax/xml/transform/stream/StreamSource.java \
+javax/xml/transform/Source.java        \
+javax/xml/transform/SourceLocator.java \
+javax/xml/transform/ErrorListener.java \
+javax/xml/transform/TransformerConfigurationException.java \
+javax/xml/transform/Templates.java \
+javax/xml/transform/Result.java        \
+javax/xml/transform/URIResolver.java \
+javax/xml/transform/dom/DOMSource.java \
+javax/xml/transform/dom/DOMLocator.java        \
+javax/xml/transform/dom/DOMResult.java \
+javax/xml/transform/Transformer.java \
+javax/xml/transform/TransformerFactory.java \
+javax/security/cert/CertificateNotYetValidException.java \
+javax/security/cert/Certificate.java \
+javax/security/cert/X509Certificate.java \
+javax/security/cert/X509CertBridge.java        \
+javax/security/cert/CertificateEncodingException.java \
+javax/security/cert/CertificateExpiredException.java \
+javax/security/cert/CertificateException.java \
+javax/security/cert/CertificateParsingException.java \
+javax/security/auth/Destroyable.java \
 javax/security/auth/x500/X500PrivateCredential.java \
+javax/security/auth/x500/X500Principal.java \
+javax/security/auth/spi/LoginModule.java \
+javax/security/auth/DestroyFailedException.java        \
+javax/security/auth/SubjectDomainCombiner.java \
+javax/security/auth/AuthPermission.java        \
+javax/security/auth/login/CredentialExpiredException.java \
+javax/security/auth/login/NullConfiguration.java \
+javax/security/auth/login/AccountExpiredException.java \
+javax/security/auth/login/LoginException.java \
+javax/security/auth/login/AppConfigurationEntry.java \
+javax/security/auth/login/Configuration.java \
+javax/security/auth/login/LoginContext.java \
+javax/security/auth/login/FailedLoginException.java \
+javax/security/auth/PrivateCredentialPermission.java \
+javax/security/auth/Subject.java \
+javax/security/auth/Policy.java        \
+javax/security/auth/Refreshable.java \
+javax/security/auth/callback/TextInputCallback.java \
+javax/security/auth/callback/LanguageCallback.java \
+javax/security/auth/callback/TextOutputCallback.java \
+javax/security/auth/callback/UnsupportedCallbackException.java \
 javax/security/auth/callback/Callback.java \
-javax/security/auth/callback/CallbackHandler.java \
-javax/security/auth/callback/ChoiceCallback.java \
 javax/security/auth/callback/ConfirmationCallback.java \
-javax/security/auth/callback/LanguageCallback.java \
+javax/security/auth/callback/ChoiceCallback.java \
 javax/security/auth/callback/NameCallback.java \
 javax/security/auth/callback/PasswordCallback.java \
-javax/security/auth/callback/TextInputCallback.java \
-javax/security/auth/callback/TextOutputCallback.java \
-javax/security/auth/callback/UnsupportedCallbackException.java \
-javax/security/cert/Certificate.java \
-javax/security/cert/CertificateEncodingException.java \
-javax/security/cert/CertificateException.java \
-javax/security/cert/CertificateExpiredException.java \
-javax/security/cert/CertificateNotYetValidException.java \
-javax/security/cert/CertificateParsingException.java \
-javax/security/cert/X509CertBridge.java \
-javax/security/cert/X509Certificate.java \
-javax/security/sasl/AuthenticationException.java \
-javax/security/sasl/AuthorizeCallback.java \
+javax/security/auth/callback/CallbackHandler.java \
+javax/security/auth/RefreshFailedException.java        \
 javax/security/sasl/RealmCallback.java \
+javax/security/sasl/SaslClient.java \
 javax/security/sasl/RealmChoiceCallback.java \
+javax/security/sasl/AuthenticationException.java \
 javax/security/sasl/Sasl.java \
-javax/security/sasl/SaslClient.java \
 javax/security/sasl/SaslClientFactory.java \
+javax/security/sasl/AuthorizeCallback.java \
+javax/security/sasl/SaslServerFactory.java \
 javax/security/sasl/SaslException.java \
 javax/security/sasl/SaslServer.java \
-javax/security/sasl/SaslServerFactory.java \
-javax/sql/ConnectionEvent.java \
-javax/sql/ConnectionEventListener.java \
-javax/sql/ConnectionPoolDataSource.java \
-javax/sql/DataSource.java \
-javax/sql/PooledConnection.java \
-javax/sql/RowSetEvent.java \
-javax/sql/RowSetInternal.java \
-javax/sql/RowSet.java \
-javax/sql/RowSetListener.java \
-javax/sql/RowSetMetaData.java \
-javax/sql/RowSetReader.java \
-javax/sql/RowSetWriter.java \
-javax/sql/XAConnection.java \
-javax/sql/XADataSource.java \
-javax/transaction/xa/XAException.java \
-javax/transaction/xa/XAResource.java \
-javax/transaction/xa/Xid.java \
-javax/transaction/HeuristicCommitException.java        \
-javax/transaction/HeuristicMixedException.java \
-javax/transaction/HeuristicRollbackException.java \
-javax/transaction/InvalidTransactionException.java \
-javax/transaction/NotSupportedException.java \
+javax/transaction/TransactionRolledbackException.java \
+javax/transaction/Synchronization.java \
+javax/transaction/TransactionRequiredException.java \
 javax/transaction/RollbackException.java \
 javax/transaction/Status.java \
-javax/transaction/Synchronization.java \
+javax/transaction/HeuristicMixedException.java \
+javax/transaction/HeuristicRollbackException.java \
 javax/transaction/SystemException.java \
+javax/transaction/UserTransaction.java \
+javax/transaction/NotSupportedException.java \
+javax/transaction/HeuristicCommitException.java        \
 javax/transaction/Transaction.java \
 javax/transaction/TransactionManager.java \
-javax/transaction/TransactionRequiredException.java \
-javax/transaction/TransactionRolledbackException.java \
-javax/transaction/UserTransaction.java
-
-built_java_source_files = java/lang/ConcreteProcess.java \
-                          gnu/classpath/Configuration.java
+javax/transaction/InvalidTransactionException.java \
+javax/transaction/xa/XAException.java \
+javax/transaction/xa/XAResource.java \
+javax/transaction/xa/Xid.java \
+javax/accessibility/AccessibleValue.java \
+javax/accessibility/AccessibleBundle.java \
+javax/accessibility/AccessibleContext.java \
+javax/accessibility/AccessibleRelationSet.java \
+javax/accessibility/Accessible.java \
+javax/accessibility/AccessibleTableModelChange.java \
+javax/accessibility/AccessibleState.java \
+javax/accessibility/AccessibleIcon.java        \
+javax/accessibility/AccessibleHypertext.java \
+javax/accessibility/AccessibleComponent.java \
+javax/accessibility/AccessibleText.java        \
+javax/accessibility/AccessibleRole.java        \
+javax/accessibility/AccessibleEditableText.java        \
+javax/accessibility/AccessibleRelation.java \
+javax/accessibility/AccessibleTable.java \
+javax/accessibility/AccessibleStateSet.java \
+javax/accessibility/AccessibleSelection.java \
+javax/accessibility/AccessibleExtendedTable.java \
+javax/accessibility/AccessibleResourceBundle.java \
+javax/accessibility/AccessibleExtendedComponent.java \
+javax/accessibility/AccessibleHyperlink.java \
+javax/accessibility/AccessibleKeyBinding.java \
+javax/accessibility/AccessibleAction.java \
+javax/sql/ConnectionEventListener.java \
+javax/sql/RowSetEvent.java \
+javax/sql/ConnectionPoolDataSource.java        \
+javax/sql/RowSetWriter.java \
+javax/sql/XAConnection.java \
+javax/sql/RowSet.java \
+javax/sql/DataSource.java \
+javax/sql/RowSetInternal.java \
+javax/sql/RowSetReader.java \
+javax/sql/RowSetMetaData.java \
+javax/sql/PooledConnection.java        \
+javax/sql/XADataSource.java \
+javax/sql/RowSetListener.java \
+javax/sql/ConnectionEvent.java \
+javax/crypto/Cipher.java \
+javax/crypto/IllegalBlockSizeException.java \
+javax/crypto/MacSpi.java \
+javax/crypto/SecretKeyFactorySpi.java \
+javax/crypto/ShortBufferException.java \
+javax/crypto/KeyAgreement.java \
+javax/crypto/ExemptionMechanism.java \
+javax/crypto/CipherOutputStream.java \
+javax/crypto/SealedObject.java \
+javax/crypto/NullCipher.java \
+javax/crypto/KeyAgreementSpi.java \
+javax/crypto/SecretKeyFactory.java \
+javax/crypto/SecretKey.java \
+javax/crypto/NullCipherImpl.java \
+javax/crypto/spec/DESKeySpec.java \
+javax/crypto/spec/DHPrivateKeySpec.java        \
+javax/crypto/spec/DHParameterSpec.java \
+javax/crypto/spec/PBEParameterSpec.java        \
+javax/crypto/spec/DESedeKeySpec.java \
+javax/crypto/spec/DHGenParameterSpec.java \
+javax/crypto/spec/DHPublicKeySpec.java \
+javax/crypto/spec/PBEKeySpec.java \
+javax/crypto/spec/RC5ParameterSpec.java        \
+javax/crypto/spec/RC2ParameterSpec.java        \
+javax/crypto/spec/IvParameterSpec.java \
+javax/crypto/spec/SecretKeySpec.java \
+javax/crypto/interfaces/DHPublicKey.java \
+javax/crypto/interfaces/DHKey.java \
+javax/crypto/interfaces/DHPrivateKey.java \
+javax/crypto/interfaces/PBEKey.java \
+javax/crypto/NoSuchPaddingException.java \
+javax/crypto/KeyGeneratorSpi.java \
+javax/crypto/BadPaddingException.java \
+javax/crypto/CipherSpi.java \
+javax/crypto/KeyGenerator.java \
+javax/crypto/CipherInputStream.java \
+javax/crypto/ExemptionMechanismException.java \
+javax/crypto/ExemptionMechanismSpi.java        \
+javax/crypto/EncryptedPrivateKeyInfo.java \
+javax/crypto/Mac.java
+
+org_source_files = \
+org/ietf/jgss/GSSManager.java \
+org/ietf/jgss/GSSException.java        \
+org/ietf/jgss/MessageProp.java \
+org/ietf/jgss/GSSName.java \
+org/ietf/jgss/GSSContext.java \
+org/ietf/jgss/Oid.java \
+org/ietf/jgss/GSSCredential.java \
+org/ietf/jgss/ChannelBinding.java
+
+gnu_xml_source_files = \
+gnu/xml/xpath/EqualityExpr.java        \
+gnu/xml/xpath/NumberFunction.java \
+gnu/xml/xpath/StringLengthFunction.java        \
+gnu/xml/xpath/NameFunction.java        \
+gnu/xml/xpath/SumFunction.java \
+gnu/xml/xpath/Pattern.java \
+gnu/xml/xpath/StringFunction.java \
+gnu/xml/xpath/NegativeExpr.java        \
+gnu/xml/xpath/UnionExpr.java \
+gnu/xml/xpath/SubstringFunction.java \
+gnu/xml/xpath/Expr.java        \
+gnu/xml/xpath/XPathFactoryImpl.java \
+gnu/xml/xpath/NormalizeSpaceFunction.java \
+gnu/xml/xpath/Constant.java \
+gnu/xml/xpath/Predicate.java \
+gnu/xml/xpath/Path.java        \
+gnu/xml/xpath/OrExpr.java \
+gnu/xml/xpath/LangFunction.java        \
+gnu/xml/xpath/StartsWithFunction.java \
+gnu/xml/xpath/SubstringAfterFunction.java \
+gnu/xml/xpath/FloorFunction.java \
+gnu/xml/xpath/NotFunction.java \
+gnu/xml/xpath/Root.java        \
+gnu/xml/xpath/PositionFunction.java \
+gnu/xml/xpath/VariableReference.java \
+gnu/xml/xpath/DocumentOrderComparator.java \
+gnu/xml/xpath/LocalNameFunction.java \
+gnu/xml/xpath/NamespaceUriFunction.java        \
+gnu/xml/xpath/TranslateFunction.java \
+gnu/xml/xpath/FalseFunction.java \
+gnu/xml/xpath/AndExpr.java \
+gnu/xml/xpath/XPathParser.java \
+gnu/xml/xpath/NamespaceTest.java \
+gnu/xml/xpath/ConcatFunction.java \
+gnu/xml/xpath/NameTest.java \
+gnu/xml/xpath/CountFunction.java \
+gnu/xml/xpath/IdFunction.java \
+gnu/xml/xpath/LastFunction.java        \
+gnu/xml/xpath/XPathTokenizer.java \
+gnu/xml/xpath/Steps.java \
+gnu/xml/xpath/TrueFunction.java        \
+gnu/xml/xpath/BooleanFunction.java \
+gnu/xml/xpath/ParenthesizedExpr.java \
+gnu/xml/xpath/XPathImpl.java \
+gnu/xml/xpath/Selector.java \
+gnu/xml/xpath/RoundFunction.java \
+gnu/xml/xpath/SubstringBeforeFunction.java \
+gnu/xml/xpath/Function.java \
+gnu/xml/xpath/CeilingFunction.java \
+gnu/xml/xpath/RelationalExpr.java \
+gnu/xml/xpath/FunctionCall.java        \
+gnu/xml/xpath/NodeTypeTest.java        \
+gnu/xml/xpath/ArithmeticExpr.java \
+gnu/xml/xpath/Test.java        \
+gnu/xml/xpath/ContainsFunction.java \
+gnu/xml/pipeline/EventFilter.java \
+gnu/xml/pipeline/NSFilter.java \
+gnu/xml/pipeline/XsltFilter.java \
+gnu/xml/pipeline/ValidationConsumer.java \
+gnu/xml/pipeline/PipelineFactory.java \
+gnu/xml/pipeline/TextConsumer.java \
+gnu/xml/pipeline/LinkFilter.java \
+gnu/xml/pipeline/TeeConsumer.java \
+gnu/xml/pipeline/DomConsumer.java \
+gnu/xml/pipeline/EventConsumer.java \
+gnu/xml/pipeline/WellFormednessFilter.java \
+gnu/xml/pipeline/XIncludeFilter.java \
+gnu/xml/pipeline/CallFilter.java \
+gnu/xml/aelfred2/XmlParser.java        \
+gnu/xml/aelfred2/XmlReader.java        \
+gnu/xml/aelfred2/JAXPFactory.java \
+gnu/xml/aelfred2/ContentHandler2.java \
+gnu/xml/aelfred2/SAXDriver.java        \
+gnu/xml/util/XCat.java \
+gnu/xml/util/DomParser.java \
+gnu/xml/util/XMLWriter.java \
+gnu/xml/util/Resolver.java \
+gnu/xml/util/DoParse.java \
+gnu/xml/util/XHTMLWriter.java \
+gnu/xml/util/SAXNullTransformerFactory.java \
+gnu/xml/dom/DomCDATA.java \
+gnu/xml/dom/DomXPathNSResolver.java \
+gnu/xml/dom/ls/DomLSEx.java \
+gnu/xml/dom/ls/FilteredSAXEventSink.java \
+gnu/xml/dom/ls/DomLSSerializer.java \
+gnu/xml/dom/ls/DomLSInput.java \
+gnu/xml/dom/ls/DomLSOutput.java        \
+gnu/xml/dom/ls/SAXEventSink.java \
+gnu/xml/dom/ls/DomLSParser.java        \
+gnu/xml/dom/ls/ReaderInputStream.java \
+gnu/xml/dom/ls/WriterOutputStream.java \
+gnu/xml/dom/DomElement.java \
+gnu/xml/dom/DomNsNode.java \
+gnu/xml/dom/DomAttr.java \
+gnu/xml/dom/DomPI.java \
+gnu/xml/dom/DTDAttributeTypeInfo.java \
+gnu/xml/dom/DomDocumentBuilder.java \
+gnu/xml/dom/DTDElementTypeInfo.java \
+gnu/xml/dom/DomEx.java \
+gnu/xml/dom/DomDocument.java \
+gnu/xml/dom/DomXPathExpression.java \
+gnu/xml/dom/DomDocumentConfiguration.java \
+gnu/xml/dom/Consumer.java \
+gnu/xml/dom/DomComment.java \
+gnu/xml/dom/DomCharacterData.java \
+gnu/xml/dom/DomExtern.java \
+gnu/xml/dom/DomEntityReference.java \
+gnu/xml/dom/DomNamedNodeMap.java \
+gnu/xml/dom/ImplementationList.java \
+gnu/xml/dom/ImplementationSource.java \
+gnu/xml/dom/DomImpl.java \
+gnu/xml/dom/DomDoctype.java \
+gnu/xml/dom/DomNode.java \
+gnu/xml/dom/DomXPathResult.java        \
+gnu/xml/dom/DomDocumentBuilderFactory.java \
+gnu/xml/dom/DomText.java \
+gnu/xml/dom/DomNSResolverContext.java \
+gnu/xml/dom/DomNodeIterator.java \
+gnu/xml/dom/DomNotation.java \
+gnu/xml/dom/JAXPFactory.java \
+gnu/xml/dom/DomIterator.java \
+gnu/xml/dom/DomFragment.java \
+gnu/xml/dom/DomEvent.java \
+gnu/xml/dom/DomEntity.java \
+gnu/xml/transform/GenerateIdFunction.java \
+gnu/xml/transform/FormatNumberFunction.java \
+gnu/xml/transform/ValueOfNode.java \
+gnu/xml/transform/ApplyImportsNode.java        \
+gnu/xml/transform/WithParam.java \
+gnu/xml/transform/DocumentFunction.java        \
+gnu/xml/transform/SAXSerializer.java \
+gnu/xml/transform/FunctionAvailableFunction.java \
+gnu/xml/transform/ElementAvailableFunction.java        \
+gnu/xml/transform/IfNode.java \
+gnu/xml/transform/ApplyTemplatesNode.java \
+gnu/xml/transform/SortKey.java \
+gnu/xml/transform/Key.java \
+gnu/xml/transform/ElementNode.java \
+gnu/xml/transform/CurrentFunction.java \
+gnu/xml/transform/XSLComparator.java \
+gnu/xml/transform/CallTemplateNode.java        \
+gnu/xml/transform/TemplatesImpl.java \
+gnu/xml/transform/ChooseNode.java \
+gnu/xml/transform/NumberNode.java \
+gnu/xml/transform/CopyOfNode.java \
+gnu/xml/transform/ParameterNode.java \
+gnu/xml/transform/TransformerFactoryImpl.java \
+gnu/xml/transform/TextNode.java        \
+gnu/xml/transform/CopyNode.java        \
+gnu/xml/transform/SystemPropertyFunction.java \
+gnu/xml/transform/Stylesheet.java \
+gnu/xml/transform/ProcessingInstructionNode.java \
+gnu/xml/transform/UnparsedEntityUriFunction.java \
+gnu/xml/transform/URIResolverEntityResolver.java \
+gnu/xml/transform/ErrorListenerErrorHandler.java \
+gnu/xml/transform/Bindings.java        \
+gnu/xml/transform/AttributeSet.java \
+gnu/xml/transform/Template.java        \
+gnu/xml/transform/MessageNode.java \
+gnu/xml/transform/LiteralNode.java \
+gnu/xml/transform/StreamSerializer.java        \
+gnu/xml/transform/XSLURIResolver.java \
+gnu/xml/transform/AttributeNode.java \
+gnu/xml/transform/CommentNode.java \
+gnu/xml/transform/ForEachNode.java \
+gnu/xml/transform/KeyFunction.java \
+gnu/xml/transform/TransformerImpl.java \
+gnu/xml/transform/WhenNode.java        \
+gnu/xml/transform/NodeNumberNode.java \
+gnu/xml/transform/OtherwiseNode.java \
+gnu/xml/transform/AbstractNumberNode.java \
+gnu/xml/transform/TemplateNode.java \
+gnu/xml/transform/TransformerOutputProperties.java \
+gnu/xml/transform/DOMSourceLocator.java
+
+built_java_source_files = java/lang/ConcreteProcess.java \
+                          gnu/classpath/Configuration.java
 
 core_java_source_files = \
 java/lang/AbstractMethodError.java \
@@ -7276,7 +7758,8 @@ java/util/zip/ZipOutputStream.java \
 $(rmi_java_source_files) \
 $(awt_java_source_files) \
 $(convert_source_files) \
-$(javax_source_files)
+$(javax_source_files) \
+$(org_source_files)
 
 java_source_files = $(special_java_source_files) $(ordinary_java_source_files)
 math_c_source_files = \
@@ -7959,197 +8442,6 @@ jni/classpath/lib_gnu_java_awt_peer_gtk_la-primlib.lo:  \
        jni/classpath/$(DEPDIR)/$(am__dirstamp)
 lib-gnu-java-awt-peer-gtk.la: $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES) 
        $(lib_gnu_java_awt_peer_gtk_la_LINK) $(am_lib_gnu_java_awt_peer_gtk_la_rpath) $(lib_gnu_java_awt_peer_gtk_la_LDFLAGS) $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_LIBADD) $(LIBS)
-org/ietf/jgss/$(am__dirstamp):
-       @$(mkdir_p) org/ietf/jgss
-       @: > org/ietf/jgss/$(am__dirstamp)
-org/ietf/jgss/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/ietf/jgss/$(DEPDIR)
-       @: > org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
-org/ietf/jgss/ChannelBinding.lo: org/ietf/jgss/$(am__dirstamp) \
-       org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
-org/ietf/jgss/GSSContext.lo: org/ietf/jgss/$(am__dirstamp) \
-       org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
-org/ietf/jgss/GSSCredential.lo: org/ietf/jgss/$(am__dirstamp) \
-       org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
-org/ietf/jgss/GSSException.lo: org/ietf/jgss/$(am__dirstamp) \
-       org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
-org/ietf/jgss/GSSManager.lo: org/ietf/jgss/$(am__dirstamp) \
-       org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
-org/ietf/jgss/GSSName.lo: org/ietf/jgss/$(am__dirstamp) \
-       org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
-org/ietf/jgss/MessageProp.lo: org/ietf/jgss/$(am__dirstamp) \
-       org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
-org/ietf/jgss/Oid.lo: org/ietf/jgss/$(am__dirstamp) \
-       org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
-lib-org-ietf-jgss.la: $(lib_org_ietf_jgss_la_OBJECTS) $(lib_org_ietf_jgss_la_DEPENDENCIES) 
-       $(GCJLINK) -rpath $(toolexeclibdir) $(lib_org_ietf_jgss_la_LDFLAGS) $(lib_org_ietf_jgss_la_OBJECTS) $(lib_org_ietf_jgss_la_LIBADD) $(LIBS)
-org/w3c/dom/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom
-       @: > org/w3c/dom/$(am__dirstamp)
-org/w3c/dom/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/$(DEPDIR)
-       @: > org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/Attr.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/CDATASection.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/CharacterData.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/Comment.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/DOMException.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/DOMImplementation.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/Document.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/DocumentFragment.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/DocumentType.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/Element.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/Entity.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/EntityReference.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/NamedNodeMap.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/Node.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/NodeList.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/Notation.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ProcessingInstruction.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/Text.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ranges/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/ranges
-       @: > org/w3c/dom/ranges/$(am__dirstamp)
-org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/ranges/$(DEPDIR)
-       @: > org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ranges/DocumentRange.lo:  \
-       org/w3c/dom/ranges/$(am__dirstamp) \
-       org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ranges/Range.lo: org/w3c/dom/ranges/$(am__dirstamp) \
-       org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ranges/RangeException.lo:  \
-       org/w3c/dom/ranges/$(am__dirstamp) \
-       org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/traversal/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/traversal
-       @: > org/w3c/dom/traversal/$(am__dirstamp)
-org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/traversal/$(DEPDIR)
-       @: > org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/traversal/DocumentTraversal.lo:  \
-       org/w3c/dom/traversal/$(am__dirstamp) \
-       org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/traversal/NodeFilter.lo:  \
-       org/w3c/dom/traversal/$(am__dirstamp) \
-       org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/traversal/NodeIterator.lo:  \
-       org/w3c/dom/traversal/$(am__dirstamp) \
-       org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/traversal/TreeWalker.lo:  \
-       org/w3c/dom/traversal/$(am__dirstamp) \
-       org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
-lib-org-w3c-dom.la: $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_w3c_dom_la_DEPENDENCIES) 
-       $(GCJLINK) -rpath $(toolexeclibdir) $(lib_org_w3c_dom_la_LDFLAGS) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_w3c_dom_la_LIBADD) $(LIBS)
-org/xml/sax/ext/$(am__dirstamp):
-       @$(mkdir_p) org/xml/sax/ext
-       @: > org/xml/sax/ext/$(am__dirstamp)
-org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/xml/sax/ext/$(DEPDIR)
-       @: > org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/ext/DeclHandler.lo: org/xml/sax/ext/$(am__dirstamp) \
-       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/ext/LexicalHandler.lo: org/xml/sax/ext/$(am__dirstamp) \
-       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/$(am__dirstamp):
-       @$(mkdir_p) org/xml/sax/helpers
-       @: > org/xml/sax/helpers/$(am__dirstamp)
-org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/xml/sax/helpers/$(DEPDIR)
-       @: > org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/AttributeListImpl.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/AttributesImpl.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/DefaultHandler.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/LocatorImpl.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/NamespaceSupport.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/NewInstance.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/ParserAdapter.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/ParserFactory.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/XMLFilterImpl.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/XMLReaderAdapter.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/XMLReaderFactory.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/$(am__dirstamp):
-       @$(mkdir_p) org/xml/sax
-       @: > org/xml/sax/$(am__dirstamp)
-org/xml/sax/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/xml/sax/$(DEPDIR)
-       @: > org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/AttributeList.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/Attributes.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/ContentHandler.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/DTDHandler.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/DocumentHandler.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/EntityResolver.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/ErrorHandler.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/HandlerBase.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/InputSource.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/Locator.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/Parser.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/SAXException.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/SAXNotRecognizedException.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/SAXNotSupportedException.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/SAXParseException.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/XMLFilter.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/XMLReader.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-lib-org-xml-sax.la: $(lib_org_xml_sax_la_OBJECTS) $(lib_org_xml_sax_la_DEPENDENCIES) 
-       $(GCJLINK) -rpath $(toolexeclibdir) $(lib_org_xml_sax_la_LDFLAGS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_xml_sax_la_LIBADD) $(LIBS)
 gnu/gcj/$(am__dirstamp):
        @$(mkdir_p) gnu/gcj
        @: > gnu/gcj/$(am__dirstamp)
@@ -13361,602 +13653,160 @@ gnu/gcj/convert/Output_iconv.lo: gnu/gcj/convert/$(am__dirstamp) \
        gnu/gcj/convert/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/convert/UnicodeToBytes.lo: gnu/gcj/convert/$(am__dirstamp) \
        gnu/gcj/convert/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/$(am__dirstamp):
-       @$(mkdir_p) javax/accessibility
-       @: > javax/accessibility/$(am__dirstamp)
-javax/accessibility/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/accessibility/$(DEPDIR)
-       @: > javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/Accessible.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleAction.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleBundle.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleComponent.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleContext.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleEditableText.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleExtendedComponent.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleExtendedTable.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleHyperlink.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleHypertext.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleIcon.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleKeyBinding.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleRelation.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleRelationSet.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleResourceBundle.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleRole.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleSelection.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleState.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleStateSet.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleTable.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleTableModelChange.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleText.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/accessibility/AccessibleValue.lo:  \
-       javax/accessibility/$(am__dirstamp) \
-       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/$(am__dirstamp):
-       @$(mkdir_p) javax/crypto
-       @: > javax/crypto/$(am__dirstamp)
-javax/crypto/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/crypto/$(DEPDIR)
-       @: > javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/BadPaddingException.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/Cipher.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/CipherInputStream.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/CipherOutputStream.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/CipherSpi.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/EncryptedPrivateKeyInfo.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/KeyGeneratorSpi.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/ExemptionMechanism.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/ExemptionMechanismException.lo:  \
-       javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/ExemptionMechanismSpi.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/IllegalBlockSizeException.lo:  \
-       javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/KeyAgreement.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/KeyAgreementSpi.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/KeyGenerator.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/Mac.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/MacSpi.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/NoSuchPaddingException.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/NullCipher.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/NullCipherImpl.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/SealedObject.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/SecretKey.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/SecretKeyFactory.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/SecretKeyFactorySpi.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/ShortBufferException.lo: javax/crypto/$(am__dirstamp) \
-       javax/crypto/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/interfaces/$(am__dirstamp):
-       @$(mkdir_p) javax/crypto/interfaces
-       @: > javax/crypto/interfaces/$(am__dirstamp)
-javax/crypto/interfaces/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/crypto/interfaces/$(DEPDIR)
-       @: > javax/crypto/interfaces/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/interfaces/DHKey.lo:  \
-       javax/crypto/interfaces/$(am__dirstamp) \
-       javax/crypto/interfaces/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/interfaces/DHPrivateKey.lo:  \
-       javax/crypto/interfaces/$(am__dirstamp) \
-       javax/crypto/interfaces/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/interfaces/DHPublicKey.lo:  \
-       javax/crypto/interfaces/$(am__dirstamp) \
-       javax/crypto/interfaces/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/interfaces/PBEKey.lo:  \
-       javax/crypto/interfaces/$(am__dirstamp) \
-       javax/crypto/interfaces/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/spec/$(am__dirstamp):
-       @$(mkdir_p) javax/crypto/spec
-       @: > javax/crypto/spec/$(am__dirstamp)
-javax/crypto/spec/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/crypto/spec/$(DEPDIR)
-       @: > javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/spec/DESKeySpec.lo: javax/crypto/spec/$(am__dirstamp) \
-       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/spec/DESedeKeySpec.lo: javax/crypto/spec/$(am__dirstamp) \
-       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/spec/DHGenParameterSpec.lo:  \
-       javax/crypto/spec/$(am__dirstamp) \
-       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/spec/DHParameterSpec.lo:  \
-       javax/crypto/spec/$(am__dirstamp) \
-       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/spec/DHPrivateKeySpec.lo:  \
-       javax/crypto/spec/$(am__dirstamp) \
-       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/spec/DHPublicKeySpec.lo:  \
-       javax/crypto/spec/$(am__dirstamp) \
-       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/spec/IvParameterSpec.lo:  \
-       javax/crypto/spec/$(am__dirstamp) \
-       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/spec/PBEKeySpec.lo: javax/crypto/spec/$(am__dirstamp) \
-       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/spec/PBEParameterSpec.lo:  \
-       javax/crypto/spec/$(am__dirstamp) \
-       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/spec/RC2ParameterSpec.lo:  \
-       javax/crypto/spec/$(am__dirstamp) \
-       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/spec/RC5ParameterSpec.lo:  \
-       javax/crypto/spec/$(am__dirstamp) \
-       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
-javax/crypto/spec/SecretKeySpec.lo: javax/crypto/spec/$(am__dirstamp) \
-       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
 javax/imageio/$(am__dirstamp):
        @$(mkdir_p) javax/imageio
        @: > javax/imageio/$(am__dirstamp)
 javax/imageio/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) javax/imageio/$(DEPDIR)
        @: > javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/IIOException.lo: javax/imageio/$(am__dirstamp) \
+javax/imageio/ImageWriteParam.lo: javax/imageio/$(am__dirstamp) \
        javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/IIOImage.lo: javax/imageio/$(am__dirstamp) \
+javax/imageio/ImageReader.lo: javax/imageio/$(am__dirstamp) \
        javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/IIOParam.lo: javax/imageio/$(am__dirstamp) \
+javax/imageio/ImageWriter.lo: javax/imageio/$(am__dirstamp) \
        javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/IIOParamController.lo: javax/imageio/$(am__dirstamp) \
+javax/imageio/IIOException.lo: javax/imageio/$(am__dirstamp) \
        javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/ImageIO.lo: javax/imageio/$(am__dirstamp) \
+javax/imageio/IIOParamController.lo: javax/imageio/$(am__dirstamp) \
        javax/imageio/$(DEPDIR)/$(am__dirstamp)
 javax/imageio/ImageReadParam.lo: javax/imageio/$(am__dirstamp) \
        javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/ImageReader.lo: javax/imageio/$(am__dirstamp) \
-       javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/ImageTranscoder.lo: javax/imageio/$(am__dirstamp) \
-       javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/ImageTypeSpecifier.lo: javax/imageio/$(am__dirstamp) \
-       javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/ImageWriteParam.lo: javax/imageio/$(am__dirstamp) \
-       javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/ImageWriter.lo: javax/imageio/$(am__dirstamp) \
+javax/imageio/IIOParam.lo: javax/imageio/$(am__dirstamp) \
        javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/event/$(am__dirstamp):
-       @$(mkdir_p) javax/imageio/event
-       @: > javax/imageio/event/$(am__dirstamp)
-javax/imageio/event/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/imageio/event/$(DEPDIR)
-       @: > javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/event/IIOReadProgressListener.lo:  \
-       javax/imageio/event/$(am__dirstamp) \
-       javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/event/IIOReadUpdateListener.lo:  \
-       javax/imageio/event/$(am__dirstamp) \
-       javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/event/IIOReadWarningListener.lo:  \
-       javax/imageio/event/$(am__dirstamp) \
-       javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/event/IIOWriteProgressListener.lo:  \
-       javax/imageio/event/$(am__dirstamp) \
-       javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/event/IIOWriteWarningListener.lo:  \
-       javax/imageio/event/$(am__dirstamp) \
-       javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/$(am__dirstamp):
-       @$(mkdir_p) javax/imageio/metadata
-       @: > javax/imageio/metadata/$(am__dirstamp)
-javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/imageio/metadata/$(DEPDIR)
-       @: > javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/IIOInvalidTreeException.lo:  \
-       javax/imageio/metadata/$(am__dirstamp) \
-       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/IIOMetadata.lo:  \
-       javax/imageio/metadata/$(am__dirstamp) \
-       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/IIOMetadataController.lo:  \
-       javax/imageio/metadata/$(am__dirstamp) \
-       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/IIOMetadataFormat.lo:  \
-       javax/imageio/metadata/$(am__dirstamp) \
-       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/IIOMetadataFormatImpl.lo:  \
-       javax/imageio/metadata/$(am__dirstamp) \
-       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/IIOMetadataNode.lo:  \
-       javax/imageio/metadata/$(am__dirstamp) \
-       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
 javax/imageio/spi/$(am__dirstamp):
        @$(mkdir_p) javax/imageio/spi
        @: > javax/imageio/spi/$(am__dirstamp)
 javax/imageio/spi/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) javax/imageio/spi/$(DEPDIR)
        @: > javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/IIOServiceProvider.lo:  \
-       javax/imageio/spi/$(am__dirstamp) \
-       javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
 javax/imageio/spi/IIORegistry.lo: javax/imageio/spi/$(am__dirstamp) \
        javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/ImageInputStreamSpi.lo:  \
+javax/imageio/spi/ImageWriterSpi.lo:  \
        javax/imageio/spi/$(am__dirstamp) \
        javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
 javax/imageio/spi/ImageOutputStreamSpi.lo:  \
        javax/imageio/spi/$(am__dirstamp) \
        javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/ImageReaderSpi.lo:  \
+javax/imageio/spi/ServiceRegistry.lo:  \
        javax/imageio/spi/$(am__dirstamp) \
        javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/ImageReaderWriterSpi.lo:  \
+javax/imageio/spi/ImageTranscoderSpi.lo:  \
        javax/imageio/spi/$(am__dirstamp) \
        javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/ImageTranscoderSpi.lo:  \
+javax/imageio/spi/ImageReaderSpi.lo:  \
        javax/imageio/spi/$(am__dirstamp) \
        javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/RegisterableService.lo:  \
+javax/imageio/spi/IIOServiceProvider.lo:  \
        javax/imageio/spi/$(am__dirstamp) \
        javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/ServiceRegistry.lo:  \
+javax/imageio/spi/ImageReaderWriterSpi.lo:  \
        javax/imageio/spi/$(am__dirstamp) \
        javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/ImageWriterSpi.lo:  \
+javax/imageio/spi/ImageInputStreamSpi.lo:  \
        javax/imageio/spi/$(am__dirstamp) \
        javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/spi/RegisterableService.lo:  \
+       javax/imageio/spi/$(am__dirstamp) \
+       javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/metadata/$(am__dirstamp):
+       @$(mkdir_p) javax/imageio/metadata
+       @: > javax/imageio/metadata/$(am__dirstamp)
+javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/imageio/metadata/$(DEPDIR)
+       @: > javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/metadata/IIOMetadataFormatImpl.lo:  \
+       javax/imageio/metadata/$(am__dirstamp) \
+       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/metadata/IIOInvalidTreeException.lo:  \
+       javax/imageio/metadata/$(am__dirstamp) \
+       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/metadata/IIOMetadataFormat.lo:  \
+       javax/imageio/metadata/$(am__dirstamp) \
+       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/metadata/IIOMetadataController.lo:  \
+       javax/imageio/metadata/$(am__dirstamp) \
+       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/metadata/IIOMetadataNode.lo:  \
+       javax/imageio/metadata/$(am__dirstamp) \
+       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/metadata/IIOMetadata.lo:  \
+       javax/imageio/metadata/$(am__dirstamp) \
+       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
 javax/imageio/stream/$(am__dirstamp):
        @$(mkdir_p) javax/imageio/stream
        @: > javax/imageio/stream/$(am__dirstamp)
 javax/imageio/stream/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) javax/imageio/stream/$(DEPDIR)
        @: > javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/FileCacheImageInputStream.lo:  \
+javax/imageio/stream/FileImageOutputStream.lo:  \
        javax/imageio/stream/$(am__dirstamp) \
        javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/FileCacheImageOutputStream.lo:  \
+javax/imageio/stream/ImageInputStream.lo:  \
        javax/imageio/stream/$(am__dirstamp) \
        javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/FileImageInputStream.lo:  \
+javax/imageio/stream/IIOByteBuffer.lo:  \
        javax/imageio/stream/$(am__dirstamp) \
        javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/FileImageOutputStream.lo:  \
+javax/imageio/stream/FileCacheImageInputStream.lo:  \
        javax/imageio/stream/$(am__dirstamp) \
        javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/IIOByteBuffer.lo:  \
+javax/imageio/stream/ImageInputStreamImpl.lo:  \
        javax/imageio/stream/$(am__dirstamp) \
        javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/ImageInputStream.lo:  \
+javax/imageio/stream/ImageOutputStreamImpl.lo:  \
        javax/imageio/stream/$(am__dirstamp) \
        javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/ImageInputStreamImpl.lo:  \
+javax/imageio/stream/MemoryCacheImageInputStream.lo:  \
        javax/imageio/stream/$(am__dirstamp) \
        javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/ImageOutputStream.lo:  \
+javax/imageio/stream/FileCacheImageOutputStream.lo:  \
        javax/imageio/stream/$(am__dirstamp) \
        javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/ImageOutputStreamImpl.lo:  \
+javax/imageio/stream/ImageOutputStream.lo:  \
        javax/imageio/stream/$(am__dirstamp) \
        javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/MemoryCacheImageInputStream.lo:  \
+javax/imageio/stream/MemoryCacheImageOutputStream.lo:  \
        javax/imageio/stream/$(am__dirstamp) \
        javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/MemoryCacheImageOutputStream.lo:  \
+javax/imageio/stream/FileImageInputStream.lo:  \
        javax/imageio/stream/$(am__dirstamp) \
        javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/$(am__dirstamp):
-       @$(mkdir_p) javax/naming/directory
-       @: > javax/naming/directory/$(am__dirstamp)
-javax/naming/directory/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/naming/directory/$(DEPDIR)
-       @: > javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/Attribute.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/AttributeInUseException.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/AttributeModificationException.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/Attributes.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/DirContext.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/InvalidAttributeIdentifierException.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/InvalidAttributeValueException.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/InvalidAttributesException.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/InvalidSearchControlsException.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/InvalidSearchFilterException.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/NoSuchAttributeException.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/SchemaViolationException.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/BasicAttribute.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/BasicAttributes.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/ModificationItem.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/SearchControls.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/SearchResult.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/directory/InitialDirContext.lo:  \
-       javax/naming/directory/$(am__dirstamp) \
-       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
-javax/naming/$(am__dirstamp):
-       @$(mkdir_p) javax/naming
-       @: > javax/naming/$(am__dirstamp)
-javax/naming/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/naming/$(DEPDIR)
-       @: > javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/AuthenticationException.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/AuthenticationNotSupportedException.lo:  \
-       javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/CannotProceedException.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/CommunicationException.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/ConfigurationException.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/Context.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/ContextNotEmptyException.lo:  \
-       javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/InsufficientResourcesException.lo:  \
-       javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/InterruptedNamingException.lo:  \
-       javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/BinaryRefAddr.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/LimitExceededException.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/LinkException.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/LinkLoopException.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/MalformedLinkException.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/Name.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/NameAlreadyBoundException.lo:  \
-       javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/NameNotFoundException.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/NameParser.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/NamingEnumeration.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/InitialContext.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/NamingSecurityException.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/NoInitialContextException.lo:  \
-       javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/NoPermissionException.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/NotContextException.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/NamingException.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/PartialResultException.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/event/$(am__dirstamp):
-       @$(mkdir_p) javax/naming/event
-       @: > javax/naming/event/$(am__dirstamp)
-javax/naming/event/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/naming/event/$(DEPDIR)
-       @: > javax/naming/event/$(DEPDIR)/$(am__dirstamp)
-javax/naming/event/EventContext.lo:  \
-       javax/naming/event/$(am__dirstamp) \
-       javax/naming/event/$(DEPDIR)/$(am__dirstamp)
-javax/naming/event/EventDirContext.lo:  \
-       javax/naming/event/$(am__dirstamp) \
-       javax/naming/event/$(DEPDIR)/$(am__dirstamp)
-javax/naming/event/NamespaceChangeListener.lo:  \
-       javax/naming/event/$(am__dirstamp) \
-       javax/naming/event/$(DEPDIR)/$(am__dirstamp)
-javax/naming/event/NamingEvent.lo: javax/naming/event/$(am__dirstamp) \
-       javax/naming/event/$(DEPDIR)/$(am__dirstamp)
-javax/naming/event/NamingExceptionEvent.lo:  \
-       javax/naming/event/$(am__dirstamp) \
-       javax/naming/event/$(DEPDIR)/$(am__dirstamp)
-javax/naming/event/NamingListener.lo:  \
-       javax/naming/event/$(am__dirstamp) \
-       javax/naming/event/$(DEPDIR)/$(am__dirstamp)
-javax/naming/event/ObjectChangeListener.lo:  \
-       javax/naming/event/$(am__dirstamp) \
-       javax/naming/event/$(DEPDIR)/$(am__dirstamp)
-javax/naming/RefAddr.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/Reference.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/Referenceable.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/ReferralException.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/ServiceUnavailableException.lo:  \
-       javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/SizeLimitExceededException.lo:  \
-       javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/StringRefAddr.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/TimeLimitExceededException.lo:  \
-       javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/spi/$(am__dirstamp):
-       @$(mkdir_p) javax/naming/spi
-       @: > javax/naming/spi/$(am__dirstamp)
-javax/naming/spi/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/naming/spi/$(DEPDIR)
-       @: > javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
-javax/naming/spi/InitialContextFactory.lo:  \
-       javax/naming/spi/$(am__dirstamp) \
-       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
-javax/naming/spi/InitialContextFactoryBuilder.lo:  \
-       javax/naming/spi/$(am__dirstamp) \
-       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
-javax/naming/spi/NamingManager.lo: javax/naming/spi/$(am__dirstamp) \
-       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
-javax/naming/spi/ObjectFactory.lo: javax/naming/spi/$(am__dirstamp) \
-       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
-javax/naming/spi/Resolver.lo: javax/naming/spi/$(am__dirstamp) \
-       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
-javax/naming/spi/DirObjectFactory.lo:  \
-       javax/naming/spi/$(am__dirstamp) \
-       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
-javax/naming/spi/DirStateFactory.lo: javax/naming/spi/$(am__dirstamp) \
-       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
-javax/naming/spi/DirectoryManager.lo:  \
-       javax/naming/spi/$(am__dirstamp) \
-       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
-javax/naming/spi/ObjectFactoryBuilder.lo:  \
-       javax/naming/spi/$(am__dirstamp) \
-       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
-javax/naming/spi/ResolveResult.lo: javax/naming/spi/$(am__dirstamp) \
-       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
-javax/naming/spi/StateFactory.lo: javax/naming/spi/$(am__dirstamp) \
-       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
-javax/naming/InvalidNameException.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/Binding.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/CompositeName.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/CompoundName.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/LinkRef.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/NameClassPair.lo: javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/naming/ldap/$(am__dirstamp):
-       @$(mkdir_p) javax/naming/ldap
-       @: > javax/naming/ldap/$(am__dirstamp)
-javax/naming/ldap/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/naming/ldap/$(DEPDIR)
-       @: > javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
-javax/naming/ldap/Control.lo: javax/naming/ldap/$(am__dirstamp) \
-       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
-javax/naming/ldap/ControlFactory.lo:  \
-       javax/naming/ldap/$(am__dirstamp) \
-       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
-javax/naming/ldap/ExtendedRequest.lo:  \
-       javax/naming/ldap/$(am__dirstamp) \
-       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
-javax/naming/ldap/ExtendedResponse.lo:  \
-       javax/naming/ldap/$(am__dirstamp) \
-       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
-javax/naming/ldap/HasControls.lo: javax/naming/ldap/$(am__dirstamp) \
-       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
-javax/naming/ldap/InitialLdapContext.lo:  \
-       javax/naming/ldap/$(am__dirstamp) \
-       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
-javax/naming/ldap/LdapContext.lo: javax/naming/ldap/$(am__dirstamp) \
-       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
-javax/naming/ldap/LdapReferralException.lo:  \
-       javax/naming/ldap/$(am__dirstamp) \
-       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
-javax/naming/ldap/UnsolicitedNotification.lo:  \
-       javax/naming/ldap/$(am__dirstamp) \
-       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
-javax/naming/ldap/UnsolicitedNotificationEvent.lo:  \
-       javax/naming/ldap/$(am__dirstamp) \
-       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
-javax/naming/ldap/UnsolicitedNotificationListener.lo:  \
-       javax/naming/ldap/$(am__dirstamp) \
-       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
-javax/naming/OperationNotSupportedException.lo:  \
-       javax/naming/$(am__dirstamp) \
-       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/event/$(am__dirstamp):
+       @$(mkdir_p) javax/imageio/event
+       @: > javax/imageio/event/$(am__dirstamp)
+javax/imageio/event/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/imageio/event/$(DEPDIR)
+       @: > javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/event/IIOReadProgressListener.lo:  \
+       javax/imageio/event/$(am__dirstamp) \
+       javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/event/IIOWriteWarningListener.lo:  \
+       javax/imageio/event/$(am__dirstamp) \
+       javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/event/IIOReadWarningListener.lo:  \
+       javax/imageio/event/$(am__dirstamp) \
+       javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/event/IIOReadUpdateListener.lo:  \
+       javax/imageio/event/$(am__dirstamp) \
+       javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/event/IIOWriteProgressListener.lo:  \
+       javax/imageio/event/$(am__dirstamp) \
+       javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/ImageTranscoder.lo: javax/imageio/$(am__dirstamp) \
+       javax/imageio/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/ImageTypeSpecifier.lo: javax/imageio/$(am__dirstamp) \
+       javax/imageio/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/ImageIO.lo: javax/imageio/$(am__dirstamp) \
+       javax/imageio/$(DEPDIR)/$(am__dirstamp)
+javax/imageio/IIOImage.lo: javax/imageio/$(am__dirstamp) \
+       javax/imageio/$(DEPDIR)/$(am__dirstamp)
 javax/net/$(am__dirstamp):
        @$(mkdir_p) javax/net
        @: > javax/net/$(am__dirstamp)
 javax/net/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) javax/net/$(DEPDIR)
        @: > javax/net/$(DEPDIR)/$(am__dirstamp)
-javax/net/ServerSocketFactory.lo: javax/net/$(am__dirstamp) \
-       javax/net/$(DEPDIR)/$(am__dirstamp)
-javax/net/SocketFactory.lo: javax/net/$(am__dirstamp) \
+javax/net/VanillaSocketFactory.lo: javax/net/$(am__dirstamp) \
        javax/net/$(DEPDIR)/$(am__dirstamp)
 javax/net/ssl/$(am__dirstamp):
        @$(mkdir_p) javax/net/ssl
@@ -13964,197 +13814,97 @@ javax/net/ssl/$(am__dirstamp):
 javax/net/ssl/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) javax/net/ssl/$(DEPDIR)
        @: > javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/HandshakeCompletedEvent.lo:  \
-       javax/net/ssl/$(am__dirstamp) \
-       javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/HandshakeCompletedListener.lo:  \
+javax/net/ssl/TrustManagerFactorySpi.lo:  \
        javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/HostnameVerifier.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/SSLKeyException.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/HttpsURLConnection.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/TrustManager.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/KeyManager.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/SSLServerSocket.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/KeyManagerFactory.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/TrustManagerFactory.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/KeyManagerFactorySpi.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/KeyManager.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/ManagerFactoryParameters.lo:  \
-       javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/SSLSocketFactory.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/SSLProtocolException.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/SSLPermission.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
 javax/net/ssl/SSLContext.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/SSLContextSpi.lo: javax/net/ssl/$(am__dirstamp) \
-       javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/SSLException.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/TrivialHostnameVerifier.lo:  \
+       javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/SSLHandshakeException.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/X509KeyManager.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/SSLKeyException.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/SSLServerSocketFactory.lo:  \
+       javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/SSLPeerUnverifiedException.lo:  \
+javax/net/ssl/SSLSessionBindingListener.lo:  \
        javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/SSLPermission.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/SSLSessionContext.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/SSLServerSocket.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/KeyManagerFactory.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/SSLServerSocketFactory.lo:  \
-       javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/SSLProtocolException.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/SSLSession.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/SSLSocket.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/SSLSessionBindingEvent.lo:  \
-       javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/HostnameVerifier.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/SSLSessionBindingListener.lo:  \
+javax/net/ssl/HandshakeCompletedListener.lo:  \
        javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/SSLSessionContext.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/HttpsURLConnection.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/SSLSocket.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/KeyManagerFactorySpi.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/SSLSocketFactory.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/SSLHandshakeException.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/TrivialHostnameVerifier.lo:  \
+javax/net/ssl/SSLPeerUnverifiedException.lo:  \
        javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/TrustManager.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/X509TrustManager.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/TrustManagerFactory.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/SSLSession.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/TrustManagerFactorySpi.lo:  \
+javax/net/ssl/SSLContextSpi.lo: javax/net/ssl/$(am__dirstamp) \
+       javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
+javax/net/ssl/HandshakeCompletedEvent.lo:  \
        javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/X509KeyManager.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/SSLSessionBindingEvent.lo:  \
+       javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/ssl/X509TrustManager.lo: javax/net/ssl/$(am__dirstamp) \
+javax/net/ssl/SSLException.lo: javax/net/ssl/$(am__dirstamp) \
        javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
-javax/net/VanillaSocketFactory.lo: javax/net/$(am__dirstamp) \
+javax/net/ssl/ManagerFactoryParameters.lo:  \
+       javax/net/ssl/$(am__dirstamp) \
+       javax/net/ssl/$(DEPDIR)/$(am__dirstamp)
+javax/net/SocketFactory.lo: javax/net/$(am__dirstamp) \
        javax/net/$(DEPDIR)/$(am__dirstamp)
 javax/net/VanillaServerSocketFactory.lo: javax/net/$(am__dirstamp) \
        javax/net/$(DEPDIR)/$(am__dirstamp)
-javax/print/$(am__dirstamp):
-       @$(mkdir_p) javax/print
-       @: > javax/print/$(am__dirstamp)
-javax/print/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/print/$(DEPDIR)
-       @: > javax/print/$(DEPDIR)/$(am__dirstamp)
-javax/print/AttributeException.lo: javax/print/$(am__dirstamp) \
-       javax/print/$(DEPDIR)/$(am__dirstamp)
-javax/print/CancelablePrintJob.lo: javax/print/$(am__dirstamp) \
-       javax/print/$(DEPDIR)/$(am__dirstamp)
-javax/print/Doc.lo: javax/print/$(am__dirstamp) \
-       javax/print/$(DEPDIR)/$(am__dirstamp)
-javax/print/DocFlavor.lo: javax/print/$(am__dirstamp) \
-       javax/print/$(DEPDIR)/$(am__dirstamp)
-javax/print/DocPrintJob.lo: javax/print/$(am__dirstamp) \
-       javax/print/$(DEPDIR)/$(am__dirstamp)
-javax/print/FlavorException.lo: javax/print/$(am__dirstamp) \
-       javax/print/$(DEPDIR)/$(am__dirstamp)
-javax/print/MultiDoc.lo: javax/print/$(am__dirstamp) \
-       javax/print/$(DEPDIR)/$(am__dirstamp)
-javax/print/MultiDocPrintJob.lo: javax/print/$(am__dirstamp) \
-       javax/print/$(DEPDIR)/$(am__dirstamp)
-javax/print/MultiDocPrintService.lo: javax/print/$(am__dirstamp) \
-       javax/print/$(DEPDIR)/$(am__dirstamp)
-javax/print/PrintException.lo: javax/print/$(am__dirstamp) \
-       javax/print/$(DEPDIR)/$(am__dirstamp)
-javax/print/PrintService.lo: javax/print/$(am__dirstamp) \
-       javax/print/$(DEPDIR)/$(am__dirstamp)
-javax/print/PrintServiceLookup.lo: javax/print/$(am__dirstamp) \
-       javax/print/$(DEPDIR)/$(am__dirstamp)
-javax/print/ServiceUIFactory.lo: javax/print/$(am__dirstamp) \
-       javax/print/$(DEPDIR)/$(am__dirstamp)
-javax/print/StreamPrintService.lo: javax/print/$(am__dirstamp) \
-       javax/print/$(DEPDIR)/$(am__dirstamp)
-javax/print/URIException.lo: javax/print/$(am__dirstamp) \
-       javax/print/$(DEPDIR)/$(am__dirstamp)
+javax/net/ServerSocketFactory.lo: javax/net/$(am__dirstamp) \
+       javax/net/$(DEPDIR)/$(am__dirstamp)
 javax/print/attribute/$(am__dirstamp):
        @$(mkdir_p) javax/print/attribute
        @: > javax/print/attribute/$(am__dirstamp)
 javax/print/attribute/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) javax/print/attribute/$(DEPDIR)
        @: > javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/Attribute.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/AttributeSet.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/AttributeSetUtilities.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/DateTimeSyntax.lo:  \
+javax/print/attribute/HashPrintServiceAttributeSet.lo:  \
        javax/print/attribute/$(am__dirstamp) \
        javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/DocAttribute.lo:  \
+javax/print/attribute/Attribute.lo:  \
        javax/print/attribute/$(am__dirstamp) \
        javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
 javax/print/attribute/DocAttributeSet.lo:  \
        javax/print/attribute/$(am__dirstamp) \
        javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/EnumSyntax.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/HashAttributeSet.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/HashDocAttributeSet.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/HashPrintJobAttributeSet.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/HashPrintRequestAttributeSet.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/HashPrintServiceAttributeSet.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/IntegerSyntax.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/PrintJobAttribute.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/PrintJobAttributeSet.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/PrintRequestAttribute.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/PrintRequestAttributeSet.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/PrintServiceAttribute.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/PrintServiceAttributeSet.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/ResolutionSyntax.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/SetOfIntegerSyntax.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/Size2DSyntax.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/SupportedValuesAttribute.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/TextSyntax.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/UnmodifiableSetException.lo:  \
-       javax/print/attribute/$(am__dirstamp) \
-       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/URISyntax.lo:  \
+javax/print/attribute/PrintRequestAttributeSet.lo:  \
        javax/print/attribute/$(am__dirstamp) \
        javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
 javax/print/attribute/standard/$(am__dirstamp):
@@ -14163,195 +13913,273 @@ javax/print/attribute/standard/$(am__dirstamp):
 javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) javax/print/attribute/standard/$(DEPDIR)
        @: > javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/ColorSupported.lo:  \
+javax/print/attribute/standard/NumberOfInterveningJobs.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/Compression.lo:  \
+javax/print/attribute/standard/PrinterMakeAndModel.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/Copies.lo:  \
+javax/print/attribute/standard/PrinterStateReason.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/CopiesSupported.lo:  \
+javax/print/attribute/standard/JobImpressions.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/DateTimeAtCompleted.lo:  \
+javax/print/attribute/standard/JobHoldUntil.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/DateTimeAtCreation.lo:  \
+javax/print/attribute/standard/JobKOctetsSupported.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/DateTimeAtProcessing.lo:  \
+javax/print/attribute/standard/JobPriority.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/DocumentName.lo:  \
+javax/print/attribute/standard/QueuedJobCount.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/Fidelity.lo:  \
+javax/print/attribute/standard/JobOriginatingUserName.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/Finishings.lo:  \
+javax/print/attribute/standard/PrinterName.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobHoldUntil.lo:  \
+javax/print/attribute/standard/PDLOverrideSupported.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobImpressions.lo:  \
+javax/print/attribute/standard/PrinterStateReasons.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobImpressionsCompleted.lo:  \
+javax/print/attribute/standard/JobMediaSheets.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobImpressionsSupported.lo:  \
+javax/print/attribute/standard/JobKOctets.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobKOctets.lo:  \
+javax/print/attribute/standard/MultipleDocumentHandling.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobKOctetsProcessed.lo:  \
+javax/print/attribute/standard/PrinterMessageFromOperator.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobKOctetsSupported.lo:  \
+javax/print/attribute/standard/Severity.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobMediaSheets.lo:  \
+javax/print/attribute/standard/ReferenceUriSchemesSupported.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobMediaSheetsCompleted.lo:  \
+javax/print/attribute/standard/DocumentName.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobMediaSheetsSupported.lo:  \
+javax/print/attribute/standard/PrinterMoreInfo.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
 javax/print/attribute/standard/JobMessageFromOperator.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobName.lo:  \
+javax/print/attribute/standard/JobStateReasons.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobOriginatingUserName.lo:  \
+javax/print/attribute/standard/PrinterIsAcceptingJobs.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobPriority.lo:  \
+javax/print/attribute/standard/DateTimeAtProcessing.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobPrioritySupported.lo:  \
+javax/print/attribute/standard/PagesPerMinute.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobSheets.lo:  \
+javax/print/attribute/standard/PrinterResolution.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobState.lo:  \
+javax/print/attribute/standard/JobMediaSheetsSupported.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobStateReason.lo:  \
+javax/print/attribute/standard/NumberUpSupported.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/JobStateReasons.lo:  \
+javax/print/attribute/standard/Finishings.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/Media.lo:  \
+javax/print/attribute/standard/DateTimeAtCompleted.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/MediaSizeName.lo:  \
+javax/print/attribute/standard/NumberOfDocuments.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/MultipleDocumentHandling.lo:  \
+javax/print/attribute/standard/PrinterInfo.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/NumberOfDocuments.lo:  \
+javax/print/attribute/standard/PrintQuality.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/NumberOfInterveningJobs.lo:  \
+javax/print/attribute/standard/JobSheets.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/NumberUp.lo:  \
+javax/print/attribute/standard/Media.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/NumberUpSupported.lo:  \
+javax/print/attribute/standard/Fidelity.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/OrientationRequested.lo:  \
+javax/print/attribute/standard/PrinterLocation.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/OutputDeviceAssigned.lo:  \
+javax/print/attribute/standard/PrinterMoreInfoManufacturer.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PDLOverrideSupported.lo:  \
+javax/print/attribute/standard/OrientationRequested.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PageRanges.lo:  \
+javax/print/attribute/standard/JobState.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PagesPerMinute.lo:  \
+javax/print/attribute/standard/DateTimeAtCreation.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PagesPerMinuteColor.lo:  \
+javax/print/attribute/standard/PresentationDirection.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PresentationDirection.lo:  \
+javax/print/attribute/standard/JobName.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PrintQuality.lo:  \
+javax/print/attribute/standard/PagesPerMinuteColor.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PrinterInfo.lo:  \
+javax/print/attribute/standard/CopiesSupported.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PrinterIsAcceptingJobs.lo:  \
+javax/print/attribute/standard/PrinterURI.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PrinterLocation.lo:  \
+javax/print/attribute/standard/PageRanges.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PrinterMakeAndModel.lo:  \
+javax/print/attribute/standard/RequestingUserName.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PrinterMessageFromOperator.lo:  \
+javax/print/attribute/standard/JobPrioritySupported.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PrinterMoreInfo.lo:  \
+javax/print/attribute/standard/JobMediaSheetsCompleted.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PrinterMoreInfoManufacturer.lo:  \
+javax/print/attribute/standard/JobKOctetsProcessed.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PrinterName.lo:  \
+javax/print/attribute/standard/JobImpressionsCompleted.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PrinterResolution.lo:  \
+javax/print/attribute/standard/Compression.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PrinterState.lo:  \
+javax/print/attribute/standard/JobImpressionsSupported.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PrinterStateReason.lo:  \
+javax/print/attribute/standard/Sides.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PrinterStateReasons.lo:  \
+javax/print/attribute/standard/JobStateReason.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/PrinterURI.lo:  \
+javax/print/attribute/standard/SheetCollate.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/QueuedJobCount.lo:  \
+javax/print/attribute/standard/Copies.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/ReferenceUriSchemesSupported.lo:  \
+javax/print/attribute/standard/MediaSizeName.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/RequestingUserName.lo:  \
+javax/print/attribute/standard/OutputDeviceAssigned.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/Severity.lo:  \
+javax/print/attribute/standard/PrinterState.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/SheetCollate.lo:  \
+javax/print/attribute/standard/NumberUp.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
-javax/print/attribute/standard/Sides.lo:  \
+javax/print/attribute/standard/ColorSupported.lo:  \
        javax/print/attribute/standard/$(am__dirstamp) \
        javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/HashAttributeSet.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/SetOfIntegerSyntax.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/HashDocAttributeSet.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/PrintRequestAttribute.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/DateTimeSyntax.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/PrintServiceAttribute.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/UnmodifiableSetException.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/HashPrintJobAttributeSet.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/PrintJobAttribute.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/AttributeSet.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/ResolutionSyntax.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/URISyntax.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/AttributeSetUtilities.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/HashPrintRequestAttributeSet.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/TextSyntax.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/PrintJobAttributeSet.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/SupportedValuesAttribute.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/EnumSyntax.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/DocAttribute.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/Size2DSyntax.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/IntegerSyntax.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/attribute/PrintServiceAttributeSet.lo:  \
+       javax/print/attribute/$(am__dirstamp) \
+       javax/print/attribute/$(DEPDIR)/$(am__dirstamp)
+javax/print/$(am__dirstamp):
+       @$(mkdir_p) javax/print
+       @: > javax/print/$(am__dirstamp)
+javax/print/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/print/$(DEPDIR)
+       @: > javax/print/$(DEPDIR)/$(am__dirstamp)
+javax/print/PrintService.lo: javax/print/$(am__dirstamp) \
+       javax/print/$(DEPDIR)/$(am__dirstamp)
+javax/print/DocFlavor.lo: javax/print/$(am__dirstamp) \
+       javax/print/$(DEPDIR)/$(am__dirstamp)
+javax/print/DocPrintJob.lo: javax/print/$(am__dirstamp) \
+       javax/print/$(DEPDIR)/$(am__dirstamp)
 javax/print/event/$(am__dirstamp):
        @$(mkdir_p) javax/print/event
        @: > javax/print/event/$(am__dirstamp)
@@ -14363,10 +14191,13 @@ javax/print/event/PrintEvent.lo: javax/print/event/$(am__dirstamp) \
 javax/print/event/PrintJobAdapter.lo:  \
        javax/print/event/$(am__dirstamp) \
        javax/print/event/$(DEPDIR)/$(am__dirstamp)
+javax/print/event/PrintServiceAttributeEvent.lo:  \
+       javax/print/event/$(am__dirstamp) \
+       javax/print/event/$(DEPDIR)/$(am__dirstamp)
 javax/print/event/PrintJobAttributeEvent.lo:  \
        javax/print/event/$(am__dirstamp) \
        javax/print/event/$(DEPDIR)/$(am__dirstamp)
-javax/print/event/PrintJobAttributeListener.lo:  \
+javax/print/event/PrintServiceAttributeListener.lo:  \
        javax/print/event/$(am__dirstamp) \
        javax/print/event/$(DEPDIR)/$(am__dirstamp)
 javax/print/event/PrintJobEvent.lo: javax/print/event/$(am__dirstamp) \
@@ -14374,289 +14205,1394 @@ javax/print/event/PrintJobEvent.lo: javax/print/event/$(am__dirstamp) \
 javax/print/event/PrintJobListener.lo:  \
        javax/print/event/$(am__dirstamp) \
        javax/print/event/$(DEPDIR)/$(am__dirstamp)
-javax/print/event/PrintServiceAttributeEvent.lo:  \
-       javax/print/event/$(am__dirstamp) \
-       javax/print/event/$(DEPDIR)/$(am__dirstamp)
-javax/print/event/PrintServiceAttributeListener.lo:  \
+javax/print/event/PrintJobAttributeListener.lo:  \
        javax/print/event/$(am__dirstamp) \
        javax/print/event/$(DEPDIR)/$(am__dirstamp)
+javax/print/PrintServiceLookup.lo: javax/print/$(am__dirstamp) \
+       javax/print/$(DEPDIR)/$(am__dirstamp)
+javax/print/URIException.lo: javax/print/$(am__dirstamp) \
+       javax/print/$(DEPDIR)/$(am__dirstamp)
+javax/print/StreamPrintService.lo: javax/print/$(am__dirstamp) \
+       javax/print/$(DEPDIR)/$(am__dirstamp)
+javax/print/MultiDoc.lo: javax/print/$(am__dirstamp) \
+       javax/print/$(DEPDIR)/$(am__dirstamp)
+javax/print/FlavorException.lo: javax/print/$(am__dirstamp) \
+       javax/print/$(DEPDIR)/$(am__dirstamp)
+javax/print/Doc.lo: javax/print/$(am__dirstamp) \
+       javax/print/$(DEPDIR)/$(am__dirstamp)
+javax/print/MultiDocPrintJob.lo: javax/print/$(am__dirstamp) \
+       javax/print/$(DEPDIR)/$(am__dirstamp)
+javax/print/CancelablePrintJob.lo: javax/print/$(am__dirstamp) \
+       javax/print/$(DEPDIR)/$(am__dirstamp)
+javax/print/MultiDocPrintService.lo: javax/print/$(am__dirstamp) \
+       javax/print/$(DEPDIR)/$(am__dirstamp)
+javax/print/ServiceUIFactory.lo: javax/print/$(am__dirstamp) \
+       javax/print/$(DEPDIR)/$(am__dirstamp)
+javax/print/AttributeException.lo: javax/print/$(am__dirstamp) \
+       javax/print/$(DEPDIR)/$(am__dirstamp)
+javax/print/PrintException.lo: javax/print/$(am__dirstamp) \
+       javax/print/$(DEPDIR)/$(am__dirstamp)
+javax/naming/$(am__dirstamp):
+       @$(mkdir_p) javax/naming
+       @: > javax/naming/$(am__dirstamp)
+javax/naming/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/naming/$(DEPDIR)
+       @: > javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/ServiceUnavailableException.lo:  \
+       javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/$(am__dirstamp):
+       @$(mkdir_p) javax/naming/directory
+       @: > javax/naming/directory/$(am__dirstamp)
+javax/naming/directory/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/naming/directory/$(DEPDIR)
+       @: > javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/Attribute.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/SchemaViolationException.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/InitialDirContext.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/BasicAttribute.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/NoSuchAttributeException.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/InvalidAttributesException.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/InvalidAttributeValueException.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/BasicAttributes.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/AttributeModificationException.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/InvalidAttributeIdentifierException.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/DirContext.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/Attributes.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/InvalidSearchControlsException.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/SearchControls.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/AttributeInUseException.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/InvalidSearchFilterException.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/ModificationItem.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/directory/SearchResult.lo:  \
+       javax/naming/directory/$(am__dirstamp) \
+       javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
+javax/naming/Binding.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/ContextNotEmptyException.lo:  \
+       javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/Referenceable.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/InterruptedNamingException.lo:  \
+       javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/CommunicationException.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/LinkException.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/BinaryRefAddr.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/LinkLoopException.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/AuthenticationException.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/NameAlreadyBoundException.lo:  \
+       javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/MalformedLinkException.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/NotContextException.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/spi/$(am__dirstamp):
+       @$(mkdir_p) javax/naming/spi
+       @: > javax/naming/spi/$(am__dirstamp)
+javax/naming/spi/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/naming/spi/$(DEPDIR)
+       @: > javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
+javax/naming/spi/DirStateFactory.lo: javax/naming/spi/$(am__dirstamp) \
+       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
+javax/naming/spi/ResolveResult.lo: javax/naming/spi/$(am__dirstamp) \
+       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
+javax/naming/spi/ObjectFactoryBuilder.lo:  \
+       javax/naming/spi/$(am__dirstamp) \
+       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
+javax/naming/spi/DirObjectFactory.lo:  \
+       javax/naming/spi/$(am__dirstamp) \
+       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
+javax/naming/spi/DirectoryManager.lo:  \
+       javax/naming/spi/$(am__dirstamp) \
+       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
+javax/naming/spi/InitialContextFactoryBuilder.lo:  \
+       javax/naming/spi/$(am__dirstamp) \
+       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
+javax/naming/spi/ObjectFactory.lo: javax/naming/spi/$(am__dirstamp) \
+       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
+javax/naming/spi/Resolver.lo: javax/naming/spi/$(am__dirstamp) \
+       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
+javax/naming/spi/StateFactory.lo: javax/naming/spi/$(am__dirstamp) \
+       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
+javax/naming/spi/InitialContextFactory.lo:  \
+       javax/naming/spi/$(am__dirstamp) \
+       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
+javax/naming/spi/NamingManager.lo: javax/naming/spi/$(am__dirstamp) \
+       javax/naming/spi/$(DEPDIR)/$(am__dirstamp)
+javax/naming/InvalidNameException.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/NamingEnumeration.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/LinkRef.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/event/$(am__dirstamp):
+       @$(mkdir_p) javax/naming/event
+       @: > javax/naming/event/$(am__dirstamp)
+javax/naming/event/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/naming/event/$(DEPDIR)
+       @: > javax/naming/event/$(DEPDIR)/$(am__dirstamp)
+javax/naming/event/NamingListener.lo:  \
+       javax/naming/event/$(am__dirstamp) \
+       javax/naming/event/$(DEPDIR)/$(am__dirstamp)
+javax/naming/event/NamingEvent.lo: javax/naming/event/$(am__dirstamp) \
+       javax/naming/event/$(DEPDIR)/$(am__dirstamp)
+javax/naming/event/NamespaceChangeListener.lo:  \
+       javax/naming/event/$(am__dirstamp) \
+       javax/naming/event/$(DEPDIR)/$(am__dirstamp)
+javax/naming/event/ObjectChangeListener.lo:  \
+       javax/naming/event/$(am__dirstamp) \
+       javax/naming/event/$(DEPDIR)/$(am__dirstamp)
+javax/naming/event/EventContext.lo:  \
+       javax/naming/event/$(am__dirstamp) \
+       javax/naming/event/$(DEPDIR)/$(am__dirstamp)
+javax/naming/event/NamingExceptionEvent.lo:  \
+       javax/naming/event/$(am__dirstamp) \
+       javax/naming/event/$(DEPDIR)/$(am__dirstamp)
+javax/naming/event/EventDirContext.lo:  \
+       javax/naming/event/$(am__dirstamp) \
+       javax/naming/event/$(DEPDIR)/$(am__dirstamp)
+javax/naming/NamingException.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/CannotProceedException.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/PartialResultException.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/TimeLimitExceededException.lo:  \
+       javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/NoPermissionException.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/CompoundName.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/SizeLimitExceededException.lo:  \
+       javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/NoInitialContextException.lo:  \
+       javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/NameNotFoundException.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/InitialContext.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/NamingSecurityException.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/Context.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/ConfigurationException.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/InsufficientResourcesException.lo:  \
+       javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/AuthenticationNotSupportedException.lo:  \
+       javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/StringRefAddr.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/ldap/$(am__dirstamp):
+       @$(mkdir_p) javax/naming/ldap
+       @: > javax/naming/ldap/$(am__dirstamp)
+javax/naming/ldap/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/naming/ldap/$(DEPDIR)
+       @: > javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
+javax/naming/ldap/InitialLdapContext.lo:  \
+       javax/naming/ldap/$(am__dirstamp) \
+       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
+javax/naming/ldap/ExtendedRequest.lo:  \
+       javax/naming/ldap/$(am__dirstamp) \
+       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
+javax/naming/ldap/Control.lo: javax/naming/ldap/$(am__dirstamp) \
+       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
+javax/naming/ldap/UnsolicitedNotificationListener.lo:  \
+       javax/naming/ldap/$(am__dirstamp) \
+       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
+javax/naming/ldap/LdapReferralException.lo:  \
+       javax/naming/ldap/$(am__dirstamp) \
+       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
+javax/naming/ldap/UnsolicitedNotificationEvent.lo:  \
+       javax/naming/ldap/$(am__dirstamp) \
+       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
+javax/naming/ldap/HasControls.lo: javax/naming/ldap/$(am__dirstamp) \
+       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
+javax/naming/ldap/LdapContext.lo: javax/naming/ldap/$(am__dirstamp) \
+       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
+javax/naming/ldap/ExtendedResponse.lo:  \
+       javax/naming/ldap/$(am__dirstamp) \
+       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
+javax/naming/ldap/UnsolicitedNotification.lo:  \
+       javax/naming/ldap/$(am__dirstamp) \
+       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
+javax/naming/ldap/ControlFactory.lo:  \
+       javax/naming/ldap/$(am__dirstamp) \
+       javax/naming/ldap/$(DEPDIR)/$(am__dirstamp)
+javax/naming/OperationNotSupportedException.lo:  \
+       javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/ReferralException.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/LimitExceededException.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/Reference.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/NameParser.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/NameClassPair.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/RefAddr.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/CompositeName.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/naming/Name.lo: javax/naming/$(am__dirstamp) \
+       javax/naming/$(DEPDIR)/$(am__dirstamp)
+javax/xml/xpath/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/xpath
+       @: > javax/xml/xpath/$(am__dirstamp)
+javax/xml/xpath/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/xpath/$(DEPDIR)
+       @: > javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+javax/xml/xpath/XPathConstants.lo: javax/xml/xpath/$(am__dirstamp) \
+       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+javax/xml/xpath/XPathFunction.lo: javax/xml/xpath/$(am__dirstamp) \
+       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+javax/xml/xpath/XPathVariableResolver.lo:  \
+       javax/xml/xpath/$(am__dirstamp) \
+       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+javax/xml/xpath/XPathExpressionException.lo:  \
+       javax/xml/xpath/$(am__dirstamp) \
+       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+javax/xml/xpath/XPathFunctionResolver.lo:  \
+       javax/xml/xpath/$(am__dirstamp) \
+       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+javax/xml/xpath/XPath.lo: javax/xml/xpath/$(am__dirstamp) \
+       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+javax/xml/xpath/XPathFactoryConfigurationException.lo:  \
+       javax/xml/xpath/$(am__dirstamp) \
+       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+javax/xml/xpath/XPathFactory.lo: javax/xml/xpath/$(am__dirstamp) \
+       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+javax/xml/xpath/XPathException.lo: javax/xml/xpath/$(am__dirstamp) \
+       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+javax/xml/xpath/XPathExpression.lo: javax/xml/xpath/$(am__dirstamp) \
+       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+javax/xml/xpath/XPathFunctionException.lo:  \
+       javax/xml/xpath/$(am__dirstamp) \
+       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+javax/xml/validation/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/validation
+       @: > javax/xml/validation/$(am__dirstamp)
+javax/xml/validation/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/validation/$(DEPDIR)
+       @: > javax/xml/validation/$(DEPDIR)/$(am__dirstamp)
+javax/xml/validation/ValidatorHandler.lo:  \
+       javax/xml/validation/$(am__dirstamp) \
+       javax/xml/validation/$(DEPDIR)/$(am__dirstamp)
+javax/xml/validation/Validator.lo:  \
+       javax/xml/validation/$(am__dirstamp) \
+       javax/xml/validation/$(DEPDIR)/$(am__dirstamp)
+javax/xml/validation/TypeInfoProvider.lo:  \
+       javax/xml/validation/$(am__dirstamp) \
+       javax/xml/validation/$(DEPDIR)/$(am__dirstamp)
+javax/xml/validation/SchemaFactory.lo:  \
+       javax/xml/validation/$(am__dirstamp) \
+       javax/xml/validation/$(DEPDIR)/$(am__dirstamp)
+javax/xml/validation/Schema.lo: javax/xml/validation/$(am__dirstamp) \
+       javax/xml/validation/$(DEPDIR)/$(am__dirstamp)
+javax/xml/parsers/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/parsers
+       @: > javax/xml/parsers/$(am__dirstamp)
+javax/xml/parsers/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/parsers/$(DEPDIR)
+       @: > javax/xml/parsers/$(DEPDIR)/$(am__dirstamp)
+javax/xml/parsers/SAXParserFactory.lo:  \
+       javax/xml/parsers/$(am__dirstamp) \
+       javax/xml/parsers/$(DEPDIR)/$(am__dirstamp)
+javax/xml/parsers/FactoryConfigurationError.lo:  \
+       javax/xml/parsers/$(am__dirstamp) \
+       javax/xml/parsers/$(DEPDIR)/$(am__dirstamp)
+javax/xml/parsers/SAXParser.lo: javax/xml/parsers/$(am__dirstamp) \
+       javax/xml/parsers/$(DEPDIR)/$(am__dirstamp)
+javax/xml/parsers/DocumentBuilderFactory.lo:  \
+       javax/xml/parsers/$(am__dirstamp) \
+       javax/xml/parsers/$(DEPDIR)/$(am__dirstamp)
+javax/xml/parsers/ParserConfigurationException.lo:  \
+       javax/xml/parsers/$(am__dirstamp) \
+       javax/xml/parsers/$(DEPDIR)/$(am__dirstamp)
+javax/xml/parsers/DocumentBuilder.lo:  \
+       javax/xml/parsers/$(am__dirstamp) \
+       javax/xml/parsers/$(DEPDIR)/$(am__dirstamp)
+javax/xml/datatype/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/datatype
+       @: > javax/xml/datatype/$(am__dirstamp)
+javax/xml/datatype/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/datatype/$(DEPDIR)
+       @: > javax/xml/datatype/$(DEPDIR)/$(am__dirstamp)
+javax/xml/datatype/DatatypeFactory.lo:  \
+       javax/xml/datatype/$(am__dirstamp) \
+       javax/xml/datatype/$(DEPDIR)/$(am__dirstamp)
+javax/xml/datatype/XMLGregorianCalendar.lo:  \
+       javax/xml/datatype/$(am__dirstamp) \
+       javax/xml/datatype/$(DEPDIR)/$(am__dirstamp)
+javax/xml/datatype/Duration.lo: javax/xml/datatype/$(am__dirstamp) \
+       javax/xml/datatype/$(DEPDIR)/$(am__dirstamp)
+javax/xml/datatype/DatatypeConfigurationException.lo:  \
+       javax/xml/datatype/$(am__dirstamp) \
+       javax/xml/datatype/$(DEPDIR)/$(am__dirstamp)
+javax/xml/datatype/DatatypeConstants.lo:  \
+       javax/xml/datatype/$(am__dirstamp) \
+       javax/xml/datatype/$(DEPDIR)/$(am__dirstamp)
+javax/xml/$(am__dirstamp):
+       @$(mkdir_p) javax/xml
+       @: > javax/xml/$(am__dirstamp)
+javax/xml/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/$(DEPDIR)
+       @: > javax/xml/$(DEPDIR)/$(am__dirstamp)
+javax/xml/XMLConstants.lo: javax/xml/$(am__dirstamp) \
+       javax/xml/$(DEPDIR)/$(am__dirstamp)
+javax/xml/namespace/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/namespace
+       @: > javax/xml/namespace/$(am__dirstamp)
+javax/xml/namespace/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/namespace/$(DEPDIR)
+       @: > javax/xml/namespace/$(DEPDIR)/$(am__dirstamp)
+javax/xml/namespace/NamespaceContext.lo:  \
+       javax/xml/namespace/$(am__dirstamp) \
+       javax/xml/namespace/$(DEPDIR)/$(am__dirstamp)
+javax/xml/namespace/QName.lo: javax/xml/namespace/$(am__dirstamp) \
+       javax/xml/namespace/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/transform
+       @: > javax/xml/transform/$(am__dirstamp)
+javax/xml/transform/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/transform/$(DEPDIR)
+       @: > javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/TransformerException.lo:  \
+       javax/xml/transform/$(am__dirstamp) \
+       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/TransformerFactoryConfigurationError.lo:  \
+       javax/xml/transform/$(am__dirstamp) \
+       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/sax/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/transform/sax
+       @: > javax/xml/transform/sax/$(am__dirstamp)
+javax/xml/transform/sax/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/transform/sax/$(DEPDIR)
+       @: > javax/xml/transform/sax/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/sax/SAXResult.lo:  \
+       javax/xml/transform/sax/$(am__dirstamp) \
+       javax/xml/transform/sax/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/sax/TransformerHandler.lo:  \
+       javax/xml/transform/sax/$(am__dirstamp) \
+       javax/xml/transform/sax/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/sax/SAXTransformerFactory.lo:  \
+       javax/xml/transform/sax/$(am__dirstamp) \
+       javax/xml/transform/sax/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/sax/SAXSource.lo:  \
+       javax/xml/transform/sax/$(am__dirstamp) \
+       javax/xml/transform/sax/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/sax/TemplatesHandler.lo:  \
+       javax/xml/transform/sax/$(am__dirstamp) \
+       javax/xml/transform/sax/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/OutputKeys.lo:  \
+       javax/xml/transform/$(am__dirstamp) \
+       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/stream/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/transform/stream
+       @: > javax/xml/transform/stream/$(am__dirstamp)
+javax/xml/transform/stream/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/transform/stream/$(DEPDIR)
+       @: > javax/xml/transform/stream/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/stream/StreamResult.lo:  \
+       javax/xml/transform/stream/$(am__dirstamp) \
+       javax/xml/transform/stream/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/stream/StreamSource.lo:  \
+       javax/xml/transform/stream/$(am__dirstamp) \
+       javax/xml/transform/stream/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/Source.lo: javax/xml/transform/$(am__dirstamp) \
+       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/SourceLocator.lo:  \
+       javax/xml/transform/$(am__dirstamp) \
+       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/ErrorListener.lo:  \
+       javax/xml/transform/$(am__dirstamp) \
+       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/TransformerConfigurationException.lo:  \
+       javax/xml/transform/$(am__dirstamp) \
+       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/Templates.lo: javax/xml/transform/$(am__dirstamp) \
+       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/Result.lo: javax/xml/transform/$(am__dirstamp) \
+       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/URIResolver.lo:  \
+       javax/xml/transform/$(am__dirstamp) \
+       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/dom/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/transform/dom
+       @: > javax/xml/transform/dom/$(am__dirstamp)
+javax/xml/transform/dom/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/xml/transform/dom/$(DEPDIR)
+       @: > javax/xml/transform/dom/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/dom/DOMSource.lo:  \
+       javax/xml/transform/dom/$(am__dirstamp) \
+       javax/xml/transform/dom/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/dom/DOMLocator.lo:  \
+       javax/xml/transform/dom/$(am__dirstamp) \
+       javax/xml/transform/dom/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/dom/DOMResult.lo:  \
+       javax/xml/transform/dom/$(am__dirstamp) \
+       javax/xml/transform/dom/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/Transformer.lo:  \
+       javax/xml/transform/$(am__dirstamp) \
+       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
+javax/xml/transform/TransformerFactory.lo:  \
+       javax/xml/transform/$(am__dirstamp) \
+       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
+javax/security/cert/$(am__dirstamp):
+       @$(mkdir_p) javax/security/cert
+       @: > javax/security/cert/$(am__dirstamp)
+javax/security/cert/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/security/cert/$(DEPDIR)
+       @: > javax/security/cert/$(DEPDIR)/$(am__dirstamp)
+javax/security/cert/CertificateNotYetValidException.lo:  \
+       javax/security/cert/$(am__dirstamp) \
+       javax/security/cert/$(DEPDIR)/$(am__dirstamp)
+javax/security/cert/Certificate.lo:  \
+       javax/security/cert/$(am__dirstamp) \
+       javax/security/cert/$(DEPDIR)/$(am__dirstamp)
+javax/security/cert/X509Certificate.lo:  \
+       javax/security/cert/$(am__dirstamp) \
+       javax/security/cert/$(DEPDIR)/$(am__dirstamp)
+javax/security/cert/X509CertBridge.lo:  \
+       javax/security/cert/$(am__dirstamp) \
+       javax/security/cert/$(DEPDIR)/$(am__dirstamp)
+javax/security/cert/CertificateEncodingException.lo:  \
+       javax/security/cert/$(am__dirstamp) \
+       javax/security/cert/$(DEPDIR)/$(am__dirstamp)
+javax/security/cert/CertificateExpiredException.lo:  \
+       javax/security/cert/$(am__dirstamp) \
+       javax/security/cert/$(DEPDIR)/$(am__dirstamp)
+javax/security/cert/CertificateException.lo:  \
+       javax/security/cert/$(am__dirstamp) \
+       javax/security/cert/$(DEPDIR)/$(am__dirstamp)
+javax/security/cert/CertificateParsingException.lo:  \
+       javax/security/cert/$(am__dirstamp) \
+       javax/security/cert/$(DEPDIR)/$(am__dirstamp)
 javax/security/auth/$(am__dirstamp):
        @$(mkdir_p) javax/security/auth
        @: > javax/security/auth/$(am__dirstamp)
 javax/security/auth/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) javax/security/auth/$(DEPDIR)
        @: > javax/security/auth/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/AuthPermission.lo:  \
-       javax/security/auth/$(am__dirstamp) \
-       javax/security/auth/$(DEPDIR)/$(am__dirstamp)
 javax/security/auth/Destroyable.lo:  \
        javax/security/auth/$(am__dirstamp) \
        javax/security/auth/$(DEPDIR)/$(am__dirstamp)
+javax/security/auth/x500/$(am__dirstamp):
+       @$(mkdir_p) javax/security/auth/x500
+       @: > javax/security/auth/x500/$(am__dirstamp)
+javax/security/auth/x500/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/security/auth/x500/$(DEPDIR)
+       @: > javax/security/auth/x500/$(DEPDIR)/$(am__dirstamp)
+javax/security/auth/x500/X500PrivateCredential.lo:  \
+       javax/security/auth/x500/$(am__dirstamp) \
+       javax/security/auth/x500/$(DEPDIR)/$(am__dirstamp)
+javax/security/auth/x500/X500Principal.lo:  \
+       javax/security/auth/x500/$(am__dirstamp) \
+       javax/security/auth/x500/$(DEPDIR)/$(am__dirstamp)
+javax/security/auth/spi/$(am__dirstamp):
+       @$(mkdir_p) javax/security/auth/spi
+       @: > javax/security/auth/spi/$(am__dirstamp)
+javax/security/auth/spi/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/security/auth/spi/$(DEPDIR)
+       @: > javax/security/auth/spi/$(DEPDIR)/$(am__dirstamp)
+javax/security/auth/spi/LoginModule.lo:  \
+       javax/security/auth/spi/$(am__dirstamp) \
+       javax/security/auth/spi/$(DEPDIR)/$(am__dirstamp)
 javax/security/auth/DestroyFailedException.lo:  \
        javax/security/auth/$(am__dirstamp) \
        javax/security/auth/$(DEPDIR)/$(am__dirstamp)
+javax/security/auth/SubjectDomainCombiner.lo:  \
+       javax/security/auth/$(am__dirstamp) \
+       javax/security/auth/$(DEPDIR)/$(am__dirstamp)
+javax/security/auth/AuthPermission.lo:  \
+       javax/security/auth/$(am__dirstamp) \
+       javax/security/auth/$(DEPDIR)/$(am__dirstamp)
 javax/security/auth/login/$(am__dirstamp):
        @$(mkdir_p) javax/security/auth/login
        @: > javax/security/auth/login/$(am__dirstamp)
 javax/security/auth/login/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) javax/security/auth/login/$(DEPDIR)
        @: > javax/security/auth/login/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/login/AccountExpiredException.lo:  \
+javax/security/auth/login/CredentialExpiredException.lo:  \
        javax/security/auth/login/$(am__dirstamp) \
        javax/security/auth/login/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/login/AppConfigurationEntry.lo:  \
+javax/security/auth/login/NullConfiguration.lo:  \
        javax/security/auth/login/$(am__dirstamp) \
        javax/security/auth/login/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/login/Configuration.lo:  \
+javax/security/auth/login/AccountExpiredException.lo:  \
        javax/security/auth/login/$(am__dirstamp) \
        javax/security/auth/login/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/login/CredentialExpiredException.lo:  \
+javax/security/auth/login/LoginException.lo:  \
        javax/security/auth/login/$(am__dirstamp) \
        javax/security/auth/login/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/login/FailedLoginException.lo:  \
+javax/security/auth/login/AppConfigurationEntry.lo:  \
        javax/security/auth/login/$(am__dirstamp) \
        javax/security/auth/login/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/login/LoginContext.lo:  \
+javax/security/auth/login/Configuration.lo:  \
        javax/security/auth/login/$(am__dirstamp) \
        javax/security/auth/login/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/login/LoginException.lo:  \
+javax/security/auth/login/LoginContext.lo:  \
        javax/security/auth/login/$(am__dirstamp) \
        javax/security/auth/login/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/login/NullConfiguration.lo:  \
+javax/security/auth/login/FailedLoginException.lo:  \
        javax/security/auth/login/$(am__dirstamp) \
        javax/security/auth/login/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/spi/$(am__dirstamp):
-       @$(mkdir_p) javax/security/auth/spi
-       @: > javax/security/auth/spi/$(am__dirstamp)
-javax/security/auth/spi/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/security/auth/spi/$(DEPDIR)
-       @: > javax/security/auth/spi/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/spi/LoginModule.lo:  \
-       javax/security/auth/spi/$(am__dirstamp) \
-       javax/security/auth/spi/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/Policy.lo: javax/security/auth/$(am__dirstamp) \
-       javax/security/auth/$(DEPDIR)/$(am__dirstamp)
 javax/security/auth/PrivateCredentialPermission.lo:  \
        javax/security/auth/$(am__dirstamp) \
        javax/security/auth/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/Refreshable.lo:  \
-       javax/security/auth/$(am__dirstamp) \
-       javax/security/auth/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/RefreshFailedException.lo:  \
-       javax/security/auth/$(am__dirstamp) \
-       javax/security/auth/$(DEPDIR)/$(am__dirstamp)
 javax/security/auth/Subject.lo: javax/security/auth/$(am__dirstamp) \
        javax/security/auth/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/SubjectDomainCombiner.lo:  \
+javax/security/auth/Policy.lo: javax/security/auth/$(am__dirstamp) \
+       javax/security/auth/$(DEPDIR)/$(am__dirstamp)
+javax/security/auth/Refreshable.lo:  \
        javax/security/auth/$(am__dirstamp) \
        javax/security/auth/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/x500/$(am__dirstamp):
-       @$(mkdir_p) javax/security/auth/x500
-       @: > javax/security/auth/x500/$(am__dirstamp)
-javax/security/auth/x500/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/security/auth/x500/$(DEPDIR)
-       @: > javax/security/auth/x500/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/x500/X500Principal.lo:  \
-       javax/security/auth/x500/$(am__dirstamp) \
-       javax/security/auth/x500/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/x500/X500PrivateCredential.lo:  \
-       javax/security/auth/x500/$(am__dirstamp) \
-       javax/security/auth/x500/$(DEPDIR)/$(am__dirstamp)
 javax/security/auth/callback/$(am__dirstamp):
        @$(mkdir_p) javax/security/auth/callback
        @: > javax/security/auth/callback/$(am__dirstamp)
 javax/security/auth/callback/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) javax/security/auth/callback/$(DEPDIR)
        @: > javax/security/auth/callback/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/callback/Callback.lo:  \
+javax/security/auth/callback/TextInputCallback.lo:  \
        javax/security/auth/callback/$(am__dirstamp) \
        javax/security/auth/callback/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/callback/CallbackHandler.lo:  \
+javax/security/auth/callback/LanguageCallback.lo:  \
        javax/security/auth/callback/$(am__dirstamp) \
        javax/security/auth/callback/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/callback/ChoiceCallback.lo:  \
+javax/security/auth/callback/TextOutputCallback.lo:  \
        javax/security/auth/callback/$(am__dirstamp) \
        javax/security/auth/callback/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/callback/ConfirmationCallback.lo:  \
+javax/security/auth/callback/UnsupportedCallbackException.lo:  \
        javax/security/auth/callback/$(am__dirstamp) \
        javax/security/auth/callback/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/callback/LanguageCallback.lo:  \
+javax/security/auth/callback/Callback.lo:  \
        javax/security/auth/callback/$(am__dirstamp) \
        javax/security/auth/callback/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/callback/NameCallback.lo:  \
+javax/security/auth/callback/ConfirmationCallback.lo:  \
        javax/security/auth/callback/$(am__dirstamp) \
        javax/security/auth/callback/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/callback/PasswordCallback.lo:  \
+javax/security/auth/callback/ChoiceCallback.lo:  \
        javax/security/auth/callback/$(am__dirstamp) \
        javax/security/auth/callback/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/callback/TextInputCallback.lo:  \
+javax/security/auth/callback/NameCallback.lo:  \
        javax/security/auth/callback/$(am__dirstamp) \
        javax/security/auth/callback/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/callback/TextOutputCallback.lo:  \
+javax/security/auth/callback/PasswordCallback.lo:  \
        javax/security/auth/callback/$(am__dirstamp) \
        javax/security/auth/callback/$(DEPDIR)/$(am__dirstamp)
-javax/security/auth/callback/UnsupportedCallbackException.lo:  \
+javax/security/auth/callback/CallbackHandler.lo:  \
        javax/security/auth/callback/$(am__dirstamp) \
        javax/security/auth/callback/$(DEPDIR)/$(am__dirstamp)
-javax/security/cert/$(am__dirstamp):
-       @$(mkdir_p) javax/security/cert
-       @: > javax/security/cert/$(am__dirstamp)
-javax/security/cert/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/security/cert/$(DEPDIR)
-       @: > javax/security/cert/$(DEPDIR)/$(am__dirstamp)
-javax/security/cert/Certificate.lo:  \
-       javax/security/cert/$(am__dirstamp) \
-       javax/security/cert/$(DEPDIR)/$(am__dirstamp)
-javax/security/cert/CertificateEncodingException.lo:  \
-       javax/security/cert/$(am__dirstamp) \
-       javax/security/cert/$(DEPDIR)/$(am__dirstamp)
-javax/security/cert/CertificateException.lo:  \
-       javax/security/cert/$(am__dirstamp) \
-       javax/security/cert/$(DEPDIR)/$(am__dirstamp)
-javax/security/cert/CertificateExpiredException.lo:  \
-       javax/security/cert/$(am__dirstamp) \
-       javax/security/cert/$(DEPDIR)/$(am__dirstamp)
-javax/security/cert/CertificateNotYetValidException.lo:  \
-       javax/security/cert/$(am__dirstamp) \
-       javax/security/cert/$(DEPDIR)/$(am__dirstamp)
-javax/security/cert/CertificateParsingException.lo:  \
-       javax/security/cert/$(am__dirstamp) \
-       javax/security/cert/$(DEPDIR)/$(am__dirstamp)
-javax/security/cert/X509CertBridge.lo:  \
-       javax/security/cert/$(am__dirstamp) \
-       javax/security/cert/$(DEPDIR)/$(am__dirstamp)
-javax/security/cert/X509Certificate.lo:  \
-       javax/security/cert/$(am__dirstamp) \
-       javax/security/cert/$(DEPDIR)/$(am__dirstamp)
+javax/security/auth/RefreshFailedException.lo:  \
+       javax/security/auth/$(am__dirstamp) \
+       javax/security/auth/$(DEPDIR)/$(am__dirstamp)
 javax/security/sasl/$(am__dirstamp):
        @$(mkdir_p) javax/security/sasl
        @: > javax/security/sasl/$(am__dirstamp)
 javax/security/sasl/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) javax/security/sasl/$(DEPDIR)
        @: > javax/security/sasl/$(DEPDIR)/$(am__dirstamp)
-javax/security/sasl/AuthenticationException.lo:  \
+javax/security/sasl/RealmCallback.lo:  \
        javax/security/sasl/$(am__dirstamp) \
        javax/security/sasl/$(DEPDIR)/$(am__dirstamp)
-javax/security/sasl/AuthorizeCallback.lo:  \
+javax/security/sasl/SaslClient.lo:  \
        javax/security/sasl/$(am__dirstamp) \
        javax/security/sasl/$(DEPDIR)/$(am__dirstamp)
-javax/security/sasl/RealmCallback.lo:  \
+javax/security/sasl/RealmChoiceCallback.lo:  \
        javax/security/sasl/$(am__dirstamp) \
        javax/security/sasl/$(DEPDIR)/$(am__dirstamp)
-javax/security/sasl/RealmChoiceCallback.lo:  \
+javax/security/sasl/AuthenticationException.lo:  \
        javax/security/sasl/$(am__dirstamp) \
        javax/security/sasl/$(DEPDIR)/$(am__dirstamp)
 javax/security/sasl/Sasl.lo: javax/security/sasl/$(am__dirstamp) \
        javax/security/sasl/$(DEPDIR)/$(am__dirstamp)
-javax/security/sasl/SaslClient.lo:  \
+javax/security/sasl/SaslClientFactory.lo:  \
        javax/security/sasl/$(am__dirstamp) \
        javax/security/sasl/$(DEPDIR)/$(am__dirstamp)
-javax/security/sasl/SaslClientFactory.lo:  \
+javax/security/sasl/AuthorizeCallback.lo:  \
        javax/security/sasl/$(am__dirstamp) \
        javax/security/sasl/$(DEPDIR)/$(am__dirstamp)
-javax/security/sasl/SaslException.lo:  \
+javax/security/sasl/SaslServerFactory.lo:  \
        javax/security/sasl/$(am__dirstamp) \
        javax/security/sasl/$(DEPDIR)/$(am__dirstamp)
-javax/security/sasl/SaslServer.lo:  \
+javax/security/sasl/SaslException.lo:  \
        javax/security/sasl/$(am__dirstamp) \
        javax/security/sasl/$(DEPDIR)/$(am__dirstamp)
-javax/security/sasl/SaslServerFactory.lo:  \
+javax/security/sasl/SaslServer.lo:  \
        javax/security/sasl/$(am__dirstamp) \
        javax/security/sasl/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/$(am__dirstamp):
+       @$(mkdir_p) javax/transaction
+       @: > javax/transaction/$(am__dirstamp)
+javax/transaction/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/transaction/$(DEPDIR)
+       @: > javax/transaction/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/TransactionRolledbackException.lo:  \
+       javax/transaction/$(am__dirstamp) \
+       javax/transaction/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/Synchronization.lo:  \
+       javax/transaction/$(am__dirstamp) \
+       javax/transaction/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/TransactionRequiredException.lo:  \
+       javax/transaction/$(am__dirstamp) \
+       javax/transaction/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/RollbackException.lo:  \
+       javax/transaction/$(am__dirstamp) \
+       javax/transaction/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/Status.lo: javax/transaction/$(am__dirstamp) \
+       javax/transaction/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/HeuristicMixedException.lo:  \
+       javax/transaction/$(am__dirstamp) \
+       javax/transaction/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/HeuristicRollbackException.lo:  \
+       javax/transaction/$(am__dirstamp) \
+       javax/transaction/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/SystemException.lo:  \
+       javax/transaction/$(am__dirstamp) \
+       javax/transaction/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/UserTransaction.lo:  \
+       javax/transaction/$(am__dirstamp) \
+       javax/transaction/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/NotSupportedException.lo:  \
+       javax/transaction/$(am__dirstamp) \
+       javax/transaction/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/HeuristicCommitException.lo:  \
+       javax/transaction/$(am__dirstamp) \
+       javax/transaction/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/Transaction.lo: javax/transaction/$(am__dirstamp) \
+       javax/transaction/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/TransactionManager.lo:  \
+       javax/transaction/$(am__dirstamp) \
+       javax/transaction/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/InvalidTransactionException.lo:  \
+       javax/transaction/$(am__dirstamp) \
+       javax/transaction/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/xa/$(am__dirstamp):
+       @$(mkdir_p) javax/transaction/xa
+       @: > javax/transaction/xa/$(am__dirstamp)
+javax/transaction/xa/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/transaction/xa/$(DEPDIR)
+       @: > javax/transaction/xa/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/xa/XAException.lo:  \
+       javax/transaction/xa/$(am__dirstamp) \
+       javax/transaction/xa/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/xa/XAResource.lo:  \
+       javax/transaction/xa/$(am__dirstamp) \
+       javax/transaction/xa/$(DEPDIR)/$(am__dirstamp)
+javax/transaction/xa/Xid.lo: javax/transaction/xa/$(am__dirstamp) \
+       javax/transaction/xa/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/$(am__dirstamp):
+       @$(mkdir_p) javax/accessibility
+       @: > javax/accessibility/$(am__dirstamp)
+javax/accessibility/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/accessibility/$(DEPDIR)
+       @: > javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleValue.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleBundle.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleContext.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleRelationSet.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/Accessible.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleTableModelChange.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleState.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleIcon.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleHypertext.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleComponent.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleText.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleRole.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleEditableText.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleRelation.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleTable.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleStateSet.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleSelection.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleExtendedTable.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleResourceBundle.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleExtendedComponent.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleHyperlink.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleKeyBinding.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
+javax/accessibility/AccessibleAction.lo:  \
+       javax/accessibility/$(am__dirstamp) \
+       javax/accessibility/$(DEPDIR)/$(am__dirstamp)
 javax/sql/$(am__dirstamp):
        @$(mkdir_p) javax/sql
        @: > javax/sql/$(am__dirstamp)
 javax/sql/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) javax/sql/$(DEPDIR)
        @: > javax/sql/$(DEPDIR)/$(am__dirstamp)
-javax/sql/ConnectionEvent.lo: javax/sql/$(am__dirstamp) \
-       javax/sql/$(DEPDIR)/$(am__dirstamp)
 javax/sql/ConnectionEventListener.lo: javax/sql/$(am__dirstamp) \
        javax/sql/$(DEPDIR)/$(am__dirstamp)
-javax/sql/ConnectionPoolDataSource.lo: javax/sql/$(am__dirstamp) \
-       javax/sql/$(DEPDIR)/$(am__dirstamp)
-javax/sql/DataSource.lo: javax/sql/$(am__dirstamp) \
+javax/sql/RowSetEvent.lo: javax/sql/$(am__dirstamp) \
        javax/sql/$(DEPDIR)/$(am__dirstamp)
-javax/sql/PooledConnection.lo: javax/sql/$(am__dirstamp) \
+javax/sql/ConnectionPoolDataSource.lo: javax/sql/$(am__dirstamp) \
        javax/sql/$(DEPDIR)/$(am__dirstamp)
-javax/sql/RowSetEvent.lo: javax/sql/$(am__dirstamp) \
+javax/sql/RowSetWriter.lo: javax/sql/$(am__dirstamp) \
        javax/sql/$(DEPDIR)/$(am__dirstamp)
-javax/sql/RowSetInternal.lo: javax/sql/$(am__dirstamp) \
+javax/sql/XAConnection.lo: javax/sql/$(am__dirstamp) \
        javax/sql/$(DEPDIR)/$(am__dirstamp)
 javax/sql/RowSet.lo: javax/sql/$(am__dirstamp) \
        javax/sql/$(DEPDIR)/$(am__dirstamp)
-javax/sql/RowSetListener.lo: javax/sql/$(am__dirstamp) \
+javax/sql/DataSource.lo: javax/sql/$(am__dirstamp) \
        javax/sql/$(DEPDIR)/$(am__dirstamp)
-javax/sql/RowSetMetaData.lo: javax/sql/$(am__dirstamp) \
+javax/sql/RowSetInternal.lo: javax/sql/$(am__dirstamp) \
        javax/sql/$(DEPDIR)/$(am__dirstamp)
 javax/sql/RowSetReader.lo: javax/sql/$(am__dirstamp) \
        javax/sql/$(DEPDIR)/$(am__dirstamp)
-javax/sql/RowSetWriter.lo: javax/sql/$(am__dirstamp) \
+javax/sql/RowSetMetaData.lo: javax/sql/$(am__dirstamp) \
        javax/sql/$(DEPDIR)/$(am__dirstamp)
-javax/sql/XAConnection.lo: javax/sql/$(am__dirstamp) \
+javax/sql/PooledConnection.lo: javax/sql/$(am__dirstamp) \
        javax/sql/$(DEPDIR)/$(am__dirstamp)
 javax/sql/XADataSource.lo: javax/sql/$(am__dirstamp) \
        javax/sql/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/xa/$(am__dirstamp):
-       @$(mkdir_p) javax/transaction/xa
-       @: > javax/transaction/xa/$(am__dirstamp)
-javax/transaction/xa/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/transaction/xa/$(DEPDIR)
-       @: > javax/transaction/xa/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/xa/XAException.lo:  \
-       javax/transaction/xa/$(am__dirstamp) \
-       javax/transaction/xa/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/xa/XAResource.lo:  \
-       javax/transaction/xa/$(am__dirstamp) \
-       javax/transaction/xa/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/xa/Xid.lo: javax/transaction/xa/$(am__dirstamp) \
-       javax/transaction/xa/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/$(am__dirstamp):
-       @$(mkdir_p) javax/transaction
-       @: > javax/transaction/$(am__dirstamp)
-javax/transaction/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/transaction/$(DEPDIR)
-       @: > javax/transaction/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/HeuristicCommitException.lo:  \
-       javax/transaction/$(am__dirstamp) \
-       javax/transaction/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/HeuristicMixedException.lo:  \
-       javax/transaction/$(am__dirstamp) \
-       javax/transaction/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/HeuristicRollbackException.lo:  \
-       javax/transaction/$(am__dirstamp) \
-       javax/transaction/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/InvalidTransactionException.lo:  \
-       javax/transaction/$(am__dirstamp) \
-       javax/transaction/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/NotSupportedException.lo:  \
-       javax/transaction/$(am__dirstamp) \
-       javax/transaction/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/RollbackException.lo:  \
-       javax/transaction/$(am__dirstamp) \
-       javax/transaction/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/Status.lo: javax/transaction/$(am__dirstamp) \
-       javax/transaction/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/Synchronization.lo:  \
-       javax/transaction/$(am__dirstamp) \
-       javax/transaction/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/SystemException.lo:  \
-       javax/transaction/$(am__dirstamp) \
-       javax/transaction/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/Transaction.lo: javax/transaction/$(am__dirstamp) \
-       javax/transaction/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/TransactionManager.lo:  \
-       javax/transaction/$(am__dirstamp) \
-       javax/transaction/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/TransactionRequiredException.lo:  \
-       javax/transaction/$(am__dirstamp) \
-       javax/transaction/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/TransactionRolledbackException.lo:  \
-       javax/transaction/$(am__dirstamp) \
-       javax/transaction/$(DEPDIR)/$(am__dirstamp)
-javax/transaction/UserTransaction.lo:  \
-       javax/transaction/$(am__dirstamp) \
-       javax/transaction/$(DEPDIR)/$(am__dirstamp)
+javax/sql/RowSetListener.lo: javax/sql/$(am__dirstamp) \
+       javax/sql/$(DEPDIR)/$(am__dirstamp)
+javax/sql/ConnectionEvent.lo: javax/sql/$(am__dirstamp) \
+       javax/sql/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/$(am__dirstamp):
+       @$(mkdir_p) javax/crypto
+       @: > javax/crypto/$(am__dirstamp)
+javax/crypto/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/crypto/$(DEPDIR)
+       @: > javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/Cipher.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/IllegalBlockSizeException.lo:  \
+       javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/MacSpi.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/SecretKeyFactorySpi.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/ShortBufferException.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/KeyAgreement.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/ExemptionMechanism.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/CipherOutputStream.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/SealedObject.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/NullCipher.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/KeyAgreementSpi.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/SecretKeyFactory.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/SecretKey.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/NullCipherImpl.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/spec/$(am__dirstamp):
+       @$(mkdir_p) javax/crypto/spec
+       @: > javax/crypto/spec/$(am__dirstamp)
+javax/crypto/spec/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/crypto/spec/$(DEPDIR)
+       @: > javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/spec/DESKeySpec.lo: javax/crypto/spec/$(am__dirstamp) \
+       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/spec/DHPrivateKeySpec.lo:  \
+       javax/crypto/spec/$(am__dirstamp) \
+       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/spec/DHParameterSpec.lo:  \
+       javax/crypto/spec/$(am__dirstamp) \
+       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/spec/PBEParameterSpec.lo:  \
+       javax/crypto/spec/$(am__dirstamp) \
+       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/spec/DESedeKeySpec.lo: javax/crypto/spec/$(am__dirstamp) \
+       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/spec/DHGenParameterSpec.lo:  \
+       javax/crypto/spec/$(am__dirstamp) \
+       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/spec/DHPublicKeySpec.lo:  \
+       javax/crypto/spec/$(am__dirstamp) \
+       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/spec/PBEKeySpec.lo: javax/crypto/spec/$(am__dirstamp) \
+       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/spec/RC5ParameterSpec.lo:  \
+       javax/crypto/spec/$(am__dirstamp) \
+       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/spec/RC2ParameterSpec.lo:  \
+       javax/crypto/spec/$(am__dirstamp) \
+       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/spec/IvParameterSpec.lo:  \
+       javax/crypto/spec/$(am__dirstamp) \
+       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/spec/SecretKeySpec.lo: javax/crypto/spec/$(am__dirstamp) \
+       javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/interfaces/$(am__dirstamp):
+       @$(mkdir_p) javax/crypto/interfaces
+       @: > javax/crypto/interfaces/$(am__dirstamp)
+javax/crypto/interfaces/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) javax/crypto/interfaces/$(DEPDIR)
+       @: > javax/crypto/interfaces/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/interfaces/DHPublicKey.lo:  \
+       javax/crypto/interfaces/$(am__dirstamp) \
+       javax/crypto/interfaces/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/interfaces/DHKey.lo:  \
+       javax/crypto/interfaces/$(am__dirstamp) \
+       javax/crypto/interfaces/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/interfaces/DHPrivateKey.lo:  \
+       javax/crypto/interfaces/$(am__dirstamp) \
+       javax/crypto/interfaces/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/interfaces/PBEKey.lo:  \
+       javax/crypto/interfaces/$(am__dirstamp) \
+       javax/crypto/interfaces/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/NoSuchPaddingException.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/KeyGeneratorSpi.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/BadPaddingException.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/CipherSpi.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/KeyGenerator.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/CipherInputStream.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/ExemptionMechanismException.lo:  \
+       javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/ExemptionMechanismSpi.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/EncryptedPrivateKeyInfo.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+javax/crypto/Mac.lo: javax/crypto/$(am__dirstamp) \
+       javax/crypto/$(DEPDIR)/$(am__dirstamp)
+org/ietf/jgss/$(am__dirstamp):
+       @$(mkdir_p) org/ietf/jgss
+       @: > org/ietf/jgss/$(am__dirstamp)
+org/ietf/jgss/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) org/ietf/jgss/$(DEPDIR)
+       @: > org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
+org/ietf/jgss/GSSManager.lo: org/ietf/jgss/$(am__dirstamp) \
+       org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
+org/ietf/jgss/GSSException.lo: org/ietf/jgss/$(am__dirstamp) \
+       org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
+org/ietf/jgss/MessageProp.lo: org/ietf/jgss/$(am__dirstamp) \
+       org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
+org/ietf/jgss/GSSName.lo: org/ietf/jgss/$(am__dirstamp) \
+       org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
+org/ietf/jgss/GSSContext.lo: org/ietf/jgss/$(am__dirstamp) \
+       org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
+org/ietf/jgss/Oid.lo: org/ietf/jgss/$(am__dirstamp) \
+       org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
+org/ietf/jgss/GSSCredential.lo: org/ietf/jgss/$(am__dirstamp) \
+       org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
+org/ietf/jgss/ChannelBinding.lo: org/ietf/jgss/$(am__dirstamp) \
+       org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/$(am__dirstamp):
+       @$(mkdir_p) gnu/xml/xpath
+       @: > gnu/xml/xpath/$(am__dirstamp)
+gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) gnu/xml/xpath/$(DEPDIR)
+       @: > gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/EqualityExpr.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/NumberFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/StringLengthFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/NameFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/SumFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/Pattern.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/StringFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/NegativeExpr.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/UnionExpr.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/SubstringFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/Expr.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/XPathFactoryImpl.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/NormalizeSpaceFunction.lo:  \
+       gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/Constant.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/Predicate.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/Path.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/OrExpr.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/LangFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/StartsWithFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/SubstringAfterFunction.lo:  \
+       gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/FloorFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/NotFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/Root.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/PositionFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/VariableReference.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/DocumentOrderComparator.lo:  \
+       gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/LocalNameFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/NamespaceUriFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/TranslateFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/FalseFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/AndExpr.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/XPathParser.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/NamespaceTest.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/ConcatFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/NameTest.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/CountFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/IdFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/LastFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/XPathTokenizer.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/Steps.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/TrueFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/BooleanFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/ParenthesizedExpr.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/XPathImpl.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/Selector.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/RoundFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/SubstringBeforeFunction.lo:  \
+       gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/Function.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/CeilingFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/RelationalExpr.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/FunctionCall.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/NodeTypeTest.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/ArithmeticExpr.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/Test.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/xpath/ContainsFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
+       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/pipeline/$(am__dirstamp):
+       @$(mkdir_p) gnu/xml/pipeline
+       @: > gnu/xml/pipeline/$(am__dirstamp)
+gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) gnu/xml/pipeline/$(DEPDIR)
+       @: > gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/pipeline/EventFilter.lo: gnu/xml/pipeline/$(am__dirstamp) \
+       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/pipeline/NSFilter.lo: gnu/xml/pipeline/$(am__dirstamp) \
+       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/pipeline/XsltFilter.lo: gnu/xml/pipeline/$(am__dirstamp) \
+       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/pipeline/ValidationConsumer.lo:  \
+       gnu/xml/pipeline/$(am__dirstamp) \
+       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/pipeline/PipelineFactory.lo: gnu/xml/pipeline/$(am__dirstamp) \
+       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/pipeline/TextConsumer.lo: gnu/xml/pipeline/$(am__dirstamp) \
+       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/pipeline/LinkFilter.lo: gnu/xml/pipeline/$(am__dirstamp) \
+       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/pipeline/TeeConsumer.lo: gnu/xml/pipeline/$(am__dirstamp) \
+       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/pipeline/DomConsumer.lo: gnu/xml/pipeline/$(am__dirstamp) \
+       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/pipeline/EventConsumer.lo: gnu/xml/pipeline/$(am__dirstamp) \
+       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/pipeline/WellFormednessFilter.lo:  \
+       gnu/xml/pipeline/$(am__dirstamp) \
+       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/pipeline/XIncludeFilter.lo: gnu/xml/pipeline/$(am__dirstamp) \
+       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/pipeline/CallFilter.lo: gnu/xml/pipeline/$(am__dirstamp) \
+       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/aelfred2/$(am__dirstamp):
+       @$(mkdir_p) gnu/xml/aelfred2
+       @: > gnu/xml/aelfred2/$(am__dirstamp)
+gnu/xml/aelfred2/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) gnu/xml/aelfred2/$(DEPDIR)
+       @: > gnu/xml/aelfred2/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/aelfred2/XmlParser.lo: gnu/xml/aelfred2/$(am__dirstamp) \
+       gnu/xml/aelfred2/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/aelfred2/XmlReader.lo: gnu/xml/aelfred2/$(am__dirstamp) \
+       gnu/xml/aelfred2/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/aelfred2/JAXPFactory.lo: gnu/xml/aelfred2/$(am__dirstamp) \
+       gnu/xml/aelfred2/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/aelfred2/ContentHandler2.lo: gnu/xml/aelfred2/$(am__dirstamp) \
+       gnu/xml/aelfred2/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/aelfred2/SAXDriver.lo: gnu/xml/aelfred2/$(am__dirstamp) \
+       gnu/xml/aelfred2/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/util/$(am__dirstamp):
+       @$(mkdir_p) gnu/xml/util
+       @: > gnu/xml/util/$(am__dirstamp)
+gnu/xml/util/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) gnu/xml/util/$(DEPDIR)
+       @: > gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/util/XCat.lo: gnu/xml/util/$(am__dirstamp) \
+       gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/util/DomParser.lo: gnu/xml/util/$(am__dirstamp) \
+       gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/util/XMLWriter.lo: gnu/xml/util/$(am__dirstamp) \
+       gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/util/Resolver.lo: gnu/xml/util/$(am__dirstamp) \
+       gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/util/DoParse.lo: gnu/xml/util/$(am__dirstamp) \
+       gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/util/XHTMLWriter.lo: gnu/xml/util/$(am__dirstamp) \
+       gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/util/SAXNullTransformerFactory.lo:  \
+       gnu/xml/util/$(am__dirstamp) \
+       gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/$(am__dirstamp):
+       @$(mkdir_p) gnu/xml/dom
+       @: > gnu/xml/dom/$(am__dirstamp)
+gnu/xml/dom/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) gnu/xml/dom/$(DEPDIR)
+       @: > gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomCDATA.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomXPathNSResolver.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/ls/$(am__dirstamp):
+       @$(mkdir_p) gnu/xml/dom/ls
+       @: > gnu/xml/dom/ls/$(am__dirstamp)
+gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) gnu/xml/dom/ls/$(DEPDIR)
+       @: > gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/ls/DomLSEx.lo: gnu/xml/dom/ls/$(am__dirstamp) \
+       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/ls/FilteredSAXEventSink.lo:  \
+       gnu/xml/dom/ls/$(am__dirstamp) \
+       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/ls/DomLSSerializer.lo: gnu/xml/dom/ls/$(am__dirstamp) \
+       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/ls/DomLSInput.lo: gnu/xml/dom/ls/$(am__dirstamp) \
+       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/ls/DomLSOutput.lo: gnu/xml/dom/ls/$(am__dirstamp) \
+       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/ls/SAXEventSink.lo: gnu/xml/dom/ls/$(am__dirstamp) \
+       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/ls/DomLSParser.lo: gnu/xml/dom/ls/$(am__dirstamp) \
+       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/ls/ReaderInputStream.lo: gnu/xml/dom/ls/$(am__dirstamp) \
+       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/ls/WriterOutputStream.lo: gnu/xml/dom/ls/$(am__dirstamp) \
+       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomElement.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomNsNode.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomAttr.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomPI.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DTDAttributeTypeInfo.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomDocumentBuilder.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DTDElementTypeInfo.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomEx.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomDocument.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomXPathExpression.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomDocumentConfiguration.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/Consumer.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomComment.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomCharacterData.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomExtern.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomEntityReference.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomNamedNodeMap.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/ImplementationList.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/ImplementationSource.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomImpl.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomDoctype.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomNode.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomXPathResult.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomDocumentBuilderFactory.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomText.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomNSResolverContext.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomNodeIterator.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomNotation.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/JAXPFactory.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomIterator.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomFragment.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomEvent.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomEntity.lo: gnu/xml/dom/$(am__dirstamp) \
+       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/$(am__dirstamp):
+       @$(mkdir_p) gnu/xml/transform
+       @: > gnu/xml/transform/$(am__dirstamp)
+gnu/xml/transform/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) gnu/xml/transform/$(DEPDIR)
+       @: > gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/GenerateIdFunction.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/FormatNumberFunction.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/ValueOfNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/ApplyImportsNode.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/WithParam.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/DocumentFunction.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/SAXSerializer.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/FunctionAvailableFunction.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/ElementAvailableFunction.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/IfNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/ApplyTemplatesNode.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/SortKey.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/Key.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/ElementNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/CurrentFunction.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/XSLComparator.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/CallTemplateNode.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/TemplatesImpl.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/ChooseNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/NumberNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/CopyOfNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/ParameterNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/TransformerFactoryImpl.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/TextNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/CopyNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/SystemPropertyFunction.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/Stylesheet.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/ProcessingInstructionNode.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/UnparsedEntityUriFunction.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/URIResolverEntityResolver.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/ErrorListenerErrorHandler.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/Bindings.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/AttributeSet.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/Template.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/MessageNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/LiteralNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/StreamSerializer.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/XSLURIResolver.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/AttributeNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/CommentNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/ForEachNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/KeyFunction.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/TransformerImpl.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/WhenNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/NodeNumberNode.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/OtherwiseNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/AbstractNumberNode.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/TemplateNode.lo: gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/TransformerOutputProperties.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/transform/DOMSourceLocator.lo:  \
+       gnu/xml/transform/$(am__dirstamp) \
+       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
 java/lang/ConcreteProcess.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
 gnu/classpath/Configuration.lo: gnu/classpath/$(am__dirstamp) \
@@ -15897,6 +16833,354 @@ mostlyclean-compile:
        -rm -f gnu/regexp/RETokenWordBoundary.lo
        -rm -f gnu/regexp/UncheckedRE.$(OBJEXT)
        -rm -f gnu/regexp/UncheckedRE.lo
+       -rm -f gnu/xml/aelfred2/ContentHandler2.$(OBJEXT)
+       -rm -f gnu/xml/aelfred2/ContentHandler2.lo
+       -rm -f gnu/xml/aelfred2/JAXPFactory.$(OBJEXT)
+       -rm -f gnu/xml/aelfred2/JAXPFactory.lo
+       -rm -f gnu/xml/aelfred2/SAXDriver.$(OBJEXT)
+       -rm -f gnu/xml/aelfred2/SAXDriver.lo
+       -rm -f gnu/xml/aelfred2/XmlParser.$(OBJEXT)
+       -rm -f gnu/xml/aelfred2/XmlParser.lo
+       -rm -f gnu/xml/aelfred2/XmlReader.$(OBJEXT)
+       -rm -f gnu/xml/aelfred2/XmlReader.lo
+       -rm -f gnu/xml/dom/Consumer.$(OBJEXT)
+       -rm -f gnu/xml/dom/Consumer.lo
+       -rm -f gnu/xml/dom/DTDAttributeTypeInfo.$(OBJEXT)
+       -rm -f gnu/xml/dom/DTDAttributeTypeInfo.lo
+       -rm -f gnu/xml/dom/DTDElementTypeInfo.$(OBJEXT)
+       -rm -f gnu/xml/dom/DTDElementTypeInfo.lo
+       -rm -f gnu/xml/dom/DomAttr.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomAttr.lo
+       -rm -f gnu/xml/dom/DomCDATA.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomCDATA.lo
+       -rm -f gnu/xml/dom/DomCharacterData.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomCharacterData.lo
+       -rm -f gnu/xml/dom/DomComment.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomComment.lo
+       -rm -f gnu/xml/dom/DomDoctype.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomDoctype.lo
+       -rm -f gnu/xml/dom/DomDocument.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomDocument.lo
+       -rm -f gnu/xml/dom/DomDocumentBuilder.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomDocumentBuilder.lo
+       -rm -f gnu/xml/dom/DomDocumentBuilderFactory.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomDocumentBuilderFactory.lo
+       -rm -f gnu/xml/dom/DomDocumentConfiguration.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomDocumentConfiguration.lo
+       -rm -f gnu/xml/dom/DomElement.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomElement.lo
+       -rm -f gnu/xml/dom/DomEntity.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomEntity.lo
+       -rm -f gnu/xml/dom/DomEntityReference.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomEntityReference.lo
+       -rm -f gnu/xml/dom/DomEvent.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomEvent.lo
+       -rm -f gnu/xml/dom/DomEx.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomEx.lo
+       -rm -f gnu/xml/dom/DomExtern.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomExtern.lo
+       -rm -f gnu/xml/dom/DomFragment.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomFragment.lo
+       -rm -f gnu/xml/dom/DomImpl.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomImpl.lo
+       -rm -f gnu/xml/dom/DomIterator.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomIterator.lo
+       -rm -f gnu/xml/dom/DomNSResolverContext.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomNSResolverContext.lo
+       -rm -f gnu/xml/dom/DomNamedNodeMap.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomNamedNodeMap.lo
+       -rm -f gnu/xml/dom/DomNode.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomNode.lo
+       -rm -f gnu/xml/dom/DomNodeIterator.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomNodeIterator.lo
+       -rm -f gnu/xml/dom/DomNotation.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomNotation.lo
+       -rm -f gnu/xml/dom/DomNsNode.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomNsNode.lo
+       -rm -f gnu/xml/dom/DomPI.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomPI.lo
+       -rm -f gnu/xml/dom/DomText.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomText.lo
+       -rm -f gnu/xml/dom/DomXPathExpression.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomXPathExpression.lo
+       -rm -f gnu/xml/dom/DomXPathNSResolver.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomXPathNSResolver.lo
+       -rm -f gnu/xml/dom/DomXPathResult.$(OBJEXT)
+       -rm -f gnu/xml/dom/DomXPathResult.lo
+       -rm -f gnu/xml/dom/ImplementationList.$(OBJEXT)
+       -rm -f gnu/xml/dom/ImplementationList.lo
+       -rm -f gnu/xml/dom/ImplementationSource.$(OBJEXT)
+       -rm -f gnu/xml/dom/ImplementationSource.lo
+       -rm -f gnu/xml/dom/JAXPFactory.$(OBJEXT)
+       -rm -f gnu/xml/dom/JAXPFactory.lo
+       -rm -f gnu/xml/dom/ls/DomLSEx.$(OBJEXT)
+       -rm -f gnu/xml/dom/ls/DomLSEx.lo
+       -rm -f gnu/xml/dom/ls/DomLSInput.$(OBJEXT)
+       -rm -f gnu/xml/dom/ls/DomLSInput.lo
+       -rm -f gnu/xml/dom/ls/DomLSOutput.$(OBJEXT)
+       -rm -f gnu/xml/dom/ls/DomLSOutput.lo
+       -rm -f gnu/xml/dom/ls/DomLSParser.$(OBJEXT)
+       -rm -f gnu/xml/dom/ls/DomLSParser.lo
+       -rm -f gnu/xml/dom/ls/DomLSSerializer.$(OBJEXT)
+       -rm -f gnu/xml/dom/ls/DomLSSerializer.lo
+       -rm -f gnu/xml/dom/ls/FilteredSAXEventSink.$(OBJEXT)
+       -rm -f gnu/xml/dom/ls/FilteredSAXEventSink.lo
+       -rm -f gnu/xml/dom/ls/ReaderInputStream.$(OBJEXT)
+       -rm -f gnu/xml/dom/ls/ReaderInputStream.lo
+       -rm -f gnu/xml/dom/ls/SAXEventSink.$(OBJEXT)
+       -rm -f gnu/xml/dom/ls/SAXEventSink.lo
+       -rm -f gnu/xml/dom/ls/WriterOutputStream.$(OBJEXT)
+       -rm -f gnu/xml/dom/ls/WriterOutputStream.lo
+       -rm -f gnu/xml/pipeline/CallFilter.$(OBJEXT)
+       -rm -f gnu/xml/pipeline/CallFilter.lo
+       -rm -f gnu/xml/pipeline/DomConsumer.$(OBJEXT)
+       -rm -f gnu/xml/pipeline/DomConsumer.lo
+       -rm -f gnu/xml/pipeline/EventConsumer.$(OBJEXT)
+       -rm -f gnu/xml/pipeline/EventConsumer.lo
+       -rm -f gnu/xml/pipeline/EventFilter.$(OBJEXT)
+       -rm -f gnu/xml/pipeline/EventFilter.lo
+       -rm -f gnu/xml/pipeline/LinkFilter.$(OBJEXT)
+       -rm -f gnu/xml/pipeline/LinkFilter.lo
+       -rm -f gnu/xml/pipeline/NSFilter.$(OBJEXT)
+       -rm -f gnu/xml/pipeline/NSFilter.lo
+       -rm -f gnu/xml/pipeline/PipelineFactory.$(OBJEXT)
+       -rm -f gnu/xml/pipeline/PipelineFactory.lo
+       -rm -f gnu/xml/pipeline/TeeConsumer.$(OBJEXT)
+       -rm -f gnu/xml/pipeline/TeeConsumer.lo
+       -rm -f gnu/xml/pipeline/TextConsumer.$(OBJEXT)
+       -rm -f gnu/xml/pipeline/TextConsumer.lo
+       -rm -f gnu/xml/pipeline/ValidationConsumer.$(OBJEXT)
+       -rm -f gnu/xml/pipeline/ValidationConsumer.lo
+       -rm -f gnu/xml/pipeline/WellFormednessFilter.$(OBJEXT)
+       -rm -f gnu/xml/pipeline/WellFormednessFilter.lo
+       -rm -f gnu/xml/pipeline/XIncludeFilter.$(OBJEXT)
+       -rm -f gnu/xml/pipeline/XIncludeFilter.lo
+       -rm -f gnu/xml/pipeline/XsltFilter.$(OBJEXT)
+       -rm -f gnu/xml/pipeline/XsltFilter.lo
+       -rm -f gnu/xml/transform/AbstractNumberNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/AbstractNumberNode.lo
+       -rm -f gnu/xml/transform/ApplyImportsNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/ApplyImportsNode.lo
+       -rm -f gnu/xml/transform/ApplyTemplatesNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/ApplyTemplatesNode.lo
+       -rm -f gnu/xml/transform/AttributeNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/AttributeNode.lo
+       -rm -f gnu/xml/transform/AttributeSet.$(OBJEXT)
+       -rm -f gnu/xml/transform/AttributeSet.lo
+       -rm -f gnu/xml/transform/Bindings.$(OBJEXT)
+       -rm -f gnu/xml/transform/Bindings.lo
+       -rm -f gnu/xml/transform/CallTemplateNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/CallTemplateNode.lo
+       -rm -f gnu/xml/transform/ChooseNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/ChooseNode.lo
+       -rm -f gnu/xml/transform/CommentNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/CommentNode.lo
+       -rm -f gnu/xml/transform/CopyNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/CopyNode.lo
+       -rm -f gnu/xml/transform/CopyOfNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/CopyOfNode.lo
+       -rm -f gnu/xml/transform/CurrentFunction.$(OBJEXT)
+       -rm -f gnu/xml/transform/CurrentFunction.lo
+       -rm -f gnu/xml/transform/DOMSourceLocator.$(OBJEXT)
+       -rm -f gnu/xml/transform/DOMSourceLocator.lo
+       -rm -f gnu/xml/transform/DocumentFunction.$(OBJEXT)
+       -rm -f gnu/xml/transform/DocumentFunction.lo
+       -rm -f gnu/xml/transform/ElementAvailableFunction.$(OBJEXT)
+       -rm -f gnu/xml/transform/ElementAvailableFunction.lo
+       -rm -f gnu/xml/transform/ElementNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/ElementNode.lo
+       -rm -f gnu/xml/transform/ErrorListenerErrorHandler.$(OBJEXT)
+       -rm -f gnu/xml/transform/ErrorListenerErrorHandler.lo
+       -rm -f gnu/xml/transform/ForEachNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/ForEachNode.lo
+       -rm -f gnu/xml/transform/FormatNumberFunction.$(OBJEXT)
+       -rm -f gnu/xml/transform/FormatNumberFunction.lo
+       -rm -f gnu/xml/transform/FunctionAvailableFunction.$(OBJEXT)
+       -rm -f gnu/xml/transform/FunctionAvailableFunction.lo
+       -rm -f gnu/xml/transform/GenerateIdFunction.$(OBJEXT)
+       -rm -f gnu/xml/transform/GenerateIdFunction.lo
+       -rm -f gnu/xml/transform/IfNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/IfNode.lo
+       -rm -f gnu/xml/transform/Key.$(OBJEXT)
+       -rm -f gnu/xml/transform/Key.lo
+       -rm -f gnu/xml/transform/KeyFunction.$(OBJEXT)
+       -rm -f gnu/xml/transform/KeyFunction.lo
+       -rm -f gnu/xml/transform/LiteralNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/LiteralNode.lo
+       -rm -f gnu/xml/transform/MessageNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/MessageNode.lo
+       -rm -f gnu/xml/transform/NodeNumberNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/NodeNumberNode.lo
+       -rm -f gnu/xml/transform/NumberNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/NumberNode.lo
+       -rm -f gnu/xml/transform/OtherwiseNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/OtherwiseNode.lo
+       -rm -f gnu/xml/transform/ParameterNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/ParameterNode.lo
+       -rm -f gnu/xml/transform/ProcessingInstructionNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/ProcessingInstructionNode.lo
+       -rm -f gnu/xml/transform/SAXSerializer.$(OBJEXT)
+       -rm -f gnu/xml/transform/SAXSerializer.lo
+       -rm -f gnu/xml/transform/SortKey.$(OBJEXT)
+       -rm -f gnu/xml/transform/SortKey.lo
+       -rm -f gnu/xml/transform/StreamSerializer.$(OBJEXT)
+       -rm -f gnu/xml/transform/StreamSerializer.lo
+       -rm -f gnu/xml/transform/Stylesheet.$(OBJEXT)
+       -rm -f gnu/xml/transform/Stylesheet.lo
+       -rm -f gnu/xml/transform/SystemPropertyFunction.$(OBJEXT)
+       -rm -f gnu/xml/transform/SystemPropertyFunction.lo
+       -rm -f gnu/xml/transform/Template.$(OBJEXT)
+       -rm -f gnu/xml/transform/Template.lo
+       -rm -f gnu/xml/transform/TemplateNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/TemplateNode.lo
+       -rm -f gnu/xml/transform/TemplatesImpl.$(OBJEXT)
+       -rm -f gnu/xml/transform/TemplatesImpl.lo
+       -rm -f gnu/xml/transform/TextNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/TextNode.lo
+       -rm -f gnu/xml/transform/TransformerFactoryImpl.$(OBJEXT)
+       -rm -f gnu/xml/transform/TransformerFactoryImpl.lo
+       -rm -f gnu/xml/transform/TransformerImpl.$(OBJEXT)
+       -rm -f gnu/xml/transform/TransformerImpl.lo
+       -rm -f gnu/xml/transform/TransformerOutputProperties.$(OBJEXT)
+       -rm -f gnu/xml/transform/TransformerOutputProperties.lo
+       -rm -f gnu/xml/transform/URIResolverEntityResolver.$(OBJEXT)
+       -rm -f gnu/xml/transform/URIResolverEntityResolver.lo
+       -rm -f gnu/xml/transform/UnparsedEntityUriFunction.$(OBJEXT)
+       -rm -f gnu/xml/transform/UnparsedEntityUriFunction.lo
+       -rm -f gnu/xml/transform/ValueOfNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/ValueOfNode.lo
+       -rm -f gnu/xml/transform/WhenNode.$(OBJEXT)
+       -rm -f gnu/xml/transform/WhenNode.lo
+       -rm -f gnu/xml/transform/WithParam.$(OBJEXT)
+       -rm -f gnu/xml/transform/WithParam.lo
+       -rm -f gnu/xml/transform/XSLComparator.$(OBJEXT)
+       -rm -f gnu/xml/transform/XSLComparator.lo
+       -rm -f gnu/xml/transform/XSLURIResolver.$(OBJEXT)
+       -rm -f gnu/xml/transform/XSLURIResolver.lo
+       -rm -f gnu/xml/util/DoParse.$(OBJEXT)
+       -rm -f gnu/xml/util/DoParse.lo
+       -rm -f gnu/xml/util/DomParser.$(OBJEXT)
+       -rm -f gnu/xml/util/DomParser.lo
+       -rm -f gnu/xml/util/Resolver.$(OBJEXT)
+       -rm -f gnu/xml/util/Resolver.lo
+       -rm -f gnu/xml/util/SAXNullTransformerFactory.$(OBJEXT)
+       -rm -f gnu/xml/util/SAXNullTransformerFactory.lo
+       -rm -f gnu/xml/util/XCat.$(OBJEXT)
+       -rm -f gnu/xml/util/XCat.lo
+       -rm -f gnu/xml/util/XHTMLWriter.$(OBJEXT)
+       -rm -f gnu/xml/util/XHTMLWriter.lo
+       -rm -f gnu/xml/util/XMLWriter.$(OBJEXT)
+       -rm -f gnu/xml/util/XMLWriter.lo
+       -rm -f gnu/xml/xpath/AndExpr.$(OBJEXT)
+       -rm -f gnu/xml/xpath/AndExpr.lo
+       -rm -f gnu/xml/xpath/ArithmeticExpr.$(OBJEXT)
+       -rm -f gnu/xml/xpath/ArithmeticExpr.lo
+       -rm -f gnu/xml/xpath/BooleanFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/BooleanFunction.lo
+       -rm -f gnu/xml/xpath/CeilingFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/CeilingFunction.lo
+       -rm -f gnu/xml/xpath/ConcatFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/ConcatFunction.lo
+       -rm -f gnu/xml/xpath/Constant.$(OBJEXT)
+       -rm -f gnu/xml/xpath/Constant.lo
+       -rm -f gnu/xml/xpath/ContainsFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/ContainsFunction.lo
+       -rm -f gnu/xml/xpath/CountFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/CountFunction.lo
+       -rm -f gnu/xml/xpath/DocumentOrderComparator.$(OBJEXT)
+       -rm -f gnu/xml/xpath/DocumentOrderComparator.lo
+       -rm -f gnu/xml/xpath/EqualityExpr.$(OBJEXT)
+       -rm -f gnu/xml/xpath/EqualityExpr.lo
+       -rm -f gnu/xml/xpath/Expr.$(OBJEXT)
+       -rm -f gnu/xml/xpath/Expr.lo
+       -rm -f gnu/xml/xpath/FalseFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/FalseFunction.lo
+       -rm -f gnu/xml/xpath/FloorFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/FloorFunction.lo
+       -rm -f gnu/xml/xpath/Function.$(OBJEXT)
+       -rm -f gnu/xml/xpath/Function.lo
+       -rm -f gnu/xml/xpath/FunctionCall.$(OBJEXT)
+       -rm -f gnu/xml/xpath/FunctionCall.lo
+       -rm -f gnu/xml/xpath/IdFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/IdFunction.lo
+       -rm -f gnu/xml/xpath/LangFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/LangFunction.lo
+       -rm -f gnu/xml/xpath/LastFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/LastFunction.lo
+       -rm -f gnu/xml/xpath/LocalNameFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/LocalNameFunction.lo
+       -rm -f gnu/xml/xpath/NameFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/NameFunction.lo
+       -rm -f gnu/xml/xpath/NameTest.$(OBJEXT)
+       -rm -f gnu/xml/xpath/NameTest.lo
+       -rm -f gnu/xml/xpath/NamespaceTest.$(OBJEXT)
+       -rm -f gnu/xml/xpath/NamespaceTest.lo
+       -rm -f gnu/xml/xpath/NamespaceUriFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/NamespaceUriFunction.lo
+       -rm -f gnu/xml/xpath/NegativeExpr.$(OBJEXT)
+       -rm -f gnu/xml/xpath/NegativeExpr.lo
+       -rm -f gnu/xml/xpath/NodeTypeTest.$(OBJEXT)
+       -rm -f gnu/xml/xpath/NodeTypeTest.lo
+       -rm -f gnu/xml/xpath/NormalizeSpaceFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/NormalizeSpaceFunction.lo
+       -rm -f gnu/xml/xpath/NotFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/NotFunction.lo
+       -rm -f gnu/xml/xpath/NumberFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/NumberFunction.lo
+       -rm -f gnu/xml/xpath/OrExpr.$(OBJEXT)
+       -rm -f gnu/xml/xpath/OrExpr.lo
+       -rm -f gnu/xml/xpath/ParenthesizedExpr.$(OBJEXT)
+       -rm -f gnu/xml/xpath/ParenthesizedExpr.lo
+       -rm -f gnu/xml/xpath/Path.$(OBJEXT)
+       -rm -f gnu/xml/xpath/Path.lo
+       -rm -f gnu/xml/xpath/Pattern.$(OBJEXT)
+       -rm -f gnu/xml/xpath/Pattern.lo
+       -rm -f gnu/xml/xpath/PositionFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/PositionFunction.lo
+       -rm -f gnu/xml/xpath/Predicate.$(OBJEXT)
+       -rm -f gnu/xml/xpath/Predicate.lo
+       -rm -f gnu/xml/xpath/RelationalExpr.$(OBJEXT)
+       -rm -f gnu/xml/xpath/RelationalExpr.lo
+       -rm -f gnu/xml/xpath/Root.$(OBJEXT)
+       -rm -f gnu/xml/xpath/Root.lo
+       -rm -f gnu/xml/xpath/RoundFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/RoundFunction.lo
+       -rm -f gnu/xml/xpath/Selector.$(OBJEXT)
+       -rm -f gnu/xml/xpath/Selector.lo
+       -rm -f gnu/xml/xpath/StartsWithFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/StartsWithFunction.lo
+       -rm -f gnu/xml/xpath/Steps.$(OBJEXT)
+       -rm -f gnu/xml/xpath/Steps.lo
+       -rm -f gnu/xml/xpath/StringFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/StringFunction.lo
+       -rm -f gnu/xml/xpath/StringLengthFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/StringLengthFunction.lo
+       -rm -f gnu/xml/xpath/SubstringAfterFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/SubstringAfterFunction.lo
+       -rm -f gnu/xml/xpath/SubstringBeforeFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/SubstringBeforeFunction.lo
+       -rm -f gnu/xml/xpath/SubstringFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/SubstringFunction.lo
+       -rm -f gnu/xml/xpath/SumFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/SumFunction.lo
+       -rm -f gnu/xml/xpath/Test.$(OBJEXT)
+       -rm -f gnu/xml/xpath/Test.lo
+       -rm -f gnu/xml/xpath/TranslateFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/TranslateFunction.lo
+       -rm -f gnu/xml/xpath/TrueFunction.$(OBJEXT)
+       -rm -f gnu/xml/xpath/TrueFunction.lo
+       -rm -f gnu/xml/xpath/UnionExpr.$(OBJEXT)
+       -rm -f gnu/xml/xpath/UnionExpr.lo
+       -rm -f gnu/xml/xpath/VariableReference.$(OBJEXT)
+       -rm -f gnu/xml/xpath/VariableReference.lo
+       -rm -f gnu/xml/xpath/XPathFactoryImpl.$(OBJEXT)
+       -rm -f gnu/xml/xpath/XPathFactoryImpl.lo
+       -rm -f gnu/xml/xpath/XPathImpl.$(OBJEXT)
+       -rm -f gnu/xml/xpath/XPathImpl.lo
+       -rm -f gnu/xml/xpath/XPathParser.$(OBJEXT)
+       -rm -f gnu/xml/xpath/XPathParser.lo
+       -rm -f gnu/xml/xpath/XPathTokenizer.$(OBJEXT)
+       -rm -f gnu/xml/xpath/XPathTokenizer.lo
        -rm -f java/applet/Applet.$(OBJEXT)
        -rm -f java/applet/Applet.lo
        -rm -f java/applet/AppletContext.$(OBJEXT)
@@ -19709,6 +20993,110 @@ mostlyclean-compile:
        -rm -f javax/transaction/xa/XAResource.lo
        -rm -f javax/transaction/xa/Xid.$(OBJEXT)
        -rm -f javax/transaction/xa/Xid.lo
+       -rm -f javax/xml/XMLConstants.$(OBJEXT)
+       -rm -f javax/xml/XMLConstants.lo
+       -rm -f javax/xml/datatype/DatatypeConfigurationException.$(OBJEXT)
+       -rm -f javax/xml/datatype/DatatypeConfigurationException.lo
+       -rm -f javax/xml/datatype/DatatypeConstants.$(OBJEXT)
+       -rm -f javax/xml/datatype/DatatypeConstants.lo
+       -rm -f javax/xml/datatype/DatatypeFactory.$(OBJEXT)
+       -rm -f javax/xml/datatype/DatatypeFactory.lo
+       -rm -f javax/xml/datatype/Duration.$(OBJEXT)
+       -rm -f javax/xml/datatype/Duration.lo
+       -rm -f javax/xml/datatype/XMLGregorianCalendar.$(OBJEXT)
+       -rm -f javax/xml/datatype/XMLGregorianCalendar.lo
+       -rm -f javax/xml/namespace/NamespaceContext.$(OBJEXT)
+       -rm -f javax/xml/namespace/NamespaceContext.lo
+       -rm -f javax/xml/namespace/QName.$(OBJEXT)
+       -rm -f javax/xml/namespace/QName.lo
+       -rm -f javax/xml/parsers/DocumentBuilder.$(OBJEXT)
+       -rm -f javax/xml/parsers/DocumentBuilder.lo
+       -rm -f javax/xml/parsers/DocumentBuilderFactory.$(OBJEXT)
+       -rm -f javax/xml/parsers/DocumentBuilderFactory.lo
+       -rm -f javax/xml/parsers/FactoryConfigurationError.$(OBJEXT)
+       -rm -f javax/xml/parsers/FactoryConfigurationError.lo
+       -rm -f javax/xml/parsers/ParserConfigurationException.$(OBJEXT)
+       -rm -f javax/xml/parsers/ParserConfigurationException.lo
+       -rm -f javax/xml/parsers/SAXParser.$(OBJEXT)
+       -rm -f javax/xml/parsers/SAXParser.lo
+       -rm -f javax/xml/parsers/SAXParserFactory.$(OBJEXT)
+       -rm -f javax/xml/parsers/SAXParserFactory.lo
+       -rm -f javax/xml/transform/ErrorListener.$(OBJEXT)
+       -rm -f javax/xml/transform/ErrorListener.lo
+       -rm -f javax/xml/transform/OutputKeys.$(OBJEXT)
+       -rm -f javax/xml/transform/OutputKeys.lo
+       -rm -f javax/xml/transform/Result.$(OBJEXT)
+       -rm -f javax/xml/transform/Result.lo
+       -rm -f javax/xml/transform/Source.$(OBJEXT)
+       -rm -f javax/xml/transform/Source.lo
+       -rm -f javax/xml/transform/SourceLocator.$(OBJEXT)
+       -rm -f javax/xml/transform/SourceLocator.lo
+       -rm -f javax/xml/transform/Templates.$(OBJEXT)
+       -rm -f javax/xml/transform/Templates.lo
+       -rm -f javax/xml/transform/Transformer.$(OBJEXT)
+       -rm -f javax/xml/transform/Transformer.lo
+       -rm -f javax/xml/transform/TransformerConfigurationException.$(OBJEXT)
+       -rm -f javax/xml/transform/TransformerConfigurationException.lo
+       -rm -f javax/xml/transform/TransformerException.$(OBJEXT)
+       -rm -f javax/xml/transform/TransformerException.lo
+       -rm -f javax/xml/transform/TransformerFactory.$(OBJEXT)
+       -rm -f javax/xml/transform/TransformerFactory.lo
+       -rm -f javax/xml/transform/TransformerFactoryConfigurationError.$(OBJEXT)
+       -rm -f javax/xml/transform/TransformerFactoryConfigurationError.lo
+       -rm -f javax/xml/transform/URIResolver.$(OBJEXT)
+       -rm -f javax/xml/transform/URIResolver.lo
+       -rm -f javax/xml/transform/dom/DOMLocator.$(OBJEXT)
+       -rm -f javax/xml/transform/dom/DOMLocator.lo
+       -rm -f javax/xml/transform/dom/DOMResult.$(OBJEXT)
+       -rm -f javax/xml/transform/dom/DOMResult.lo
+       -rm -f javax/xml/transform/dom/DOMSource.$(OBJEXT)
+       -rm -f javax/xml/transform/dom/DOMSource.lo
+       -rm -f javax/xml/transform/sax/SAXResult.$(OBJEXT)
+       -rm -f javax/xml/transform/sax/SAXResult.lo
+       -rm -f javax/xml/transform/sax/SAXSource.$(OBJEXT)
+       -rm -f javax/xml/transform/sax/SAXSource.lo
+       -rm -f javax/xml/transform/sax/SAXTransformerFactory.$(OBJEXT)
+       -rm -f javax/xml/transform/sax/SAXTransformerFactory.lo
+       -rm -f javax/xml/transform/sax/TemplatesHandler.$(OBJEXT)
+       -rm -f javax/xml/transform/sax/TemplatesHandler.lo
+       -rm -f javax/xml/transform/sax/TransformerHandler.$(OBJEXT)
+       -rm -f javax/xml/transform/sax/TransformerHandler.lo
+       -rm -f javax/xml/transform/stream/StreamResult.$(OBJEXT)
+       -rm -f javax/xml/transform/stream/StreamResult.lo
+       -rm -f javax/xml/transform/stream/StreamSource.$(OBJEXT)
+       -rm -f javax/xml/transform/stream/StreamSource.lo
+       -rm -f javax/xml/validation/Schema.$(OBJEXT)
+       -rm -f javax/xml/validation/Schema.lo
+       -rm -f javax/xml/validation/SchemaFactory.$(OBJEXT)
+       -rm -f javax/xml/validation/SchemaFactory.lo
+       -rm -f javax/xml/validation/TypeInfoProvider.$(OBJEXT)
+       -rm -f javax/xml/validation/TypeInfoProvider.lo
+       -rm -f javax/xml/validation/Validator.$(OBJEXT)
+       -rm -f javax/xml/validation/Validator.lo
+       -rm -f javax/xml/validation/ValidatorHandler.$(OBJEXT)
+       -rm -f javax/xml/validation/ValidatorHandler.lo
+       -rm -f javax/xml/xpath/XPath.$(OBJEXT)
+       -rm -f javax/xml/xpath/XPath.lo
+       -rm -f javax/xml/xpath/XPathConstants.$(OBJEXT)
+       -rm -f javax/xml/xpath/XPathConstants.lo
+       -rm -f javax/xml/xpath/XPathException.$(OBJEXT)
+       -rm -f javax/xml/xpath/XPathException.lo
+       -rm -f javax/xml/xpath/XPathExpression.$(OBJEXT)
+       -rm -f javax/xml/xpath/XPathExpression.lo
+       -rm -f javax/xml/xpath/XPathExpressionException.$(OBJEXT)
+       -rm -f javax/xml/xpath/XPathExpressionException.lo
+       -rm -f javax/xml/xpath/XPathFactory.$(OBJEXT)
+       -rm -f javax/xml/xpath/XPathFactory.lo
+       -rm -f javax/xml/xpath/XPathFactoryConfigurationException.$(OBJEXT)
+       -rm -f javax/xml/xpath/XPathFactoryConfigurationException.lo
+       -rm -f javax/xml/xpath/XPathFunction.$(OBJEXT)
+       -rm -f javax/xml/xpath/XPathFunction.lo
+       -rm -f javax/xml/xpath/XPathFunctionException.$(OBJEXT)
+       -rm -f javax/xml/xpath/XPathFunctionException.lo
+       -rm -f javax/xml/xpath/XPathFunctionResolver.$(OBJEXT)
+       -rm -f javax/xml/xpath/XPathFunctionResolver.lo
+       -rm -f javax/xml/xpath/XPathVariableResolver.$(OBJEXT)
+       -rm -f javax/xml/xpath/XPathVariableResolver.lo
        -rm -f jni/classpath/lib_gnu_java_awt_peer_gtk_la-jcl.$(OBJEXT)
        -rm -f jni/classpath/lib_gnu_java_awt_peer_gtk_la-jcl.lo
        -rm -f jni/classpath/lib_gnu_java_awt_peer_gtk_la-jnilink.$(OBJEXT)
@@ -19813,116 +21201,6 @@ mostlyclean-compile:
        -rm -f org/ietf/jgss/MessageProp.lo
        -rm -f org/ietf/jgss/Oid.$(OBJEXT)
        -rm -f org/ietf/jgss/Oid.lo
-       -rm -f org/w3c/dom/Attr.$(OBJEXT)
-       -rm -f org/w3c/dom/Attr.lo
-       -rm -f org/w3c/dom/CDATASection.$(OBJEXT)
-       -rm -f org/w3c/dom/CDATASection.lo
-       -rm -f org/w3c/dom/CharacterData.$(OBJEXT)
-       -rm -f org/w3c/dom/CharacterData.lo
-       -rm -f org/w3c/dom/Comment.$(OBJEXT)
-       -rm -f org/w3c/dom/Comment.lo
-       -rm -f org/w3c/dom/DOMException.$(OBJEXT)
-       -rm -f org/w3c/dom/DOMException.lo
-       -rm -f org/w3c/dom/DOMImplementation.$(OBJEXT)
-       -rm -f org/w3c/dom/DOMImplementation.lo
-       -rm -f org/w3c/dom/Document.$(OBJEXT)
-       -rm -f org/w3c/dom/Document.lo
-       -rm -f org/w3c/dom/DocumentFragment.$(OBJEXT)
-       -rm -f org/w3c/dom/DocumentFragment.lo
-       -rm -f org/w3c/dom/DocumentType.$(OBJEXT)
-       -rm -f org/w3c/dom/DocumentType.lo
-       -rm -f org/w3c/dom/Element.$(OBJEXT)
-       -rm -f org/w3c/dom/Element.lo
-       -rm -f org/w3c/dom/Entity.$(OBJEXT)
-       -rm -f org/w3c/dom/Entity.lo
-       -rm -f org/w3c/dom/EntityReference.$(OBJEXT)
-       -rm -f org/w3c/dom/EntityReference.lo
-       -rm -f org/w3c/dom/NamedNodeMap.$(OBJEXT)
-       -rm -f org/w3c/dom/NamedNodeMap.lo
-       -rm -f org/w3c/dom/Node.$(OBJEXT)
-       -rm -f org/w3c/dom/Node.lo
-       -rm -f org/w3c/dom/NodeList.$(OBJEXT)
-       -rm -f org/w3c/dom/NodeList.lo
-       -rm -f org/w3c/dom/Notation.$(OBJEXT)
-       -rm -f org/w3c/dom/Notation.lo
-       -rm -f org/w3c/dom/ProcessingInstruction.$(OBJEXT)
-       -rm -f org/w3c/dom/ProcessingInstruction.lo
-       -rm -f org/w3c/dom/Text.$(OBJEXT)
-       -rm -f org/w3c/dom/Text.lo
-       -rm -f org/w3c/dom/ranges/DocumentRange.$(OBJEXT)
-       -rm -f org/w3c/dom/ranges/DocumentRange.lo
-       -rm -f org/w3c/dom/ranges/Range.$(OBJEXT)
-       -rm -f org/w3c/dom/ranges/Range.lo
-       -rm -f org/w3c/dom/ranges/RangeException.$(OBJEXT)
-       -rm -f org/w3c/dom/ranges/RangeException.lo
-       -rm -f org/w3c/dom/traversal/DocumentTraversal.$(OBJEXT)
-       -rm -f org/w3c/dom/traversal/DocumentTraversal.lo
-       -rm -f org/w3c/dom/traversal/NodeFilter.$(OBJEXT)
-       -rm -f org/w3c/dom/traversal/NodeFilter.lo
-       -rm -f org/w3c/dom/traversal/NodeIterator.$(OBJEXT)
-       -rm -f org/w3c/dom/traversal/NodeIterator.lo
-       -rm -f org/w3c/dom/traversal/TreeWalker.$(OBJEXT)
-       -rm -f org/w3c/dom/traversal/TreeWalker.lo
-       -rm -f org/xml/sax/AttributeList.$(OBJEXT)
-       -rm -f org/xml/sax/AttributeList.lo
-       -rm -f org/xml/sax/Attributes.$(OBJEXT)
-       -rm -f org/xml/sax/Attributes.lo
-       -rm -f org/xml/sax/ContentHandler.$(OBJEXT)
-       -rm -f org/xml/sax/ContentHandler.lo
-       -rm -f org/xml/sax/DTDHandler.$(OBJEXT)
-       -rm -f org/xml/sax/DTDHandler.lo
-       -rm -f org/xml/sax/DocumentHandler.$(OBJEXT)
-       -rm -f org/xml/sax/DocumentHandler.lo
-       -rm -f org/xml/sax/EntityResolver.$(OBJEXT)
-       -rm -f org/xml/sax/EntityResolver.lo
-       -rm -f org/xml/sax/ErrorHandler.$(OBJEXT)
-       -rm -f org/xml/sax/ErrorHandler.lo
-       -rm -f org/xml/sax/HandlerBase.$(OBJEXT)
-       -rm -f org/xml/sax/HandlerBase.lo
-       -rm -f org/xml/sax/InputSource.$(OBJEXT)
-       -rm -f org/xml/sax/InputSource.lo
-       -rm -f org/xml/sax/Locator.$(OBJEXT)
-       -rm -f org/xml/sax/Locator.lo
-       -rm -f org/xml/sax/Parser.$(OBJEXT)
-       -rm -f org/xml/sax/Parser.lo
-       -rm -f org/xml/sax/SAXException.$(OBJEXT)
-       -rm -f org/xml/sax/SAXException.lo
-       -rm -f org/xml/sax/SAXNotRecognizedException.$(OBJEXT)
-       -rm -f org/xml/sax/SAXNotRecognizedException.lo
-       -rm -f org/xml/sax/SAXNotSupportedException.$(OBJEXT)
-       -rm -f org/xml/sax/SAXNotSupportedException.lo
-       -rm -f org/xml/sax/SAXParseException.$(OBJEXT)
-       -rm -f org/xml/sax/SAXParseException.lo
-       -rm -f org/xml/sax/XMLFilter.$(OBJEXT)
-       -rm -f org/xml/sax/XMLFilter.lo
-       -rm -f org/xml/sax/XMLReader.$(OBJEXT)
-       -rm -f org/xml/sax/XMLReader.lo
-       -rm -f org/xml/sax/ext/DeclHandler.$(OBJEXT)
-       -rm -f org/xml/sax/ext/DeclHandler.lo
-       -rm -f org/xml/sax/ext/LexicalHandler.$(OBJEXT)
-       -rm -f org/xml/sax/ext/LexicalHandler.lo
-       -rm -f org/xml/sax/helpers/AttributeListImpl.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/AttributeListImpl.lo
-       -rm -f org/xml/sax/helpers/AttributesImpl.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/AttributesImpl.lo
-       -rm -f org/xml/sax/helpers/DefaultHandler.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/DefaultHandler.lo
-       -rm -f org/xml/sax/helpers/LocatorImpl.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/LocatorImpl.lo
-       -rm -f org/xml/sax/helpers/NamespaceSupport.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/NamespaceSupport.lo
-       -rm -f org/xml/sax/helpers/NewInstance.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/NewInstance.lo
-       -rm -f org/xml/sax/helpers/ParserAdapter.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/ParserAdapter.lo
-       -rm -f org/xml/sax/helpers/ParserFactory.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/ParserFactory.lo
-       -rm -f org/xml/sax/helpers/XMLFilterImpl.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/XMLFilterImpl.lo
-       -rm -f org/xml/sax/helpers/XMLReaderAdapter.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/XMLReaderAdapter.lo
-       -rm -f org/xml/sax/helpers/XMLReaderFactory.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/XMLReaderFactory.lo
        -rm -f sysdep/dwarf2-backtrace.$(OBJEXT)
        -rm -f sysdep/dwarf2-backtrace.lo
 
@@ -20515,6 +21793,180 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/regexp/$(DEPDIR)/RETokenStart.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/regexp/$(DEPDIR)/RETokenWordBoundary.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/regexp/$(DEPDIR)/UncheckedRE.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/aelfred2/$(DEPDIR)/ContentHandler2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/aelfred2/$(DEPDIR)/JAXPFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/aelfred2/$(DEPDIR)/SAXDriver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/aelfred2/$(DEPDIR)/XmlParser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/aelfred2/$(DEPDIR)/XmlReader.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/Consumer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DTDAttributeTypeInfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DTDElementTypeInfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomAttr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomCDATA.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomCharacterData.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomComment.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDoctype.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDocument.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDocumentBuilder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDocumentBuilderFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDocumentConfiguration.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomEntity.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomEntityReference.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomEvent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomEx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomExtern.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomFragment.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomIterator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomNSResolverContext.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomNamedNodeMap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomNodeIterator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomNotation.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomNsNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomPI.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomText.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomXPathExpression.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomXPathNSResolver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomXPathResult.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/ImplementationList.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/ImplementationSource.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/JAXPFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/DomLSEx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/DomLSInput.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/DomLSOutput.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/DomLSParser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/DomLSSerializer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/FilteredSAXEventSink.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/ReaderInputStream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/SAXEventSink.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/WriterOutputStream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/CallFilter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/DomConsumer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/EventConsumer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/EventFilter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/LinkFilter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/NSFilter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/PipelineFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/TeeConsumer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/TextConsumer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/ValidationConsumer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/WellFormednessFilter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/XIncludeFilter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/XsltFilter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/AbstractNumberNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ApplyImportsNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ApplyTemplatesNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/AttributeNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/AttributeSet.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/Bindings.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/CallTemplateNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ChooseNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/CommentNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/CopyNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/CopyOfNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/CurrentFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/DOMSourceLocator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/DocumentFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ElementAvailableFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ElementNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ErrorListenerErrorHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ForEachNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/FormatNumberFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/FunctionAvailableFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/GenerateIdFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/IfNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/Key.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/KeyFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/LiteralNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/MessageNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/NodeNumberNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/NumberNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/OtherwiseNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ParameterNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ProcessingInstructionNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/SAXSerializer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/SortKey.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/StreamSerializer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/Stylesheet.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/SystemPropertyFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/Template.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/TemplateNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/TemplatesImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/TextNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/TransformerFactoryImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/TransformerImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/TransformerOutputProperties.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/URIResolverEntityResolver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/UnparsedEntityUriFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ValueOfNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/WhenNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/WithParam.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/XSLComparator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/XSLURIResolver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/util/$(DEPDIR)/DoParse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/util/$(DEPDIR)/DomParser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/util/$(DEPDIR)/Resolver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/util/$(DEPDIR)/SAXNullTransformerFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/util/$(DEPDIR)/XCat.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/util/$(DEPDIR)/XHTMLWriter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/util/$(DEPDIR)/XMLWriter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/AndExpr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/ArithmeticExpr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/BooleanFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/CeilingFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/ConcatFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Constant.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/ContainsFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/CountFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/DocumentOrderComparator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/EqualityExpr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Expr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/FalseFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/FloorFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Function.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/FunctionCall.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/IdFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/LangFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/LastFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/LocalNameFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NameFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NameTest.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NamespaceTest.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NamespaceUriFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NegativeExpr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NodeTypeTest.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NormalizeSpaceFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NotFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NumberFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/OrExpr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/ParenthesizedExpr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Path.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Pattern.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/PositionFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Predicate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/RelationalExpr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Root.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/RoundFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Selector.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/StartsWithFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Steps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/StringFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/StringLengthFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/SubstringAfterFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/SubstringBeforeFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/SubstringFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/SumFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Test.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/TranslateFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/TrueFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/UnionExpr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/VariableReference.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/XPathFactoryImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/XPathImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/XPathParser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/XPathTokenizer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/applet/$(DEPDIR)/Applet.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/applet/$(DEPDIR)/AppletContext.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/applet/$(DEPDIR)/AppletStub.Plo@am__quote@
@@ -22421,6 +23873,58 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@javax/transaction/xa/$(DEPDIR)/XAException.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@javax/transaction/xa/$(DEPDIR)/XAResource.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@javax/transaction/xa/$(DEPDIR)/Xid.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/$(DEPDIR)/XMLConstants.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/datatype/$(DEPDIR)/DatatypeConfigurationException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/datatype/$(DEPDIR)/DatatypeConstants.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/datatype/$(DEPDIR)/DatatypeFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/datatype/$(DEPDIR)/Duration.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/datatype/$(DEPDIR)/XMLGregorianCalendar.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/namespace/$(DEPDIR)/NamespaceContext.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/namespace/$(DEPDIR)/QName.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/parsers/$(DEPDIR)/DocumentBuilder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/parsers/$(DEPDIR)/DocumentBuilderFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/parsers/$(DEPDIR)/FactoryConfigurationError.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/parsers/$(DEPDIR)/ParserConfigurationException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/parsers/$(DEPDIR)/SAXParser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/parsers/$(DEPDIR)/SAXParserFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/ErrorListener.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/OutputKeys.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/Result.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/Source.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/SourceLocator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/Templates.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/Transformer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/TransformerConfigurationException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/TransformerException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/TransformerFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/TransformerFactoryConfigurationError.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/URIResolver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/dom/$(DEPDIR)/DOMLocator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/dom/$(DEPDIR)/DOMResult.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/dom/$(DEPDIR)/DOMSource.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/sax/$(DEPDIR)/SAXResult.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/sax/$(DEPDIR)/SAXSource.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/sax/$(DEPDIR)/SAXTransformerFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/sax/$(DEPDIR)/TemplatesHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/sax/$(DEPDIR)/TransformerHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/stream/$(DEPDIR)/StreamResult.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/stream/$(DEPDIR)/StreamSource.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/validation/$(DEPDIR)/Schema.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/validation/$(DEPDIR)/SchemaFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/validation/$(DEPDIR)/TypeInfoProvider.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/validation/$(DEPDIR)/Validator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/validation/$(DEPDIR)/ValidatorHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPath.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathConstants.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathExpression.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathExpressionException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathFactoryConfigurationException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathFunctionException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathFunctionResolver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathVariableResolver.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@jni/classpath/$(DEPDIR)/lib_gnu_java_awt_peer_gtk_la-jcl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@jni/classpath/$(DEPDIR)/lib_gnu_java_awt_peer_gtk_la-jnilink.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@jni/classpath/$(DEPDIR)/lib_gnu_java_awt_peer_gtk_la-native_state.Plo@am__quote@
@@ -22473,61 +23977,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@org/ietf/jgss/$(DEPDIR)/GSSName.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@org/ietf/jgss/$(DEPDIR)/MessageProp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@org/ietf/jgss/$(DEPDIR)/Oid.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Attr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/CDATASection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/CharacterData.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Comment.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMImplementation.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Document.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DocumentFragment.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DocumentType.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Element.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Entity.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/EntityReference.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/NamedNodeMap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Node.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/NodeList.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Notation.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/ProcessingInstruction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Text.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ranges/$(DEPDIR)/DocumentRange.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ranges/$(DEPDIR)/Range.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ranges/$(DEPDIR)/RangeException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/traversal/$(DEPDIR)/DocumentTraversal.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/traversal/$(DEPDIR)/NodeFilter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/traversal/$(DEPDIR)/NodeIterator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/traversal/$(DEPDIR)/TreeWalker.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/AttributeList.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/Attributes.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/ContentHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/DTDHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/DocumentHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/EntityResolver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/ErrorHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/HandlerBase.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/InputSource.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/Locator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/Parser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXNotRecognizedException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXNotSupportedException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXParseException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/XMLFilter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/XMLReader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/DeclHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/LexicalHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/AttributeListImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/AttributesImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/DefaultHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/LocatorImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/NamespaceSupport.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/NewInstance.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/ParserAdapter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/ParserFactory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/XMLFilterImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/XMLReaderAdapter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/XMLReaderFactory.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sysdep/$(DEPDIR)/dwarf2-backtrace.Plo@am__quote@
 
 .c.o:
@@ -23405,6 +24854,13 @@ clean-libtool:
        -rm -rf gnu/java/util/.libs gnu/java/util/_libs
        -rm -rf gnu/java/util/prefs/.libs gnu/java/util/prefs/_libs
        -rm -rf gnu/regexp/.libs gnu/regexp/_libs
+       -rm -rf gnu/xml/aelfred2/.libs gnu/xml/aelfred2/_libs
+       -rm -rf gnu/xml/dom/.libs gnu/xml/dom/_libs
+       -rm -rf gnu/xml/dom/ls/.libs gnu/xml/dom/ls/_libs
+       -rm -rf gnu/xml/pipeline/.libs gnu/xml/pipeline/_libs
+       -rm -rf gnu/xml/transform/.libs gnu/xml/transform/_libs
+       -rm -rf gnu/xml/util/.libs gnu/xml/util/_libs
+       -rm -rf gnu/xml/xpath/.libs gnu/xml/xpath/_libs
        -rm -rf java/applet/.libs java/applet/_libs
        -rm -rf java/awt/.libs java/awt/_libs
        -rm -rf java/awt/color/.libs java/awt/color/_libs
@@ -23495,15 +24951,19 @@ clean-libtool:
        -rm -rf javax/swing/undo/.libs javax/swing/undo/_libs
        -rm -rf javax/transaction/.libs javax/transaction/_libs
        -rm -rf javax/transaction/xa/.libs javax/transaction/xa/_libs
+       -rm -rf javax/xml/.libs javax/xml/_libs
+       -rm -rf javax/xml/datatype/.libs javax/xml/datatype/_libs
+       -rm -rf javax/xml/namespace/.libs javax/xml/namespace/_libs
+       -rm -rf javax/xml/parsers/.libs javax/xml/parsers/_libs
+       -rm -rf javax/xml/transform/.libs javax/xml/transform/_libs
+       -rm -rf javax/xml/transform/dom/.libs javax/xml/transform/dom/_libs
+       -rm -rf javax/xml/transform/sax/.libs javax/xml/transform/sax/_libs
+       -rm -rf javax/xml/transform/stream/.libs javax/xml/transform/stream/_libs
+       -rm -rf javax/xml/validation/.libs javax/xml/validation/_libs
+       -rm -rf javax/xml/xpath/.libs javax/xml/xpath/_libs
        -rm -rf jni/classpath/.libs jni/classpath/_libs
        -rm -rf jni/gtk-peer/.libs jni/gtk-peer/_libs
        -rm -rf org/ietf/jgss/.libs org/ietf/jgss/_libs
-       -rm -rf org/w3c/dom/.libs org/w3c/dom/_libs
-       -rm -rf org/w3c/dom/ranges/.libs org/w3c/dom/ranges/_libs
-       -rm -rf org/w3c/dom/traversal/.libs org/w3c/dom/traversal/_libs
-       -rm -rf org/xml/sax/.libs org/xml/sax/_libs
-       -rm -rf org/xml/sax/ext/.libs org/xml/sax/ext/_libs
-       -rm -rf org/xml/sax/helpers/.libs org/xml/sax/helpers/_libs
        -rm -rf sysdep/.libs sysdep/_libs
 
 distclean-libtool:
@@ -23952,6 +25412,20 @@ distclean-generic:
        -rm -f gnu/java/util/prefs/$(am__dirstamp)
        -rm -f gnu/regexp/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/regexp/$(am__dirstamp)
+       -rm -f gnu/xml/aelfred2/$(DEPDIR)/$(am__dirstamp)
+       -rm -f gnu/xml/aelfred2/$(am__dirstamp)
+       -rm -f gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+       -rm -f gnu/xml/dom/$(am__dirstamp)
+       -rm -f gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
+       -rm -f gnu/xml/dom/ls/$(am__dirstamp)
+       -rm -f gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
+       -rm -f gnu/xml/pipeline/$(am__dirstamp)
+       -rm -f gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
+       -rm -f gnu/xml/transform/$(am__dirstamp)
+       -rm -f gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
+       -rm -f gnu/xml/util/$(am__dirstamp)
+       -rm -f gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+       -rm -f gnu/xml/xpath/$(am__dirstamp)
        -rm -f java/applet/$(DEPDIR)/$(am__dirstamp)
        -rm -f java/applet/$(am__dirstamp)
        -rm -f java/awt/$(DEPDIR)/$(am__dirstamp)
@@ -24132,24 +25606,32 @@ distclean-generic:
        -rm -f javax/transaction/$(am__dirstamp)
        -rm -f javax/transaction/xa/$(DEPDIR)/$(am__dirstamp)
        -rm -f javax/transaction/xa/$(am__dirstamp)
+       -rm -f javax/xml/$(DEPDIR)/$(am__dirstamp)
+       -rm -f javax/xml/$(am__dirstamp)
+       -rm -f javax/xml/datatype/$(DEPDIR)/$(am__dirstamp)
+       -rm -f javax/xml/datatype/$(am__dirstamp)
+       -rm -f javax/xml/namespace/$(DEPDIR)/$(am__dirstamp)
+       -rm -f javax/xml/namespace/$(am__dirstamp)
+       -rm -f javax/xml/parsers/$(DEPDIR)/$(am__dirstamp)
+       -rm -f javax/xml/parsers/$(am__dirstamp)
+       -rm -f javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
+       -rm -f javax/xml/transform/$(am__dirstamp)
+       -rm -f javax/xml/transform/dom/$(DEPDIR)/$(am__dirstamp)
+       -rm -f javax/xml/transform/dom/$(am__dirstamp)
+       -rm -f javax/xml/transform/sax/$(DEPDIR)/$(am__dirstamp)
+       -rm -f javax/xml/transform/sax/$(am__dirstamp)
+       -rm -f javax/xml/transform/stream/$(DEPDIR)/$(am__dirstamp)
+       -rm -f javax/xml/transform/stream/$(am__dirstamp)
+       -rm -f javax/xml/validation/$(DEPDIR)/$(am__dirstamp)
+       -rm -f javax/xml/validation/$(am__dirstamp)
+       -rm -f javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
+       -rm -f javax/xml/xpath/$(am__dirstamp)
        -rm -f jni/classpath/$(DEPDIR)/$(am__dirstamp)
        -rm -f jni/classpath/$(am__dirstamp)
        -rm -f jni/gtk-peer/$(DEPDIR)/$(am__dirstamp)
        -rm -f jni/gtk-peer/$(am__dirstamp)
        -rm -f org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
        -rm -f org/ietf/jgss/$(am__dirstamp)
-       -rm -f org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/w3c/dom/$(am__dirstamp)
-       -rm -f org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/w3c/dom/ranges/$(am__dirstamp)
-       -rm -f org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/w3c/dom/traversal/$(am__dirstamp)
-       -rm -f org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/xml/sax/$(am__dirstamp)
-       -rm -f org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/xml/sax/ext/$(am__dirstamp)
-       -rm -f org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/xml/sax/helpers/$(am__dirstamp)
        -rm -f sysdep/$(DEPDIR)/$(am__dirstamp)
        -rm -f sysdep/$(am__dirstamp)
 
@@ -24164,7 +25646,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
 
 distclean: distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-       -rm -rf ./$(DEPDIR) gnu/awt/$(DEPDIR) gnu/awt/j2d/$(DEPDIR) gnu/awt/xlib/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/awt/$(DEPDIR) gnu/java/awt/color/$(DEPDIR) gnu/java/awt/image/$(DEPDIR) gnu/java/awt/peer/$(DEPDIR) gnu/java/awt/peer/gtk/$(DEPDIR) gnu/java/beans/$(DEPDIR) gnu/java/beans/editors/$(DEPDIR) gnu/java/beans/info/$(DEPDIR) gnu/java/io/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/reflect/$(DEPDIR) gnu/java/locale/$(DEPDIR) gnu/java/math/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/net/protocol/file/$(DEPDIR) gnu/java/net/protocol/gcjlib/$(DEPDIR) gnu/java/net/protocol/http/$(DEPDIR) gnu/java/net/protocol/http/event/$(DEPDIR) gnu/java/net/protocol/jar/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) gnu/java/nio/charset/$(DEPDIR) gnu/java/rmi/$(DEPDIR) gnu/java/rmi/dgc/$(DEPDIR) gnu/java/rmi/registry/$(DEPDIR) gnu/java/rmi/rmic/$(DEPDIR) gnu/java/rmi/server/$(DEPDIR) gnu/java/security/$(DEPDIR) gnu/java/security/action/$(DEPDIR) gnu/java/security/der/$(DEPDIR) gnu/java/security/provider/$(DEPDIR) gnu/java/security/util/$(DEPDIR) gnu/java/security/x509/$(DEPDIR) gnu/java/security/x509/ext/$(DEPDIR) gnu/java/text/$(DEPDIR) gnu/java/util/$(DEPDIR) gnu/java/util/prefs/$(DEPDIR) gnu/regexp/$(DEPDIR) java/applet/$(DEPDIR) java/awt/$(DEPDIR) java/awt/color/$(DEPDIR) java/awt/datatransfer/$(DEPDIR) java/awt/dnd/$(DEPDIR) java/awt/dnd/peer/$(DEPDIR) java/awt/event/$(DEPDIR) java/awt/font/$(DEPDIR) java/awt/geom/$(DEPDIR) java/awt/im/$(DEPDIR) java/awt/im/spi/$(DEPDIR) java/awt/image/$(DEPDIR) java/awt/image/renderable/$(DEPDIR) java/awt/peer/$(DEPDIR) java/awt/print/$(DEPDIR) java/beans/$(DEPDIR) java/beans/beancontext/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/math/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/nio/channels/spi/$(DEPDIR) java/nio/charset/$(DEPDIR) java/nio/charset/spi/$(DEPDIR) java/rmi/$(DEPDIR) java/rmi/activation/$(DEPDIR) java/rmi/dgc/$(DEPDIR) java/rmi/registry/$(DEPDIR) java/rmi/server/$(DEPDIR) java/security/$(DEPDIR) java/security/acl/$(DEPDIR) java/security/cert/$(DEPDIR) java/security/interfaces/$(DEPDIR) java/security/spec/$(DEPDIR) java/sql/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/jar/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/prefs/$(DEPDIR) java/util/regex/$(DEPDIR) java/util/zip/$(DEPDIR) javax/accessibility/$(DEPDIR) javax/crypto/$(DEPDIR) javax/crypto/interfaces/$(DEPDIR) javax/crypto/spec/$(DEPDIR) javax/imageio/$(DEPDIR) javax/imageio/event/$(DEPDIR) javax/imageio/metadata/$(DEPDIR) javax/imageio/spi/$(DEPDIR) javax/imageio/stream/$(DEPDIR) javax/naming/$(DEPDIR) javax/naming/directory/$(DEPDIR) javax/naming/event/$(DEPDIR) javax/naming/ldap/$(DEPDIR) javax/naming/spi/$(DEPDIR) javax/net/$(DEPDIR) javax/net/ssl/$(DEPDIR) javax/print/$(DEPDIR) javax/print/attribute/$(DEPDIR) javax/print/attribute/standard/$(DEPDIR) javax/print/event/$(DEPDIR) javax/security/auth/$(DEPDIR) javax/security/auth/callback/$(DEPDIR) javax/security/auth/login/$(DEPDIR) javax/security/auth/spi/$(DEPDIR) javax/security/auth/x500/$(DEPDIR) javax/security/cert/$(DEPDIR) javax/security/sasl/$(DEPDIR) javax/sql/$(DEPDIR) javax/swing/$(DEPDIR) javax/swing/border/$(DEPDIR) javax/swing/colorchooser/$(DEPDIR) javax/swing/event/$(DEPDIR) javax/swing/filechooser/$(DEPDIR) javax/swing/plaf/$(DEPDIR) javax/swing/plaf/basic/$(DEPDIR) javax/swing/plaf/metal/$(DEPDIR) javax/swing/table/$(DEPDIR) javax/swing/text/$(DEPDIR) javax/swing/text/html/$(DEPDIR) javax/swing/text/html/parser/$(DEPDIR) javax/swing/tree/$(DEPDIR) javax/swing/undo/$(DEPDIR) javax/transaction/$(DEPDIR) javax/transaction/xa/$(DEPDIR) jni/classpath/$(DEPDIR) jni/gtk-peer/$(DEPDIR) org/ietf/jgss/$(DEPDIR) org/w3c/dom/$(DEPDIR) org/w3c/dom/ranges/$(DEPDIR) org/w3c/dom/traversal/$(DEPDIR) org/xml/sax/$(DEPDIR) org/xml/sax/ext/$(DEPDIR) org/xml/sax/helpers/$(DEPDIR) sysdep/$(DEPDIR)
+       -rm -rf ./$(DEPDIR) gnu/awt/$(DEPDIR) gnu/awt/j2d/$(DEPDIR) gnu/awt/xlib/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/awt/$(DEPDIR) gnu/java/awt/color/$(DEPDIR) gnu/java/awt/image/$(DEPDIR) gnu/java/awt/peer/$(DEPDIR) gnu/java/awt/peer/gtk/$(DEPDIR) gnu/java/beans/$(DEPDIR) gnu/java/beans/editors/$(DEPDIR) gnu/java/beans/info/$(DEPDIR) gnu/java/io/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/reflect/$(DEPDIR) gnu/java/locale/$(DEPDIR) gnu/java/math/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/net/protocol/file/$(DEPDIR) gnu/java/net/protocol/gcjlib/$(DEPDIR) gnu/java/net/protocol/http/$(DEPDIR) gnu/java/net/protocol/http/event/$(DEPDIR) gnu/java/net/protocol/jar/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) gnu/java/nio/charset/$(DEPDIR) gnu/java/rmi/$(DEPDIR) gnu/java/rmi/dgc/$(DEPDIR) gnu/java/rmi/registry/$(DEPDIR) gnu/java/rmi/rmic/$(DEPDIR) gnu/java/rmi/server/$(DEPDIR) gnu/java/security/$(DEPDIR) gnu/java/security/action/$(DEPDIR) gnu/java/security/der/$(DEPDIR) gnu/java/security/provider/$(DEPDIR) gnu/java/security/util/$(DEPDIR) gnu/java/security/x509/$(DEPDIR) gnu/java/security/x509/ext/$(DEPDIR) gnu/java/text/$(DEPDIR) gnu/java/util/$(DEPDIR) gnu/java/util/prefs/$(DEPDIR) gnu/regexp/$(DEPDIR) gnu/xml/aelfred2/$(DEPDIR) gnu/xml/dom/$(DEPDIR) gnu/xml/dom/ls/$(DEPDIR) gnu/xml/pipeline/$(DEPDIR) gnu/xml/transform/$(DEPDIR) gnu/xml/util/$(DEPDIR) gnu/xml/xpath/$(DEPDIR) java/applet/$(DEPDIR) java/awt/$(DEPDIR) java/awt/color/$(DEPDIR) java/awt/datatransfer/$(DEPDIR) java/awt/dnd/$(DEPDIR) java/awt/dnd/peer/$(DEPDIR) java/awt/event/$(DEPDIR) java/awt/font/$(DEPDIR) java/awt/geom/$(DEPDIR) java/awt/im/$(DEPDIR) java/awt/im/spi/$(DEPDIR) java/awt/image/$(DEPDIR) java/awt/image/renderable/$(DEPDIR) java/awt/peer/$(DEPDIR) java/awt/print/$(DEPDIR) java/beans/$(DEPDIR) java/beans/beancontext/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/math/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/nio/channels/spi/$(DEPDIR) java/nio/charset/$(DEPDIR) java/nio/charset/spi/$(DEPDIR) java/rmi/$(DEPDIR) java/rmi/activation/$(DEPDIR) java/rmi/dgc/$(DEPDIR) java/rmi/registry/$(DEPDIR) java/rmi/server/$(DEPDIR) java/security/$(DEPDIR) java/security/acl/$(DEPDIR) java/security/cert/$(DEPDIR) java/security/interfaces/$(DEPDIR) java/security/spec/$(DEPDIR) java/sql/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/jar/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/prefs/$(DEPDIR) java/util/regex/$(DEPDIR) java/util/zip/$(DEPDIR) javax/accessibility/$(DEPDIR) javax/crypto/$(DEPDIR) javax/crypto/interfaces/$(DEPDIR) javax/crypto/spec/$(DEPDIR) javax/imageio/$(DEPDIR) javax/imageio/event/$(DEPDIR) javax/imageio/metadata/$(DEPDIR) javax/imageio/spi/$(DEPDIR) javax/imageio/stream/$(DEPDIR) javax/naming/$(DEPDIR) javax/naming/directory/$(DEPDIR) javax/naming/event/$(DEPDIR) javax/naming/ldap/$(DEPDIR) javax/naming/spi/$(DEPDIR) javax/net/$(DEPDIR) javax/net/ssl/$(DEPDIR) javax/print/$(DEPDIR) javax/print/attribute/$(DEPDIR) javax/print/attribute/standard/$(DEPDIR) javax/print/event/$(DEPDIR) javax/security/auth/$(DEPDIR) javax/security/auth/callback/$(DEPDIR) javax/security/auth/login/$(DEPDIR) javax/security/auth/spi/$(DEPDIR) javax/security/auth/x500/$(DEPDIR) javax/security/cert/$(DEPDIR) javax/security/sasl/$(DEPDIR) javax/sql/$(DEPDIR) javax/swing/$(DEPDIR) javax/swing/border/$(DEPDIR) javax/swing/colorchooser/$(DEPDIR) javax/swing/event/$(DEPDIR) javax/swing/filechooser/$(DEPDIR) javax/swing/plaf/$(DEPDIR) javax/swing/plaf/basic/$(DEPDIR) javax/swing/plaf/metal/$(DEPDIR) javax/swing/table/$(DEPDIR) javax/swing/text/$(DEPDIR) javax/swing/text/html/$(DEPDIR) javax/swing/text/html/parser/$(DEPDIR) javax/swing/tree/$(DEPDIR) javax/swing/undo/$(DEPDIR) javax/transaction/$(DEPDIR) javax/transaction/xa/$(DEPDIR) javax/xml/$(DEPDIR) javax/xml/datatype/$(DEPDIR) javax/xml/namespace/$(DEPDIR) javax/xml/parsers/$(DEPDIR) javax/xml/transform/$(DEPDIR) javax/xml/transform/dom/$(DEPDIR) javax/xml/transform/sax/$(DEPDIR) javax/xml/transform/stream/$(DEPDIR) javax/xml/validation/$(DEPDIR) javax/xml/xpath/$(DEPDIR) jni/classpath/$(DEPDIR) jni/gtk-peer/$(DEPDIR) org/ietf/jgss/$(DEPDIR) sysdep/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-libtool distclean-local distclean-tags
@@ -24194,7 +25676,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf $(top_srcdir)/autom4te.cache
-       -rm -rf ./$(DEPDIR) gnu/awt/$(DEPDIR) gnu/awt/j2d/$(DEPDIR) gnu/awt/xlib/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/awt/$(DEPDIR) gnu/java/awt/color/$(DEPDIR) gnu/java/awt/image/$(DEPDIR) gnu/java/awt/peer/$(DEPDIR) gnu/java/awt/peer/gtk/$(DEPDIR) gnu/java/beans/$(DEPDIR) gnu/java/beans/editors/$(DEPDIR) gnu/java/beans/info/$(DEPDIR) gnu/java/io/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/reflect/$(DEPDIR) gnu/java/locale/$(DEPDIR) gnu/java/math/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/net/protocol/file/$(DEPDIR) gnu/java/net/protocol/gcjlib/$(DEPDIR) gnu/java/net/protocol/http/$(DEPDIR) gnu/java/net/protocol/http/event/$(DEPDIR) gnu/java/net/protocol/jar/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) gnu/java/nio/charset/$(DEPDIR) gnu/java/rmi/$(DEPDIR) gnu/java/rmi/dgc/$(DEPDIR) gnu/java/rmi/registry/$(DEPDIR) gnu/java/rmi/rmic/$(DEPDIR) gnu/java/rmi/server/$(DEPDIR) gnu/java/security/$(DEPDIR) gnu/java/security/action/$(DEPDIR) gnu/java/security/der/$(DEPDIR) gnu/java/security/provider/$(DEPDIR) gnu/java/security/util/$(DEPDIR) gnu/java/security/x509/$(DEPDIR) gnu/java/security/x509/ext/$(DEPDIR) gnu/java/text/$(DEPDIR) gnu/java/util/$(DEPDIR) gnu/java/util/prefs/$(DEPDIR) gnu/regexp/$(DEPDIR) java/applet/$(DEPDIR) java/awt/$(DEPDIR) java/awt/color/$(DEPDIR) java/awt/datatransfer/$(DEPDIR) java/awt/dnd/$(DEPDIR) java/awt/dnd/peer/$(DEPDIR) java/awt/event/$(DEPDIR) java/awt/font/$(DEPDIR) java/awt/geom/$(DEPDIR) java/awt/im/$(DEPDIR) java/awt/im/spi/$(DEPDIR) java/awt/image/$(DEPDIR) java/awt/image/renderable/$(DEPDIR) java/awt/peer/$(DEPDIR) java/awt/print/$(DEPDIR) java/beans/$(DEPDIR) java/beans/beancontext/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/math/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/nio/channels/spi/$(DEPDIR) java/nio/charset/$(DEPDIR) java/nio/charset/spi/$(DEPDIR) java/rmi/$(DEPDIR) java/rmi/activation/$(DEPDIR) java/rmi/dgc/$(DEPDIR) java/rmi/registry/$(DEPDIR) java/rmi/server/$(DEPDIR) java/security/$(DEPDIR) java/security/acl/$(DEPDIR) java/security/cert/$(DEPDIR) java/security/interfaces/$(DEPDIR) java/security/spec/$(DEPDIR) java/sql/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/jar/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/prefs/$(DEPDIR) java/util/regex/$(DEPDIR) java/util/zip/$(DEPDIR) javax/accessibility/$(DEPDIR) javax/crypto/$(DEPDIR) javax/crypto/interfaces/$(DEPDIR) javax/crypto/spec/$(DEPDIR) javax/imageio/$(DEPDIR) javax/imageio/event/$(DEPDIR) javax/imageio/metadata/$(DEPDIR) javax/imageio/spi/$(DEPDIR) javax/imageio/stream/$(DEPDIR) javax/naming/$(DEPDIR) javax/naming/directory/$(DEPDIR) javax/naming/event/$(DEPDIR) javax/naming/ldap/$(DEPDIR) javax/naming/spi/$(DEPDIR) javax/net/$(DEPDIR) javax/net/ssl/$(DEPDIR) javax/print/$(DEPDIR) javax/print/attribute/$(DEPDIR) javax/print/attribute/standard/$(DEPDIR) javax/print/event/$(DEPDIR) javax/security/auth/$(DEPDIR) javax/security/auth/callback/$(DEPDIR) javax/security/auth/login/$(DEPDIR) javax/security/auth/spi/$(DEPDIR) javax/security/auth/x500/$(DEPDIR) javax/security/cert/$(DEPDIR) javax/security/sasl/$(DEPDIR) javax/sql/$(DEPDIR) javax/swing/$(DEPDIR) javax/swing/border/$(DEPDIR) javax/swing/colorchooser/$(DEPDIR) javax/swing/event/$(DEPDIR) javax/swing/filechooser/$(DEPDIR) javax/swing/plaf/$(DEPDIR) javax/swing/plaf/basic/$(DEPDIR) javax/swing/plaf/metal/$(DEPDIR) javax/swing/table/$(DEPDIR) javax/swing/text/$(DEPDIR) javax/swing/text/html/$(DEPDIR) javax/swing/text/html/parser/$(DEPDIR) javax/swing/tree/$(DEPDIR) javax/swing/undo/$(DEPDIR) javax/transaction/$(DEPDIR) javax/transaction/xa/$(DEPDIR) jni/classpath/$(DEPDIR) jni/gtk-peer/$(DEPDIR) org/ietf/jgss/$(DEPDIR) org/w3c/dom/$(DEPDIR) org/w3c/dom/ranges/$(DEPDIR) org/w3c/dom/traversal/$(DEPDIR) org/xml/sax/$(DEPDIR) org/xml/sax/ext/$(DEPDIR) org/xml/sax/helpers/$(DEPDIR) sysdep/$(DEPDIR)
+       -rm -rf ./$(DEPDIR) gnu/awt/$(DEPDIR) gnu/awt/j2d/$(DEPDIR) gnu/awt/xlib/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/awt/$(DEPDIR) gnu/java/awt/color/$(DEPDIR) gnu/java/awt/image/$(DEPDIR) gnu/java/awt/peer/$(DEPDIR) gnu/java/awt/peer/gtk/$(DEPDIR) gnu/java/beans/$(DEPDIR) gnu/java/beans/editors/$(DEPDIR) gnu/java/beans/info/$(DEPDIR) gnu/java/io/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/reflect/$(DEPDIR) gnu/java/locale/$(DEPDIR) gnu/java/math/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/net/protocol/file/$(DEPDIR) gnu/java/net/protocol/gcjlib/$(DEPDIR) gnu/java/net/protocol/http/$(DEPDIR) gnu/java/net/protocol/http/event/$(DEPDIR) gnu/java/net/protocol/jar/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) gnu/java/nio/charset/$(DEPDIR) gnu/java/rmi/$(DEPDIR) gnu/java/rmi/dgc/$(DEPDIR) gnu/java/rmi/registry/$(DEPDIR) gnu/java/rmi/rmic/$(DEPDIR) gnu/java/rmi/server/$(DEPDIR) gnu/java/security/$(DEPDIR) gnu/java/security/action/$(DEPDIR) gnu/java/security/der/$(DEPDIR) gnu/java/security/provider/$(DEPDIR) gnu/java/security/util/$(DEPDIR) gnu/java/security/x509/$(DEPDIR) gnu/java/security/x509/ext/$(DEPDIR) gnu/java/text/$(DEPDIR) gnu/java/util/$(DEPDIR) gnu/java/util/prefs/$(DEPDIR) gnu/regexp/$(DEPDIR) gnu/xml/aelfred2/$(DEPDIR) gnu/xml/dom/$(DEPDIR) gnu/xml/dom/ls/$(DEPDIR) gnu/xml/pipeline/$(DEPDIR) gnu/xml/transform/$(DEPDIR) gnu/xml/util/$(DEPDIR) gnu/xml/xpath/$(DEPDIR) java/applet/$(DEPDIR) java/awt/$(DEPDIR) java/awt/color/$(DEPDIR) java/awt/datatransfer/$(DEPDIR) java/awt/dnd/$(DEPDIR) java/awt/dnd/peer/$(DEPDIR) java/awt/event/$(DEPDIR) java/awt/font/$(DEPDIR) java/awt/geom/$(DEPDIR) java/awt/im/$(DEPDIR) java/awt/im/spi/$(DEPDIR) java/awt/image/$(DEPDIR) java/awt/image/renderable/$(DEPDIR) java/awt/peer/$(DEPDIR) java/awt/print/$(DEPDIR) java/beans/$(DEPDIR) java/beans/beancontext/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/math/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/nio/channels/spi/$(DEPDIR) java/nio/charset/$(DEPDIR) java/nio/charset/spi/$(DEPDIR) java/rmi/$(DEPDIR) java/rmi/activation/$(DEPDIR) java/rmi/dgc/$(DEPDIR) java/rmi/registry/$(DEPDIR) java/rmi/server/$(DEPDIR) java/security/$(DEPDIR) java/security/acl/$(DEPDIR) java/security/cert/$(DEPDIR) java/security/interfaces/$(DEPDIR) java/security/spec/$(DEPDIR) java/sql/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/jar/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/prefs/$(DEPDIR) java/util/regex/$(DEPDIR) java/util/zip/$(DEPDIR) javax/accessibility/$(DEPDIR) javax/crypto/$(DEPDIR) javax/crypto/interfaces/$(DEPDIR) javax/crypto/spec/$(DEPDIR) javax/imageio/$(DEPDIR) javax/imageio/event/$(DEPDIR) javax/imageio/metadata/$(DEPDIR) javax/imageio/spi/$(DEPDIR) javax/imageio/stream/$(DEPDIR) javax/naming/$(DEPDIR) javax/naming/directory/$(DEPDIR) javax/naming/event/$(DEPDIR) javax/naming/ldap/$(DEPDIR) javax/naming/spi/$(DEPDIR) javax/net/$(DEPDIR) javax/net/ssl/$(DEPDIR) javax/print/$(DEPDIR) javax/print/attribute/$(DEPDIR) javax/print/attribute/standard/$(DEPDIR) javax/print/event/$(DEPDIR) javax/security/auth/$(DEPDIR) javax/security/auth/callback/$(DEPDIR) javax/security/auth/login/$(DEPDIR) javax/security/auth/spi/$(DEPDIR) javax/security/auth/x500/$(DEPDIR) javax/security/cert/$(DEPDIR) javax/security/sasl/$(DEPDIR) javax/sql/$(DEPDIR) javax/swing/$(DEPDIR) javax/swing/border/$(DEPDIR) javax/swing/colorchooser/$(DEPDIR) javax/swing/event/$(DEPDIR) javax/swing/filechooser/$(DEPDIR) javax/swing/plaf/$(DEPDIR) javax/swing/plaf/basic/$(DEPDIR) javax/swing/plaf/metal/$(DEPDIR) javax/swing/table/$(DEPDIR) javax/swing/text/$(DEPDIR) javax/swing/text/html/$(DEPDIR) javax/swing/text/html/parser/$(DEPDIR) javax/swing/tree/$(DEPDIR) javax/swing/undo/$(DEPDIR) javax/transaction/$(DEPDIR) javax/transaction/xa/$(DEPDIR) javax/xml/$(DEPDIR) javax/xml/datatype/$(DEPDIR) javax/xml/namespace/$(DEPDIR) javax/xml/parsers/$(DEPDIR) javax/xml/transform/$(DEPDIR) javax/xml/transform/dom/$(DEPDIR) javax/xml/transform/sax/$(DEPDIR) javax/xml/transform/stream/$(DEPDIR) javax/xml/validation/$(DEPDIR) javax/xml/xpath/$(DEPDIR) jni/classpath/$(DEPDIR) jni/gtk-peer/$(DEPDIR) org/ietf/jgss/$(DEPDIR) sysdep/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -24336,16 +25818,13 @@ $(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDEN
 %.properties.lo: %.properties
        $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"`
 
-%.properties.lo: %.properties
-       $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"`
-
 # Compile all classfiles in one go.
 
 @ONESTEP_TRUE@libgcj-@gcc_version@.jar: $(all_java_source_files)
 @ONESTEP_TRUE@ -@rm -f libgcj-@gcc_version@.jar
 @ONESTEP_TRUE@ @echo Compiling Java sourcefiles...
 @ONESTEP_TRUE@ @: $(call write_entries_to_file,$?,libgcj.sourcelist)
-@ONESTEP_TRUE@ $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir) -d $(here) @libgcj.sourcelist
+@ONESTEP_TRUE@ $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(BOOTCLASSPATH) -d $(here) @libgcj.sourcelist
 @ONESTEP_TRUE@ (find java gnu javax org -type d -o -type f -name '*.class'; \
 @ONESTEP_TRUE@ for file in $(all_property_files); do \
 @ONESTEP_TRUE@   echo "x-C" | sed -e 's/^.//'; \
@@ -24354,6 +25833,15 @@ $(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDEN
 @ONESTEP_TRUE@ done) | \
 @ONESTEP_TRUE@   sed -e '/\/xlib/d' -e '/\/\.libs/d' -e '/\/\.deps/d' | \
 @ONESTEP_TRUE@   $(ZIP) -cfM0E@ $@
+@ONESTEP_TRUE@ for dir in sax w3c_dom; do \
+@ONESTEP_TRUE@   (cd external/$$dir; \
+@ONESTEP_TRUE@   find org -type f -name '*.class' -print | while read file; do \
+@ONESTEP_TRUE@     echo "x-C" | sed -e 's/^.//'; \
+@ONESTEP_TRUE@     echo external/$$dir; \
+@ONESTEP_TRUE@     echo $$file; \
+@ONESTEP_TRUE@          done) | \
+@ONESTEP_TRUE@   $(ZIP) -ufM0E@ $@; \
+@ONESTEP_TRUE@ done
 
 # This next rule seems backward, but reflects the fact
 # that 1) all classfiles are compiled in one go when the
@@ -24377,6 +25865,15 @@ $(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDEN
 @ONESTEP_FALSE@        done) | \
 @ONESTEP_FALSE@          sed -e '/\/xlib/d' -e '/\/\.libs/d' -e '/\/\.deps/d' | \
 @ONESTEP_FALSE@          $(ZIP) -cfM0E@ $@
+@ONESTEP_FALSE@        for dir in sax w3c_dom; do \
+@ONESTEP_FALSE@          (cd external/$$dir; \
+@ONESTEP_FALSE@          find org -type f -name '*.class' -print | while read file; do \
+@ONESTEP_FALSE@            echo "x-C" | sed -e 's/^.//'; \
+@ONESTEP_FALSE@            echo external/$$dir; \
+@ONESTEP_FALSE@            echo $$file; \
+@ONESTEP_FALSE@          done) | \
+@ONESTEP_FALSE@          $(ZIP) -ufM0E@ $@; \
+@ONESTEP_FALSE@        done
 
 mostlyclean-local:
        find . -name '*.lo' -print | xargs $(LIBTOOL) rm -f
@@ -24392,10 +25889,10 @@ distclean-local:
 clean-nat:
        rm -f $(nat_files) $(xlib_nat_files)
 
-$(filter-out gnu/gcj/runtime/StackTrace.lo, $(javao_files)) $(xlib_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_ietf_jgss_la_OBJECTS): %.lo: %.java
+$(filter-out gnu/gcj/runtime/StackTrace.lo, $(javao_files)) $(xlib_javao_files): %.lo: %.java
        $(LTGCJCOMPILE) -o $@ -c $<
 
-$(gtk_awt_peer_sources:.java=.lo): %.lo: %.java
+$(gtk_awt_peer_sources:.java=.lo) $(gnu_xml_source_files:.java=.lo): %.lo: %.java
        $(LTGCJCOMPILE) -fjni -o $@ -c $<
 
 gnu/gcj/runtime/StackTrace.lo: gnu/gcj/runtime/StackTrace.java
@@ -24414,7 +25911,7 @@ lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPEND
        $(lib_gnu_awt_xlib_la_LINK) -objectlist lib_gnu_awt_xlib.objectlist \
        -rpath $(toolexeclibdir) $(lib_gnu_awt_xlib_la_LDFLAGS) $(LIBS)
 
-.class.h:
+%.h: %.class
        $(GCJH) -classpath '' -bootclasspath $(top_builddir) $(basename $<)
 
 $(ordinary_nat_headers) $(xlib_nat_headers): %.h: %.class
diff --git a/libjava/configure b/libjava/configure
index 5242a00..277dd8b 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -16316,7 +16316,7 @@ here=`${PWDCMD-pwd}`
 # We get this from the environment.
 
 
-                                                                                ac_config_files="$ac_config_files Makefile libgcj.pc libgcj.spec libgcj-test.spec gnu/classpath/Configuration.java gcj/Makefile include/Makefile testsuite/Makefile"
+                                                                                                              ac_config_files="$ac_config_files Makefile libgcj.pc libgcj.spec libgcj-test.spec gnu/classpath/Configuration.java gcj/Makefile include/Makefile testsuite/Makefile external/Makefile external/sax/Makefile external/w3c_dom/Makefile"
 
 
           ac_config_commands="$ac_config_commands default"
@@ -17040,6 +17040,9 @@ do
   "gcj/Makefile" ) CONFIG_FILES="$CONFIG_FILES gcj/Makefile" ;;
   "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
   "testsuite/Makefile" ) CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
+  "external/Makefile" ) CONFIG_FILES="$CONFIG_FILES external/Makefile" ;;
+  "external/sax/Makefile" ) CONFIG_FILES="$CONFIG_FILES external/sax/Makefile" ;;
+  "external/w3c_dom/Makefile" ) CONFIG_FILES="$CONFIG_FILES external/w3c_dom/Makefile" ;;
   "include/platform.h" ) CONFIG_LINKS="$CONFIG_LINKS include/platform.h:include/$PLATFORMH" ;;
   "java/io/natFile.cc" ) CONFIG_LINKS="$CONFIG_LINKS java/io/natFile.cc:java/io/natFile${FILE-${PLATFORM}}.cc" ;;
   "java/lang/ConcreteProcess.java" ) CONFIG_LINKS="$CONFIG_LINKS java/lang/ConcreteProcess.java:java/lang/${PLATFORM}Process.java" ;;
diff --git a/libjava/configure.ac b/libjava/configure.ac
index c453029..2925785 100644 (file)
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1389,6 +1389,9 @@ gnu/classpath/Configuration.java
 gcj/Makefile
 include/Makefile
 testsuite/Makefile
+external/Makefile
+external/sax/Makefile
+external/w3c_dom/Makefile
 ])
 
 AC_CONFIG_COMMANDS([default],
diff --git a/libjava/external/Makefile.am b/libjava/external/Makefile.am
new file mode 100644 (file)
index 0000000..1f9b175
--- /dev/null
+++ b/libjava/external/Makefile.am
@@ -0,0 +1,44 @@
+## Input file for automake to generate the Makefile.in used by configure
+
+SUBDIRS = sax w3c_dom
+
+# Work around what appears to be a GNU make bug handling MAKEFLAGS
+# values defined in terms of make variables, as is the case for CC and
+# friends when we are called from the top level Makefile.
+AM_MAKEFLAGS = \
+       "AR_FLAGS=$(AR_FLAGS)" \
+       "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+       "CFLAGS=$(CFLAGS)" \
+       "CXXFLAGS=$(CXXFLAGS)" \
+       "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+       "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+       "INSTALL=$(INSTALL)" \
+       "INSTALL_DATA=$(INSTALL_DATA)" \
+       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+       "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
+       "LDFLAGS=$(LDFLAGS)" \
+       "LIBCFLAGS=$(LIBCFLAGS)" \
+       "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
+       "MAKE=$(MAKE)" \
+       "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+       "PICFLAG=$(PICFLAG)" \
+       "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
+       "SHELL=$(SHELL)" \
+       "EXPECT=$(EXPECT)" \
+       "RUNTEST=$(RUNTEST)" \
+       "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+       "exec_prefix=$(exec_prefix)" \
+       "infodir=$(infodir)" \
+       "libdir=$(libdir)" \
+       "prefix=$(prefix)" \
+       "tooldir=$(tooldir)" \
+       "AR=$(AR)" \
+       "AS=$(AS)" \
+       "CC=$(CC)" \
+       "CXX=$(CXX)" \
+       "LD=$(LD)" \
+       "LIBCFLAGS=$(LIBCFLAGS)" \
+       "NM=$(NM)" \
+       "PICFLAG=$(PICFLAG)" \
+       "RANLIB=$(RANLIB)" \
+       "DESTDIR=$(DESTDIR)"
diff --git a/libjava/external/Makefile.in b/libjava/external/Makefile.in
new file mode 100644 (file)
index 0000000..a35f042
--- /dev/null
+++ b/libjava/external/Makefile.in
@@ -0,0 +1,633 @@
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = external
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
+       $(top_srcdir)/../config/acx.m4 \
+       $(top_srcdir)/../config/gcc-version.m4 \
+       $(top_srcdir)/../config/gxx-include-dir.m4 \
+       $(top_srcdir)/../config/iconv.m4 \
+       $(top_srcdir)/../config/lcmessage.m4 \
+       $(top_srcdir)/../config/lib-ld.m4 \
+       $(top_srcdir)/../config/lib-link.m4 \
+       $(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \
+       $(top_srcdir)/acinclude.m4 \
+       $(top_srcdir)/../config/no-executables.m4 \
+       $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+       $(top_builddir)/gcj/libgcj-config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+       html-recursive info-recursive install-data-recursive \
+       install-exec-recursive install-info-recursive \
+       install-recursive installcheck-recursive installdirs-recursive \
+       pdf-recursive ps-recursive uninstall-info-recursive \
+       uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BACKTRACESPEC = @BACKTRACESPEC@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CHECKREFSPEC = @CHECKREFSPEC@
+CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
+COMPPATH = @COMPPATH@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIRLTDL = @DIRLTDL@
+DIVIDESPEC = @DIVIDESPEC@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXCEPTIONSPEC = @EXCEPTIONSPEC@
+EXEEXT = @EXEEXT@
+GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
+GCDEPS = @GCDEPS@
+GCINCS = @GCINCS@
+GCJ = @GCJ@
+GCJDEPMODE = @GCJDEPMODE@
+GCJFLAGS = @GCJFLAGS@
+GCJH = @GCJH@
+GCJVERSION = @GCJVERSION@
+GCLIBS = @GCLIBS@
+GCSPEC = @GCSPEC@
+GCTESTSPEC = @GCTESTSPEC@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GTK_AWT_FALSE = @GTK_AWT_FALSE@
+GTK_AWT_TRUE = @GTK_AWT_TRUE@
+GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
+GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+HASH_SYNC_SPEC = @HASH_SYNC_SPEC@
+IEEESPEC = @IEEESPEC@
+INCLTDL = @INCLTDL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTERPRETER = @INTERPRETER@
+JC1GCSPEC = @JC1GCSPEC@
+LDFLAGS = @LDFLAGS@
+LIBART_CFLAGS = @LIBART_CFLAGS@
+LIBART_LIBS = @LIBART_LIBS@
+LIBFFI = @LIBFFI@
+LIBFFIINCS = @LIBFFIINCS@
+LIBGCJDEBUG = @LIBGCJDEBUG@
+LIBGCJTESTSPEC = @LIBGCJTESTSPEC@
+LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@
+LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@
+LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
+LIBGCJ_LD_SYMBOLIC = @LIBGCJ_LD_SYMBOLIC@
+LIBICONV = @LIBICONV@
+LIBLTDL = @LIBLTDL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NATIVE_FALSE = @NATIVE_FALSE@
+NATIVE_TRUE = @NATIVE_TRUE@
+NEEDS_DATA_START_FALSE = @NEEDS_DATA_START_FALSE@
+NEEDS_DATA_START_TRUE = @NEEDS_DATA_START_TRUE@
+OBJEXT = @OBJEXT@
+ONESTEP_FALSE = @ONESTEP_FALSE@
+ONESTEP_TRUE = @ONESTEP_TRUE@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOFT2_CFLAGS = @PANGOFT2_CFLAGS@
+PANGOFT2_LIBS = @PANGOFT2_LIBS@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_INNER_NAT_HDRS = @PLATFORM_INNER_NAT_HDRS@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SUPPLY_BACKTRACE_FALSE = @SUPPLY_BACKTRACE_FALSE@
+SUPPLY_BACKTRACE_TRUE = @SUPPLY_BACKTRACE_TRUE@
+SYSDEP_SOURCES = @SYSDEP_SOURCES@
+SYSTEMSPEC = @SYSTEMSPEC@
+SYS_ZLIBS = @SYS_ZLIBS@
+TESTSUBDIR_FALSE = @TESTSUBDIR_FALSE@
+TESTSUBDIR_TRUE = @TESTSUBDIR_TRUE@
+THREADCXXFLAGS = @THREADCXXFLAGS@
+THREADDEPS = @THREADDEPS@
+THREADINCS = @THREADINCS@
+THREADLDFLAGS = @THREADLDFLAGS@
+THREADLIBS = @THREADLIBS@
+THREADSPEC = @THREADSPEC@
+TOOLKIT = @TOOLKIT@
+USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@
+USING_BOEHMGC_TRUE = @USING_BOEHMGC_TRUE@
+USING_DARWIN_CRT_FALSE = @USING_DARWIN_CRT_FALSE@
+USING_DARWIN_CRT_TRUE = @USING_DARWIN_CRT_TRUE@
+USING_ECOS_PLATFORM_FALSE = @USING_ECOS_PLATFORM_FALSE@
+USING_ECOS_PLATFORM_TRUE = @USING_ECOS_PLATFORM_TRUE@
+USING_GCC_FALSE = @USING_GCC_FALSE@
+USING_GCC_TRUE = @USING_GCC_TRUE@
+USING_NOGC_FALSE = @USING_NOGC_FALSE@
+USING_NOGC_TRUE = @USING_NOGC_TRUE@
+USING_NO_THREADS_FALSE = @USING_NO_THREADS_FALSE@
+USING_NO_THREADS_TRUE = @USING_NO_THREADS_TRUE@
+USING_POSIX_PLATFORM_FALSE = @USING_POSIX_PLATFORM_FALSE@
+USING_POSIX_PLATFORM_TRUE = @USING_POSIX_PLATFORM_TRUE@
+USING_POSIX_THREADS_FALSE = @USING_POSIX_THREADS_FALSE@
+USING_POSIX_THREADS_TRUE = @USING_POSIX_THREADS_TRUE@
+USING_WIN32_PLATFORM_FALSE = @USING_WIN32_PLATFORM_FALSE@
+USING_WIN32_PLATFORM_TRUE = @USING_WIN32_PLATFORM_TRUE@
+USING_WIN32_THREADS_FALSE = @USING_WIN32_THREADS_FALSE@
+USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@
+VERSION = @VERSION@
+XLIB_AWT_FALSE = @XLIB_AWT_FALSE@
+XLIB_AWT_TRUE = @XLIB_AWT_TRUE@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+ZINCS = @ZINCS@
+ZIP = @ZIP@
+ZLIBS = @ZLIBS@
+ZLIBSPEC = @ZLIBSPEC@
+ZLIBTESTSPEC = @ZLIBTESTSPEC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_GCJ = @ac_ct_GCJ@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__fastdepGCJ_FALSE = @am__fastdepGCJ_FALSE@
+am__fastdepGCJ_TRUE = @am__fastdepGCJ_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+gcc_version = @gcc_version@
+gcc_version_full = @gcc_version_full@
+gcc_version_trigger = @gcc_version_trigger@
+gxx_include_dir = @gxx_include_dir@
+here = @here@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libgcj_basedir = @libgcj_basedir@
+libstdcxx_incdir = @libstdcxx_incdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+mkinstalldirs = @mkinstalldirs@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_noncanonical = @target_noncanonical@
+target_os = @target_os@
+target_vendor = @target_vendor@
+tool_include_dir = @tool_include_dir@
+toolexecdir = @toolexecdir@
+toolexeclibdir = @toolexeclibdir@
+toolexecmainlibdir = @toolexecmainlibdir@
+SUBDIRS = sax w3c_dom
+
+# Work around what appears to be a GNU make bug handling MAKEFLAGS
+# values defined in terms of make variables, as is the case for CC and
+# friends when we are called from the top level Makefile.
+AM_MAKEFLAGS = \
+       "AR_FLAGS=$(AR_FLAGS)" \
+       "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+       "CFLAGS=$(CFLAGS)" \
+       "CXXFLAGS=$(CXXFLAGS)" \
+       "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+       "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+       "INSTALL=$(INSTALL)" \
+       "INSTALL_DATA=$(INSTALL_DATA)" \
+       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+       "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
+       "LDFLAGS=$(LDFLAGS)" \
+       "LIBCFLAGS=$(LIBCFLAGS)" \
+       "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
+       "MAKE=$(MAKE)" \
+       "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+       "PICFLAG=$(PICFLAG)" \
+       "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
+       "SHELL=$(SHELL)" \
+       "EXPECT=$(EXPECT)" \
+       "RUNTEST=$(RUNTEST)" \
+       "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+       "exec_prefix=$(exec_prefix)" \
+       "infodir=$(infodir)" \
+       "libdir=$(libdir)" \
+       "prefix=$(prefix)" \
+       "tooldir=$(tooldir)" \
+       "AR=$(AR)" \
+       "AS=$(AS)" \
+       "CC=$(CC)" \
+       "CXX=$(CXX)" \
+       "LD=$(LD)" \
+       "LIBCFLAGS=$(LIBCFLAGS)" \
+       "NM=$(NM)" \
+       "PICFLAG=$(PICFLAG)" \
+       "RANLIB=$(RANLIB)" \
+       "DESTDIR=$(DESTDIR)"
+
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  external/Makefile'; \
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --gnu  external/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+distclean-libtool:
+       -rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+       @set fnord $$MAKEFLAGS; amf=$$2; \
+       dot_seen=no; \
+       target=`echo $@ | sed s/-recursive//`; \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         echo "Making $$target in $$subdir"; \
+         if test "$$subdir" = "."; then \
+           dot_seen=yes; \
+           local_target="$$target-am"; \
+         else \
+           local_target="$$target"; \
+         fi; \
+         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+       done; \
+       if test "$$dot_seen" = "no"; then \
+         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+       fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+       @set fnord $$MAKEFLAGS; amf=$$2; \
+       dot_seen=no; \
+       case "$@" in \
+         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+         *) list='$(SUBDIRS)' ;; \
+       esac; \
+       rev=''; for subdir in $$list; do \
+         if test "$$subdir" = "."; then :; else \
+           rev="$$subdir $$rev"; \
+         fi; \
+       done; \
+       rev="$$rev ."; \
+       target=`echo $@ | sed s/-recursive//`; \
+       for subdir in $$rev; do \
+         echo "Making $$target in $$subdir"; \
+         if test "$$subdir" = "."; then \
+           local_target="$$target-am"; \
+         else \
+           local_target="$$target"; \
+         fi; \
+         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+       done && test -z "$$fail"
+tags-recursive:
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+       done
+ctags-recursive:
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+       done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+         include_option=--etags-include; \
+         empty_fix=.; \
+       else \
+         include_option=--include; \
+         empty_fix=; \
+       fi; \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test ! -f $$subdir/TAGS || \
+             tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+         fi; \
+       done; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && cd $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+       list='$(DISTFILES)'; for file in $$list; do \
+         case $$file in \
+           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+         esac; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           dir="/$$dir"; \
+           $(mkdir_p) "$(distdir)$$dir"; \
+         else \
+           dir=''; \
+         fi; \
+         if test -d $$d/$$file; then \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test -d "$(distdir)/$$subdir" \
+           || $(mkdir_p) "$(distdir)/$$subdir" \
+           || exit 1; \
+           distdir=`$(am__cd) $(distdir) && pwd`; \
+           top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+           (cd $$subdir && \
+             $(MAKE) $(AM_MAKEFLAGS) \
+               top_distdir="$$top_distdir" \
+               distdir="$$distdir/$$subdir" \
+               distdir) \
+             || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+       -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
+       distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+       clean clean-generic clean-libtool clean-recursive ctags \
+       ctags-recursive distclean distclean-generic distclean-libtool \
+       distclean-recursive distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+       install-data-am install-exec install-exec-am install-info \
+       install-info-am install-man install-strip installcheck \
+       installcheck-am installdirs installdirs-am maintainer-clean \
+       maintainer-clean-generic maintainer-clean-recursive \
+       mostlyclean mostlyclean-generic mostlyclean-libtool \
+       mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+       uninstall uninstall-am uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/libjava/external/README b/libjava/external/README
new file mode 100644 (file)
index 0000000..d6d6491
--- /dev/null
+++ b/libjava/external/README
@@ -0,0 +1,3 @@
+This directory contains libraries maintained externally to GNU Classpath.
+
+See the README files in the subdirectories for more information.
diff --git a/libjava/external/sax/Makefile.am b/libjava/external/sax/Makefile.am
new file mode 100644 (file)
index 0000000..d6afe8c
--- /dev/null
+++ b/libjava/external/sax/Makefile.am
@@ -0,0 +1,67 @@
+## Process this file with automake to produce Makefile.in.
+
+AUTOMAKE_OPTIONS = foreign subdir-objects
+
+## The compiler with whatever flags we want for both -c and -C
+## compiles.
+GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
+
+BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir)
+
+AM_GCJFLAGS = \
+       -B$(top_builddir) \
+       @LIBGCJ_JAVAFLAGS@ \
+       -fclasspath= -fbootclasspath=$(BOOTCLASSPATH) \
+       --encoding=UTF-8 \
+       -Wno-deprecated
+
+all-local: classes.stamp
+
+classes.stamp: $(libsax_convenience_la_SOURCES)
+       here=`pwd`; cd $(srcdir); \
+       $(GCJ_WITH_FLAGS) -C -d $$here $(libsax_convenience_la_SOURCES)
+       echo > classes.stamp
+
+mostlyclean-local:
+       find . -name '*.class' | xargs rm
+       rm classes.stamp
+
+noinst_LTLIBRARIES = libsax_convenience.la
+
+libsax_convenience_la_SOURCES =        \
+org/xml/sax/SAXNotSupportedException.java \
+org/xml/sax/helpers/NamespaceSupport.java \
+org/xml/sax/helpers/AttributesImpl.java        \
+org/xml/sax/helpers/LocatorImpl.java \
+org/xml/sax/helpers/DefaultHandler.java        \
+org/xml/sax/helpers/AttributeListImpl.java \
+org/xml/sax/helpers/ParserFactory.java \
+org/xml/sax/helpers/NewInstance.java \
+org/xml/sax/helpers/XMLFilterImpl.java \
+org/xml/sax/helpers/ParserAdapter.java \
+org/xml/sax/helpers/XMLReaderAdapter.java \
+org/xml/sax/helpers/XMLReaderFactory.java \
+org/xml/sax/HandlerBase.java \
+org/xml/sax/SAXException.java \
+org/xml/sax/ContentHandler.java        \
+org/xml/sax/SAXNotRecognizedException.java \
+org/xml/sax/ErrorHandler.java \
+org/xml/sax/AttributeList.java \
+org/xml/sax/Locator.java \
+org/xml/sax/Attributes.java \
+org/xml/sax/SAXParseException.java \
+org/xml/sax/XMLFilter.java \
+org/xml/sax/EntityResolver.java        \
+org/xml/sax/XMLReader.java \
+org/xml/sax/ext/Locator2.java \
+org/xml/sax/ext/LexicalHandler.java \
+org/xml/sax/ext/Attributes2Impl.java \
+org/xml/sax/ext/DeclHandler.java \
+org/xml/sax/ext/Attributes2.java \
+org/xml/sax/ext/EntityResolver2.java \
+org/xml/sax/ext/Locator2Impl.java \
+org/xml/sax/ext/DefaultHandler2.java \
+org/xml/sax/InputSource.java \
+org/xml/sax/DocumentHandler.java \
+org/xml/sax/DTDHandler.java \
+org/xml/sax/Parser.java
diff --git a/libjava/external/sax/Makefile.in b/libjava/external/sax/Makefile.in
new file mode 100644 (file)
index 0000000..d1c3219
--- /dev/null
+++ b/libjava/external/sax/Makefile.in
@@ -0,0 +1,861 @@
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+SOURCES = $(libsax_convenience_la_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = external/sax
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
+       $(top_srcdir)/../config/acx.m4 \
+       $(top_srcdir)/../config/gcc-version.m4 \
+       $(top_srcdir)/../config/gxx-include-dir.m4 \
+       $(top_srcdir)/../config/iconv.m4 \
+       $(top_srcdir)/../config/lcmessage.m4 \
+       $(top_srcdir)/../config/lib-ld.m4 \
+       $(top_srcdir)/../config/lib-link.m4 \
+       $(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \
+       $(top_srcdir)/acinclude.m4 \
+       $(top_srcdir)/../config/no-executables.m4 \
+       $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+       $(top_builddir)/gcj/libgcj-config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libsax_convenience_la_LIBADD =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libsax_convenience_la_OBJECTS =  \
+       org/xml/sax/SAXNotSupportedException.lo \
+       org/xml/sax/helpers/NamespaceSupport.lo \
+       org/xml/sax/helpers/AttributesImpl.lo \
+       org/xml/sax/helpers/LocatorImpl.lo \
+       org/xml/sax/helpers/DefaultHandler.lo \
+       org/xml/sax/helpers/AttributeListImpl.lo \
+       org/xml/sax/helpers/ParserFactory.lo \
+       org/xml/sax/helpers/NewInstance.lo \
+       org/xml/sax/helpers/XMLFilterImpl.lo \
+       org/xml/sax/helpers/ParserAdapter.lo \
+       org/xml/sax/helpers/XMLReaderAdapter.lo \
+       org/xml/sax/helpers/XMLReaderFactory.lo \
+       org/xml/sax/HandlerBase.lo org/xml/sax/SAXException.lo \
+       org/xml/sax/ContentHandler.lo \
+       org/xml/sax/SAXNotRecognizedException.lo \
+       org/xml/sax/ErrorHandler.lo org/xml/sax/AttributeList.lo \
+       org/xml/sax/Locator.lo org/xml/sax/Attributes.lo \
+       org/xml/sax/SAXParseException.lo org/xml/sax/XMLFilter.lo \
+       org/xml/sax/EntityResolver.lo org/xml/sax/XMLReader.lo \
+       org/xml/sax/ext/Locator2.lo org/xml/sax/ext/LexicalHandler.lo \
+       org/xml/sax/ext/Attributes2Impl.lo \
+       org/xml/sax/ext/DeclHandler.lo org/xml/sax/ext/Attributes2.lo \
+       org/xml/sax/ext/EntityResolver2.lo \
+       org/xml/sax/ext/Locator2Impl.lo \
+       org/xml/sax/ext/DefaultHandler2.lo org/xml/sax/InputSource.lo \
+       org/xml/sax/DocumentHandler.lo org/xml/sax/DTDHandler.lo \
+       org/xml/sax/Parser.lo
+libsax_convenience_la_OBJECTS = $(am_libsax_convenience_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/gcj
+depcomp = $(SHELL) $(top_srcdir)/../depcomp
+am__depfiles_maybe = depfiles
+GCJCOMPILE = $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS)
+LTGCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) $(AM_GCJFLAGS) \
+       $(GCJFLAGS)
+GCJLD = $(GCJ)
+GCJLINK = $(LIBTOOL) --mode=link $(GCJLD) $(AM_GCJFLAGS) $(GCJFLAGS) \
+       $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libsax_convenience_la_SOURCES)
+DIST_SOURCES = $(libsax_convenience_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BACKTRACESPEC = @BACKTRACESPEC@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CHECKREFSPEC = @CHECKREFSPEC@
+CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
+COMPPATH = @COMPPATH@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIRLTDL = @DIRLTDL@
+DIVIDESPEC = @DIVIDESPEC@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXCEPTIONSPEC = @EXCEPTIONSPEC@
+EXEEXT = @EXEEXT@
+GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
+GCDEPS = @GCDEPS@
+GCINCS = @GCINCS@
+GCJ = @GCJ@
+GCJDEPMODE = @GCJDEPMODE@
+GCJFLAGS = @GCJFLAGS@
+GCJH = @GCJH@
+GCJVERSION = @GCJVERSION@
+GCLIBS = @GCLIBS@
+GCSPEC = @GCSPEC@
+GCTESTSPEC = @GCTESTSPEC@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GTK_AWT_FALSE = @GTK_AWT_FALSE@
+GTK_AWT_TRUE = @GTK_AWT_TRUE@
+GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
+GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+HASH_SYNC_SPEC = @HASH_SYNC_SPEC@
+IEEESPEC = @IEEESPEC@
+INCLTDL = @INCLTDL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTERPRETER = @INTERPRETER@
+JC1GCSPEC = @JC1GCSPEC@
+LDFLAGS = @LDFLAGS@
+LIBART_CFLAGS = @LIBART_CFLAGS@
+LIBART_LIBS = @LIBART_LIBS@
+LIBFFI = @LIBFFI@
+LIBFFIINCS = @LIBFFIINCS@
+LIBGCJDEBUG = @LIBGCJDEBUG@
+LIBGCJTESTSPEC = @LIBGCJTESTSPEC@
+LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@
+LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@
+LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
+LIBGCJ_LD_SYMBOLIC = @LIBGCJ_LD_SYMBOLIC@
+LIBICONV = @LIBICONV@
+LIBLTDL = @LIBLTDL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NATIVE_FALSE = @NATIVE_FALSE@
+NATIVE_TRUE = @NATIVE_TRUE@
+NEEDS_DATA_START_FALSE = @NEEDS_DATA_START_FALSE@
+NEEDS_DATA_START_TRUE = @NEEDS_DATA_START_TRUE@
+OBJEXT = @OBJEXT@
+ONESTEP_FALSE = @ONESTEP_FALSE@
+ONESTEP_TRUE = @ONESTEP_TRUE@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOFT2_CFLAGS = @PANGOFT2_CFLAGS@
+PANGOFT2_LIBS = @PANGOFT2_LIBS@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_INNER_NAT_HDRS = @PLATFORM_INNER_NAT_HDRS@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SUPPLY_BACKTRACE_FALSE = @SUPPLY_BACKTRACE_FALSE@
+SUPPLY_BACKTRACE_TRUE = @SUPPLY_BACKTRACE_TRUE@
+SYSDEP_SOURCES = @SYSDEP_SOURCES@
+SYSTEMSPEC = @SYSTEMSPEC@
+SYS_ZLIBS = @SYS_ZLIBS@
+TESTSUBDIR_FALSE = @TESTSUBDIR_FALSE@
+TESTSUBDIR_TRUE = @TESTSUBDIR_TRUE@
+THREADCXXFLAGS = @THREADCXXFLAGS@
+THREADDEPS = @THREADDEPS@
+THREADINCS = @THREADINCS@
+THREADLDFLAGS = @THREADLDFLAGS@
+THREADLIBS = @THREADLIBS@
+THREADSPEC = @THREADSPEC@
+TOOLKIT = @TOOLKIT@
+USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@
+USING_BOEHMGC_TRUE = @USING_BOEHMGC_TRUE@
+USING_DARWIN_CRT_FALSE = @USING_DARWIN_CRT_FALSE@
+USING_DARWIN_CRT_TRUE = @USING_DARWIN_CRT_TRUE@
+USING_ECOS_PLATFORM_FALSE = @USING_ECOS_PLATFORM_FALSE@
+USING_ECOS_PLATFORM_TRUE = @USING_ECOS_PLATFORM_TRUE@
+USING_GCC_FALSE = @USING_GCC_FALSE@
+USING_GCC_TRUE = @USING_GCC_TRUE@
+USING_NOGC_FALSE = @USING_NOGC_FALSE@
+USING_NOGC_TRUE = @USING_NOGC_TRUE@
+USING_NO_THREADS_FALSE = @USING_NO_THREADS_FALSE@
+USING_NO_THREADS_TRUE = @USING_NO_THREADS_TRUE@
+USING_POSIX_PLATFORM_FALSE = @USING_POSIX_PLATFORM_FALSE@
+USING_POSIX_PLATFORM_TRUE = @USING_POSIX_PLATFORM_TRUE@
+USING_POSIX_THREADS_FALSE = @USING_POSIX_THREADS_FALSE@
+USING_POSIX_THREADS_TRUE = @USING_POSIX_THREADS_TRUE@
+USING_WIN32_PLATFORM_FALSE = @USING_WIN32_PLATFORM_FALSE@
+USING_WIN32_PLATFORM_TRUE = @USING_WIN32_PLATFORM_TRUE@
+USING_WIN32_THREADS_FALSE = @USING_WIN32_THREADS_FALSE@
+USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@
+VERSION = @VERSION@
+XLIB_AWT_FALSE = @XLIB_AWT_FALSE@
+XLIB_AWT_TRUE = @XLIB_AWT_TRUE@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+ZINCS = @ZINCS@
+ZIP = @ZIP@
+ZLIBS = @ZLIBS@
+ZLIBSPEC = @ZLIBSPEC@
+ZLIBTESTSPEC = @ZLIBTESTSPEC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_GCJ = @ac_ct_GCJ@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__fastdepGCJ_FALSE = @am__fastdepGCJ_FALSE@
+am__fastdepGCJ_TRUE = @am__fastdepGCJ_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+gcc_version = @gcc_version@
+gcc_version_full = @gcc_version_full@
+gcc_version_trigger = @gcc_version_trigger@
+gxx_include_dir = @gxx_include_dir@
+here = @here@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libgcj_basedir = @libgcj_basedir@
+libstdcxx_incdir = @libstdcxx_incdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+mkinstalldirs = @mkinstalldirs@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_noncanonical = @target_noncanonical@
+target_os = @target_os@
+target_vendor = @target_vendor@
+tool_include_dir = @tool_include_dir@
+toolexecdir = @toolexecdir@
+toolexeclibdir = @toolexeclibdir@
+toolexecmainlibdir = @toolexecmainlibdir@
+AUTOMAKE_OPTIONS = foreign subdir-objects
+GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
+BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir)
+AM_GCJFLAGS = \
+       -B$(top_builddir) \
+       @LIBGCJ_JAVAFLAGS@ \
+       -fclasspath= -fbootclasspath=$(BOOTCLASSPATH) \
+       --encoding=UTF-8 \
+       -Wno-deprecated
+
+noinst_LTLIBRARIES = libsax_convenience.la
+libsax_convenience_la_SOURCES = \
+org/xml/sax/SAXNotSupportedException.java \
+org/xml/sax/helpers/NamespaceSupport.java \
+org/xml/sax/helpers/AttributesImpl.java        \
+org/xml/sax/helpers/LocatorImpl.java \
+org/xml/sax/helpers/DefaultHandler.java        \
+org/xml/sax/helpers/AttributeListImpl.java \
+org/xml/sax/helpers/ParserFactory.java \
+org/xml/sax/helpers/NewInstance.java \
+org/xml/sax/helpers/XMLFilterImpl.java \
+org/xml/sax/helpers/ParserAdapter.java \
+org/xml/sax/helpers/XMLReaderAdapter.java \
+org/xml/sax/helpers/XMLReaderFactory.java \
+org/xml/sax/HandlerBase.java \
+org/xml/sax/SAXException.java \
+org/xml/sax/ContentHandler.java        \
+org/xml/sax/SAXNotRecognizedException.java \
+org/xml/sax/ErrorHandler.java \
+org/xml/sax/AttributeList.java \
+org/xml/sax/Locator.java \
+org/xml/sax/Attributes.java \
+org/xml/sax/SAXParseException.java \
+org/xml/sax/XMLFilter.java \
+org/xml/sax/EntityResolver.java        \
+org/xml/sax/XMLReader.java \
+org/xml/sax/ext/Locator2.java \
+org/xml/sax/ext/LexicalHandler.java \
+org/xml/sax/ext/Attributes2Impl.java \
+org/xml/sax/ext/DeclHandler.java \
+org/xml/sax/ext/Attributes2.java \
+org/xml/sax/ext/EntityResolver2.java \
+org/xml/sax/ext/Locator2Impl.java \
+org/xml/sax/ext/DefaultHandler2.java \
+org/xml/sax/InputSource.java \
+org/xml/sax/DocumentHandler.java \
+org/xml/sax/DTDHandler.java \
+org/xml/sax/Parser.java
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .java .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  external/sax/Makefile'; \
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --foreign  external/sax/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+       @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
+org/xml/sax/$(am__dirstamp):
+       @$(mkdir_p) org/xml/sax
+       @: > org/xml/sax/$(am__dirstamp)
+org/xml/sax/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) org/xml/sax/$(DEPDIR)
+       @: > org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/SAXNotSupportedException.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/helpers/$(am__dirstamp):
+       @$(mkdir_p) org/xml/sax/helpers
+       @: > org/xml/sax/helpers/$(am__dirstamp)
+org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) org/xml/sax/helpers/$(DEPDIR)
+       @: > org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/helpers/NamespaceSupport.lo:  \
+       org/xml/sax/helpers/$(am__dirstamp) \
+       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/helpers/AttributesImpl.lo:  \
+       org/xml/sax/helpers/$(am__dirstamp) \
+       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/helpers/LocatorImpl.lo:  \
+       org/xml/sax/helpers/$(am__dirstamp) \
+       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/helpers/DefaultHandler.lo:  \
+       org/xml/sax/helpers/$(am__dirstamp) \
+       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/helpers/AttributeListImpl.lo:  \
+       org/xml/sax/helpers/$(am__dirstamp) \
+       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/helpers/ParserFactory.lo:  \
+       org/xml/sax/helpers/$(am__dirstamp) \
+       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/helpers/NewInstance.lo:  \
+       org/xml/sax/helpers/$(am__dirstamp) \
+       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/helpers/XMLFilterImpl.lo:  \
+       org/xml/sax/helpers/$(am__dirstamp) \
+       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/helpers/ParserAdapter.lo:  \
+       org/xml/sax/helpers/$(am__dirstamp) \
+       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/helpers/XMLReaderAdapter.lo:  \
+       org/xml/sax/helpers/$(am__dirstamp) \
+       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/helpers/XMLReaderFactory.lo:  \
+       org/xml/sax/helpers/$(am__dirstamp) \
+       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/HandlerBase.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/SAXException.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/ContentHandler.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/SAXNotRecognizedException.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/ErrorHandler.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/AttributeList.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/Locator.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/Attributes.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/SAXParseException.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/XMLFilter.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/EntityResolver.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/XMLReader.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/ext/$(am__dirstamp):
+       @$(mkdir_p) org/xml/sax/ext
+       @: > org/xml/sax/ext/$(am__dirstamp)
+org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) org/xml/sax/ext/$(DEPDIR)
+       @: > org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/ext/Locator2.lo: org/xml/sax/ext/$(am__dirstamp) \
+       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/ext/LexicalHandler.lo: org/xml/sax/ext/$(am__dirstamp) \
+       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/ext/Attributes2Impl.lo: org/xml/sax/ext/$(am__dirstamp) \
+       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/ext/DeclHandler.lo: org/xml/sax/ext/$(am__dirstamp) \
+       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/ext/Attributes2.lo: org/xml/sax/ext/$(am__dirstamp) \
+       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/ext/EntityResolver2.lo: org/xml/sax/ext/$(am__dirstamp) \
+       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/ext/Locator2Impl.lo: org/xml/sax/ext/$(am__dirstamp) \
+       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/ext/DefaultHandler2.lo: org/xml/sax/ext/$(am__dirstamp) \
+       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/InputSource.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/DocumentHandler.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/DTDHandler.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+org/xml/sax/Parser.lo: org/xml/sax/$(am__dirstamp) \
+       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+libsax_convenience.la: $(libsax_convenience_la_OBJECTS) $(libsax_convenience_la_DEPENDENCIES) 
+       $(GCJLINK)  $(libsax_convenience_la_LDFLAGS) $(libsax_convenience_la_OBJECTS) $(libsax_convenience_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+       -rm -f *.$(OBJEXT)
+       -rm -f org/xml/sax/AttributeList.$(OBJEXT)
+       -rm -f org/xml/sax/AttributeList.lo
+       -rm -f org/xml/sax/Attributes.$(OBJEXT)
+       -rm -f org/xml/sax/Attributes.lo
+       -rm -f org/xml/sax/ContentHandler.$(OBJEXT)
+       -rm -f org/xml/sax/ContentHandler.lo
+       -rm -f org/xml/sax/DTDHandler.$(OBJEXT)
+       -rm -f org/xml/sax/DTDHandler.lo
+       -rm -f org/xml/sax/DocumentHandler.$(OBJEXT)
+       -rm -f org/xml/sax/DocumentHandler.lo
+       -rm -f org/xml/sax/EntityResolver.$(OBJEXT)
+       -rm -f org/xml/sax/EntityResolver.lo
+       -rm -f org/xml/sax/ErrorHandler.$(OBJEXT)
+       -rm -f org/xml/sax/ErrorHandler.lo
+       -rm -f org/xml/sax/HandlerBase.$(OBJEXT)
+       -rm -f org/xml/sax/HandlerBase.lo
+       -rm -f org/xml/sax/InputSource.$(OBJEXT)
+       -rm -f org/xml/sax/InputSource.lo
+       -rm -f org/xml/sax/Locator.$(OBJEXT)
+       -rm -f org/xml/sax/Locator.lo
+       -rm -f org/xml/sax/Parser.$(OBJEXT)
+       -rm -f org/xml/sax/Parser.lo
+       -rm -f org/xml/sax/SAXException.$(OBJEXT)
+       -rm -f org/xml/sax/SAXException.lo
+       -rm -f org/xml/sax/SAXNotRecognizedException.$(OBJEXT)
+       -rm -f org/xml/sax/SAXNotRecognizedException.lo
+       -rm -f org/xml/sax/SAXNotSupportedException.$(OBJEXT)
+       -rm -f org/xml/sax/SAXNotSupportedException.lo
+       -rm -f org/xml/sax/SAXParseException.$(OBJEXT)
+       -rm -f org/xml/sax/SAXParseException.lo
+       -rm -f org/xml/sax/XMLFilter.$(OBJEXT)
+       -rm -f org/xml/sax/XMLFilter.lo
+       -rm -f org/xml/sax/XMLReader.$(OBJEXT)
+       -rm -f org/xml/sax/XMLReader.lo
+       -rm -f org/xml/sax/ext/Attributes2.$(OBJEXT)
+       -rm -f org/xml/sax/ext/Attributes2.lo
+       -rm -f org/xml/sax/ext/Attributes2Impl.$(OBJEXT)
+       -rm -f org/xml/sax/ext/Attributes2Impl.lo
+       -rm -f org/xml/sax/ext/DeclHandler.$(OBJEXT)
+       -rm -f org/xml/sax/ext/DeclHandler.lo
+       -rm -f org/xml/sax/ext/DefaultHandler2.$(OBJEXT)
+       -rm -f org/xml/sax/ext/DefaultHandler2.lo
+       -rm -f org/xml/sax/ext/EntityResolver2.$(OBJEXT)
+       -rm -f org/xml/sax/ext/EntityResolver2.lo
+       -rm -f org/xml/sax/ext/LexicalHandler.$(OBJEXT)
+       -rm -f org/xml/sax/ext/LexicalHandler.lo
+       -rm -f org/xml/sax/ext/Locator2.$(OBJEXT)
+       -rm -f org/xml/sax/ext/Locator2.lo
+       -rm -f org/xml/sax/ext/Locator2Impl.$(OBJEXT)
+       -rm -f org/xml/sax/ext/Locator2Impl.lo
+       -rm -f org/xml/sax/helpers/AttributeListImpl.$(OBJEXT)
+       -rm -f org/xml/sax/helpers/AttributeListImpl.lo
+       -rm -f org/xml/sax/helpers/AttributesImpl.$(OBJEXT)
+       -rm -f org/xml/sax/helpers/AttributesImpl.lo
+       -rm -f org/xml/sax/helpers/DefaultHandler.$(OBJEXT)
+       -rm -f org/xml/sax/helpers/DefaultHandler.lo
+       -rm -f org/xml/sax/helpers/LocatorImpl.$(OBJEXT)
+       -rm -f org/xml/sax/helpers/LocatorImpl.lo
+       -rm -f org/xml/sax/helpers/NamespaceSupport.$(OBJEXT)
+       -rm -f org/xml/sax/helpers/NamespaceSupport.lo
+       -rm -f org/xml/sax/helpers/NewInstance.$(OBJEXT)
+       -rm -f org/xml/sax/helpers/NewInstance.lo
+       -rm -f org/xml/sax/helpers/ParserAdapter.$(OBJEXT)
+       -rm -f org/xml/sax/helpers/ParserAdapter.lo
+       -rm -f org/xml/sax/helpers/ParserFactory.$(OBJEXT)
+       -rm -f org/xml/sax/helpers/ParserFactory.lo
+       -rm -f org/xml/sax/helpers/XMLFilterImpl.$(OBJEXT)
+       -rm -f org/xml/sax/helpers/XMLFilterImpl.lo
+       -rm -f org/xml/sax/helpers/XMLReaderAdapter.$(OBJEXT)
+       -rm -f org/xml/sax/helpers/XMLReaderAdapter.lo
+       -rm -f org/xml/sax/helpers/XMLReaderFactory.$(OBJEXT)
+       -rm -f org/xml/sax/helpers/XMLReaderFactory.lo
+
+distclean-compile:
+       -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/AttributeList.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/Attributes.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/ContentHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/DTDHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/DocumentHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/EntityResolver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/ErrorHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/HandlerBase.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/InputSource.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/Locator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/Parser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXNotRecognizedException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXNotSupportedException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXParseException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/XMLFilter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/XMLReader.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/Attributes2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/Attributes2Impl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/DeclHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/DefaultHandler2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/EntityResolver2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/LexicalHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/Locator2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/Locator2Impl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/AttributeListImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/AttributesImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/DefaultHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/LocatorImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/NamespaceSupport.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/NewInstance.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/ParserAdapter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/ParserFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/XMLFilterImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/XMLReaderAdapter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/XMLReaderFactory.Plo@am__quote@
+
+.java.o:
+@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
+@am__fastdepGCJ_TRUE@  if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
+@am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ $<
+
+.java.obj:
+@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
+@am__fastdepGCJ_TRUE@  if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.java.lo:
+@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
+@am__fastdepGCJ_TRUE@  if $(LTGCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
+@am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepGCJ_FALSE@ $(LTGCJCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+       -rm -rf org/xml/sax/.libs org/xml/sax/_libs
+       -rm -rf org/xml/sax/ext/.libs org/xml/sax/ext/_libs
+       -rm -rf org/xml/sax/helpers/.libs org/xml/sax/helpers/_libs
+
+distclean-libtool:
+       -rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && cd $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+       list='$(DISTFILES)'; for file in $$list; do \
+         case $$file in \
+           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+         esac; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           dir="/$$dir"; \
+           $(mkdir_p) "$(distdir)$$dir"; \
+         else \
+           dir=''; \
+         fi; \
+         if test -d $$d/$$file; then \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) all-local
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f org/xml/sax/$(DEPDIR)/$(am__dirstamp)
+       -rm -f org/xml/sax/$(am__dirstamp)
+       -rm -f org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
+       -rm -f org/xml/sax/ext/$(am__dirstamp)
+       -rm -f org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
+       -rm -f org/xml/sax/helpers/$(am__dirstamp)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+       mostlyclean-am
+
+distclean: distclean-am
+       -rm -rf org/xml/sax/$(DEPDIR) org/xml/sax/ext/$(DEPDIR) org/xml/sax/helpers/$(DEPDIR)
+       -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+       distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -rf org/xml/sax/$(DEPDIR) org/xml/sax/ext/$(DEPDIR) org/xml/sax/helpers/$(DEPDIR)
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool mostlyclean-local
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
+       clean-generic clean-libtool clean-noinstLTLIBRARIES ctags \
+       distclean distclean-compile distclean-generic \
+       distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+       install-data-am install-exec install-exec-am install-info \
+       install-info-am install-man install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+       pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
+
+
+all-local: classes.stamp
+
+classes.stamp: $(libsax_convenience_la_SOURCES)
+       here=`pwd`; cd $(srcdir); \
+       $(GCJ_WITH_FLAGS) -C -d $$here $(libsax_convenience_la_SOURCES)
+       echo > classes.stamp
+
+mostlyclean-local:
+       find . -name '*.class' | xargs rm
+       rm classes.stamp
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/libjava/external/sax/README b/libjava/external/sax/README
new file mode 100644 (file)
index 0000000..4b39d23
--- /dev/null
+++ b/libjava/external/sax/README
@@ -0,0 +1,71 @@
+Simple API for XML (SAX), a standard application interface for processing XML.
+SAX is not maintained as part of GNU Classpath, but is used with GNU Classpath.
+
+Last imported version sax2r3 final from http://www.saxproject.org/
+
+All files are distributed with the following short notice:
+
+  NO WARRANTY!  This class is in the Public Domain.
+
+The www.saxproject.org explains:
+
+  Copyright Status
+
+  SAX is free!
+
+  In fact, it's not possible to own a license to SAX, since it's been
+  placed in the public domain.
+
+  No Warranty
+
+  Because SAX is released to the public domain, there is no warranty
+  for the design or for the software implementation, to the extent
+  permitted by applicable law. Except when otherwise stated in writing
+  the copyright holders and/or other parties provide SAX "as is" without
+  warranty of any kind, either expressed or implied, including, but not
+  limited to, the implied warranties of merchantability and fitness for
+  a particular purpose. The entire risk as to the quality and
+  performance of SAX is with you. Should SAX prove defective, you assume
+  the cost of all necessary servicing, repair or correction.
+
+  In no event unless required by applicable law or agreed to in
+  writing will any copyright holder, or any other party who may modify
+  and/or redistribute SAX, be liable to you for damages, including any
+  general, special, incidental or consequential damages arising out of
+  the use or inability to use SAX (including but not limited to loss of
+  data or data being rendered inaccurate or losses sustained by you or
+  third parties or a failure of the SAX to operate with any other
+  programs), even if such holder or other party has been advised of the
+  possibility of such damages.
+
+  Copyright Disclaimers
+
+  This page includes statements to that effect by David Megginson, who
+  would have been able to claim copyright for the original work.
+
+  SAX 1.0
+
+  Version 1.0 of the Simple API for XML (SAX), created collectively by
+  the membership of the XML-DEV mailing list, is hereby released into
+  the public domain.
+
+  No one owns SAX: you may use it freely in both commercial and
+  non-commercial applications, bundle it with your software
+  distribution, include it on a CD-ROM, list the source code in a book,
+  mirror the documentation at your own web site, or use it in any other
+  way you see fit.
+
+  David Megginson, sax@megginson.com
+  1998-05-11
+
+  SAX 2.0
+
+  I hereby abandon any property rights to SAX 2.0 (the Simple API for
+  XML), and release all of the SAX 2.0 source code, compiled code, and
+  documentation contained in this distribution into the Public
+  Domain. SAX comes with NO WARRANTY or guarantee of fitness for any
+  purpose.
+
+  David Megginson, david@megginson.com
+  2000-05-05
+
diff --git a/libjava/org/xml/sax/AttributeList.java b/libjava/external/sax/org/xml/sax/AttributeList.java
similarity index 98%
rename from libjava/org/xml/sax/AttributeList.java
rename to libjava/external/sax/org/xml/sax/AttributeList.java
index b1a647a..7d8e9be 100644 (file)
--- a/libjava/org/xml/sax/AttributeList.java
+++ b/libjava/external/sax/org/xml/sax/AttributeList.java
@@ -1,7 +1,7 @@
 // SAX Attribute List Interface.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: AttributeList.java,v 1.3.2.3 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: AttributeList.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
@@ -181,7 +181,7 @@ public interface AttributeList {
      * <p>If the attribute name has a namespace prefix in the document,
      * the application must include the prefix here.</p>
      *
-     * @param i The index of the attribute in the list.
+     * @param name the name of the attribute to return
      * @return The attribute value as a string, or null if
      *         no such attribute exists.
      * @see #getValue(int)
diff --git a/libjava/org/xml/sax/Attributes.java b/libjava/external/sax/org/xml/sax/Attributes.java
similarity index 83%
rename from libjava/org/xml/sax/Attributes.java
rename to libjava/external/sax/org/xml/sax/Attributes.java
index 251fe20..5173590 100644 (file)
--- a/libjava/org/xml/sax/Attributes.java
+++ b/libjava/external/sax/org/xml/sax/Attributes.java
@@ -2,9 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-
-// $Id: Attributes.java,v 1.5.2.4 2002/01/29 21:34:14 dbrownell Exp $
-
+// $Id: Attributes.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
@@ -34,18 +32,25 @@ package org.xml.sax;
  * the <code>http://xml.org/sax/features/namespace-prefixes</code> 
  * feature is set to <var>true</var> (it is <var>false</var> by 
  * default).
- * Because SAX2 conforms to the "Namespaces in XML" specification,
- * it does not give namespace declaration attributes a namespace URI.
- * Some other W3C specifications are in conflict with that, expecting
- * these declarations to be in a namespace.
- * Handler code may need to resolve that conflict.
+ * Because SAX2 conforms to the original "Namespaces in XML"
+ * recommendation, it normally does not
+ * give namespace declaration attributes a namespace URI.
  * </p>
  *
- * <p>If the namespace-prefixes feature (see above) is <var>false</var>, 
- * access by qualified name may not be available; if the 
- * <code>http://xml.org/sax/features/namespaces</code>
- * feature is <var>false</var>, access by Namespace-qualified names 
- * may not be available.</p>
+ * <p>Some SAX2 parsers may support using an optional feature flag
+ * (<code>http://xml.org/sax/features/xmlns-uris</code>) to request
+ * that those attributes be given URIs, conforming to a later
+ * backwards-incompatible revision of that recommendation.  (The
+ * attribute's "local name" will be the prefix, or "xmlns" when
+ * defining a default element namespace.)  For portability, handler
+ * code should always resolve that conflict, rather than requiring
+ * parsers that can change the setting of that feature flag.  </p>
+ *
+ * <p>If the namespace-prefixes feature (see above) is
+ * <var>false</var>, access by qualified name may not be available; if
+ * the <code>http://xml.org/sax/features/namespaces</code> feature is
+ * <var>false</var>, access by Namespace-qualified names may not be
+ * available.</p>
  *
  * <p>This interface replaces the now-deprecated SAX1 {@link
  * org.xml.sax.AttributeList AttributeList} interface, which does not 
@@ -111,10 +116,10 @@ public interface Attributes
 
 
     /**
-     * Look up an attribute's XML 1.0 qualified name by index.
+     * Look up an attribute's XML qualified (prefixed) name by index.
      *
      * @param index The attribute index (zero-based).
-     * @return The XML 1.0 qualified name, or the empty string
+     * @return The XML qualified name, or the empty string
      *         if none is available, or null if the index
      *         is out of range.
      * @see #getLength
@@ -131,7 +136,7 @@ public interface Attributes
      *
      * <p>If the parser has not read a declaration for the attribute,
      * or if the parser does not report attribute types, then it must
-     * return the value "CDATA" as stated in the XML 1.0 Recommentation
+     * return the value "CDATA" as stated in the XML 1.0 Recommendation
      * (clause 3.3.3, "Attribute-Value Normalization").</p>
      *
      * <p>For an enumerated attribute that is not a notation, the
@@ -180,7 +185,7 @@ public interface Attributes
 
 
     /**
-     * Look up the index of an attribute by XML 1.0 qualified name.
+     * Look up the index of an attribute by XML qualified (prefixed) name.
      *
      * @param qName The qualified (prefixed) name.
      * @return The index of the attribute, or -1 if it does not
@@ -206,12 +211,12 @@ public interface Attributes
 
 
     /**
-     * Look up an attribute's type by XML 1.0 qualified name.
+     * Look up an attribute's type by XML qualified (prefixed) name.
      *
      * <p>See {@link #getType(int) getType(int)} for a description
      * of the possible types.</p>
      *
-     * @param qName The XML 1.0 qualified name.
+     * @param qName The XML qualified name.
      * @return The attribute type as a string, or null if the
      *         attribute is not in the list or if qualified names
      *         are not available.
@@ -235,12 +240,12 @@ public interface Attributes
 
 
     /**
-     * Look up an attribute's value by XML 1.0 qualified name.
+     * Look up an attribute's value by XML qualified (prefixed) name.
      *
      * <p>See {@link #getValue(int) getValue(int)} for a description
      * of the possible values.</p>
      *
-     * @param qName The XML 1.0 qualified name.
+     * @param qName The XML qualified name.
      * @return The attribute value as a string, or null if the
      *         attribute is not in the list or if qualified names
      *         are not available.
diff --git a/libjava/org/xml/sax/ContentHandler.java b/libjava/external/sax/org/xml/sax/ContentHandler.java
similarity index 77%
rename from libjava/org/xml/sax/ContentHandler.java
rename to libjava/external/sax/org/xml/sax/ContentHandler.java
index 06462c5..c0df614 100644 (file)
--- a/libjava/org/xml/sax/ContentHandler.java
+++ b/libjava/external/sax/org/xml/sax/ContentHandler.java
@@ -2,8 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-
-// $Id: ContentHandler.java,v 1.4.2.9 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: ContentHandler.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
@@ -37,14 +36,13 @@ package org.xml.sax;
  * and for reporting skipped entities (in non-validating XML
  * processors).</p>
  *
- * <p>Implementors should note that there is also a Java class
- * {@link java.net.ContentHandler ContentHandler} in the java.net
+ * <p>Implementors should note that there is also a 
+ * <code>ContentHandler</code> class in the <code>java.net</code>
  * package; that means that it's probably a bad idea to do</p>
  *
- * <blockquote>
- * import java.net.*;
+ * <pre>import java.net.*;
  * import org.xml.sax.*;
- * </blockquote>
+ * </pre>
  *
  * <p>In fact, "import ...*" is usually a sign of sloppy programming
  * anyway, so the user should consider this a feature rather than a
@@ -52,7 +50,7 @@ package org.xml.sax;
  *
  * @since SAX 2.0
  * @author David Megginson
- * @version 2.0.1 (sax2r2)
+ * @version 2.0.1+ (sax2r3pre1)
  * @see org.xml.sax.XMLReader
  * @see org.xml.sax.DTDHandler
  * @see org.xml.sax.ErrorHandler
@@ -78,11 +76,13 @@ public interface ContentHandler
      * is probably not sufficient for use with a search engine.</p>
      *
      * <p>Note that the locator will return correct information only
-     * during the invocation of the events in this interface.  The
+     * during the invocation SAX event callbacks after
+     * {@link #startDocument startDocument} returns and before
+     * {@link #endDocument endDocument} is called.  The
      * application should not attempt to use it at any other time.</p>
      *
-     * @param locator An object that can return the location of
-     *                any SAX document event.
+     * @param locator an object that can return the location of
+     *                any SAX document event
      * @see org.xml.sax.Locator
      */
     public void setDocumentLocator (Locator locator);
@@ -95,8 +95,8 @@ public interface ContentHandler
      * other event callbacks (except for {@link #setDocumentLocator 
      * setDocumentLocator}).</p>
      *
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
+     * @throws org.xml.sax.SAXException any SAX exception, possibly
+     *            wrapping another exception
      * @see #endDocument
      */
     public void startDocument ()
@@ -106,14 +106,22 @@ public interface ContentHandler
     /**
      * Receive notification of the end of a document.
      *
+     * <p><strong>There is an apparent contradiction between the
+     * documentation for this method and the documentation for {@link
+     * org.xml.sax.ErrorHandler#fatalError}.  Until this ambiguity is
+     * resolved in a future major release, clients should make no
+     * assumptions about whether endDocument() will or will not be
+     * invoked when the parser has reported a fatalError() or thrown
+     * an exception.</strong></p>
+     *
      * <p>The SAX parser will invoke this method only once, and it will
      * be the last method invoked during the parse.  The parser shall
      * not invoke this method until it has either abandoned parsing
      * (because of an unrecoverable error) or reached the end of
      * input.</p>
      *
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
+     * @throws org.xml.sax.SAXException any SAX exception, possibly
+     *            wrapping another exception
      * @see #startDocument
      */
     public void endDocument()
@@ -149,12 +157,12 @@ public interface ContentHandler
      * <p>There should never be start/endPrefixMapping events for the
      * "xml" prefix, since it is predeclared and immutable.</p>
      *
-     * @param prefix The Namespace prefix being declared.
+     * @param prefix the Namespace prefix being declared.
      * An empty string is used for the default element namespace,
      * which has no prefix.
-     * @param uri The Namespace URI the prefix is mapped to.
-     * @exception org.xml.sax.SAXException The client may throw
-     *            an exception during processing.
+     * @param uri the Namespace URI the prefix is mapped to
+     * @throws org.xml.sax.SAXException the client may throw
+     *            an exception during processing
      * @see #endPrefixMapping
      * @see #startElement
      */
@@ -171,10 +179,10 @@ public interface ContentHandler
      * {@link #endPrefixMapping endPrefixMapping} events is not otherwise
      * guaranteed.</p>
      *
-     * @param prefix The prefix that was being mapping.
+     * @param prefix the prefix that was being mapped.
      * This is the empty string when a default mapping scope ends.
-     * @exception org.xml.sax.SAXException The client may throw
-     *            an exception during processing.
+     * @throws org.xml.sax.SAXException the client may throw
+     *            an exception during processing
      * @see #startPrefixMapping
      * @see #endElement
      */
@@ -228,21 +236,23 @@ public interface ContentHandler
      * <p>Like {@link #characters characters()}, attribute values may have
      * characters that need more than one <code>char</code> value.  </p>
      *
-     * @param uri The Namespace URI, or the empty string if the
+     * @param uri the Namespace URI, or the empty string if the
      *        element has no Namespace URI or if Namespace
-     *        processing is not being performed.
-     * @param localName The local name (without prefix), or the
+     *        processing is not being performed
+     * @param localName the local name (without prefix), or the
      *        empty string if Namespace processing is not being
-     *        performed.
-     * @param qName The qualified name (with prefix), or the
-     *        empty string if qualified names are not available.
-     * @param atts The attributes attached to the element.  If
+     *        performed
+     * @param qName the qualified name (with prefix), or the
+     *        empty string if qualified names are not available
+     * @param atts the attributes attached to the element.  If
      *        there are no attributes, it shall be an empty
-     *        Attributes object.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
+     *        Attributes object.  The value of this object after
+     *        startElement returns is undefined
+     * @throws org.xml.sax.SAXException any SAX exception, possibly
+     *            wrapping another exception
      * @see #endElement
      * @see org.xml.sax.Attributes
+     * @see org.xml.sax.helpers.AttributesImpl
      */
     public void startElement (String uri, String localName,
                              String qName, Attributes atts)
@@ -259,16 +269,16 @@ public interface ContentHandler
      *
      * <p>For information on the names, see startElement.</p>
      *
-     * @param uri The Namespace URI, or the empty string if the
+     * @param uri the Namespace URI, or the empty string if the
      *        element has no Namespace URI or if Namespace
-     *        processing is not being performed.
-     * @param localName The local name (without prefix), or the
+     *        processing is not being performed
+     * @param localName the local name (without prefix), or the
      *        empty string if Namespace processing is not being
-     *        performed.
-     * @param qName The qualified XML 1.0 name (with prefix), or the
-     *        empty string if qualified names are not available.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
+     *        performed
+     * @param qName the qualified XML name (with prefix), or the
+     *        empty string if qualified names are not available
+     * @throws org.xml.sax.SAXException any SAX exception, possibly
+     *            wrapping another exception
      */
     public void endElement (String uri, String localName,
                            String qName)
@@ -310,11 +320,11 @@ public interface ContentHandler
      * method rather than this one (validating parsers <em>must</em> 
      * do so).</p>
      *
-     * @param ch The characters from the XML document.
-     * @param start The start position in the array.
-     * @param length The number of characters to read from the array.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
+     * @param ch the characters from the XML document
+     * @param start the start position in the array
+     * @param length the number of characters to read from the array
+     * @throws org.xml.sax.SAXException any SAX exception, possibly
+     *            wrapping another exception
      * @see #ignorableWhitespace 
      * @see org.xml.sax.Locator
      */
@@ -326,9 +336,10 @@ public interface ContentHandler
      * Receive notification of ignorable whitespace in element content.
      *
      * <p>Validating Parsers must use this method to report each chunk
-     * of whitespace in element content (see the W3C XML 1.0 recommendation,
-     * section 2.10): non-validating parsers may also use this method
-     * if they are capable of parsing and using content models.</p>
+     * of whitespace in element content (see the W3C XML 1.0
+     * recommendation, section 2.10): non-validating parsers may also
+     * use this method if they are capable of parsing and using
+     * content models.</p>
      *
      * <p>SAX parsers may return all contiguous whitespace in a single
      * chunk, or they may split it into several chunks; however, all of
@@ -339,11 +350,11 @@ public interface ContentHandler
      * <p>The application must not attempt to read from the array
      * outside of the specified range.</p>
      *
-     * @param ch The characters from the XML document.
-     * @param start The start position in the array.
-     * @param length The number of characters to read from the array.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
+     * @param ch the characters from the XML document
+     * @param start the start position in the array
+     * @param length the number of characters to read from the array
+     * @throws org.xml.sax.SAXException any SAX exception, possibly
+     *            wrapping another exception
      * @see #characters
      */
     public void ignorableWhitespace (char ch[], int start, int length)
@@ -365,12 +376,12 @@ public interface ContentHandler
      * data may have characters that need more than one <code>char</code>
      * value. </p>
      *
-     * @param target The processing instruction target.
-     * @param data The processing instruction data, or null if
+     * @param target the processing instruction target
+     * @param data the processing instruction data, or null if
      *        none was supplied.  The data does not include any
-     *        whitespace separating it from the target.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
+     *        whitespace separating it from the target
+     * @throws org.xml.sax.SAXException any SAX exception, possibly
+     *            wrapping another exception
      */
     public void processingInstruction (String target, String data)
        throws SAXException;
@@ -394,12 +405,12 @@ public interface ContentHandler
      * <code>http://xml.org/sax/features/external-parameter-entities</code>
      * properties.</p>
      *
-     * @param name The name of the skipped entity.  If it is a 
+     * @param name the name of the skipped entity.  If it is a 
      *        parameter entity, the name will begin with '%', and if
      *        it is the external DTD subset, it will be the string
-     *        "[dtd]".
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
+     *        "[dtd]"
+     * @throws org.xml.sax.SAXException any SAX exception, possibly
+     *            wrapping another exception
      */
     public void skippedEntity (String name)
        throws SAXException;
diff --git a/libjava/org/xml/sax/DTDHandler.java b/libjava/external/sax/org/xml/sax/DTDHandler.java
similarity index 98%
rename from libjava/org/xml/sax/DTDHandler.java
rename to libjava/external/sax/org/xml/sax/DTDHandler.java
index ee84bb2..f894298 100644 (file)
--- a/libjava/org/xml/sax/DTDHandler.java
+++ b/libjava/external/sax/org/xml/sax/DTDHandler.java
@@ -1,7 +1,7 @@
 // SAX DTD handler.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: DTDHandler.java,v 1.5.2.4 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: DTDHandler.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
diff --git a/libjava/org/xml/sax/DocumentHandler.java b/libjava/external/sax/org/xml/sax/DocumentHandler.java
similarity index 99%
rename from libjava/org/xml/sax/DocumentHandler.java
rename to libjava/external/sax/org/xml/sax/DocumentHandler.java
index 10c07b2..08429b6 100644 (file)
--- a/libjava/org/xml/sax/DocumentHandler.java
+++ b/libjava/external/sax/org/xml/sax/DocumentHandler.java
@@ -1,7 +1,7 @@
 // SAX document handler.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: DocumentHandler.java,v 1.3.2.3 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: DocumentHandler.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
diff --git a/libjava/org/xml/sax/EntityResolver.java b/libjava/external/sax/org/xml/sax/EntityResolver.java
similarity index 98%
rename from libjava/org/xml/sax/EntityResolver.java
rename to libjava/external/sax/org/xml/sax/EntityResolver.java
index acc365a..e240ba1 100644 (file)
--- a/libjava/org/xml/sax/EntityResolver.java
+++ b/libjava/external/sax/org/xml/sax/EntityResolver.java
@@ -1,7 +1,7 @@
 // SAX entity resolver.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: EntityResolver.java,v 1.7.2.3 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: EntityResolver.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
diff --git a/libjava/org/xml/sax/ErrorHandler.java b/libjava/external/sax/org/xml/sax/ErrorHandler.java
similarity index 69%
rename from libjava/org/xml/sax/ErrorHandler.java
rename to libjava/external/sax/org/xml/sax/ErrorHandler.java
index e823020..5ebe392 100644 (file)
--- a/libjava/org/xml/sax/ErrorHandler.java
+++ b/libjava/external/sax/org/xml/sax/ErrorHandler.java
@@ -1,7 +1,7 @@
 // SAX error handler.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: ErrorHandler.java,v 1.4.2.3 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: ErrorHandler.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
@@ -24,20 +24,25 @@ package org.xml.sax;
  * through this interface.</p>
  *
  * <p><strong>WARNING:</strong> If an application does <em>not</em>
- * register an ErrorHandler, XML parsing errors will go unreported
- * and bizarre behaviour may result.</p>
+ * register an ErrorHandler, XML parsing errors will go unreported,
+ * except that <em>SAXParseException</em>s will be thrown for fatal errors.
+ * In order to detect validity errors, an ErrorHandler that does something
+ * with {@link #error error()} calls must be registered.</p>
  *
  * <p>For XML processing errors, a SAX driver must use this interface 
- * instead of throwing an exception: it is up to the application 
+ * in preference to throwing an exception: it is up to the application 
  * to decide whether to throw an exception for different types of 
  * errors and warnings.  Note, however, that there is no requirement that 
- * the parser continue to provide useful information after a call to 
- * {@link #fatalError fatalError} (in other words, a SAX driver class 
- * could catch an exception and report a fatalError).</p>
+ * the parser continue to report additional errors after a call to 
+ * {@link #fatalError fatalError}.  In other words, a SAX driver class 
+ * may throw an exception after reporting any fatalError.
+ * Also parsers may throw appropriate exceptions for non-XML errors.
+ * For example, {@link XMLReader#parse XMLReader.parse()} would throw
+ * an IOException for errors accessing entities or the document.</p>
  *
  * @since SAX 1.0
  * @author David Megginson
- * @version 2.0.1 (sax2r2)
+ * @version 2.0.1+ (sax2r3pre1)
  * @see org.xml.sax.XMLReader#setErrorHandler
  * @see org.xml.sax.SAXParseException 
  */
@@ -48,8 +53,9 @@ public interface ErrorHandler {
      * Receive notification of a warning.
      *
      * <p>SAX parsers will use this method to report conditions that
-     * are not errors or fatal errors as defined by the XML 1.0
-     * recommendation.  The default behaviour is to take no action.</p>
+     * are not errors or fatal errors as defined by the XML
+     * recommendation.  The default behaviour is to take no
+     * action.</p>
      *
      * <p>The SAX parser must continue to provide normal parsing events
      * after invoking this method: it should still be possible for the
@@ -77,12 +83,12 @@ public interface ErrorHandler {
      * validity constraint.  The default behaviour is to take no
      * action.</p>
      *
-     * <p>The SAX parser must continue to provide normal parsing events
-     * after invoking this method: it should still be possible for the
-     * application to process the document through to the end.  If the
-     * application cannot do so, then the parser should report a fatal
-     * error even if the XML 1.0 recommendation does not require it to
-     * do so.</p>
+     * <p>The SAX parser must continue to provide normal parsing
+     * events after invoking this method: it should still be possible
+     * for the application to process the document through to the end.
+     * If the application cannot do so, then the parser should report
+     * a fatal error even if the XML recommendation does not require
+     * it to do so.</p>
      *
      * <p>Filters may use this method to report other, non-XML errors
      * as well.</p>
@@ -100,6 +106,14 @@ public interface ErrorHandler {
     /**
      * Receive notification of a non-recoverable error.
      *
+     * <p><strong>There is an apparent contradiction between the
+     * documentation for this method and the documentation for {@link
+     * org.xml.sax.ContentHandler#endDocument}.  Until this ambiguity
+     * is resolved in a future major release, clients should make no
+     * assumptions about whether endDocument() will or will not be
+     * invoked when the parser has reported a fatalError() or thrown
+     * an exception.</strong></p>
+     *
      * <p>This corresponds to the definition of "fatal error" in
      * section 1.2 of the W3C XML 1.0 Recommendation.  For example, a
      * parser would use this callback to report the violation of a
@@ -107,7 +121,7 @@ public interface ErrorHandler {
      *
      * <p>The application must assume that the document is unusable
      * after the parser has invoked this method, and should continue
-     * (if at all) only for the sake of collecting addition error
+     * (if at all) only for the sake of collecting additional error
      * messages: in fact, SAX parsers are free to stop reporting any
      * other events once this method has been invoked.</p>
      *
diff --git a/libjava/org/xml/sax/HandlerBase.java b/libjava/external/sax/org/xml/sax/HandlerBase.java
similarity index 98%
rename from libjava/org/xml/sax/HandlerBase.java
rename to libjava/external/sax/org/xml/sax/HandlerBase.java
index 42c3a07..7d6ce73 100644 (file)
--- a/libjava/org/xml/sax/HandlerBase.java
+++ b/libjava/external/sax/org/xml/sax/HandlerBase.java
@@ -1,7 +1,7 @@
 // SAX default handler base class.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: HandlerBase.java,v 1.3.2.3 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: HandlerBase.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
@@ -213,8 +213,7 @@ public class HandlerBase
      * each element (such as finalising a tree node or writing
      * output to a file).</p>
      *
-     * @param name The element type name.
-     * @param attributes The specified or defaulted attributes.
+     * @param name the element name
      * @exception org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.DocumentHandler#endElement
diff --git a/libjava/org/xml/sax/InputSource.java b/libjava/external/sax/org/xml/sax/InputSource.java
similarity index 99%
rename from libjava/org/xml/sax/InputSource.java
rename to libjava/external/sax/org/xml/sax/InputSource.java
index f6c0907..3737b63 100644 (file)
--- a/libjava/org/xml/sax/InputSource.java
+++ b/libjava/external/sax/org/xml/sax/InputSource.java
@@ -1,7 +1,7 @@
 // SAX input source.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: InputSource.java,v 1.5.2.4 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: InputSource.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
diff --git a/libjava/org/xml/sax/Locator.java b/libjava/external/sax/org/xml/sax/Locator.java
similarity index 98%
rename from libjava/org/xml/sax/Locator.java
rename to libjava/external/sax/org/xml/sax/Locator.java
index d94c3ea..63947df 100644 (file)
--- a/libjava/org/xml/sax/Locator.java
+++ b/libjava/external/sax/org/xml/sax/Locator.java
@@ -1,7 +1,7 @@
 // SAX locator interface for document events.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: Locator.java,v 1.4.2.5 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: Locator.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
diff --git a/libjava/org/xml/sax/Parser.java b/libjava/external/sax/org/xml/sax/Parser.java
similarity index 99%
rename from libjava/org/xml/sax/Parser.java
rename to libjava/external/sax/org/xml/sax/Parser.java
index 2999265..5866eb0 100644 (file)
--- a/libjava/org/xml/sax/Parser.java
+++ b/libjava/external/sax/org/xml/sax/Parser.java
@@ -1,7 +1,7 @@
 // SAX parser interface.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: Parser.java,v 1.3.2.3 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: Parser.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
diff --git a/libjava/org/xml/sax/SAXException.java b/libjava/external/sax/org/xml/sax/SAXException.java
similarity index 98%
rename from libjava/org/xml/sax/SAXException.java
rename to libjava/external/sax/org/xml/sax/SAXException.java
index b11d998..b3c23e9 100644 (file)
--- a/libjava/org/xml/sax/SAXException.java
+++ b/libjava/external/sax/org/xml/sax/SAXException.java
@@ -1,7 +1,7 @@
 // SAX exception class.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: SAXException.java,v 1.4.2.4 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: SAXException.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
diff --git a/libjava/org/xml/sax/SAXNotRecognizedException.java b/libjava/external/sax/org/xml/sax/SAXNotRecognizedException.java
similarity index 93%
rename from libjava/org/xml/sax/SAXNotRecognizedException.java
rename to libjava/external/sax/org/xml/sax/SAXNotRecognizedException.java
index 83aac69..dc411b1 100644 (file)
--- a/libjava/org/xml/sax/SAXNotRecognizedException.java
+++ b/libjava/external/sax/org/xml/sax/SAXNotRecognizedException.java
@@ -2,9 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the Public Domain.
-
-// $Id: SAXNotRecognizedException.java,v 1.4.2.3 2002/01/29 21:34:14 dbrownell Exp $
-
+// $Id: SAXNotRecognizedException.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
diff --git a/libjava/org/xml/sax/SAXNotSupportedException.java b/libjava/external/sax/org/xml/sax/SAXNotSupportedException.java
similarity index 94%
rename from libjava/org/xml/sax/SAXNotSupportedException.java
rename to libjava/external/sax/org/xml/sax/SAXNotSupportedException.java
index 2939eb1..232ce80 100644 (file)
--- a/libjava/org/xml/sax/SAXNotSupportedException.java
+++ b/libjava/external/sax/org/xml/sax/SAXNotSupportedException.java
@@ -2,9 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the Public Domain.
-
-// $Id: SAXNotSupportedException.java,v 1.4.2.3 2002/01/29 21:34:14 dbrownell Exp $
-
+// $Id: SAXNotSupportedException.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
diff --git a/libjava/org/xml/sax/SAXParseException.java b/libjava/external/sax/org/xml/sax/SAXParseException.java
similarity index 95%
rename from libjava/org/xml/sax/SAXParseException.java
rename to libjava/external/sax/org/xml/sax/SAXParseException.java
index e87d79f..c49ff09 100644 (file)
--- a/libjava/org/xml/sax/SAXParseException.java
+++ b/libjava/external/sax/org/xml/sax/SAXParseException.java
@@ -1,7 +1,7 @@
 // SAX exception class.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: SAXParseException.java,v 1.3.2.5 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: SAXParseException.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
@@ -104,9 +104,9 @@ public class SAXParseException extends SAXException {
      *
      *
      * @param message The error or warning message.
-     * @param publicId The public identifer of the entity that generated
+     * @param publicId The public identifier of the entity that generated
      *                 the error or warning.
-     * @param systemId The system identifer of the entity that generated
+     * @param systemId The system identifier of the entity that generated
      *                 the error or warning.
      * @param lineNumber The line number of the end of the text that
      *                   caused the error or warning.
@@ -135,9 +135,9 @@ public class SAXParseException extends SAXException {
      *
      * @param message The error or warning message, or null to use
      *                the message from the embedded exception.
-     * @param publicId The public identifer of the entity that generated
+     * @param publicId The public identifier of the entity that generated
      *                 the error or warning.
-     * @param systemId The system identifer of the entity that generated
+     * @param systemId The system identifier of the entity that generated
      *                 the error or warning.
      * @param lineNumber The line number of the end of the text that
      *                   caused the error or warning.
@@ -231,7 +231,6 @@ public class SAXParseException extends SAXException {
        return this.columnNumber;
     }
     
-    
     \f
     //////////////////////////////////////////////////////////////////////
     // Internal state.
diff --git a/libjava/org/xml/sax/XMLFilter.java b/libjava/external/sax/org/xml/sax/XMLFilter.java
similarity index 96%
rename from libjava/org/xml/sax/XMLFilter.java
rename to libjava/external/sax/org/xml/sax/XMLFilter.java
index eaca11c..363328e 100644 (file)
--- a/libjava/org/xml/sax/XMLFilter.java
+++ b/libjava/external/sax/org/xml/sax/XMLFilter.java
@@ -2,9 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the Public Domain.
-
-// $Id: XMLFilter.java,v 1.3.2.3 2002/01/29 21:34:14 dbrownell Exp $
-
+// $Id: XMLFilter.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
diff --git a/libjava/org/xml/sax/XMLReader.java b/libjava/external/sax/org/xml/sax/XMLReader.java
similarity index 96%
rename from libjava/org/xml/sax/XMLReader.java
rename to libjava/external/sax/org/xml/sax/XMLReader.java
index 23f3daf..92d0a94 100644 (file)
--- a/libjava/org/xml/sax/XMLReader.java
+++ b/libjava/external/sax/org/xml/sax/XMLReader.java
@@ -2,8 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the Public Domain.
-
-// $Id: XMLReader.java,v 1.3.2.5 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: XMLReader.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax;
 
@@ -53,7 +52,7 @@ import java.io.IOException;
  *
  * @since SAX 2.0
  * @author David Megginson
- * @version 2.0.1 (sax2r2)
+ * @version 2.0.1+ (sax2r3pre1)
  * @see org.xml.sax.XMLFilter
  * @see org.xml.sax.helpers.ParserAdapter
  * @see org.xml.sax.helpers.XMLReaderAdapter 
@@ -342,7 +341,14 @@ public interface XMLReader
      * progress (they should create a new XMLReader instead for each
      * nested XML document).  Once a parse is complete, an
      * application may reuse the same XMLReader object, possibly with a
-     * different input source.</p>
+     * different input source.
+     * Configuration of the XMLReader object (such as handler bindings and
+     * values established for feature flags and properties) is unchanged
+     * by completion of a parse, unless the definition of that aspect of
+     * the configuration explicitly specifies other behavior.
+     * (For example, feature flags or properties exposing
+     * characteristics of the document being parsed.)
+     * </p>
      *
      * <p>During the parse, the XMLReader will provide information
      * about the XML document through the registered event
@@ -352,7 +358,7 @@ public interface XMLReader
      * has ended.  If a client application wants to terminate 
      * parsing early, it should throw an exception.</p>
      *
-     * @param source The input source for the top-level of the
+     * @param input The input source for the top-level of the
      *        XML document.
      * @exception org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
diff --git a/libjava/external/sax/org/xml/sax/ext/Attributes2.java b/libjava/external/sax/org/xml/sax/ext/Attributes2.java
new file mode 100644 (file)
index 0000000..5c839bd
--- /dev/null
+++ b/libjava/external/sax/org/xml/sax/ext/Attributes2.java
@@ -0,0 +1,132 @@
+// Attributes2.java - extended Attributes
+// http://www.saxproject.org
+// Public Domain: no warranty.
+// $Id: Attributes2.java,v 1.1 2004/12/23 22:38:42 mark Exp $
+
+package org.xml.sax.ext;
+
+import org.xml.sax.Attributes;
+
+
+/**
+ * SAX2 extension to augment the per-attribute information
+ * provided though {@link Attributes}.
+ * If an implementation supports this extension, the attributes
+ * provided in {@link org.xml.sax.ContentHandler#startElement
+ * ContentHandler.startElement() } will implement this interface,
+ * and the <em>http://xml.org/sax/features/use-attributes2</em>
+ * feature flag will have the value <em>true</em>.
+ *
+ * <blockquote>
+ * <em>This module, both source code and documentation, is in the
+ * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
+ * </blockquote>
+ *
+ * <p> XMLReader implementations are not required to support this
+ * information, and it is not part of core-only SAX2 distributions.</p>
+ *
+ * <p>Note that if an attribute was defaulted (<em>!isSpecified()</em>)
+ * it will of necessity also have been declared (<em>isDeclared()</em>)
+ * in the DTD.
+ * Similarly if an attribute's type is anything except CDATA, then it
+ * must have been declared.
+ * </p>
+ *
+ * @since SAX 2.0 (extensions 1.1 alpha)
+ * @author David Brownell
+ * @version TBS
+ */
+public interface Attributes2 extends Attributes
+{
+    /**
+     * Returns false unless the attribute was declared in the DTD.
+     * This helps distinguish two kinds of attributes that SAX reports
+     * as CDATA:  ones that were declared (and hence are usually valid),
+     * and those that were not (and which are never valid).
+     *
+     * @param index The attribute index (zero-based).
+     * @return true if the attribute was declared in the DTD,
+     *         false otherwise.
+     * @exception java.lang.ArrayIndexOutOfBoundsException When the
+     *            supplied index does not identify an attribute.
+     */
+    public boolean isDeclared (int index);
+
+    /**
+     * Returns false unless the attribute was declared in the DTD.
+     * This helps distinguish two kinds of attributes that SAX reports
+     * as CDATA:  ones that were declared (and hence are usually valid),
+     * and those that were not (and which are never valid).
+     *
+     * @param qName The XML qualified (prefixed) name.
+     * @return true if the attribute was declared in the DTD,
+     *         false otherwise.
+     * @exception java.lang.IllegalArgumentException When the
+     *            supplied name does not identify an attribute.
+     */
+    public boolean isDeclared (String qName);
+
+    /**
+     * Returns false unless the attribute was declared in the DTD.
+     * This helps distinguish two kinds of attributes that SAX reports
+     * as CDATA:  ones that were declared (and hence are usually valid),
+     * and those that were not (and which are never valid).
+     *
+     * <p>Remember that since DTDs do not "understand" namespaces, the
+     * namespace URI associated with an attribute may not have come from
+     * the DTD.  The declaration will have applied to the attribute's
+     * <em>qName</em>.
+     *
+     * @param uri The Namespace URI, or the empty string if
+     *        the name has no Namespace URI.
+     * @param localName The attribute's local name.
+     * @return true if the attribute was declared in the DTD,
+     *         false otherwise.
+     * @exception java.lang.IllegalArgumentException When the
+     *            supplied names do not identify an attribute.
+     */
+    public boolean isDeclared (String uri, String localName);
+
+    /**
+     * Returns true unless the attribute value was provided
+     * by DTD defaulting.
+     *
+     * @param index The attribute index (zero-based).
+     * @return true if the value was found in the XML text,
+     *         false if the value was provided by DTD defaulting.
+     * @exception java.lang.ArrayIndexOutOfBoundsException When the
+     *            supplied index does not identify an attribute.
+     */
+    public boolean isSpecified (int index);
+
+    /**
+     * Returns true unless the attribute value was provided
+     * by DTD defaulting.
+     *
+     * <p>Remember that since DTDs do not "understand" namespaces, the
+     * namespace URI associated with an attribute may not have come from
+     * the DTD.  The declaration will have applied to the attribute's
+     * <em>qName</em>.
+     *
+     * @param uri The Namespace URI, or the empty string if
+     *        the name has no Namespace URI.
+     * @param localName The attribute's local name.
+     * @return true if the value was found in the XML text,
+     *         false if the value was provided by DTD defaulting.
+     * @exception java.lang.IllegalArgumentException When the
+     *            supplied names do not identify an attribute.
+     */
+    public boolean isSpecified (String uri, String localName);
+
+    /**
+     * Returns true unless the attribute value was provided
+     * by DTD defaulting.
+     *
+     * @param qName The XML qualified (prefixed) name.
+     * @return true if the value was found in the XML text,
+     *         false if the value was provided by DTD defaulting.
+     * @exception java.lang.IllegalArgumentException When the
+     *            supplied name does not identify an attribute.
+     */
+    public boolean isSpecified (String qName);
+}
diff --git a/libjava/external/sax/org/xml/sax/ext/Attributes2Impl.java b/libjava/external/sax/org/xml/sax/ext/Attributes2Impl.java
new file mode 100644 (file)
index 0000000..485a5d6
--- /dev/null
+++ b/libjava/external/sax/org/xml/sax/ext/Attributes2Impl.java
@@ -0,0 +1,301 @@
+// Attributes2Impl.java - extended AttributesImpl
+// http://www.saxproject.org
+// Public Domain: no warranty.
+// $Id: Attributes2Impl.java,v 1.1 2004/12/23 22:38:42 mark Exp $
+
+package org.xml.sax.ext;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.helpers.AttributesImpl;
+
+
+/**
+ * SAX2 extension helper for additional Attributes information,
+ * implementing the {@link Attributes2} interface.
+ *
+ * <blockquote>
+ * <em>This module, both source code and documentation, is in the
+ * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
+ * </blockquote>
+ *
+ * <p>This is not part of core-only SAX2 distributions.</p>
+ *
+ * <p>The <em>specified</em> flag for each attribute will always
+ * be true, unless it has been set to false in the copy constructor
+ * or using {@link #setSpecified}.
+ * Similarly, the <em>declared</em> flag for each attribute will
+ * always be false, except for defaulted attributes (<em>specified</em>
+ * is false), non-CDATA attributes, or when it is set to true using
+ * {@link #setDeclared}.
+ * If you change an attribute's type by hand, you may need to modify
+ * its <em>declared</em> flag to match. 
+ * </p>
+ *
+ * @since SAX 2.0 (extensions 1.1 alpha)
+ * @author David Brownell
+ * @version TBS
+ */
+public class Attributes2Impl extends AttributesImpl implements Attributes2
+{
+    private boolean    declared [];
+    private boolean    specified [];
+
+
+    /**
+     * Construct a new, empty Attributes2Impl object.
+     */
+    public Attributes2Impl () { }
+
+
+    /**
+     * Copy an existing Attributes or Attributes2 object.
+     * If the object implements Attributes2, values of the
+     * <em>specified</em> and <em>declared</em> flags for each
+     * attribute are copied.
+     * Otherwise the flag values are defaulted to assume no DTD was used,
+     * unless there is evidence to the contrary (such as attributes with
+     * type other than CDATA, which must have been <em>declared</em>).
+     *
+     * <p>This constructor is especially useful inside a
+     * {@link org.xml.sax.ContentHandler#startElement startElement} event.</p>
+     *
+     * @param atts The existing Attributes object.
+     */
+    public Attributes2Impl (Attributes atts)
+    {
+       super (atts);
+    }
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Implementation of Attributes2
+    ////////////////////////////////////////////////////////////////////
+
+
+    /**
+     * Returns the current value of the attribute's "declared" flag.
+     */
+    // javadoc mostly from interface
+    public boolean isDeclared (int index)
+    {
+       if (index < 0 || index >= getLength ())
+           throw new ArrayIndexOutOfBoundsException (
+               "No attribute at index: " + index);
+       return declared [index];
+    }
+
+
+    /**
+     * Returns the current value of the attribute's "declared" flag.
+     */
+    // javadoc mostly from interface
+    public boolean isDeclared (String uri, String localName)
+    {
+       int index = getIndex (uri, localName);
+
+       if (index < 0)
+           throw new IllegalArgumentException (
+               "No such attribute: local=" + localName
+               + ", namespace=" + uri);
+       return declared [index];
+    }
+
+
+    /**
+     * Returns the current value of the attribute's "declared" flag.
+     */
+    // javadoc mostly from interface
+    public boolean isDeclared (String qName)
+    {
+       int index = getIndex (qName);
+
+       if (index < 0)
+           throw new IllegalArgumentException (
+               "No such attribute: " + qName);
+       return declared [index];
+    }
+
+
+    /**
+     * Returns the current value of an attribute's "specified" flag.
+     *
+     * @param index The attribute index (zero-based).
+     * @return current flag value
+     * @exception java.lang.ArrayIndexOutOfBoundsException When the
+     *            supplied index does not identify an attribute.
+     */
+    public boolean isSpecified (int index)
+    {
+       if (index < 0 || index >= getLength ())
+           throw new ArrayIndexOutOfBoundsException (
+               "No attribute at index: " + index);
+       return specified [index];
+    }
+
+
+    /**
+     * Returns the current value of an attribute's "specified" flag.
+     *
+     * @param uri The Namespace URI, or the empty string if
+     *        the name has no Namespace URI.
+     * @param localName The attribute's local name.
+     * @return current flag value
+     * @exception java.lang.IllegalArgumentException When the
+     *            supplied names do not identify an attribute.
+     */
+    public boolean isSpecified (String uri, String localName)
+    {
+       int index = getIndex (uri, localName);
+
+       if (index < 0)
+           throw new IllegalArgumentException (
+               "No such attribute: local=" + localName
+               + ", namespace=" + uri);
+       return specified [index];
+    }
+
+
+    /**
+     * Returns the current value of an attribute's "specified" flag.
+     *
+     * @param qName The XML qualified (prefixed) name.
+     * @return current flag value
+     * @exception java.lang.IllegalArgumentException When the
+     *            supplied name does not identify an attribute.
+     */
+    public boolean isSpecified (String qName)
+    {
+       int index = getIndex (qName);
+
+       if (index < 0)
+           throw new IllegalArgumentException (
+               "No such attribute: " + qName);
+       return specified [index];
+    }
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Manipulators
+    ////////////////////////////////////////////////////////////////////
+
+
+    /**
+     * Copy an entire Attributes object.  The "specified" flags are
+     * assigned as true, and "declared" flags as false (except when
+     * an attribute's type is not CDATA),
+     * unless the object is an Attributes2 object.
+     * In that case those flag values are all copied.
+     *
+     * @see AttributesImpl#setAttributes
+     */
+    public void setAttributes (Attributes atts)
+    {
+       int length = atts.getLength ();
+
+       super.setAttributes (atts);
+       declared = new boolean [length];
+       specified = new boolean [length];
+
+       if (atts instanceof Attributes2) {
+           Attributes2 a2 = (Attributes2) atts;
+           for (int i = 0; i < length; i++) {
+               declared [i] = a2.isDeclared (i);
+               specified [i] = a2.isSpecified (i);
+           }
+       } else {
+           for (int i = 0; i < length; i++) {
+               declared [i] = !"CDATA".equals (atts.getType (i));
+               specified [i] = true;
+           }
+       }
+    }
+
+
+    /**
+     * Add an attribute to the end of the list, setting its
+     * "specified" flag to true.  To set that flag's value
+     * to false, use {@link #setSpecified}.
+     *
+     * <p>Unless the attribute <em>type</em> is CDATA, this attribute
+     * is marked as being declared in the DTD.  To set that flag's value
+     * to true for CDATA attributes, use {@link #setDeclared}.
+     *
+     * @see AttributesImpl#addAttribute
+     */
+    public void addAttribute (String uri, String localName, String qName,
+                             String type, String value)
+    {
+       super.addAttribute (uri, localName, qName, type, value);
+
+       int length = getLength ();
+
+       if (length < specified.length) {
+           boolean     newFlags [];
+
+           newFlags = new boolean [length];
+           System.arraycopy (declared, 0, newFlags, 0, declared.length);
+           declared = newFlags;
+
+           newFlags = new boolean [length];
+           System.arraycopy (specified, 0, newFlags, 0, specified.length);
+           specified = newFlags;
+       }
+
+       specified [length - 1] = true;
+       declared [length - 1] = !"CDATA".equals (type);
+    }
+
+
+    // javadoc entirely from superclass
+    public void removeAttribute (int index)
+    {
+       int origMax = getLength () - 1;
+
+       super.removeAttribute (index);
+       if (index != origMax) {
+           System.arraycopy (declared, index + 1, declared, index,
+                   origMax - index);
+           System.arraycopy (specified, index + 1, specified, index,
+                   origMax - index);
+       }
+    }
+
+
+    /**
+     * Assign a value to the "declared" flag of a specific attribute.
+     * This is normally needed only for attributes of type CDATA,
+     * including attributes whose type is changed to or from CDATA.
+     *
+     * @param index The index of the attribute (zero-based).
+     * @param value The desired flag value.
+     * @exception java.lang.ArrayIndexOutOfBoundsException When the
+     *            supplied index does not identify an attribute.
+     * @see #setType
+     */
+    public void setDeclared (int index, boolean value)
+    {
+       if (index < 0 || index >= getLength ())
+           throw new ArrayIndexOutOfBoundsException (
+               "No attribute at index: " + index);
+       declared [index] = value;
+    }
+
+
+    /**
+     * Assign a value to the "specified" flag of a specific attribute.
+     * This is the only way this flag can be cleared, except clearing
+     * by initialization with the copy constructor.
+     *
+     * @param index The index of the attribute (zero-based).
+     * @param value The desired flag value.
+     * @exception java.lang.ArrayIndexOutOfBoundsException When the
+     *            supplied index does not identify an attribute.
+     */
+    public void setSpecified (int index, boolean value)
+    {
+       if (index < 0 || index >= getLength ())
+           throw new ArrayIndexOutOfBoundsException (
+               "No attribute at index: " + index);
+       specified [index] = value;
+    }
+}
diff --git a/libjava/org/xml/sax/ext/DeclHandler.java b/libjava/external/sax/org/xml/sax/ext/DeclHandler.java
similarity index 93%
rename from libjava/org/xml/sax/ext/DeclHandler.java
rename to libjava/external/sax/org/xml/sax/ext/DeclHandler.java
index 742f464..1bb4dea 100644 (file)
--- a/libjava/org/xml/sax/ext/DeclHandler.java
+++ b/libjava/external/sax/org/xml/sax/ext/DeclHandler.java
@@ -1,7 +1,7 @@
 // DeclHandler.java - Optional handler for DTD declaration events.
 // http://www.saxproject.org
 // Public Domain: no warranty.
-// $Id: DeclHandler.java,v 1.2.2.5 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: DeclHandler.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax.ext;
 
@@ -125,11 +125,14 @@ public interface DeclHandler
      * <p>Only the effective (first) declaration for each entity
      * will be reported.</p>
      *
+     * <p>If the system identifier is a URL, the parser must resolve it
+     * fully before passing it to the application.</p>
+     *
      * @param name The name of the entity.  If it is a parameter
      *        entity, the name will begin with '%'.
-     * @param publicId The declared public identifier of the entity, or
-     *        null if none was declared.
-     * @param systemId The declared system identifier of the entity.
+     * @param publicId The entity's public identifier, or null if none
+     *        was given.
+     * @param systemId The entity's system identifier.
      * @exception SAXException The application may raise an exception.
      * @see #internalEntityDecl
      * @see org.xml.sax.DTDHandler#unparsedEntityDecl
diff --git a/libjava/external/sax/org/xml/sax/ext/DefaultHandler2.java b/libjava/external/sax/org/xml/sax/ext/DefaultHandler2.java
new file mode 100644 (file)
index 0000000..2b792e9
--- /dev/null
+++ b/libjava/external/sax/org/xml/sax/ext/DefaultHandler2.java
@@ -0,0 +1,130 @@
+// DefaultHandler2.java - extended DefaultHandler
+// http://www.saxproject.org
+// Public Domain: no warranty.
+// $Id: DefaultHandler2.java,v 1.1 2004/12/23 22:38:42 mark Exp $
+
+package org.xml.sax.ext;
+
+import java.io.IOException;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+
+/**
+ * This class extends the SAX2 base handler class to support the
+ * SAX2 {@link LexicalHandler}, {@link DeclHandler}, and
+ * {@link EntityResolver2} extensions.  Except for overriding the
+ * original SAX1 {@link DefaultHandler#resolveEntity resolveEntity()}
+ * method the added handler methods just return.  Subclassers may
+ * override everything on a method-by-method basis.
+ *
+ * <blockquote>
+ * <em>This module, both source code and documentation, is in the
+ * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
+ * </blockquote>
+ *
+ * <p> <em>Note:</em> this class might yet learn that the
+ * <em>ContentHandler.setDocumentLocator()</em> call might be passed a
+ * {@link Locator2} object, and that the
+ * <em>ContentHandler.startElement()</em> call might be passed a
+ * {@link Attributes2} object.
+ *
+ * @since SAX 2.0 (extensions 1.1 alpha)
+ * @author David Brownell
+ * @version TBS
+ */
+public class DefaultHandler2 extends DefaultHandler
+    implements LexicalHandler, DeclHandler, EntityResolver2
+{
+    /** Constructs a handler which ignores all parsing events. */
+    public DefaultHandler2 () { }
+
+
+    // SAX2 ext-1.0 LexicalHandler
+
+    public void startCDATA ()
+    throws SAXException
+       {}
+
+    public void endCDATA ()
+    throws SAXException
+       {}
+
+    public void startDTD (String name, String publicId, String systemId)
+    throws SAXException
+       {}
+
+    public void endDTD ()
+    throws SAXException
+       {}
+
+    public void startEntity (String name)
+    throws SAXException
+       {}
+
+    public void endEntity (String name)
+    throws SAXException
+       {}
+
+    public void comment (char ch [], int start, int length)
+    throws SAXException
+       { }
+
+
+    // SAX2 ext-1.0 DeclHandler
+
+    public void attributeDecl (String eName, String aName,
+           String type, String mode, String value)
+    throws SAXException
+       {}
+
+    public void elementDecl (String name, String model)
+    throws SAXException
+       {}
+
+    public void externalEntityDecl (String name,
+       String publicId, String systemId)
+    throws SAXException
+       {}
+
+    public void internalEntityDecl (String name, String value)
+    throws SAXException
+       {}
+
+    // SAX2 ext-1.1 EntityResolver2
+
+    /**
+     * Tells the parser that if no external subset has been declared
+     * in the document text, none should be used.
+     */
+    public InputSource getExternalSubset (String name, String baseURI)
+    throws SAXException, IOException
+       { return null; }
+
+    /**
+     * Tells the parser to resolve the systemId against the baseURI
+     * and read the entity text from that resulting absolute URI.
+     * Note that because the older
+     * {@link DefaultHandler#resolveEntity DefaultHandler.resolveEntity()},
+     * method is overridden to call this one, this method may sometimes 
+     * be invoked with null <em>name</em> and <em>baseURI</em>, and
+     * with the <em>systemId</em> already absolutized.
+     */
+    public InputSource resolveEntity (String name, String publicId,
+           String baseURI, String systemId)
+    throws SAXException, IOException
+       { return null; }
+    
+    // SAX1 EntityResolver
+
+    /**
+     * Invokes
+     * {@link EntityResolver2#resolveEntity EntityResolver2.resolveEntity()}
+     * with null entity name and base URI.
+     * You only need to override that method to use this class.
+     */
+    public InputSource resolveEntity (String publicId, String systemId)
+    throws SAXException, IOException
+       { return resolveEntity (null, publicId, null, systemId); }
+}
diff --git a/libjava/external/sax/org/xml/sax/ext/EntityResolver2.java b/libjava/external/sax/org/xml/sax/ext/EntityResolver2.java
new file mode 100644 (file)
index 0000000..57b0d83
--- /dev/null
+++ b/libjava/external/sax/org/xml/sax/ext/EntityResolver2.java
@@ -0,0 +1,197 @@
+// EntityResolver2.java - Extended SAX entity resolver.
+// http://www.saxproject.org
+// No warranty; no copyright -- use this as you will.
+// $Id: EntityResolver2.java,v 1.1 2004/12/23 22:38:42 mark Exp $
+
+package org.xml.sax.ext;
+
+import java.io.IOException;
+
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.SAXException;
+
+
+/**
+ * Extended interface for mapping external entity references to input
+ * sources, or providing a missing external subset.  The
+ * {@link XMLReader#setEntityResolver XMLReader.setEntityResolver()} method
+ * is used to provide implementations of this interface to parsers.
+ * When a parser uses the methods in this interface, the
+ * {@link EntityResolver2#resolveEntity EntityResolver2.resolveEntity()}
+ * method (in this interface) is used <em>instead of</em> the older (SAX 1.0)
+ * {@link EntityResolver#resolveEntity EntityResolver.resolveEntity()} method.
+ *
+ * <blockquote>
+ * <em>This module, both source code and documentation, is in the
+ * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
+ * </blockquote>
+ *
+ * <p>If a SAX application requires the customized handling which this
+ * interface defines for external entities, it must ensure that it uses
+ * an XMLReader with the
+ * <em>http://xml.org/sax/features/use-entity-resolver2</em> feature flag
+ * set to <em>true</em> (which is its default value when the feature is
+ * recognized).  If that flag is unrecognized, or its value is false,
+ * or the resolver does not implement this interface, then only the
+ * {@link EntityResolver} method will be used.
+ * </p>
+ *
+ * <p>That supports three categories of application that modify entity
+ * resolution.  <em>Old Style</em> applications won't know about this interface;
+ * they will provide an EntityResolver.
+ * <em>Transitional Mode</em> provide an EntityResolver2 and automatically
+ * get the benefit of its methods in any systems (parsers or other tools)
+ * supporting it, due to polymorphism.
+ * Both <em>Old Style</em> and <em>Transitional Mode</em> applications will
+ * work with any SAX2 parser.
+ * <em>New style</em> applications will fail to run except on SAX2 parsers
+ * that support this particular feature.
+ * They will insist that feature flag have a value of "true", and the
+ * EntityResolver2 implementation they provide  might throw an exception
+ * if the original SAX 1.0 style entity resolution method is invoked.
+ * </p>
+ *
+ * @see org.xml.sax.XMLReader#setEntityResolver
+ *
+ * @since SAX 2.0 (extensions 1.1 alpha)
+ * @author David Brownell
+ * @version TBD
+ */
+public interface EntityResolver2 extends EntityResolver
+{
+    /**
+     * Allows applications to provide an external subset for documents
+     * that don't explicitly define one.  Documents with DOCTYPE declarations
+     * that omit an external subset can thus augment the declarations
+     * available for validation, entity processing, and attribute processing
+     * (normalization, defaulting, and reporting types including ID).
+     * This augmentation is reported
+     * through the {@link LexicalHandler#startDTD startDTD()} method as if
+     * the document text had originally included the external subset;
+     * this callback is made before any internal subset data or errors
+     * are reported.</p>
+     *
+     * <p>This method can also be used with documents that have no DOCTYPE
+     * declaration.  When the root element is encountered,
+     * but no DOCTYPE declaration has been seen, this method is
+     * invoked.  If it returns a value for the external subset, that root
+     * element is declared to be the root element, giving the effect of
+     * splicing a DOCTYPE declaration at the end the prolog of a document
+     * that could not otherwise be valid.  The sequence of parser callbacks
+     * in that case logically resembles this:</p>
+     *
+     * <pre>
+     * ... comments and PIs from the prolog (as usual)
+     * startDTD ("rootName", source.getPublicId (), source.getSystemId ());
+     * startEntity ("[dtd]");
+     * ... declarations, comments, and PIs from the external subset
+     * endEntity ("[dtd]");
+     * endDTD ();
+     * ... then the rest of the document (as usual)
+     * startElement (..., "rootName", ...);
+     * </pre>
+     *
+     * <p>Note that the InputSource gets no further resolution.
+     * Implementations of this method may wish to invoke
+     * {@link #resolveEntity resolveEntity()} to gain benefits such as use
+     * of local caches of DTD entities.  Also, this method will never be
+     * used by a (non-validating) processor that is not including external
+     * parameter entities. </p>
+     *
+     * <p>Uses for this method include facilitating data validation when
+     * interoperating with XML processors that would always require
+     * undesirable network accesses for external entities, or which for
+     * other reasons adopt a "no DTDs" policy.
+     * Non-validation motives include forcing documents to include DTDs so
+     * that attributes are handled consistently.
+     * For example, an XPath processor needs to know which attibutes have
+     * type "ID" before it can process a widely used type of reference.</p>
+     * 
+     * <p><strong>Warning:</strong> Returning an external subset modifies
+     * the input document.  By providing definitions for general entities,
+     * it can make a malformed document appear to be well formed.
+     * </p>
+     *
+     * @param name Identifies the document root element.  This name comes
+     * from a DOCTYPE declaration (where available) or from the actual
+     * root element. 
+     * @param baseURI The document's base URI, serving as an additional
+     * hint for selecting the external subset.  This is always an absolute
+     * URI, unless it is null because the XMLReader was given an InputSource
+     * without one.
+     *
+     * @return An InputSource object describing the new external subset
+     * to be used by the parser, or null to indicate that no external
+     * subset is provided.
+     *
+     * @exception SAXException Any SAX exception, possibly wrapping
+     * another exception.
+     * @exception IOException Probably indicating a failure to create
+     * a new InputStream or Reader, or an illegal URL.
+     */
+    public InputSource getExternalSubset (String name, String baseURI)
+    throws SAXException, IOException;
+
+    /**
+     * Allows applications to map references to external entities into input
+     * sources, or tell the parser it should use conventional URI resolution.
+     * This method is only called for external entities which have been
+     * properly declared.
+     * This method provides more flexibility than the {@link EntityResolver}
+     * interface, supporting implementations of more complex catalogue
+     * schemes such as the one defined by the <a href=
+       "http://www.oasis-open.org/committees/entity/spec-2001-08-06.html"
+       >OASIS XML Catalogs</a> specification.</p>
+     *
+     * <p>Parsers configured to use this resolver method will call it
+     * to determine the input source to use for any external entity
+     * being included because of a reference in the XML text.
+     * That excludes the document entity, and any external entity returned
+     * by {@link #getExternalSubset getExternalSubset()}.
+     * When a (non-validating) processor is configured not to include
+     * a class of entities (parameter or general) through use of feature
+     * flags, this method is not invoked for such entities.  </p>
+     *
+     * <p>Note that the entity naming scheme used here is the same one
+     * used in the {@link LexicalHandler}, or in the {@link
+       org.xml.sax.ContentHandler#skippedEntity
+       ContentHandler.skippedEntity()}
+     * method. </p>
+     *
+     * @param name Identifies the external entity being resolved.
+     * Either "[dtd]" for the external subset, or a name starting
+     * with "%" to indicate a parameter entity, or else the name of
+     * a general entity.  This is never null when invoked by a SAX2
+     * parser.
+     * @param publicId The public identifier of the external entity being
+     * referenced (normalized as required by the XML specification), or
+     * null if none was supplied.
+     * @param baseURI The URI with respect to which relative systemIDs
+     * are interpreted.  This is always an absolute URI, unless it is
+     * null (likely because the XMLReader was given an InputSource without
+     *  one).  This URI is defined by the XML specification to be the one
+     * associated with the "&lt;" starting the relevant declaration.
+     * @param systemId The system identifier of the external entity
+     * being referenced; either a relative or absolute URI.
+     *  This is never null when invoked by a SAX2 parser; only declared
+     * entities, and any external subset, are resolved by such parsers.
+     *
+     * @return An InputSource object describing the new input source to
+     * be used by the parser.  Returning null directs the parser to
+     * resolve the system ID against the base URI and open a connection
+     * to resulting URI.
+     *
+     * @exception SAXException Any SAX exception, possibly wrapping
+     * another exception.
+     * @exception IOException Probably indicating a failure to create
+     * a new InputStream or Reader, or an illegal URL.
+     */
+    public InputSource resolveEntity (
+           String name,
+           String publicId,
+           String baseURI,
+           String systemId
+    ) throws SAXException, IOException;
+}
diff --git a/libjava/org/xml/sax/ext/LexicalHandler.java b/libjava/external/sax/org/xml/sax/ext/LexicalHandler.java
similarity index 99%
rename from libjava/org/xml/sax/ext/LexicalHandler.java
rename to libjava/external/sax/org/xml/sax/ext/LexicalHandler.java
index 15b2557..076bdf8 100644 (file)
--- a/libjava/org/xml/sax/ext/LexicalHandler.java
+++ b/libjava/external/sax/org/xml/sax/ext/LexicalHandler.java
@@ -1,7 +1,7 @@
 // LexicalHandler.java - optional handler for lexical parse events.
 // http://www.saxproject.org
 // Public Domain: no warranty.
-// $Id: LexicalHandler.java,v 1.2.2.4 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: LexicalHandler.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax.ext;
 
diff --git a/libjava/external/sax/org/xml/sax/ext/Locator2.java b/libjava/external/sax/org/xml/sax/ext/Locator2.java
new file mode 100644 (file)
index 0000000..5fe3ba7
--- /dev/null
+++ b/libjava/external/sax/org/xml/sax/ext/Locator2.java
@@ -0,0 +1,75 @@
+// Locator2.java - extended Locator
+// http://www.saxproject.org
+// Public Domain: no warranty.
+// $Id: Locator2.java,v 1.1 2004/12/23 22:38:42 mark Exp $
+
+package org.xml.sax.ext;
+
+import org.xml.sax.Locator;
+
+
+/**
+ * SAX2 extension to augment the entity information provided 
+ * though a {@link Locator}.
+ * If an implementation supports this extension, the Locator
+ * provided in {@link org.xml.sax.ContentHandler#setDocumentLocator
+ * ContentHandler.setDocumentLocator() } will implement this
+ * interface, and the
+ * <em>http://xml.org/sax/features/use-locator2</em> feature
+ * flag will have the value <em>true</em>.
+ *
+ * <blockquote>
+ * <em>This module, both source code and documentation, is in the
+ * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
+ * </blockquote>
+ *
+ * <p> XMLReader implementations are not required to support this
+ * information, and it is not part of core-only SAX2 distributions.</p>
+ *
+ * @since SAX 2.0 (extensions 1.1 alpha)
+ * @author David Brownell
+ * @version TBS
+ */
+public interface Locator2 extends Locator
+{
+    /**
+     * Returns the version of XML used for the entity.  This will
+     * normally be the identifier from the current entity's
+     * <em>&lt;?xml&nbsp;version='...'&nbsp;...?&gt;</em> declaration,
+     * or be defaulted by the parser.
+     *
+     * @return Identifier for the XML version being used to interpret
+     * the entity's text, or null if that information is not yet
+     * available in the current parsing state.
+     */
+    public String getXMLVersion ();
+
+    /**
+     * Returns the name of the character encoding for the entity.
+     * If the encoding was declared externally (for example, in a MIME
+     * Content-Type header), that will be the name returned.  Else if there
+     * was an <em>&lt;?xml&nbsp;...encoding='...'?&gt;</em> declaration at
+     * the start of the document, that encoding name will be returned.
+     * Otherwise the encoding will been inferred (normally to be UTF-8, or
+     * some UTF-16 variant), and that inferred name will be returned.
+     *
+     * <p>When an {@link org.xml.sax.InputSource InputSource} is used
+     * to provide an entity's character stream, this method returns the
+     * encoding provided in that input stream.
+     *
+     * <p> Note that some recent W3C specifications require that text
+     * in some encodings be normalized, using Unicode Normalization
+     * Form C, before processing.  Such normalization must be performed
+     * by applications, and would normally be triggered based on the
+     * value returned by this method.
+     *
+     * <p> Encoding names may be those used by the underlying JVM,
+     * and comparisons should be case-insensitive.
+     *
+     * @return Name of the character encoding being used to interpret
+     * * the entity's text, or null if this was not provided for a *
+     * character stream passed through an InputSource or is otherwise
+     * not yet available in the current parsing state.
+     */
+    public String getEncoding ();
+}
diff --git a/libjava/external/sax/org/xml/sax/ext/Locator2Impl.java b/libjava/external/sax/org/xml/sax/ext/Locator2Impl.java
new file mode 100644 (file)
index 0000000..52f6331
--- /dev/null
+++ b/libjava/external/sax/org/xml/sax/ext/Locator2Impl.java
@@ -0,0 +1,101 @@
+// Locator2Impl.java - extended LocatorImpl
+// http://www.saxproject.org
+// Public Domain: no warranty.
+// $Id: Locator2Impl.java,v 1.1 2004/12/23 22:38:42 mark Exp $
+
+package org.xml.sax.ext;
+
+import org.xml.sax.Locator;
+import org.xml.sax.helpers.LocatorImpl;
+
+
+/**
+ * SAX2 extension helper for holding additional Entity information,
+ * implementing the {@link Locator2} interface.
+ *
+ * <blockquote>
+ * <em>This module, both source code and documentation, is in the
+ * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
+ * </blockquote>
+ *
+ * <p> This is not part of core-only SAX2 distributions.</p>
+ *
+ * @since SAX 2.0.2
+ * @author David Brownell
+ * @version TBS
+ */
+public class Locator2Impl extends LocatorImpl implements Locator2
+{
+    private String     encoding;
+    private String     version;
+
+
+    /**
+     * Construct a new, empty Locator2Impl object.
+     * This will not normally be useful, since the main purpose
+     * of this class is to make a snapshot of an existing Locator.
+     */
+    public Locator2Impl () { }
+
+    /**
+     * Copy an existing Locator or Locator2 object.
+     * If the object implements Locator2, values of the
+     * <em>encoding</em> and <em>version</em>strings are copied,
+     * otherwise they set to <em>null</em>. 
+     *
+     * @param locator The existing Locator object.
+     */
+    public Locator2Impl (Locator locator)
+    {
+       super (locator);
+       if (locator instanceof Locator2) {
+           Locator2    l2 = (Locator2) locator;
+
+           version = l2.getXMLVersion ();
+           encoding = l2.getEncoding ();
+       }
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    // Locator2 method implementations
+    ////////////////////////////////////////////////////////////////////
+    
+    /**
+     * Returns the current value of the version property.
+     *
+     * @see #setXMLVersion
+     */
+    public String getXMLVersion ()
+       { return version; }
+
+    /**
+     * Returns the current value of the encoding property.
+     *
+     * @see #setEncoding
+     */
+    public String getEncoding ()
+       { return encoding; }
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Setters 
+    ////////////////////////////////////////////////////////////////////
+    
+    /**
+     * Assigns the current value of the version property.
+     *
+     * @param version the new "version" value
+     * @see #getXMLVersion
+     */
+    public void setXMLVersion (String version)
+       { this.version = version; }
+
+    /**
+     * Assigns the current value of the encoding property.
+     *
+     * @param encoding the new "encoding" value
+     * @see #getEncoding
+     */
+    public void setEncoding (String encoding)
+       { this.encoding = encoding; }
+}
diff --git a/libjava/org/xml/sax/ext/package.html b/libjava/external/sax/org/xml/sax/ext/package.html
similarity index 51%
rename from libjava/org/xml/sax/ext/package.html
rename to libjava/external/sax/org/xml/sax/ext/package.html
index bbb02f9..0b74480 100644 (file)
--- a/libjava/org/xml/sax/ext/package.html
+++ b/libjava/external/sax/org/xml/sax/ext/package.html
@@ -1,33 +1,36 @@
 <HTML><HEAD>
-
+<!-- $Id: package.html,v 1.1 2004/12/23 22:38:42 mark Exp $ -->
 </HEAD><BODY>
 
 <p>
-This package contains interfaces to optional SAX2 handlers.
+This package contains interfaces to SAX2 facilities that
+conformant SAX drivers won't necessarily support.
 
 <p>See <a href='http://www.saxproject.org'>http://www.saxproject.org</a>
 for more information about SAX.</p>
 
-<p>
-The package is independent of the SAX2 core, though the functionality
-exposed generally needs to be implemented within a parser.
+<p> This package is independent of the SAX2 core, though the functionality
+exposed generally needs to be implemented within a parser core.
 That independence has several consequences:</p>
 
 <ul>
 
-<li>SAX2 drivers are <em>not</em> required to recognize these handlers,
-and you cannot assume that the class files will be present in every SAX2
+<li>SAX2 drivers are <em>not</em> required to recognize these handlers.
+</li>
+
+<li>You cannot assume that the class files will be present in every SAX2
 installation.</li>
 
 <li>This package may be updated independently of SAX2 (i.e. new
-handlers may be added without updating SAX2 itself).</li>
+handlers and classes may be added without updating SAX2 itself).</li>
 
-<li>The handlers are not implemented by the SAX2
+<li>The new handlers are not implemented by the SAX2
 <code>org.xml.sax.helpers.DefaultHandler</code> or
 <code>org.xml.sax.helpers.XMLFilterImpl</code> classes.
-You can subclass these if you need such behaviour.</li>
+You can subclass these if you need such behavior, or
+use the helper classes found here.</li>
 
-<li>The handlers need to be registered differently than regular SAX2
+<li>The handlers need to be registered differently than core SAX2
 handlers.</li>
 
 </ul>
@@ -37,13 +40,7 @@ designed both to allow SAX parsers to pass certain types of information
 to applications, and to serve as a simple model for other SAX2 parser
 extension packages.  Not all such extension packages should need to
 be recognized directly by parsers, however.
-As an example, most schema systems can be cleanly layered on top
+As an example, most validation systems can be cleanly layered on top
 of parsers supporting the standardized SAX2 interfaces.  </p>
 
-<p><strong>NOTE:</strong> this package alone does add any
-functionality; it simply provides optional interfaces for SAX2 drivers
-to use.  You must use a SAX2 driver that recognizes these interfaces if
-you actually want to have access to lexical and declaration
-information.</p>
-
 </BODY></HTML>
diff --git a/libjava/org/xml/sax/helpers/AttributeListImpl.java b/libjava/external/sax/org/xml/sax/helpers/AttributeListImpl.java
similarity index 99%
rename from libjava/org/xml/sax/helpers/AttributeListImpl.java
rename to libjava/external/sax/org/xml/sax/helpers/AttributeListImpl.java
index 6cabed4..ca859fb 100644 (file)
--- a/libjava/org/xml/sax/helpers/AttributeListImpl.java
+++ b/libjava/external/sax/org/xml/sax/helpers/AttributeListImpl.java
@@ -1,7 +1,7 @@
 // SAX default implementation for AttributeList.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: AttributeListImpl.java,v 1.3.2.3 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: AttributeListImpl.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax.helpers;
 
diff --git a/libjava/org/xml/sax/helpers/AttributesImpl.java b/libjava/external/sax/org/xml/sax/helpers/AttributesImpl.java
similarity index 99%
rename from libjava/org/xml/sax/helpers/AttributesImpl.java
rename to libjava/external/sax/org/xml/sax/helpers/AttributesImpl.java
index d16cb33..8753968 100644 (file)
--- a/libjava/org/xml/sax/helpers/AttributesImpl.java
+++ b/libjava/external/sax/org/xml/sax/helpers/AttributesImpl.java
@@ -2,9 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-
-// $Id: AttributesImpl.java,v 1.6.2.3 2002/01/29 21:34:14 dbrownell Exp $
-
+// $Id: AttributesImpl.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax.helpers;
 
diff --git a/libjava/org/xml/sax/helpers/DefaultHandler.java b/libjava/external/sax/org/xml/sax/helpers/DefaultHandler.java
similarity index 99%
rename from libjava/org/xml/sax/helpers/DefaultHandler.java
rename to libjava/external/sax/org/xml/sax/helpers/DefaultHandler.java
index 873e754..e01c3be 100644 (file)
--- a/libjava/org/xml/sax/helpers/DefaultHandler.java
+++ b/libjava/external/sax/org/xml/sax/helpers/DefaultHandler.java
@@ -2,8 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-
-// $Id: DefaultHandler.java,v 1.5.2.3 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: DefaultHandler.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax.helpers;
 
@@ -262,7 +261,7 @@ public class DefaultHandler
      *        performed.
      * @param qName The qualified name (with prefix), or the
      *        empty string if qualified names are not available.
-     * @param atts The attributes attached to the element.  If
+     * @param attributes The attributes attached to the element.  If
      *        there are no attributes, it shall be an empty
      *        Attributes object.
      * @exception org.xml.sax.SAXException Any SAX exception, possibly
diff --git a/libjava/org/xml/sax/helpers/LocatorImpl.java b/libjava/external/sax/org/xml/sax/helpers/LocatorImpl.java
similarity index 98%
rename from libjava/org/xml/sax/helpers/LocatorImpl.java
rename to libjava/external/sax/org/xml/sax/helpers/LocatorImpl.java
index 4b297ea..6fa4857 100644 (file)
--- a/libjava/org/xml/sax/helpers/LocatorImpl.java
+++ b/libjava/external/sax/org/xml/sax/helpers/LocatorImpl.java
@@ -1,7 +1,7 @@
 // SAX default implementation for Locator.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: LocatorImpl.java,v 1.3.2.3 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: LocatorImpl.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax.helpers;
 
diff --git a/libjava/org/xml/sax/helpers/NamespaceSupport.java b/libjava/external/sax/org/xml/sax/helpers/NamespaceSupport.java
similarity index 84%
rename from libjava/org/xml/sax/helpers/NamespaceSupport.java
rename to libjava/external/sax/org/xml/sax/helpers/NamespaceSupport.java
index 917a7f7..01e11fa 100644 (file)
--- a/libjava/org/xml/sax/helpers/NamespaceSupport.java
+++ b/libjava/external/sax/org/xml/sax/helpers/NamespaceSupport.java
@@ -2,8 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // This class is in the Public Domain.  NO WARRANTY!
-
-// $Id: NamespaceSupport.java,v 1.6.2.5 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: NamespaceSupport.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax.helpers;
 
@@ -24,11 +23,11 @@ import java.util.Vector;
  * for further information.
  * </blockquote>
  *
- * <p>This class encapsulates the logic of Namespace processing:
- * it tracks the declarations currently in force for each context
- * and automatically processes qualified XML 1.0 names into their
- * Namespace parts; it can also be used in reverse for generating
- * XML 1.0 from Namespaces.</p>
+ * <p>This class encapsulates the logic of Namespace processing: it
+ * tracks the declarations currently in force for each context and
+ * automatically processes qualified XML names into their Namespace
+ * parts; it can also be used in reverse for generating XML qnames
+ * from Namespaces.</p>
  *
  * <p>Namespace support objects are reusable, but the reset method
  * must be invoked between each session.</p>
@@ -82,7 +81,7 @@ public class NamespaceSupport
     /**
      * The XML Namespace URI as a constant.
      * The value is <code>http://www.w3.org/XML/1998/namespace</code>
-     * as defined in the XML Namespaces specification.
+     * as defined in the "Namespaces in XML" * recommendation.
      *
      * <p>This is the Namespace URI that is automatically mapped
      * to the "xml" prefix.</p>
@@ -92,6 +91,26 @@ public class NamespaceSupport
 
 
     /**
+     * The namespace declaration URI as a constant.
+     * The value is <code>http://www.w3.org/xmlns/2000/</code>, as defined
+     * in a backwards-incompatible erratum to the "Namespaces in XML"
+     * recommendation.  Because that erratum postdated SAX2, SAX2 defaults 
+     * to the original recommendation, and does not normally use this URI.
+     * 
+     *
+     * <p>This is the Namespace URI that is optionally applied to
+     * <em>xmlns</em> and <em>xmlns:*</em> attributes, which are used to
+     * declare namespaces.  </p>
+     *
+     * @since SAX 2.1alpha
+     * @see #setNamespaceDeclUris
+     * @see #isNamespaceDeclUris
+     */
+    public final static String NSDECL =
+       "http://www.w3.org/xmlns/2000/";
+
+
+    /**
      * An empty enumeration.
      */
     private final static Enumeration EMPTY_ENUMERATION =
@@ -122,11 +141,17 @@ public class NamespaceSupport
      * Reset this Namespace support object for reuse.
      *
      * <p>It is necessary to invoke this method before reusing the
-     * Namespace support object for a new session.</p>
+     * Namespace support object for a new session.  If namespace
+     * declaration URIs are to be supported, that flag must also
+     * be set to a non-default value.
+     * </p>
+     *
+     * @see #setNamespaceDeclUris
      */
     public void reset ()
     {
        contexts = new Context[32];
+       namespaceDeclUris = false;
        contextPos = 0;
        contexts[contextPos] = currentContext = new Context();
        currentContext.declarePrefix("xml", XMLNS);
@@ -260,9 +285,6 @@ public class NamespaceSupport
      * the value "xml" or "xmlns".
      * @param uri The Namespace URI to associate with the prefix.
      * @return true if the prefix was legal, false otherwise
-     * @exception IllegalStateException when a prefix is declared
-     * after looking up a name in the context, or after pushing
-     * another context on top of it.
      *
      * @see #processName
      * @see #getURI
@@ -280,12 +302,13 @@ public class NamespaceSupport
 
 
     /**
-     * Process a raw XML 1.0 name, after all declarations in the current
-     * context have been handled by {@link #declarePrefix declarePrefix()}.
+     * Process a raw XML qualified name, after all declarations in the
+     * current context have been handled by {@link #declarePrefix
+     * declarePrefix()}.
      *
-     * <p>This method processes a raw XML 1.0 name in the current
-     * context by removing the prefix and looking it up among the
-     * prefixes currently declared.  The return value will be the
+     * <p>This method processes a raw XML qualified name in the
+     * current context by removing the prefix and looking it up among
+     * the prefixes currently declared.  The return value will be the
      * array supplied by the caller, filled in as follows:</p>
      *
      * <dl>
@@ -303,18 +326,18 @@ public class NamespaceSupport
      * the return value will be null.</p>
      *
      * <p>Note that attribute names are processed differently than
-     * element names: an unprefixed element name will received the
+     * element names: an unprefixed element name will receive the
      * default Namespace (if any), while an unprefixed attribute name
      * will not.</p>
      *
-     * @param qName The raw XML 1.0 name to be processed.
+     * @param qName The XML qualified name to be processed.
      * @param parts An array supplied by the caller, capable of
      *        holding at least three members.
      * @param isAttribute A flag indicating whether this is an
      *        attribute name (true) or an element name (false).
      * @return The supplied array holding three internalized strings 
      *        representing the Namespace URI (or empty string), the
-     *        local name, and the raw XML 1.0 name; or null if there
+     *        local name, and the XML qualified name; or null if there
      *        is an undeclared prefix.
      * @see #declarePrefix
      * @see java.lang.String#intern */
@@ -352,15 +375,16 @@ public class NamespaceSupport
 
 
     /**
-     * Return an enumeration of all prefixes currently declared.
+     * Return an enumeration of all prefixes whose declarations are
+     * active in the current context.
+     * This includes declarations from parent contexts that have
+     * not been overridden.
      *
      * <p><strong>Note:</strong> if there is a default prefix, it will not be
      * returned in this enumeration; check for the default prefix
      * using the {@link #getURI getURI} with an argument of "".</p>
      *
-     * @return An enumeration of all prefixes declared in the
-     *         current context except for the empty (default)
-     *         prefix.
+     * @return An enumeration of prefixes (never empty).
      * @see #getDeclaredPrefixes
      * @see #getURI
      */
@@ -382,12 +406,10 @@ public class NamespaceSupport
      * to check for a default prefix, use the {@link #getURI getURI}
      * method with an argument of "".</p>
      *
-     * @param uri The Namespace URI.
-     * @param isAttribute true if this prefix is for an attribute
-     *        (and the default Namespace is not allowed).
-     * @return One of the prefixes currently mapped to the URI supplied,
+     * @param uri the namespace URI
+     * @return one of the prefixes currently mapped to the URI supplied,
      *         or null if none is mapped or if the URI is assigned to
-     *         the default Namespace.
+     *         the default namespace
      * @see #getPrefixes(java.lang.String)
      * @see #getURI
      */
@@ -398,7 +420,10 @@ public class NamespaceSupport
 
 
     /**
-     * Return an enumeration of all prefixes currently declared for a URI.
+     * Return an enumeration of all prefixes for a given URI whose
+     * declarations are active in the current context.
+     * This includes declarations from parent contexts that have
+     * not been overridden.
      *
      * <p>This method returns prefixes mapped to a specific Namespace
      * URI.  The xml: prefix will be included.  If you want only one
@@ -412,8 +437,7 @@ public class NamespaceSupport
      * argument of "".</p>
      *
      * @param uri The Namespace URI.
-     * @return An enumeration of all prefixes declared in the
-     *         current context.
+     * @return An enumeration of prefixes (never empty).
      * @see #getPrefix
      * @see #getDeclaredPrefixes
      * @see #getURI
@@ -449,6 +473,41 @@ public class NamespaceSupport
        return currentContext.getDeclaredPrefixes();
     }
 
+    /**
+     * Controls whether namespace declaration attributes are placed
+     * into the {@link #NSDECL NSDECL} namespace
+     * by {@link #processName processName()}.  This may only be
+     * changed before any contexts have been pushed.
+     *
+     * @since SAX 2.1alpha
+     *
+     * @exception IllegalStateException when attempting to set this
+     * after any context has been pushed.
+     */
+    public void setNamespaceDeclUris (boolean value)
+    {
+       if (contextPos != 0)
+           throw new IllegalStateException ();
+       if (value == namespaceDeclUris)
+           return;
+       namespaceDeclUris = value;
+       if (value)
+           currentContext.declarePrefix ("xmlns", NSDECL);
+       else {
+           contexts[contextPos] = currentContext = new Context();
+           currentContext.declarePrefix("xml", XMLNS);
+       }
+    }
+
+    /**
+     * Returns true if namespace declaration attributes are placed into
+     * a namespace.  This behavior is not the default.
+     *
+     * @since SAX 2.1alpha
+     */
+    public boolean isNamespaceDeclUris ()
+       { return namespaceDeclUris; }
+
 
 \f
     ////////////////////////////////////////////////////////////////////
@@ -458,7 +517,7 @@ public class NamespaceSupport
     private Context contexts[];
     private Context currentContext;
     private int contextPos;
-
+    private boolean namespaceDeclUris;
 
 \f
     ////////////////////////////////////////////////////////////////////
@@ -562,9 +621,9 @@ public class NamespaceSupport
 
 
        /**
-        * Process a raw XML 1.0 name in this context.
+        * Process an XML qualified name in this context.
         *
-        * @param qName The raw XML 1.0 name.
+        * @param qName The XML qualified name.
         * @param isAttribute true if this is an attribute name.
         * @return An array of three strings containing the
         *         URI part (or empty string), the local part,
@@ -606,7 +665,12 @@ public class NamespaceSupport
            
                                // No prefix.
            if (index == -1) {
-               if (isAttribute || defaultNS == null) {
+               if (isAttribute) {
+                   if (qName == "xmlns" && namespaceDeclUris)
+                       name[0] = NSDECL;
+                   else
+                       name[0] = "";
+               } else if (defaultNS == null) {
                    name[0] = "";
                } else {
                    name[0] = defaultNS;
@@ -624,7 +688,8 @@ public class NamespaceSupport
                } else {
                    uri = (String)prefixTable.get(prefix);
                }
-               if (uri == null) {
+               if (uri == null
+                       || (!isAttribute && "xmlns".equals (prefix))) {
                    return null;
                }
                name[0] = uri;
diff --git a/libjava/org/xml/sax/helpers/NewInstance.java b/libjava/external/sax/org/xml/sax/helpers/NewInstance.java
similarity index 97%
rename from libjava/org/xml/sax/helpers/NewInstance.java
rename to libjava/external/sax/org/xml/sax/helpers/NewInstance.java
index 7d107a6..70c043e 100644 (file)
--- a/libjava/org/xml/sax/helpers/NewInstance.java
+++ b/libjava/external/sax/org/xml/sax/helpers/NewInstance.java
@@ -3,8 +3,7 @@
 // Written by Edwin Goei, edwingo@apache.org
 // and by David Brownell, dbrownell@users.sourceforge.net
 // NO WARRANTY!  This class is in the Public Domain.
-
-// $Id: NewInstance.java,v 1.1.2.4 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: NewInstance.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax.helpers;
 
diff --git a/libjava/org/xml/sax/helpers/ParserAdapter.java b/libjava/external/sax/org/xml/sax/helpers/ParserAdapter.java
similarity index 95%
rename from libjava/org/xml/sax/helpers/ParserAdapter.java
rename to libjava/external/sax/org/xml/sax/helpers/ParserAdapter.java
index ca66a9e..748ad1c 100644 (file)
--- a/libjava/org/xml/sax/helpers/ParserAdapter.java
+++ b/libjava/external/sax/org/xml/sax/helpers/ParserAdapter.java
@@ -2,8 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-
-// $Id: ParserAdapter.java,v 1.8.2.4 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: ParserAdapter.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax.helpers;
 
@@ -159,6 +158,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler
     private final static String FEATURES = "http://xml.org/sax/features/";
     private final static String NAMESPACES = FEATURES + "namespaces";
     private final static String NAMESPACE_PREFIXES = FEATURES + "namespace-prefixes";
+    private final static String XMLNS_URIs = FEATURES + "xmlns-uris";
 
 
     /**
@@ -190,6 +190,9 @@ public class ParserAdapter implements XMLReader, DocumentHandler
            if (!prefixes && !namespaces) {
                namespaces = true;
            }
+       } else if (name.equals(XMLNS_URIs)) {
+           checkNotParsing("feature", name);
+           uris = value;
        } else {
            throw new SAXNotRecognizedException("Feature: " + name);
        }
@@ -217,6 +220,8 @@ public class ParserAdapter implements XMLReader, DocumentHandler
            return namespaces;
        } else if (name.equals(NAMESPACE_PREFIXES)) {
            return prefixes;
+       } else if (name.equals(XMLNS_URIs)) {
+           return uris;
        } else {
            throw new SAXNotRecognizedException("Feature: " + name);
        }
@@ -290,7 +295,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler
     /**
      * Set the DTD handler.
      *
-     * @param resolver The new DTD handler.
+     * @param handler the new DTD handler
      * @see org.xml.sax.XMLReader#setEntityResolver
      */
     public void setDTDHandler (DTDHandler handler)
@@ -302,7 +307,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler
     /**
      * Return the current DTD handler.
      *
-     * @return The current DTD handler, or null if none was supplied.
+     * @return the current DTD handler, or null if none was supplied
      * @see org.xml.sax.XMLReader#getEntityResolver
      */
     public DTDHandler getDTDHandler ()
@@ -314,7 +319,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler
     /**
      * Set the content handler.
      *
-     * @param resolver The new content handler.
+     * @param handler the new content handler
      * @see org.xml.sax.XMLReader#setEntityResolver
      */
     public void setContentHandler (ContentHandler handler)
@@ -338,7 +343,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler
     /**
      * Set the error handler.
      *
-     * @param resolver The new error handler.
+     * @param handler The new error handler.
      * @see org.xml.sax.XMLReader#setEntityResolver
      */
     public void setErrorHandler (ErrorHandler handler)
@@ -405,7 +410,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler
     }
 
 
-\f
+
     ////////////////////////////////////////////////////////////////////
     // Implementation of org.xml.sax.DocumentHandler.
     ////////////////////////////////////////////////////////////////////
@@ -468,7 +473,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler
      * <p>If necessary, perform Namespace processing.</p>
      *
      * @param qName The qualified (prefixed) name.
-     * @param qAtts The XML 1.0 attribute list (with qnames).
+     * @param qAtts The XML attribute list (with qnames).
      * @exception SAXException The client may raise a
      *            processing exception.
      */
@@ -547,13 +552,21 @@ public class ParserAdapter implements XMLReader, DocumentHandler
                    // (and similarly named) attributes ... ignore
                    prefix = null;
                } else {
-                   prefix = attQName.substring(n+1);
+                   prefix = attQName.substring(6);
                }
                                // Yes, decl:  report or prune
                if (prefix != null) {
-                   if (prefixes)
-                       atts.addAttribute("", "", attQName.intern(),
-                                     type, value);
+                   if (prefixes) {
+                       if (uris)
+                           // note funky case:  localname can be null
+                           // when declaring the default prefix, and
+                           // yet the uri isn't null.
+                           atts.addAttribute (nsSupport.XMLNS, prefix,
+                                   attQName.intern(), type, value);
+                       else
+                           atts.addAttribute ("", "",
+                                   attQName.intern(), type, value);
+                   }
                    continue;
                }
            } 
@@ -691,7 +704,13 @@ public class ParserAdapter implements XMLReader, DocumentHandler
      */
     private void setupParser ()
     {
+       // catch an illegal "nonsense" state.
+       if (!prefixes && !namespaces)
+           throw new IllegalStateException ();
+
        nsSupport.reset();
+       if (uris)
+           nsSupport.setNamespaceDeclUris (true);
 
        if (entityResolver != null) {
            parser.setEntityResolver(entityResolver);
@@ -809,6 +828,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler
                                // Features
     private boolean namespaces = true;
     private boolean prefixes = false;
+    private boolean uris = false;
 
                                // Properties
 
diff --git a/libjava/org/xml/sax/helpers/ParserFactory.java b/libjava/external/sax/org/xml/sax/helpers/ParserFactory.java
similarity index 98%
rename from libjava/org/xml/sax/helpers/ParserFactory.java
rename to libjava/external/sax/org/xml/sax/helpers/ParserFactory.java
index acedfd1..2313998 100644 (file)
--- a/libjava/org/xml/sax/helpers/ParserFactory.java
+++ b/libjava/external/sax/org/xml/sax/helpers/ParserFactory.java
@@ -1,7 +1,7 @@
 // SAX parser factory.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: ParserFactory.java,v 1.4.2.3 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: ParserFactory.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax.helpers;
 
diff --git a/libjava/org/xml/sax/helpers/XMLFilterImpl.java b/libjava/external/sax/org/xml/sax/helpers/XMLFilterImpl.java
similarity index 98%
rename from libjava/org/xml/sax/helpers/XMLFilterImpl.java
rename to libjava/external/sax/org/xml/sax/helpers/XMLFilterImpl.java
index 2f84808..64ff0a4 100644 (file)
--- a/libjava/org/xml/sax/helpers/XMLFilterImpl.java
+++ b/libjava/external/sax/org/xml/sax/helpers/XMLFilterImpl.java
@@ -2,8 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the Public Domain.
-
-// $Id: XMLFilterImpl.java,v 1.3.2.7 2002/01/29 21:34:14 dbrownell Exp $
+// $Id: XMLFilterImpl.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax.helpers;
 
@@ -254,7 +253,7 @@ public class XMLFilterImpl
     /**
      * Set the DTD event handler.
      *
-     * @param resolver The new DTD handler.
+     * @param handler the new DTD handler
      */
     public void setDTDHandler (DTDHandler handler)
     {
@@ -276,7 +275,7 @@ public class XMLFilterImpl
     /**
      * Set the content event handler.
      *
-     * @param resolver The new content handler.
+     * @param handler the new content handler
      */
     public void setContentHandler (ContentHandler handler)
     {
@@ -298,7 +297,7 @@ public class XMLFilterImpl
     /**
      * Set the error event handler.
      *
-     * @param handle The new error handler.
+     * @param handler the new error handler
      */
     public void setErrorHandler (ErrorHandler handler)
     {
diff --git a/libjava/org/xml/sax/helpers/XMLReaderAdapter.java b/libjava/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java
similarity index 99%
rename from libjava/org/xml/sax/helpers/XMLReaderAdapter.java
rename to libjava/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java
index 19c8d3f..566e69b 100644 (file)
--- a/libjava/org/xml/sax/helpers/XMLReaderAdapter.java
+++ b/libjava/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java
@@ -2,8 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-
-// $Id: XMLReaderAdapter.java,v 1.5.2.3 2002/01/29 21:34:15 dbrownell Exp $
+// $Id: XMLReaderAdapter.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax.helpers;
 
@@ -108,7 +107,7 @@ public class XMLReaderAdapter implements Parser, ContentHandler
     }
 
 
-\f
+
     ////////////////////////////////////////////////////////////////////
     // Implementation of org.xml.sax.Parser.
     ////////////////////////////////////////////////////////////////////
@@ -120,7 +119,7 @@ public class XMLReaderAdapter implements Parser, ContentHandler
      * <p>This is not supported in SAX2, and will always throw
      * an exception.</p>
      *
-     * @param The locale for error reporting.
+     * @param locale the locale for error reporting.
      * @see org.xml.sax.Parser#setLocale
      * @exception org.xml.sax.SAXException Thrown unless overridden.
      */
diff --git a/libjava/org/xml/sax/helpers/XMLReaderFactory.java b/libjava/external/sax/org/xml/sax/helpers/XMLReaderFactory.java
similarity index 98%
rename from libjava/org/xml/sax/helpers/XMLReaderFactory.java
rename to libjava/external/sax/org/xml/sax/helpers/XMLReaderFactory.java
index e1fa80c..0516ff2 100644 (file)
--- a/libjava/org/xml/sax/helpers/XMLReaderFactory.java
+++ b/libjava/external/sax/org/xml/sax/helpers/XMLReaderFactory.java
@@ -3,8 +3,7 @@
 // Written by David Megginson
 // and by David Brownell
 // NO WARRANTY!  This class is in the Public Domain.
-
-// $Id: XMLReaderFactory.java,v 1.5.2.4 2002/01/29 21:34:15 dbrownell Exp $
+// $Id: XMLReaderFactory.java,v 1.1 2004/12/23 22:38:42 mark Exp $
 
 package org.xml.sax.helpers;
 import java.io.BufferedReader;
@@ -110,7 +109,7 @@ final public class XMLReaderFactory
        
        // 1. try the JVM-instance-wide system property
        try { className = System.getProperty (property); }
-       catch (Exception e) { /* normally fails for applets */ }
+       catch (RuntimeException e) { /* normally fails for applets */ }
 
        // 2. if that fails, try META-INF/services/
        if (className == null) {
diff --git a/libjava/org/xml/sax/helpers/package.html b/libjava/external/sax/org/xml/sax/helpers/package.html
similarity index 77%
rename from libjava/org/xml/sax/helpers/package.html
rename to libjava/external/sax/org/xml/sax/helpers/package.html
index 458d122..06d4a30 100644 (file)
--- a/libjava/org/xml/sax/helpers/package.html
+++ b/libjava/external/sax/org/xml/sax/helpers/package.html
@@ -1,7 +1,5 @@
 <HTML><HEAD>
-
-<!-- $Id: package.html,v 1.3.2.1 2001/11/09 20:32:58 dbrownell Exp $ -->
-
+<!-- $Id: package.html,v 1.1 2004/12/23 22:38:42 mark Exp $ -->
 </HEAD><BODY>
 
 <p>This package contains "helper" classes, including
diff --git a/libjava/external/sax/org/xml/sax/package.html b/libjava/external/sax/org/xml/sax/package.html
new file mode 100644 (file)
index 0000000..b71f67f
--- /dev/null
+++ b/libjava/external/sax/org/xml/sax/package.html
@@ -0,0 +1,297 @@
+<html><head>
+<!-- $Id: package.html,v 1.1 2004/12/23 22:38:42 mark Exp $ -->
+</head><body>
+
+<p> This package provides the core SAX APIs.
+Some SAX1 APIs are deprecated to encourage integration of
+namespace-awareness into designs of new applications
+and into maintenance of existing infrastructure. </p>
+
+<p>See <a href='http://www.saxproject.org'>http://www.saxproject.org</a>
+for more information about SAX.</p>
+
+
+<h2> SAX2 Standard Feature Flags </h2>
+
+<p> One of the essential characteristics of SAX2 is that it added
+feature flags which can be used to examine and perhaps modify
+parser modes, in particular modes such as validation.
+Since features are identified by (absolute) URIs, anyone
+can define such features.   
+Currently defined standard feature URIs have the prefix
+<code>http://xml.org/sax/features/</code> before an identifier such as
+<code>validation</code>.  Turn features on or off using
+<em>setFeature</em>.  Those standard identifiers are: </p>
+
+
+<table border="1" cellpadding="3" cellspacing="0" width="100%">
+    <tr align="center" bgcolor="#ccccff">
+       <th>Feature ID</th>
+       <th>Access</th>
+       <th>Default</th>
+       <th>Description</th>
+       </tr>
+
+    <tr>
+       <td>external-general-entities</td>
+       <td><em>read/write</em></td>
+       <td><em>unspecified</em></td>
+       <td> Reports whether this parser processes external
+           general entities; always true if validating.
+               </td>
+       </tr>
+
+    <tr>
+       <td>external-parameter-entities</td>
+       <td><em>read/write</em></td>
+       <td><em>unspecified</em></td>
+       <td> Reports whether this parser processes external
+           parameter entities; always true if validating.
+               </td>
+       </tr>
+
+    <tr>
+       <td>is-standalone</td>
+       <td>(parsing) <em>read-only</em>, (not parsing) <em>none</em></td>
+       <td>not applicable</td>
+       <td> May be examined only during a parse, after the
+           <em>startDocument()</em> callback has been completed; read-only.
+           The value is true if the document specified standalone="yes" in 
+           its XML declaration, and otherwise is false.
+               </td>
+       </tr>
+
+    <tr>
+       <td>lexical-handler/parameter-entities</td>
+       <td><em>read/write</em></td>
+       <td><em>unspecified</em></td>
+       <td> A value of "true" indicates that the LexicalHandler will report
+           the beginning and end of parameter entities.
+               </td>
+       </tr>
+
+    <tr>
+       <td>namespaces</td>
+       <td><em>read/write</em></td>
+       <td>true</td>
+       <td> A value of "true" indicates namespace URIs and unprefixed local names
+           for element and attribute names will be available.
+               </td>
+       </tr>
+
+    <tr>
+       <td>namespace-prefixes</td>
+       <td><em>read/write</em></td>
+       <td>false</td>
+       <td> A value of "true" indicates that XML qualified names (with prefixes) and
+           attributes (including <em>xmlns*</em> attributes) will be available.
+               </td>
+       </tr>
+
+    <tr>
+       <td>resolve-dtd-uris</td>
+       <td><em>read/write</em></td>
+       <td><em>true</em></td>
+       <td> A value of "true" indicates that system IDs in declarations will
+           be absolutized (relative to their base URIs) before reporting.
+           (That is the default behavior for all SAX2 XML parsers.)
+           A value of "false" indicates those IDs will not be absolutized;
+           parsers will provide the base URI from
+           <em>Locator.getSystemId()</em>.
+           This applies to system IDs passed in <ul>
+               <li><em>DTDHandler.notationDecl()</em>,
+               <li><em>DTDHandler.unparsedEntityDecl()</em>, and
+               <li><em>DeclHandler.externalEntityDecl()</em>.
+           </ul>
+           It does not apply to <em>EntityResolver.resolveEntity()</em>,
+           which is not used to report declarations, or to
+           <em>LexicalHandler.startDTD()</em>, which already provides
+           the non-absolutized URI.
+           </td>
+       </tr>
+
+    <tr>
+       <td>string-interning</td>
+       <td><em>read/write</em></td>
+       <td><em>unspecified</em></td>
+       <td> Has a value of "true" if all XML names (for elements, prefixes,
+           attributes, entities, notations, and local names),
+           as well as Namespace URIs, will have been interned
+           using <em>java.lang.String.intern</em>. This supports fast
+           testing of equality/inequality against string constants,
+           rather than forcing slower calls to <em>String.equals()</em>.
+           </td>
+       </tr>
+
+    <tr>
+    <td>unicode-normalization-checking</td>
+    <td><em>read/write</em></td>
+    <td><em>false</em></td>
+    <td> Controls whether the parser reports Unicode normalization 
+        errors as described in section 2.13 and Appendix B of the 
+        XML 1.1 Recommendation. If true, Unicode normalization
+        errors are reported using the ErrorHandler.error() callback.
+        Such errors are not fatal in themselves (though, obviously,
+        other Unicode-related encoding errors may be).
+               </td>
+    </tr>
+    
+    <tr>
+       <td>use-attributes2</td>
+       <td><em>read-only</em></td>
+       <td>not applicable</td>
+       <td> Returns "true" if the <em>Attributes</em> objects passed by
+           this parser in <em>ContentHandler.startElement()</em>
+           implement the <a href="ext/Attributes2.html"
+           ><em>org.xml.sax.ext.Attributes2</em></a> interface.
+           That interface exposes additional DTD-related information,
+           such as whether the attribute was specified in the
+           source text rather than defaulted.
+               </td>
+       </tr>
+
+    <tr>
+       <td>use-locator2</td>
+       <td><em>read-only</em></td>
+       <td>not applicable</td>
+       <td> Returns "true" if the <em>Locator</em> objects passed by
+           this parser in <em>ContentHandler.setDocumentLocator()</em>
+           implement the <a href="ext/Locator2.html"
+           ><em>org.xml.sax.ext.Locator2</em></a> interface.
+           That interface exposes additional entity information,
+           such as the character encoding and XML version used.
+               </td>
+       </tr>
+
+    <tr>
+       <td>use-entity-resolver2</td>
+       <td><em>read/write</em></td>
+       <td><em>true</em></td>
+       <td> Returns "true" if, when <em>setEntityResolver</em> is given
+           an object implementing the <a href="ext/EntityResolver2.html"
+           ><em>org.xml.sax.ext.EntityResolver2</em></a> interface,
+           those new methods will be used.
+           Returns "false" to indicate that those methods will not be used.
+               </td>
+       </tr>
+
+    <tr>
+       <td>validation</td>
+       <td><em>read/write</em></td>
+       <td><em>unspecified</em></td>
+       <td> Controls whether the parser is reporting all validity
+           errors; if true, all external entities will be read.
+               </td>
+       </tr>
+
+    <tr>
+       <td>xmlns-uris</td>
+       <td><em>read/write</em></td>
+       <td><em>false</em></td>
+       <td> Controls whether, when the <em>namespace-prefixes</em> feature
+           is set, the parser treats namespace declaration attributes as
+           being in the <em>http://www.w3.org/2000/xmlns/</em> namespace.
+           By default, SAX2 conforms to the original "Namespaces in XML"
+           Recommendation, which explicitly states that such attributes are
+           not in any namespace.
+           Setting this optional flag to "true" makes the SAX2 events conform to
+           a later backwards-incompatible revision of that recommendation,
+           placing those attributes in a namespace.
+               </td>
+       </tr>
+
+    <tr>
+    <td>xml-1.1</td>
+    <td><em>read-only</em></td>
+    <td>not applicable</td>
+    <td> Returns "true" if the parser supports both XML 1.1 and XML 1.0.
+        Returns "false" if the parser supports only XML 1.0.
+               </td>
+    </tr>
+
+</table>
+
+<p> Support for the default values of the
+<em>namespaces</em> and <em>namespace-prefixes</em>
+properties is required.
+Support for any other feature flags is entirely optional.
+</p>
+
+<p> For default values not specified by SAX2,
+each XMLReader implementation specifies its default,
+or may choose not to expose the feature flag.
+Unless otherwise specified here,
+implementations may support changing current values
+of these standard feature flags, but not while parsing.
+</p>
+
+<h2> SAX2 Standard Handler and Property IDs </h2>
+
+<p> For parser interface characteristics that are described
+as objects, a separate namespace is defined.  The
+objects in this namespace are again identified by URI, and
+the standard property URIs have the prefix
+<code>http://xml.org/sax/properties/</code> before an identifier such as
+<code>lexical-handler</code> or
+<code>dom-node</code>.  Manage those properties using
+<em>setProperty()</em>.  Those identifiers are: </p>
+
+<table border="1" cellpadding="3" cellspacing="0" width="100%">
+    <tr align="center" bgcolor="#ccccff">
+       <th>Property ID</th>
+       <th>Description</th>
+       </tr>
+
+    <tr>
+       <td>declaration-handler</td>
+       <td> Used to see most DTD declarations except those treated
+           as lexical ("document element name is ...") or which are
+           mandatory for all SAX parsers (<em>DTDHandler</em>).
+           The Object must implement <a href="ext/DeclHandler.html"
+           ><em>org.xml.sax.ext.DeclHandler</em></a>.
+           </td>
+       </tr>
+
+    <tr>
+        <td>document-xml-version</td>
+        <td> May be examined only during a parse, after the startDocument()
+            callback has been completed; read-only. This property is a 
+            literal string describing the actual XML version of the document, 
+            such as "1.0" or "1.1".
+            </td>
+        </tr>
+    
+    <tr>
+       <td>dom-node</td>
+       <td> For "DOM Walker" style parsers, which ignore their
+           <em>parser.parse()</em> parameters, this is used to
+           specify the DOM (sub)tree being walked by the parser.
+           The Object must implement the
+           <em>org.w3c.dom.Node</em> interface.
+           </td>
+       </tr>
+
+    <tr>
+       <td>lexical-handler</td>
+       <td> Used to see some syntax events that are essential in some
+           applications:  comments, CDATA delimiters, selected general
+           entity inclusions, and the start and end of the DTD
+           (and declaration of document element name).
+           The Object must implement <a href="ext/LexicalHandler.html"
+           ><em>org.xml.sax.ext.LexicalHandler</em></a>.
+           </td>
+       </tr>
+
+    <tr>
+       <td>xml-string</td>
+       <td> Readable only during a parser callback, this exposes a <b>TBS</b>
+           chunk of characters responsible for the current event. </td>
+       </tr>
+
+</table>
+
+<p> All of these standard properties are optional;
+XMLReader implementations need not support them.
+</p>
+
+</body></html>
\ No newline at end of file
diff --git a/libjava/external/w3c_dom/COPYRIGHT.html b/libjava/external/w3c_dom/COPYRIGHT.html
new file mode 100644 (file)
index 0000000..c7e0e49
--- /dev/null
+++ b/libjava/external/w3c_dom/COPYRIGHT.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+    <title>W3C IPR SOFTWARE NOTICE</title>
+<style type="text/css">
+<!--
+html, body { background: #fff; color: #000; } /* body for Windows IE3 */
+-->
+</style>
+  </head>
+  <body>
+    <h1>
+      W3C IPR SOFTWARE NOTICE
+    </h1>
+    <h3>
+      Copyright &copy; 2002 <a href="http://www.w3.org/">World Wide Web
+      Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts
+      Institute of Technology</a>, <a href="http://www.inria.fr/">Institut
+      National de Recherche en Informatique et en Automatique</a>, <a
+      href="http://www.keio.ac.jp/">Keio University</a>). All Rights
+      Reserved.
+    </h3>
+    <p>
+      The DOM bindings are published under the W3C Software Copyright Notice
+      and License. The software license requires "Notice of any changes or
+      modifications to the W3C files, including the date changes were made."
+      Consequently, modified versions of the DOM bindings must document that
+      they do not conform to the W3C standard; in the case of the IDL
+      definitions, the pragma prefix can no longer be 'w3c.org'; in the case of
+      the Java language binding, the package names can no longer be in the
+      'org.w3c' package.
+    </p>
+    <p>
+      <b>Note:</b> The original version of the W3C Software Copyright Notice
+      and License could be found at <a
+      href='http://www.w3.org/Consortium/Legal/copyright-software-19980720'>http://www.w3.org/Consortium/Legal/copyright-software-19980720</a>
+    </p>
+    <h3>
+      Copyright &copy; 1994-2002 <a href="http://www.w3.org/">World Wide Web
+      Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts
+      Institute of Technology</a>, <a href="http://www.inria.fr/">Institut
+      National de Recherche en Informatique et en Automatique</a>, <a
+      href="http://www.keio.ac.jp/">Keio University</a>). All Rights
+      Reserved. http://www.w3.org/Consortium/Legal/
+    </h3>
+    <p>
+      This W3C work (including software, documents, or other related items) is
+      being provided by the copyright holders under the following license. By
+      obtaining, using and/or copying this work, you (the licensee) agree that
+      you have read, understood, and will comply with the following terms and
+      conditions:
+    </p>
+    <p>
+      Permission to use, copy, and modify this software and its documentation,
+      with or without modification,&nbsp; for any purpose and without fee or
+      royalty is hereby granted, provided that you include the following on ALL
+      copies of the software and documentation or portions thereof, including
+      modifications, that you make:
+    </p>
+    <ol>
+      <li>
+       The full text of this NOTICE in a location viewable to users of the
+       redistributed or derivative work.
+      </li>
+      <li>
+       Any pre-existing intellectual property disclaimers, notices, or terms
+       and conditions. If none exist, a short notice of the following form
+       (hypertext is preferred, text is permitted) should be used within the
+       body of any redistributed or derivative code: "Copyright &copy;
+       [$date-of-software] <a href="http://www.w3.org/">World Wide Web
+       Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts
+       Institute of Technology</a>, <a href="http://www.inria.fr/">Institut
+       National de Recherche en Informatique et en Automatique</a>, <a
+       href="http://www.keio.ac.jp/">Keio University</a>).  All Rights
+       Reserved. http://www.w3.org/Consortium/Legal/"
+      </li>
+      <li>
+       Notice of any changes or modifications to the W3C files, including the
+       date changes were made. (We recommend you provide URIs to the location
+       from which the code is derived.)
+      </li>
+    </ol>
+    <p>
+      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
+      HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+      INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
+      FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
+      DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+      TRADEMARKS OR OTHER RIGHTS.
+    </p>
+    <p>
+      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+      CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+      DOCUMENTATION.
+    </p>
+    <p>
+      The name and trademarks of copyright holders may NOT be used in
+      advertising or publicity pertaining to the software without specific,
+      written prior permission. Title to copyright in this software and any
+      associated documentation will at all times remain with copyright
+      holders.
+    </p>
+  </body>
+</html>
diff --git a/libjava/external/w3c_dom/Makefile.am b/libjava/external/w3c_dom/Makefile.am
new file mode 100644 (file)
index 0000000..8cf62e4
--- /dev/null
+++ b/libjava/external/w3c_dom/Makefile.am
@@ -0,0 +1,177 @@
+## Process this file with automake to produce Makefile.in.
+
+AUTOMAKE_OPTIONS = foreign subdir-objects
+
+## The compiler with whatever flags we want for both -c and -C
+## compiles.
+GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
+
+BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir)
+
+AM_GCJFLAGS = \
+       -B$(top_builddir) \
+       @LIBGCJ_JAVAFLAGS@ \
+       -fclasspath= -fbootclasspath=$(BOOTCLASSPATH) \
+       --encoding=UTF-8 \
+       -Wno-deprecated
+
+all-local: classes.stamp
+
+classes.stamp: $(libw3c_convenience_la_SOURCES)
+       here=`pwd`; cd $(srcdir); \
+       $(GCJ_WITH_FLAGS) -C -d $$here $(libw3c_convenience_la_SOURCES)
+       echo > classes.stamp
+
+mostlyclean-local:
+       find . -name '*.class' | xargs rm
+       rm classes.stamp
+
+noinst_LTLIBRARIES = libw3c_convenience.la
+
+libw3c_convenience_la_SOURCES =        \
+org/w3c/dom/xpath/XPathNamespace.java \
+org/w3c/dom/xpath/XPathResult.java \
+org/w3c/dom/xpath/XPathException.java \
+org/w3c/dom/xpath/XPathExpression.java \
+org/w3c/dom/xpath/XPathNSResolver.java \
+org/w3c/dom/xpath/XPathEvaluator.java \
+org/w3c/dom/DOMException.java \
+org/w3c/dom/Comment.java \
+org/w3c/dom/stylesheets/DocumentStyle.java \
+org/w3c/dom/stylesheets/MediaList.java \
+org/w3c/dom/stylesheets/LinkStyle.java \
+org/w3c/dom/stylesheets/StyleSheet.java        \
+org/w3c/dom/stylesheets/StyleSheetList.java \
+org/w3c/dom/Attr.java \
+org/w3c/dom/Notation.java \
+org/w3c/dom/TypeInfo.java \
+org/w3c/dom/html2/HTMLIsIndexElement.java \
+org/w3c/dom/html2/HTMLTableColElement.java \
+org/w3c/dom/html2/HTMLLinkElement.java \
+org/w3c/dom/html2/HTMLTitleElement.java        \
+org/w3c/dom/html2/HTMLBRElement.java \
+org/w3c/dom/html2/HTMLHeadElement.java \
+org/w3c/dom/html2/HTMLHtmlElement.java \
+org/w3c/dom/html2/HTMLScriptElement.java \
+org/w3c/dom/html2/HTMLTableRowElement.java \
+org/w3c/dom/html2/HTMLOptionsCollection.java \
+org/w3c/dom/html2/HTMLTableCellElement.java \
+org/w3c/dom/html2/HTMLDListElement.java        \
+org/w3c/dom/html2/HTMLFieldSetElement.java \
+org/w3c/dom/html2/HTMLImageElement.java        \
+org/w3c/dom/html2/HTMLHRElement.java \
+org/w3c/dom/html2/HTMLModElement.java \
+org/w3c/dom/html2/HTMLHeadingElement.java \
+org/w3c/dom/html2/HTMLTableElement.java        \
+org/w3c/dom/html2/HTMLAreaElement.java \
+org/w3c/dom/html2/HTMLOptGroupElement.java \
+org/w3c/dom/html2/HTMLIFrameElement.java \
+org/w3c/dom/html2/HTMLDirectoryElement.java \
+org/w3c/dom/html2/HTMLParamElement.java        \
+org/w3c/dom/html2/HTMLLegendElement.java \
+org/w3c/dom/html2/HTMLFrameElement.java        \
+org/w3c/dom/html2/HTMLFormElement.java \
+org/w3c/dom/html2/HTMLStyleElement.java        \
+org/w3c/dom/html2/HTMLFrameSetElement.java \
+org/w3c/dom/html2/HTMLCollection.java \
+org/w3c/dom/html2/HTMLAnchorElement.java \
+org/w3c/dom/html2/HTMLLabelElement.java        \
+org/w3c/dom/html2/HTMLBodyElement.java \
+org/w3c/dom/html2/HTMLOptionElement.java \
+org/w3c/dom/html2/HTMLTableSectionElement.java \
+org/w3c/dom/html2/HTMLAppletElement.java \
+org/w3c/dom/html2/HTMLSelectElement.java \
+org/w3c/dom/html2/HTMLMetaElement.java \
+org/w3c/dom/html2/HTMLMenuElement.java \
+org/w3c/dom/html2/HTMLDivElement.java \
+org/w3c/dom/html2/HTMLLIElement.java \
+org/w3c/dom/html2/HTMLFontElement.java \
+org/w3c/dom/html2/HTMLOListElement.java        \
+org/w3c/dom/html2/HTMLBaseFontElement.java \
+org/w3c/dom/html2/HTMLElement.java \
+org/w3c/dom/html2/HTMLTableCaptionElement.java \
+org/w3c/dom/html2/HTMLTextAreaElement.java \
+org/w3c/dom/html2/HTMLPreElement.java \
+org/w3c/dom/html2/HTMLObjectElement.java \
+org/w3c/dom/html2/HTMLBaseElement.java \
+org/w3c/dom/html2/HTMLUListElement.java        \
+org/w3c/dom/html2/HTMLMapElement.java \
+org/w3c/dom/html2/HTMLParagraphElement.java \
+org/w3c/dom/html2/HTMLButtonElement.java \
+org/w3c/dom/html2/HTMLQuoteElement.java        \
+org/w3c/dom/html2/HTMLInputElement.java        \
+org/w3c/dom/html2/HTMLDocument.java \
+org/w3c/dom/ls/LSParser.java \
+org/w3c/dom/ls/LSSerializerFilter.java \
+org/w3c/dom/ls/LSLoadEvent.java        \
+org/w3c/dom/ls/DOMImplementationLS.java        \
+org/w3c/dom/ls/LSException.java        \
+org/w3c/dom/ls/LSSerializer.java \
+org/w3c/dom/ls/LSResourceResolver.java \
+org/w3c/dom/ls/LSOutput.java \
+org/w3c/dom/ls/LSInput.java \
+org/w3c/dom/ls/LSProgressEvent.java \
+org/w3c/dom/ls/LSParserFilter.java \
+org/w3c/dom/DOMLocator.java \
+org/w3c/dom/DOMStringList.java \
+org/w3c/dom/DocumentFragment.java \
+org/w3c/dom/events/MutationEvent.java \
+org/w3c/dom/events/UIEvent.java        \
+org/w3c/dom/events/EventListener.java \
+org/w3c/dom/events/Event.java \
+org/w3c/dom/events/MouseEvent.java \
+org/w3c/dom/events/EventTarget.java \
+org/w3c/dom/events/DocumentEvent.java \
+org/w3c/dom/events/EventException.java \
+org/w3c/dom/EntityReference.java \
+org/w3c/dom/DOMErrorHandler.java \
+org/w3c/dom/views/AbstractView.java \
+org/w3c/dom/views/DocumentView.java \
+org/w3c/dom/DOMError.java \
+org/w3c/dom/bootstrap/DOMImplementationRegistry.java \
+org/w3c/dom/traversal/TreeWalker.java \
+org/w3c/dom/traversal/NodeFilter.java \
+org/w3c/dom/traversal/DocumentTraversal.java \
+org/w3c/dom/traversal/NodeIterator.java        \
+org/w3c/dom/CharacterData.java \
+org/w3c/dom/DOMConfiguration.java \
+org/w3c/dom/css/CSSRule.java \
+org/w3c/dom/css/Rect.java \
+org/w3c/dom/css/CSSStyleSheet.java \
+org/w3c/dom/css/CSSFontFaceRule.java \
+org/w3c/dom/css/CSSPrimitiveValue.java \
+org/w3c/dom/css/CSSRuleList.java \
+org/w3c/dom/css/ViewCSS.java \
+org/w3c/dom/css/CSSStyleRule.java \
+org/w3c/dom/css/CSSUnknownRule.java \
+org/w3c/dom/css/RGBColor.java \
+org/w3c/dom/css/ElementCSSInlineStyle.java \
+org/w3c/dom/css/CSSMediaRule.java \
+org/w3c/dom/css/CSS2Properties.java \
+org/w3c/dom/css/CSSValue.java \
+org/w3c/dom/css/CSSStyleDeclaration.java \
+org/w3c/dom/css/DOMImplementationCSS.java \
+org/w3c/dom/css/CSSCharsetRule.java \
+org/w3c/dom/css/Counter.java \
+org/w3c/dom/css/CSSPageRule.java \
+org/w3c/dom/css/DocumentCSS.java \
+org/w3c/dom/css/CSSValueList.java \
+org/w3c/dom/css/CSSImportRule.java \
+org/w3c/dom/NameList.java \
+org/w3c/dom/Element.java \
+org/w3c/dom/Document.java \
+org/w3c/dom/ranges/Range.java \
+org/w3c/dom/ranges/RangeException.java \
+org/w3c/dom/ranges/DocumentRange.java \
+org/w3c/dom/DOMImplementationList.java \
+org/w3c/dom/Entity.java        \
+org/w3c/dom/UserDataHandler.java \
+org/w3c/dom/DOMImplementation.java \
+org/w3c/dom/CDATASection.java \
+org/w3c/dom/ProcessingInstruction.java \
+org/w3c/dom/Node.java \
+org/w3c/dom/NamedNodeMap.java \
+org/w3c/dom/NodeList.java \
+org/w3c/dom/Text.java \
+org/w3c/dom/DocumentType.java \
+org/w3c/dom/DOMImplementationSource.java
diff --git a/libjava/external/w3c_dom/Makefile.in b/libjava/external/w3c_dom/Makefile.in
new file mode 100644 (file)
index 0000000..bb52ab7
--- /dev/null
+++ b/libjava/external/w3c_dom/Makefile.in
@@ -0,0 +1,1751 @@
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+SOURCES = $(libw3c_convenience_la_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = external/w3c_dom
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
+       $(top_srcdir)/../config/acx.m4 \
+       $(top_srcdir)/../config/gcc-version.m4 \
+       $(top_srcdir)/../config/gxx-include-dir.m4 \
+       $(top_srcdir)/../config/iconv.m4 \
+       $(top_srcdir)/../config/lcmessage.m4 \
+       $(top_srcdir)/../config/lib-ld.m4 \
+       $(top_srcdir)/../config/lib-link.m4 \
+       $(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \
+       $(top_srcdir)/acinclude.m4 \
+       $(top_srcdir)/../config/no-executables.m4 \
+       $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+       $(top_builddir)/gcj/libgcj-config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libw3c_convenience_la_LIBADD =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libw3c_convenience_la_OBJECTS =  \
+       org/w3c/dom/xpath/XPathNamespace.lo \
+       org/w3c/dom/xpath/XPathResult.lo \
+       org/w3c/dom/xpath/XPathException.lo \
+       org/w3c/dom/xpath/XPathExpression.lo \
+       org/w3c/dom/xpath/XPathNSResolver.lo \
+       org/w3c/dom/xpath/XPathEvaluator.lo \
+       org/w3c/dom/DOMException.lo org/w3c/dom/Comment.lo \
+       org/w3c/dom/stylesheets/DocumentStyle.lo \
+       org/w3c/dom/stylesheets/MediaList.lo \
+       org/w3c/dom/stylesheets/LinkStyle.lo \
+       org/w3c/dom/stylesheets/StyleSheet.lo \
+       org/w3c/dom/stylesheets/StyleSheetList.lo org/w3c/dom/Attr.lo \
+       org/w3c/dom/Notation.lo org/w3c/dom/TypeInfo.lo \
+       org/w3c/dom/html2/HTMLIsIndexElement.lo \
+       org/w3c/dom/html2/HTMLTableColElement.lo \
+       org/w3c/dom/html2/HTMLLinkElement.lo \
+       org/w3c/dom/html2/HTMLTitleElement.lo \
+       org/w3c/dom/html2/HTMLBRElement.lo \
+       org/w3c/dom/html2/HTMLHeadElement.lo \
+       org/w3c/dom/html2/HTMLHtmlElement.lo \
+       org/w3c/dom/html2/HTMLScriptElement.lo \
+       org/w3c/dom/html2/HTMLTableRowElement.lo \
+       org/w3c/dom/html2/HTMLOptionsCollection.lo \
+       org/w3c/dom/html2/HTMLTableCellElement.lo \
+       org/w3c/dom/html2/HTMLDListElement.lo \
+       org/w3c/dom/html2/HTMLFieldSetElement.lo \
+       org/w3c/dom/html2/HTMLImageElement.lo \
+       org/w3c/dom/html2/HTMLHRElement.lo \
+       org/w3c/dom/html2/HTMLModElement.lo \
+       org/w3c/dom/html2/HTMLHeadingElement.lo \
+       org/w3c/dom/html2/HTMLTableElement.lo \
+       org/w3c/dom/html2/HTMLAreaElement.lo \
+       org/w3c/dom/html2/HTMLOptGroupElement.lo \
+       org/w3c/dom/html2/HTMLIFrameElement.lo \
+       org/w3c/dom/html2/HTMLDirectoryElement.lo \
+       org/w3c/dom/html2/HTMLParamElement.lo \
+       org/w3c/dom/html2/HTMLLegendElement.lo \
+       org/w3c/dom/html2/HTMLFrameElement.lo \
+       org/w3c/dom/html2/HTMLFormElement.lo \
+       org/w3c/dom/html2/HTMLStyleElement.lo \
+       org/w3c/dom/html2/HTMLFrameSetElement.lo \
+       org/w3c/dom/html2/HTMLCollection.lo \
+       org/w3c/dom/html2/HTMLAnchorElement.lo \
+       org/w3c/dom/html2/HTMLLabelElement.lo \
+       org/w3c/dom/html2/HTMLBodyElement.lo \
+       org/w3c/dom/html2/HTMLOptionElement.lo \
+       org/w3c/dom/html2/HTMLTableSectionElement.lo \
+       org/w3c/dom/html2/HTMLAppletElement.lo \
+       org/w3c/dom/html2/HTMLSelectElement.lo \
+       org/w3c/dom/html2/HTMLMetaElement.lo \
+       org/w3c/dom/html2/HTMLMenuElement.lo \
+       org/w3c/dom/html2/HTMLDivElement.lo \
+       org/w3c/dom/html2/HTMLLIElement.lo \
+       org/w3c/dom/html2/HTMLFontElement.lo \
+       org/w3c/dom/html2/HTMLOListElement.lo \
+       org/w3c/dom/html2/HTMLBaseFontElement.lo \
+       org/w3c/dom/html2/HTMLElement.lo \
+       org/w3c/dom/html2/HTMLTableCaptionElement.lo \
+       org/w3c/dom/html2/HTMLTextAreaElement.lo \
+       org/w3c/dom/html2/HTMLPreElement.lo \
+       org/w3c/dom/html2/HTMLObjectElement.lo \
+       org/w3c/dom/html2/HTMLBaseElement.lo \
+       org/w3c/dom/html2/HTMLUListElement.lo \
+       org/w3c/dom/html2/HTMLMapElement.lo \
+       org/w3c/dom/html2/HTMLParagraphElement.lo \
+       org/w3c/dom/html2/HTMLButtonElement.lo \
+       org/w3c/dom/html2/HTMLQuoteElement.lo \
+       org/w3c/dom/html2/HTMLInputElement.lo \
+       org/w3c/dom/html2/HTMLDocument.lo org/w3c/dom/ls/LSParser.lo \
+       org/w3c/dom/ls/LSSerializerFilter.lo \
+       org/w3c/dom/ls/LSLoadEvent.lo \
+       org/w3c/dom/ls/DOMImplementationLS.lo \
+       org/w3c/dom/ls/LSException.lo org/w3c/dom/ls/LSSerializer.lo \
+       org/w3c/dom/ls/LSResourceResolver.lo \
+       org/w3c/dom/ls/LSOutput.lo org/w3c/dom/ls/LSInput.lo \
+       org/w3c/dom/ls/LSProgressEvent.lo \
+       org/w3c/dom/ls/LSParserFilter.lo org/w3c/dom/DOMLocator.lo \
+       org/w3c/dom/DOMStringList.lo org/w3c/dom/DocumentFragment.lo \
+       org/w3c/dom/events/MutationEvent.lo \
+       org/w3c/dom/events/UIEvent.lo \
+       org/w3c/dom/events/EventListener.lo \
+       org/w3c/dom/events/Event.lo org/w3c/dom/events/MouseEvent.lo \
+       org/w3c/dom/events/EventTarget.lo \
+       org/w3c/dom/events/DocumentEvent.lo \
+       org/w3c/dom/events/EventException.lo \
+       org/w3c/dom/EntityReference.lo org/w3c/dom/DOMErrorHandler.lo \
+       org/w3c/dom/views/AbstractView.lo \
+       org/w3c/dom/views/DocumentView.lo org/w3c/dom/DOMError.lo \
+       org/w3c/dom/bootstrap/DOMImplementationRegistry.lo \
+       org/w3c/dom/traversal/TreeWalker.lo \
+       org/w3c/dom/traversal/NodeFilter.lo \
+       org/w3c/dom/traversal/DocumentTraversal.lo \
+       org/w3c/dom/traversal/NodeIterator.lo \
+       org/w3c/dom/CharacterData.lo org/w3c/dom/DOMConfiguration.lo \
+       org/w3c/dom/css/CSSRule.lo org/w3c/dom/css/Rect.lo \
+       org/w3c/dom/css/CSSStyleSheet.lo \
+       org/w3c/dom/css/CSSFontFaceRule.lo \
+       org/w3c/dom/css/CSSPrimitiveValue.lo \
+       org/w3c/dom/css/CSSRuleList.lo org/w3c/dom/css/ViewCSS.lo \
+       org/w3c/dom/css/CSSStyleRule.lo \
+       org/w3c/dom/css/CSSUnknownRule.lo org/w3c/dom/css/RGBColor.lo \
+       org/w3c/dom/css/ElementCSSInlineStyle.lo \
+       org/w3c/dom/css/CSSMediaRule.lo \
+       org/w3c/dom/css/CSS2Properties.lo org/w3c/dom/css/CSSValue.lo \
+       org/w3c/dom/css/CSSStyleDeclaration.lo \
+       org/w3c/dom/css/DOMImplementationCSS.lo \
+       org/w3c/dom/css/CSSCharsetRule.lo org/w3c/dom/css/Counter.lo \
+       org/w3c/dom/css/CSSPageRule.lo org/w3c/dom/css/DocumentCSS.lo \
+       org/w3c/dom/css/CSSValueList.lo \
+       org/w3c/dom/css/CSSImportRule.lo org/w3c/dom/NameList.lo \
+       org/w3c/dom/Element.lo org/w3c/dom/Document.lo \
+       org/w3c/dom/ranges/Range.lo \
+       org/w3c/dom/ranges/RangeException.lo \
+       org/w3c/dom/ranges/DocumentRange.lo \
+       org/w3c/dom/DOMImplementationList.lo org/w3c/dom/Entity.lo \
+       org/w3c/dom/UserDataHandler.lo \
+       org/w3c/dom/DOMImplementation.lo org/w3c/dom/CDATASection.lo \
+       org/w3c/dom/ProcessingInstruction.lo org/w3c/dom/Node.lo \
+       org/w3c/dom/NamedNodeMap.lo org/w3c/dom/NodeList.lo \
+       org/w3c/dom/Text.lo org/w3c/dom/DocumentType.lo \
+       org/w3c/dom/DOMImplementationSource.lo
+libw3c_convenience_la_OBJECTS = $(am_libw3c_convenience_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/gcj
+depcomp = $(SHELL) $(top_srcdir)/../depcomp
+am__depfiles_maybe = depfiles
+GCJCOMPILE = $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS)
+LTGCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) $(AM_GCJFLAGS) \
+       $(GCJFLAGS)
+GCJLD = $(GCJ)
+GCJLINK = $(LIBTOOL) --mode=link $(GCJLD) $(AM_GCJFLAGS) $(GCJFLAGS) \
+       $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libw3c_convenience_la_SOURCES)
+DIST_SOURCES = $(libw3c_convenience_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BACKTRACESPEC = @BACKTRACESPEC@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CHECKREFSPEC = @CHECKREFSPEC@
+CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
+COMPPATH = @COMPPATH@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIRLTDL = @DIRLTDL@
+DIVIDESPEC = @DIVIDESPEC@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXCEPTIONSPEC = @EXCEPTIONSPEC@
+EXEEXT = @EXEEXT@
+GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
+GCDEPS = @GCDEPS@
+GCINCS = @GCINCS@
+GCJ = @GCJ@
+GCJDEPMODE = @GCJDEPMODE@
+GCJFLAGS = @GCJFLAGS@
+GCJH = @GCJH@
+GCJVERSION = @GCJVERSION@
+GCLIBS = @GCLIBS@
+GCSPEC = @GCSPEC@
+GCTESTSPEC = @GCTESTSPEC@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GTK_AWT_FALSE = @GTK_AWT_FALSE@
+GTK_AWT_TRUE = @GTK_AWT_TRUE@
+GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
+GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+HASH_SYNC_SPEC = @HASH_SYNC_SPEC@
+IEEESPEC = @IEEESPEC@
+INCLTDL = @INCLTDL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTERPRETER = @INTERPRETER@
+JC1GCSPEC = @JC1GCSPEC@
+LDFLAGS = @LDFLAGS@
+LIBART_CFLAGS = @LIBART_CFLAGS@
+LIBART_LIBS = @LIBART_LIBS@
+LIBFFI = @LIBFFI@
+LIBFFIINCS = @LIBFFIINCS@
+LIBGCJDEBUG = @LIBGCJDEBUG@
+LIBGCJTESTSPEC = @LIBGCJTESTSPEC@
+LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@
+LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@
+LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
+LIBGCJ_LD_SYMBOLIC = @LIBGCJ_LD_SYMBOLIC@
+LIBICONV = @LIBICONV@
+LIBLTDL = @LIBLTDL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NATIVE_FALSE = @NATIVE_FALSE@
+NATIVE_TRUE = @NATIVE_TRUE@
+NEEDS_DATA_START_FALSE = @NEEDS_DATA_START_FALSE@
+NEEDS_DATA_START_TRUE = @NEEDS_DATA_START_TRUE@
+OBJEXT = @OBJEXT@
+ONESTEP_FALSE = @ONESTEP_FALSE@
+ONESTEP_TRUE = @ONESTEP_TRUE@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOFT2_CFLAGS = @PANGOFT2_CFLAGS@
+PANGOFT2_LIBS = @PANGOFT2_LIBS@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_INNER_NAT_HDRS = @PLATFORM_INNER_NAT_HDRS@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SUPPLY_BACKTRACE_FALSE = @SUPPLY_BACKTRACE_FALSE@
+SUPPLY_BACKTRACE_TRUE = @SUPPLY_BACKTRACE_TRUE@
+SYSDEP_SOURCES = @SYSDEP_SOURCES@
+SYSTEMSPEC = @SYSTEMSPEC@
+SYS_ZLIBS = @SYS_ZLIBS@
+TESTSUBDIR_FALSE = @TESTSUBDIR_FALSE@
+TESTSUBDIR_TRUE = @TESTSUBDIR_TRUE@
+THREADCXXFLAGS = @THREADCXXFLAGS@
+THREADDEPS = @THREADDEPS@
+THREADINCS = @THREADINCS@
+THREADLDFLAGS = @THREADLDFLAGS@
+THREADLIBS = @THREADLIBS@
+THREADSPEC = @THREADSPEC@
+TOOLKIT = @TOOLKIT@
+USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@
+USING_BOEHMGC_TRUE = @USING_BOEHMGC_TRUE@
+USING_DARWIN_CRT_FALSE = @USING_DARWIN_CRT_FALSE@
+USING_DARWIN_CRT_TRUE = @USING_DARWIN_CRT_TRUE@
+USING_ECOS_PLATFORM_FALSE = @USING_ECOS_PLATFORM_FALSE@
+USING_ECOS_PLATFORM_TRUE = @USING_ECOS_PLATFORM_TRUE@
+USING_GCC_FALSE = @USING_GCC_FALSE@
+USING_GCC_TRUE = @USING_GCC_TRUE@
+USING_NOGC_FALSE = @USING_NOGC_FALSE@
+USING_NOGC_TRUE = @USING_NOGC_TRUE@
+USING_NO_THREADS_FALSE = @USING_NO_THREADS_FALSE@
+USING_NO_THREADS_TRUE = @USING_NO_THREADS_TRUE@
+USING_POSIX_PLATFORM_FALSE = @USING_POSIX_PLATFORM_FALSE@
+USING_POSIX_PLATFORM_TRUE = @USING_POSIX_PLATFORM_TRUE@
+USING_POSIX_THREADS_FALSE = @USING_POSIX_THREADS_FALSE@
+USING_POSIX_THREADS_TRUE = @USING_POSIX_THREADS_TRUE@
+USING_WIN32_PLATFORM_FALSE = @USING_WIN32_PLATFORM_FALSE@
+USING_WIN32_PLATFORM_TRUE = @USING_WIN32_PLATFORM_TRUE@
+USING_WIN32_THREADS_FALSE = @USING_WIN32_THREADS_FALSE@
+USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@
+VERSION = @VERSION@
+XLIB_AWT_FALSE = @XLIB_AWT_FALSE@
+XLIB_AWT_TRUE = @XLIB_AWT_TRUE@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+ZINCS = @ZINCS@
+ZIP = @ZIP@
+ZLIBS = @ZLIBS@
+ZLIBSPEC = @ZLIBSPEC@
+ZLIBTESTSPEC = @ZLIBTESTSPEC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_GCJ = @ac_ct_GCJ@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__fastdepGCJ_FALSE = @am__fastdepGCJ_FALSE@
+am__fastdepGCJ_TRUE = @am__fastdepGCJ_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+gcc_version = @gcc_version@
+gcc_version_full = @gcc_version_full@
+gcc_version_trigger = @gcc_version_trigger@
+gxx_include_dir = @gxx_include_dir@
+here = @here@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libgcj_basedir = @libgcj_basedir@
+libstdcxx_incdir = @libstdcxx_incdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+mkinstalldirs = @mkinstalldirs@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_noncanonical = @target_noncanonical@
+target_os = @target_os@
+target_vendor = @target_vendor@
+tool_include_dir = @tool_include_dir@
+toolexecdir = @toolexecdir@
+toolexeclibdir = @toolexeclibdir@
+toolexecmainlibdir = @toolexecmainlibdir@
+AUTOMAKE_OPTIONS = foreign subdir-objects
+GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
+BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir)
+AM_GCJFLAGS = \
+       -B$(top_builddir) \
+       @LIBGCJ_JAVAFLAGS@ \
+       -fclasspath= -fbootclasspath=$(BOOTCLASSPATH) \
+       --encoding=UTF-8 \
+       -Wno-deprecated
+
+noinst_LTLIBRARIES = libw3c_convenience.la
+libw3c_convenience_la_SOURCES = \
+org/w3c/dom/xpath/XPathNamespace.java \
+org/w3c/dom/xpath/XPathResult.java \
+org/w3c/dom/xpath/XPathException.java \
+org/w3c/dom/xpath/XPathExpression.java \
+org/w3c/dom/xpath/XPathNSResolver.java \
+org/w3c/dom/xpath/XPathEvaluator.java \
+org/w3c/dom/DOMException.java \
+org/w3c/dom/Comment.java \
+org/w3c/dom/stylesheets/DocumentStyle.java \
+org/w3c/dom/stylesheets/MediaList.java \
+org/w3c/dom/stylesheets/LinkStyle.java \
+org/w3c/dom/stylesheets/StyleSheet.java        \
+org/w3c/dom/stylesheets/StyleSheetList.java \
+org/w3c/dom/Attr.java \
+org/w3c/dom/Notation.java \
+org/w3c/dom/TypeInfo.java \
+org/w3c/dom/html2/HTMLIsIndexElement.java \
+org/w3c/dom/html2/HTMLTableColElement.java \
+org/w3c/dom/html2/HTMLLinkElement.java \
+org/w3c/dom/html2/HTMLTitleElement.java        \
+org/w3c/dom/html2/HTMLBRElement.java \
+org/w3c/dom/html2/HTMLHeadElement.java \
+org/w3c/dom/html2/HTMLHtmlElement.java \
+org/w3c/dom/html2/HTMLScriptElement.java \
+org/w3c/dom/html2/HTMLTableRowElement.java \
+org/w3c/dom/html2/HTMLOptionsCollection.java \
+org/w3c/dom/html2/HTMLTableCellElement.java \
+org/w3c/dom/html2/HTMLDListElement.java        \
+org/w3c/dom/html2/HTMLFieldSetElement.java \
+org/w3c/dom/html2/HTMLImageElement.java        \
+org/w3c/dom/html2/HTMLHRElement.java \
+org/w3c/dom/html2/HTMLModElement.java \
+org/w3c/dom/html2/HTMLHeadingElement.java \
+org/w3c/dom/html2/HTMLTableElement.java        \
+org/w3c/dom/html2/HTMLAreaElement.java \
+org/w3c/dom/html2/HTMLOptGroupElement.java \
+org/w3c/dom/html2/HTMLIFrameElement.java \
+org/w3c/dom/html2/HTMLDirectoryElement.java \
+org/w3c/dom/html2/HTMLParamElement.java        \
+org/w3c/dom/html2/HTMLLegendElement.java \
+org/w3c/dom/html2/HTMLFrameElement.java        \
+org/w3c/dom/html2/HTMLFormElement.java \
+org/w3c/dom/html2/HTMLStyleElement.java        \
+org/w3c/dom/html2/HTMLFrameSetElement.java \
+org/w3c/dom/html2/HTMLCollection.java \
+org/w3c/dom/html2/HTMLAnchorElement.java \
+org/w3c/dom/html2/HTMLLabelElement.java        \
+org/w3c/dom/html2/HTMLBodyElement.java \
+org/w3c/dom/html2/HTMLOptionElement.java \
+org/w3c/dom/html2/HTMLTableSectionElement.java \
+org/w3c/dom/html2/HTMLAppletElement.java \
+org/w3c/dom/html2/HTMLSelectElement.java \
+org/w3c/dom/html2/HTMLMetaElement.java \
+org/w3c/dom/html2/HTMLMenuElement.java \
+org/w3c/dom/html2/HTMLDivElement.java \
+org/w3c/dom/html2/HTMLLIElement.java \
+org/w3c/dom/html2/HTMLFontElement.java \
+org/w3c/dom/html2/HTMLOListElement.java        \
+org/w3c/dom/html2/HTMLBaseFontElement.java \
+org/w3c/dom/html2/HTMLElement.java \
+org/w3c/dom/html2/HTMLTableCaptionElement.java \
+org/w3c/dom/html2/HTMLTextAreaElement.java \
+org/w3c/dom/html2/HTMLPreElement.java \
+org/w3c/dom/html2/HTMLObjectElement.java \
+org/w3c/dom/html2/HTMLBaseElement.java \
+org/w3c/dom/html2/HTMLUListElement.java        \
+org/w3c/dom/html2/HTMLMapElement.java \
+org/w3c/dom/html2/HTMLParagraphElement.java \
+org/w3c/dom/html2/HTMLButtonElement.java \
+org/w3c/dom/html2/HTMLQuoteElement.java        \
+org/w3c/dom/html2/HTMLInputElement.java        \
+org/w3c/dom/html2/HTMLDocument.java \
+org/w3c/dom/ls/LSParser.java \
+org/w3c/dom/ls/LSSerializerFilter.java \
+org/w3c/dom/ls/LSLoadEvent.java        \
+org/w3c/dom/ls/DOMImplementationLS.java        \
+org/w3c/dom/ls/LSException.java        \
+org/w3c/dom/ls/LSSerializer.java \
+org/w3c/dom/ls/LSResourceResolver.java \
+org/w3c/dom/ls/LSOutput.java \
+org/w3c/dom/ls/LSInput.java \
+org/w3c/dom/ls/LSProgressEvent.java \
+org/w3c/dom/ls/LSParserFilter.java \
+org/w3c/dom/DOMLocator.java \
+org/w3c/dom/DOMStringList.java \
+org/w3c/dom/DocumentFragment.java \
+org/w3c/dom/events/MutationEvent.java \
+org/w3c/dom/events/UIEvent.java        \
+org/w3c/dom/events/EventListener.java \
+org/w3c/dom/events/Event.java \
+org/w3c/dom/events/MouseEvent.java \
+org/w3c/dom/events/EventTarget.java \
+org/w3c/dom/events/DocumentEvent.java \
+org/w3c/dom/events/EventException.java \
+org/w3c/dom/EntityReference.java \
+org/w3c/dom/DOMErrorHandler.java \
+org/w3c/dom/views/AbstractView.java \
+org/w3c/dom/views/DocumentView.java \
+org/w3c/dom/DOMError.java \
+org/w3c/dom/bootstrap/DOMImplementationRegistry.java \
+org/w3c/dom/traversal/TreeWalker.java \
+org/w3c/dom/traversal/NodeFilter.java \
+org/w3c/dom/traversal/DocumentTraversal.java \
+org/w3c/dom/traversal/NodeIterator.java        \
+org/w3c/dom/CharacterData.java \
+org/w3c/dom/DOMConfiguration.java \
+org/w3c/dom/css/CSSRule.java \
+org/w3c/dom/css/Rect.java \
+org/w3c/dom/css/CSSStyleSheet.java \
+org/w3c/dom/css/CSSFontFaceRule.java \
+org/w3c/dom/css/CSSPrimitiveValue.java \
+org/w3c/dom/css/CSSRuleList.java \
+org/w3c/dom/css/ViewCSS.java \
+org/w3c/dom/css/CSSStyleRule.java \
+org/w3c/dom/css/CSSUnknownRule.java \
+org/w3c/dom/css/RGBColor.java \
+org/w3c/dom/css/ElementCSSInlineStyle.java \
+org/w3c/dom/css/CSSMediaRule.java \
+org/w3c/dom/css/CSS2Properties.java \
+org/w3c/dom/css/CSSValue.java \
+org/w3c/dom/css/CSSStyleDeclaration.java \
+org/w3c/dom/css/DOMImplementationCSS.java \
+org/w3c/dom/css/CSSCharsetRule.java \
+org/w3c/dom/css/Counter.java \
+org/w3c/dom/css/CSSPageRule.java \
+org/w3c/dom/css/DocumentCSS.java \
+org/w3c/dom/css/CSSValueList.java \
+org/w3c/dom/css/CSSImportRule.java \
+org/w3c/dom/NameList.java \
+org/w3c/dom/Element.java \
+org/w3c/dom/Document.java \
+org/w3c/dom/ranges/Range.java \
+org/w3c/dom/ranges/RangeException.java \
+org/w3c/dom/ranges/DocumentRange.java \
+org/w3c/dom/DOMImplementationList.java \
+org/w3c/dom/Entity.java        \
+org/w3c/dom/UserDataHandler.java \
+org/w3c/dom/DOMImplementation.java \
+org/w3c/dom/CDATASection.java \
+org/w3c/dom/ProcessingInstruction.java \
+org/w3c/dom/Node.java \
+org/w3c/dom/NamedNodeMap.java \
+org/w3c/dom/NodeList.java \
+org/w3c/dom/Text.java \
+org/w3c/dom/DocumentType.java \
+org/w3c/dom/DOMImplementationSource.java
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .java .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  external/w3c_dom/Makefile'; \
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --foreign  external/w3c_dom/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+       @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
+org/w3c/dom/xpath/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/xpath
+       @: > org/w3c/dom/xpath/$(am__dirstamp)
+org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/xpath/$(DEPDIR)
+       @: > org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/xpath/XPathNamespace.lo:  \
+       org/w3c/dom/xpath/$(am__dirstamp) \
+       org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/xpath/XPathResult.lo: org/w3c/dom/xpath/$(am__dirstamp) \
+       org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/xpath/XPathException.lo:  \
+       org/w3c/dom/xpath/$(am__dirstamp) \
+       org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/xpath/XPathExpression.lo:  \
+       org/w3c/dom/xpath/$(am__dirstamp) \
+       org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/xpath/XPathNSResolver.lo:  \
+       org/w3c/dom/xpath/$(am__dirstamp) \
+       org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/xpath/XPathEvaluator.lo:  \
+       org/w3c/dom/xpath/$(am__dirstamp) \
+       org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom
+       @: > org/w3c/dom/$(am__dirstamp)
+org/w3c/dom/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/$(DEPDIR)
+       @: > org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/DOMException.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/Comment.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/stylesheets/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/stylesheets
+       @: > org/w3c/dom/stylesheets/$(am__dirstamp)
+org/w3c/dom/stylesheets/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/stylesheets/$(DEPDIR)
+       @: > org/w3c/dom/stylesheets/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/stylesheets/DocumentStyle.lo:  \
+       org/w3c/dom/stylesheets/$(am__dirstamp) \
+       org/w3c/dom/stylesheets/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/stylesheets/MediaList.lo:  \
+       org/w3c/dom/stylesheets/$(am__dirstamp) \
+       org/w3c/dom/stylesheets/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/stylesheets/LinkStyle.lo:  \
+       org/w3c/dom/stylesheets/$(am__dirstamp) \
+       org/w3c/dom/stylesheets/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/stylesheets/StyleSheet.lo:  \
+       org/w3c/dom/stylesheets/$(am__dirstamp) \
+       org/w3c/dom/stylesheets/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/stylesheets/StyleSheetList.lo:  \
+       org/w3c/dom/stylesheets/$(am__dirstamp) \
+       org/w3c/dom/stylesheets/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/Attr.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/Notation.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/TypeInfo.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/html2
+       @: > org/w3c/dom/html2/$(am__dirstamp)
+org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/html2/$(DEPDIR)
+       @: > org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLIsIndexElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLTableColElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLLinkElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLTitleElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLBRElement.lo: org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLHeadElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLHtmlElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLScriptElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLTableRowElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLOptionsCollection.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLTableCellElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLDListElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLFieldSetElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLImageElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLHRElement.lo: org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLModElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLHeadingElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLTableElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLAreaElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLOptGroupElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLIFrameElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLDirectoryElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLParamElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLLegendElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLFrameElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLFormElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLStyleElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLFrameSetElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLCollection.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLAnchorElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLLabelElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLBodyElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLOptionElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLTableSectionElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLAppletElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLSelectElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLMetaElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLMenuElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLDivElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLLIElement.lo: org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLFontElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLOListElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLBaseFontElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLElement.lo: org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLTableCaptionElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLTextAreaElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLPreElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLObjectElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLBaseElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLUListElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLMapElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLParagraphElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLButtonElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLQuoteElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLInputElement.lo:  \
+       org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/html2/HTMLDocument.lo: org/w3c/dom/html2/$(am__dirstamp) \
+       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ls/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/ls
+       @: > org/w3c/dom/ls/$(am__dirstamp)
+org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/ls/$(DEPDIR)
+       @: > org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ls/LSParser.lo: org/w3c/dom/ls/$(am__dirstamp) \
+       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ls/LSSerializerFilter.lo: org/w3c/dom/ls/$(am__dirstamp) \
+       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ls/LSLoadEvent.lo: org/w3c/dom/ls/$(am__dirstamp) \
+       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ls/DOMImplementationLS.lo: org/w3c/dom/ls/$(am__dirstamp) \
+       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ls/LSException.lo: org/w3c/dom/ls/$(am__dirstamp) \
+       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ls/LSSerializer.lo: org/w3c/dom/ls/$(am__dirstamp) \
+       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ls/LSResourceResolver.lo: org/w3c/dom/ls/$(am__dirstamp) \
+       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ls/LSOutput.lo: org/w3c/dom/ls/$(am__dirstamp) \
+       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ls/LSInput.lo: org/w3c/dom/ls/$(am__dirstamp) \
+       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ls/LSProgressEvent.lo: org/w3c/dom/ls/$(am__dirstamp) \
+       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ls/LSParserFilter.lo: org/w3c/dom/ls/$(am__dirstamp) \
+       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/DOMLocator.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/DOMStringList.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/DocumentFragment.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/events/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/events
+       @: > org/w3c/dom/events/$(am__dirstamp)
+org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/events/$(DEPDIR)
+       @: > org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/events/MutationEvent.lo:  \
+       org/w3c/dom/events/$(am__dirstamp) \
+       org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/events/UIEvent.lo: org/w3c/dom/events/$(am__dirstamp) \
+       org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/events/EventListener.lo:  \
+       org/w3c/dom/events/$(am__dirstamp) \
+       org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/events/Event.lo: org/w3c/dom/events/$(am__dirstamp) \
+       org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/events/MouseEvent.lo: org/w3c/dom/events/$(am__dirstamp) \
+       org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/events/EventTarget.lo: org/w3c/dom/events/$(am__dirstamp) \
+       org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/events/DocumentEvent.lo:  \
+       org/w3c/dom/events/$(am__dirstamp) \
+       org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/events/EventException.lo:  \
+       org/w3c/dom/events/$(am__dirstamp) \
+       org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/EntityReference.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/DOMErrorHandler.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/views/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/views
+       @: > org/w3c/dom/views/$(am__dirstamp)
+org/w3c/dom/views/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/views/$(DEPDIR)
+       @: > org/w3c/dom/views/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/views/AbstractView.lo: org/w3c/dom/views/$(am__dirstamp) \
+       org/w3c/dom/views/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/views/DocumentView.lo: org/w3c/dom/views/$(am__dirstamp) \
+       org/w3c/dom/views/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/DOMError.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/bootstrap/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/bootstrap
+       @: > org/w3c/dom/bootstrap/$(am__dirstamp)
+org/w3c/dom/bootstrap/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/bootstrap/$(DEPDIR)
+       @: > org/w3c/dom/bootstrap/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/bootstrap/DOMImplementationRegistry.lo:  \
+       org/w3c/dom/bootstrap/$(am__dirstamp) \
+       org/w3c/dom/bootstrap/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/traversal/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/traversal
+       @: > org/w3c/dom/traversal/$(am__dirstamp)
+org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/traversal/$(DEPDIR)
+       @: > org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/traversal/TreeWalker.lo:  \
+       org/w3c/dom/traversal/$(am__dirstamp) \
+       org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/traversal/NodeFilter.lo:  \
+       org/w3c/dom/traversal/$(am__dirstamp) \
+       org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/traversal/DocumentTraversal.lo:  \
+       org/w3c/dom/traversal/$(am__dirstamp) \
+       org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/traversal/NodeIterator.lo:  \
+       org/w3c/dom/traversal/$(am__dirstamp) \
+       org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/CharacterData.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/DOMConfiguration.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/css
+       @: > org/w3c/dom/css/$(am__dirstamp)
+org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/css/$(DEPDIR)
+       @: > org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/CSSRule.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/Rect.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/CSSStyleSheet.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/CSSFontFaceRule.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/CSSPrimitiveValue.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/CSSRuleList.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/ViewCSS.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/CSSStyleRule.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/CSSUnknownRule.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/RGBColor.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/ElementCSSInlineStyle.lo:  \
+       org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/CSSMediaRule.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/CSS2Properties.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/CSSValue.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/CSSStyleDeclaration.lo:  \
+       org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/DOMImplementationCSS.lo:  \
+       org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/CSSCharsetRule.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/Counter.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/CSSPageRule.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/DocumentCSS.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/CSSValueList.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/css/CSSImportRule.lo: org/w3c/dom/css/$(am__dirstamp) \
+       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/NameList.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/Element.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/Document.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ranges/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/ranges
+       @: > org/w3c/dom/ranges/$(am__dirstamp)
+org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) org/w3c/dom/ranges/$(DEPDIR)
+       @: > org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ranges/Range.lo: org/w3c/dom/ranges/$(am__dirstamp) \
+       org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ranges/RangeException.lo:  \
+       org/w3c/dom/ranges/$(am__dirstamp) \
+       org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ranges/DocumentRange.lo:  \
+       org/w3c/dom/ranges/$(am__dirstamp) \
+       org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/DOMImplementationList.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/Entity.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/UserDataHandler.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/DOMImplementation.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/CDATASection.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/ProcessingInstruction.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/Node.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/NamedNodeMap.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/NodeList.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/Text.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/DocumentType.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+org/w3c/dom/DOMImplementationSource.lo: org/w3c/dom/$(am__dirstamp) \
+       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+libw3c_convenience.la: $(libw3c_convenience_la_OBJECTS) $(libw3c_convenience_la_DEPENDENCIES) 
+       $(GCJLINK)  $(libw3c_convenience_la_LDFLAGS) $(libw3c_convenience_la_OBJECTS) $(libw3c_convenience_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+       -rm -f *.$(OBJEXT)
+       -rm -f org/w3c/dom/Attr.$(OBJEXT)
+       -rm -f org/w3c/dom/Attr.lo
+       -rm -f org/w3c/dom/CDATASection.$(OBJEXT)
+       -rm -f org/w3c/dom/CDATASection.lo
+       -rm -f org/w3c/dom/CharacterData.$(OBJEXT)
+       -rm -f org/w3c/dom/CharacterData.lo
+       -rm -f org/w3c/dom/Comment.$(OBJEXT)
+       -rm -f org/w3c/dom/Comment.lo
+       -rm -f org/w3c/dom/DOMConfiguration.$(OBJEXT)
+       -rm -f org/w3c/dom/DOMConfiguration.lo
+       -rm -f org/w3c/dom/DOMError.$(OBJEXT)
+       -rm -f org/w3c/dom/DOMError.lo
+       -rm -f org/w3c/dom/DOMErrorHandler.$(OBJEXT)
+       -rm -f org/w3c/dom/DOMErrorHandler.lo
+       -rm -f org/w3c/dom/DOMException.$(OBJEXT)
+       -rm -f org/w3c/dom/DOMException.lo
+       -rm -f org/w3c/dom/DOMImplementation.$(OBJEXT)
+       -rm -f org/w3c/dom/DOMImplementation.lo
+       -rm -f org/w3c/dom/DOMImplementationList.$(OBJEXT)
+       -rm -f org/w3c/dom/DOMImplementationList.lo
+       -rm -f org/w3c/dom/DOMImplementationSource.$(OBJEXT)
+       -rm -f org/w3c/dom/DOMImplementationSource.lo
+       -rm -f org/w3c/dom/DOMLocator.$(OBJEXT)
+       -rm -f org/w3c/dom/DOMLocator.lo
+       -rm -f org/w3c/dom/DOMStringList.$(OBJEXT)
+       -rm -f org/w3c/dom/DOMStringList.lo
+       -rm -f org/w3c/dom/Document.$(OBJEXT)
+       -rm -f org/w3c/dom/Document.lo
+       -rm -f org/w3c/dom/DocumentFragment.$(OBJEXT)
+       -rm -f org/w3c/dom/DocumentFragment.lo
+       -rm -f org/w3c/dom/DocumentType.$(OBJEXT)
+       -rm -f org/w3c/dom/DocumentType.lo
+       -rm -f org/w3c/dom/Element.$(OBJEXT)
+       -rm -f org/w3c/dom/Element.lo
+       -rm -f org/w3c/dom/Entity.$(OBJEXT)
+       -rm -f org/w3c/dom/Entity.lo
+       -rm -f org/w3c/dom/EntityReference.$(OBJEXT)
+       -rm -f org/w3c/dom/EntityReference.lo
+       -rm -f org/w3c/dom/NameList.$(OBJEXT)
+       -rm -f org/w3c/dom/NameList.lo
+       -rm -f org/w3c/dom/NamedNodeMap.$(OBJEXT)
+       -rm -f org/w3c/dom/NamedNodeMap.lo
+       -rm -f org/w3c/dom/Node.$(OBJEXT)
+       -rm -f org/w3c/dom/Node.lo
+       -rm -f org/w3c/dom/NodeList.$(OBJEXT)
+       -rm -f org/w3c/dom/NodeList.lo
+       -rm -f org/w3c/dom/Notation.$(OBJEXT)
+       -rm -f org/w3c/dom/Notation.lo
+       -rm -f org/w3c/dom/ProcessingInstruction.$(OBJEXT)
+       -rm -f org/w3c/dom/ProcessingInstruction.lo
+       -rm -f org/w3c/dom/Text.$(OBJEXT)
+       -rm -f org/w3c/dom/Text.lo
+       -rm -f org/w3c/dom/TypeInfo.$(OBJEXT)
+       -rm -f org/w3c/dom/TypeInfo.lo
+       -rm -f org/w3c/dom/UserDataHandler.$(OBJEXT)
+       -rm -f org/w3c/dom/UserDataHandler.lo
+       -rm -f org/w3c/dom/bootstrap/DOMImplementationRegistry.$(OBJEXT)
+       -rm -f org/w3c/dom/bootstrap/DOMImplementationRegistry.lo
+       -rm -f org/w3c/dom/css/CSS2Properties.$(OBJEXT)
+       -rm -f org/w3c/dom/css/CSS2Properties.lo
+       -rm -f org/w3c/dom/css/CSSCharsetRule.$(OBJEXT)
+       -rm -f org/w3c/dom/css/CSSCharsetRule.lo
+       -rm -f org/w3c/dom/css/CSSFontFaceRule.$(OBJEXT)
+       -rm -f org/w3c/dom/css/CSSFontFaceRule.lo
+       -rm -f org/w3c/dom/css/CSSImportRule.$(OBJEXT)
+       -rm -f org/w3c/dom/css/CSSImportRule.lo
+       -rm -f org/w3c/dom/css/CSSMediaRule.$(OBJEXT)
+       -rm -f org/w3c/dom/css/CSSMediaRule.lo
+       -rm -f org/w3c/dom/css/CSSPageRule.$(OBJEXT)
+       -rm -f org/w3c/dom/css/CSSPageRule.lo
+       -rm -f org/w3c/dom/css/CSSPrimitiveValue.$(OBJEXT)
+       -rm -f org/w3c/dom/css/CSSPrimitiveValue.lo
+       -rm -f org/w3c/dom/css/CSSRule.$(OBJEXT)
+       -rm -f org/w3c/dom/css/CSSRule.lo
+       -rm -f org/w3c/dom/css/CSSRuleList.$(OBJEXT)
+       -rm -f org/w3c/dom/css/CSSRuleList.lo
+       -rm -f org/w3c/dom/css/CSSStyleDeclaration.$(OBJEXT)
+       -rm -f org/w3c/dom/css/CSSStyleDeclaration.lo
+       -rm -f org/w3c/dom/css/CSSStyleRule.$(OBJEXT)
+       -rm -f org/w3c/dom/css/CSSStyleRule.lo
+       -rm -f org/w3c/dom/css/CSSStyleSheet.$(OBJEXT)
+       -rm -f org/w3c/dom/css/CSSStyleSheet.lo
+       -rm -f org/w3c/dom/css/CSSUnknownRule.$(OBJEXT)
+       -rm -f org/w3c/dom/css/CSSUnknownRule.lo
+       -rm -f org/w3c/dom/css/CSSValue.$(OBJEXT)
+       -rm -f org/w3c/dom/css/CSSValue.lo
+       -rm -f org/w3c/dom/css/CSSValueList.$(OBJEXT)
+       -rm -f org/w3c/dom/css/CSSValueList.lo
+       -rm -f org/w3c/dom/css/Counter.$(OBJEXT)
+       -rm -f org/w3c/dom/css/Counter.lo
+       -rm -f org/w3c/dom/css/DOMImplementationCSS.$(OBJEXT)
+       -rm -f org/w3c/dom/css/DOMImplementationCSS.lo
+       -rm -f org/w3c/dom/css/DocumentCSS.$(OBJEXT)
+       -rm -f org/w3c/dom/css/DocumentCSS.lo
+       -rm -f org/w3c/dom/css/ElementCSSInlineStyle.$(OBJEXT)
+       -rm -f org/w3c/dom/css/ElementCSSInlineStyle.lo
+       -rm -f org/w3c/dom/css/RGBColor.$(OBJEXT)
+       -rm -f org/w3c/dom/css/RGBColor.lo
+       -rm -f org/w3c/dom/css/Rect.$(OBJEXT)
+       -rm -f org/w3c/dom/css/Rect.lo
+       -rm -f org/w3c/dom/css/ViewCSS.$(OBJEXT)
+       -rm -f org/w3c/dom/css/ViewCSS.lo
+       -rm -f org/w3c/dom/events/DocumentEvent.$(OBJEXT)
+       -rm -f org/w3c/dom/events/DocumentEvent.lo
+       -rm -f org/w3c/dom/events/Event.$(OBJEXT)
+       -rm -f org/w3c/dom/events/Event.lo
+       -rm -f org/w3c/dom/events/EventException.$(OBJEXT)
+       -rm -f org/w3c/dom/events/EventException.lo
+       -rm -f org/w3c/dom/events/EventListener.$(OBJEXT)
+       -rm -f org/w3c/dom/events/EventListener.lo
+       -rm -f org/w3c/dom/events/EventTarget.$(OBJEXT)
+       -rm -f org/w3c/dom/events/EventTarget.lo
+       -rm -f org/w3c/dom/events/MouseEvent.$(OBJEXT)
+       -rm -f org/w3c/dom/events/MouseEvent.lo
+       -rm -f org/w3c/dom/events/MutationEvent.$(OBJEXT)
+       -rm -f org/w3c/dom/events/MutationEvent.lo
+       -rm -f org/w3c/dom/events/UIEvent.$(OBJEXT)
+       -rm -f org/w3c/dom/events/UIEvent.lo
+       -rm -f org/w3c/dom/html2/HTMLAnchorElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLAnchorElement.lo
+       -rm -f org/w3c/dom/html2/HTMLAppletElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLAppletElement.lo
+       -rm -f org/w3c/dom/html2/HTMLAreaElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLAreaElement.lo
+       -rm -f org/w3c/dom/html2/HTMLBRElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLBRElement.lo
+       -rm -f org/w3c/dom/html2/HTMLBaseElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLBaseElement.lo
+       -rm -f org/w3c/dom/html2/HTMLBaseFontElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLBaseFontElement.lo
+       -rm -f org/w3c/dom/html2/HTMLBodyElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLBodyElement.lo
+       -rm -f org/w3c/dom/html2/HTMLButtonElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLButtonElement.lo
+       -rm -f org/w3c/dom/html2/HTMLCollection.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLCollection.lo
+       -rm -f org/w3c/dom/html2/HTMLDListElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLDListElement.lo
+       -rm -f org/w3c/dom/html2/HTMLDirectoryElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLDirectoryElement.lo
+       -rm -f org/w3c/dom/html2/HTMLDivElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLDivElement.lo
+       -rm -f org/w3c/dom/html2/HTMLDocument.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLDocument.lo
+       -rm -f org/w3c/dom/html2/HTMLElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLElement.lo
+       -rm -f org/w3c/dom/html2/HTMLFieldSetElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLFieldSetElement.lo
+       -rm -f org/w3c/dom/html2/HTMLFontElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLFontElement.lo
+       -rm -f org/w3c/dom/html2/HTMLFormElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLFormElement.lo
+       -rm -f org/w3c/dom/html2/HTMLFrameElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLFrameElement.lo
+       -rm -f org/w3c/dom/html2/HTMLFrameSetElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLFrameSetElement.lo
+       -rm -f org/w3c/dom/html2/HTMLHRElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLHRElement.lo
+       -rm -f org/w3c/dom/html2/HTMLHeadElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLHeadElement.lo
+       -rm -f org/w3c/dom/html2/HTMLHeadingElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLHeadingElement.lo
+       -rm -f org/w3c/dom/html2/HTMLHtmlElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLHtmlElement.lo
+       -rm -f org/w3c/dom/html2/HTMLIFrameElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLIFrameElement.lo
+       -rm -f org/w3c/dom/html2/HTMLImageElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLImageElement.lo
+       -rm -f org/w3c/dom/html2/HTMLInputElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLInputElement.lo
+       -rm -f org/w3c/dom/html2/HTMLIsIndexElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLIsIndexElement.lo
+       -rm -f org/w3c/dom/html2/HTMLLIElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLLIElement.lo
+       -rm -f org/w3c/dom/html2/HTMLLabelElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLLabelElement.lo
+       -rm -f org/w3c/dom/html2/HTMLLegendElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLLegendElement.lo
+       -rm -f org/w3c/dom/html2/HTMLLinkElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLLinkElement.lo
+       -rm -f org/w3c/dom/html2/HTMLMapElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLMapElement.lo
+       -rm -f org/w3c/dom/html2/HTMLMenuElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLMenuElement.lo
+       -rm -f org/w3c/dom/html2/HTMLMetaElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLMetaElement.lo
+       -rm -f org/w3c/dom/html2/HTMLModElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLModElement.lo
+       -rm -f org/w3c/dom/html2/HTMLOListElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLOListElement.lo
+       -rm -f org/w3c/dom/html2/HTMLObjectElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLObjectElement.lo
+       -rm -f org/w3c/dom/html2/HTMLOptGroupElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLOptGroupElement.lo
+       -rm -f org/w3c/dom/html2/HTMLOptionElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLOptionElement.lo
+       -rm -f org/w3c/dom/html2/HTMLOptionsCollection.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLOptionsCollection.lo
+       -rm -f org/w3c/dom/html2/HTMLParagraphElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLParagraphElement.lo
+       -rm -f org/w3c/dom/html2/HTMLParamElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLParamElement.lo
+       -rm -f org/w3c/dom/html2/HTMLPreElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLPreElement.lo
+       -rm -f org/w3c/dom/html2/HTMLQuoteElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLQuoteElement.lo
+       -rm -f org/w3c/dom/html2/HTMLScriptElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLScriptElement.lo
+       -rm -f org/w3c/dom/html2/HTMLSelectElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLSelectElement.lo
+       -rm -f org/w3c/dom/html2/HTMLStyleElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLStyleElement.lo
+       -rm -f org/w3c/dom/html2/HTMLTableCaptionElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLTableCaptionElement.lo
+       -rm -f org/w3c/dom/html2/HTMLTableCellElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLTableCellElement.lo
+       -rm -f org/w3c/dom/html2/HTMLTableColElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLTableColElement.lo
+       -rm -f org/w3c/dom/html2/HTMLTableElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLTableElement.lo
+       -rm -f org/w3c/dom/html2/HTMLTableRowElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLTableRowElement.lo
+       -rm -f org/w3c/dom/html2/HTMLTableSectionElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLTableSectionElement.lo
+       -rm -f org/w3c/dom/html2/HTMLTextAreaElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLTextAreaElement.lo
+       -rm -f org/w3c/dom/html2/HTMLTitleElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLTitleElement.lo
+       -rm -f org/w3c/dom/html2/HTMLUListElement.$(OBJEXT)
+       -rm -f org/w3c/dom/html2/HTMLUListElement.lo
+       -rm -f org/w3c/dom/ls/DOMImplementationLS.$(OBJEXT)
+       -rm -f org/w3c/dom/ls/DOMImplementationLS.lo
+       -rm -f org/w3c/dom/ls/LSException.$(OBJEXT)
+       -rm -f org/w3c/dom/ls/LSException.lo
+       -rm -f org/w3c/dom/ls/LSInput.$(OBJEXT)
+       -rm -f org/w3c/dom/ls/LSInput.lo
+       -rm -f org/w3c/dom/ls/LSLoadEvent.$(OBJEXT)
+       -rm -f org/w3c/dom/ls/LSLoadEvent.lo
+       -rm -f org/w3c/dom/ls/LSOutput.$(OBJEXT)
+       -rm -f org/w3c/dom/ls/LSOutput.lo
+       -rm -f org/w3c/dom/ls/LSParser.$(OBJEXT)
+       -rm -f org/w3c/dom/ls/LSParser.lo
+       -rm -f org/w3c/dom/ls/LSParserFilter.$(OBJEXT)
+       -rm -f org/w3c/dom/ls/LSParserFilter.lo
+       -rm -f org/w3c/dom/ls/LSProgressEvent.$(OBJEXT)
+       -rm -f org/w3c/dom/ls/LSProgressEvent.lo
+       -rm -f org/w3c/dom/ls/LSResourceResolver.$(OBJEXT)
+       -rm -f org/w3c/dom/ls/LSResourceResolver.lo
+       -rm -f org/w3c/dom/ls/LSSerializer.$(OBJEXT)
+       -rm -f org/w3c/dom/ls/LSSerializer.lo
+       -rm -f org/w3c/dom/ls/LSSerializerFilter.$(OBJEXT)
+       -rm -f org/w3c/dom/ls/LSSerializerFilter.lo
+       -rm -f org/w3c/dom/ranges/DocumentRange.$(OBJEXT)
+       -rm -f org/w3c/dom/ranges/DocumentRange.lo
+       -rm -f org/w3c/dom/ranges/Range.$(OBJEXT)
+       -rm -f org/w3c/dom/ranges/Range.lo
+       -rm -f org/w3c/dom/ranges/RangeException.$(OBJEXT)
+       -rm -f org/w3c/dom/ranges/RangeException.lo
+       -rm -f org/w3c/dom/stylesheets/DocumentStyle.$(OBJEXT)
+       -rm -f org/w3c/dom/stylesheets/DocumentStyle.lo
+       -rm -f org/w3c/dom/stylesheets/LinkStyle.$(OBJEXT)
+       -rm -f org/w3c/dom/stylesheets/LinkStyle.lo
+       -rm -f org/w3c/dom/stylesheets/MediaList.$(OBJEXT)
+       -rm -f org/w3c/dom/stylesheets/MediaList.lo
+       -rm -f org/w3c/dom/stylesheets/StyleSheet.$(OBJEXT)
+       -rm -f org/w3c/dom/stylesheets/StyleSheet.lo
+       -rm -f org/w3c/dom/stylesheets/StyleSheetList.$(OBJEXT)
+       -rm -f org/w3c/dom/stylesheets/StyleSheetList.lo
+       -rm -f org/w3c/dom/traversal/DocumentTraversal.$(OBJEXT)
+       -rm -f org/w3c/dom/traversal/DocumentTraversal.lo
+       -rm -f org/w3c/dom/traversal/NodeFilter.$(OBJEXT)
+       -rm -f org/w3c/dom/traversal/NodeFilter.lo
+       -rm -f org/w3c/dom/traversal/NodeIterator.$(OBJEXT)
+       -rm -f org/w3c/dom/traversal/NodeIterator.lo
+       -rm -f org/w3c/dom/traversal/TreeWalker.$(OBJEXT)
+       -rm -f org/w3c/dom/traversal/TreeWalker.lo
+       -rm -f org/w3c/dom/views/AbstractView.$(OBJEXT)
+       -rm -f org/w3c/dom/views/AbstractView.lo
+       -rm -f org/w3c/dom/views/DocumentView.$(OBJEXT)
+       -rm -f org/w3c/dom/views/DocumentView.lo
+       -rm -f org/w3c/dom/xpath/XPathEvaluator.$(OBJEXT)
+       -rm -f org/w3c/dom/xpath/XPathEvaluator.lo
+       -rm -f org/w3c/dom/xpath/XPathException.$(OBJEXT)
+       -rm -f org/w3c/dom/xpath/XPathException.lo
+       -rm -f org/w3c/dom/xpath/XPathExpression.$(OBJEXT)
+       -rm -f org/w3c/dom/xpath/XPathExpression.lo
+       -rm -f org/w3c/dom/xpath/XPathNSResolver.$(OBJEXT)
+       -rm -f org/w3c/dom/xpath/XPathNSResolver.lo
+       -rm -f org/w3c/dom/xpath/XPathNamespace.$(OBJEXT)
+       -rm -f org/w3c/dom/xpath/XPathNamespace.lo
+       -rm -f org/w3c/dom/xpath/XPathResult.$(OBJEXT)
+       -rm -f org/w3c/dom/xpath/XPathResult.lo
+
+distclean-compile:
+       -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Attr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/CDATASection.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/CharacterData.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Comment.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMConfiguration.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMError.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMErrorHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMImplementation.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMImplementationList.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMImplementationSource.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMLocator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMStringList.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Document.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DocumentFragment.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DocumentType.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Element.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Entity.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/EntityReference.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/NameList.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/NamedNodeMap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Node.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/NodeList.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Notation.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/ProcessingInstruction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Text.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/TypeInfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/UserDataHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/bootstrap/$(DEPDIR)/DOMImplementationRegistry.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSS2Properties.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSCharsetRule.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSFontFaceRule.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSImportRule.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSMediaRule.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSPageRule.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSPrimitiveValue.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSRule.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSRuleList.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSStyleDeclaration.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSStyleRule.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSStyleSheet.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSUnknownRule.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSValue.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSValueList.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/Counter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/DOMImplementationCSS.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/DocumentCSS.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/ElementCSSInlineStyle.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/RGBColor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/Rect.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/ViewCSS.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/events/$(DEPDIR)/DocumentEvent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/events/$(DEPDIR)/Event.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/events/$(DEPDIR)/EventException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/events/$(DEPDIR)/EventListener.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/events/$(DEPDIR)/EventTarget.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/events/$(DEPDIR)/MouseEvent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/events/$(DEPDIR)/MutationEvent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/events/$(DEPDIR)/UIEvent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLAnchorElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLAppletElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLAreaElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLBRElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLBaseElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLBaseFontElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLBodyElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLButtonElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLCollection.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLDListElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLDirectoryElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLDivElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLDocument.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLFieldSetElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLFontElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLFormElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLFrameElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLFrameSetElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLHRElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLHeadElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLHeadingElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLHtmlElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLIFrameElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLImageElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLInputElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLIsIndexElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLLIElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLLabelElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLLegendElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLLinkElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLMapElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLMenuElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLMetaElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLModElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLOListElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLObjectElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLOptGroupElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLOptionElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLOptionsCollection.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLParagraphElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLParamElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLPreElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLQuoteElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLScriptElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLSelectElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLStyleElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLTableCaptionElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLTableCellElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLTableColElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLTableElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLTableRowElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLTableSectionElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLTextAreaElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLTitleElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLUListElement.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/DOMImplementationLS.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSInput.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSLoadEvent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSOutput.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSParser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSParserFilter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSProgressEvent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSResourceResolver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSSerializer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSSerializerFilter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ranges/$(DEPDIR)/DocumentRange.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ranges/$(DEPDIR)/Range.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ranges/$(DEPDIR)/RangeException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/stylesheets/$(DEPDIR)/DocumentStyle.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/stylesheets/$(DEPDIR)/LinkStyle.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/stylesheets/$(DEPDIR)/MediaList.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/stylesheets/$(DEPDIR)/StyleSheet.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/stylesheets/$(DEPDIR)/StyleSheetList.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/traversal/$(DEPDIR)/DocumentTraversal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/traversal/$(DEPDIR)/NodeFilter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/traversal/$(DEPDIR)/NodeIterator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/traversal/$(DEPDIR)/TreeWalker.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/views/$(DEPDIR)/AbstractView.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/views/$(DEPDIR)/DocumentView.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/xpath/$(DEPDIR)/XPathEvaluator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/xpath/$(DEPDIR)/XPathException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/xpath/$(DEPDIR)/XPathExpression.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/xpath/$(DEPDIR)/XPathNSResolver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/xpath/$(DEPDIR)/XPathNamespace.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/xpath/$(DEPDIR)/XPathResult.Plo@am__quote@
+
+.java.o:
+@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
+@am__fastdepGCJ_TRUE@  if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
+@am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ $<
+
+.java.obj:
+@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
+@am__fastdepGCJ_TRUE@  if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.java.lo:
+@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
+@am__fastdepGCJ_TRUE@  if $(LTGCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
+@am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepGCJ_FALSE@ $(LTGCJCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+       -rm -rf org/w3c/dom/.libs org/w3c/dom/_libs
+       -rm -rf org/w3c/dom/bootstrap/.libs org/w3c/dom/bootstrap/_libs
+       -rm -rf org/w3c/dom/css/.libs org/w3c/dom/css/_libs
+       -rm -rf org/w3c/dom/events/.libs org/w3c/dom/events/_libs
+       -rm -rf org/w3c/dom/html2/.libs org/w3c/dom/html2/_libs
+       -rm -rf org/w3c/dom/ls/.libs org/w3c/dom/ls/_libs
+       -rm -rf org/w3c/dom/ranges/.libs org/w3c/dom/ranges/_libs
+       -rm -rf org/w3c/dom/stylesheets/.libs org/w3c/dom/stylesheets/_libs
+       -rm -rf org/w3c/dom/traversal/.libs org/w3c/dom/traversal/_libs
+       -rm -rf org/w3c/dom/views/.libs org/w3c/dom/views/_libs
+       -rm -rf org/w3c/dom/xpath/.libs org/w3c/dom/xpath/_libs
+
+distclean-libtool:
+       -rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && cd $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+       list='$(DISTFILES)'; for file in $$list; do \
+         case $$file in \
+           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+         esac; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           dir="/$$dir"; \
+           $(mkdir_p) "$(distdir)$$dir"; \
+         else \
+           dir=''; \
+         fi; \
+         if test -d $$d/$$file; then \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) all-local
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
+       -rm -f org/w3c/dom/$(am__dirstamp)
+       -rm -f org/w3c/dom/bootstrap/$(DEPDIR)/$(am__dirstamp)
+       -rm -f org/w3c/dom/bootstrap/$(am__dirstamp)
+       -rm -f org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
+       -rm -f org/w3c/dom/css/$(am__dirstamp)
+       -rm -f org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
+       -rm -f org/w3c/dom/events/$(am__dirstamp)
+       -rm -f org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
+       -rm -f org/w3c/dom/html2/$(am__dirstamp)
+       -rm -f org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
+       -rm -f org/w3c/dom/ls/$(am__dirstamp)
+       -rm -f org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp)
+       -rm -f org/w3c/dom/ranges/$(am__dirstamp)
+       -rm -f org/w3c/dom/stylesheets/$(DEPDIR)/$(am__dirstamp)
+       -rm -f org/w3c/dom/stylesheets/$(am__dirstamp)
+       -rm -f org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
+       -rm -f org/w3c/dom/traversal/$(am__dirstamp)
+       -rm -f org/w3c/dom/views/$(DEPDIR)/$(am__dirstamp)
+       -rm -f org/w3c/dom/views/$(am__dirstamp)
+       -rm -f org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp)
+       -rm -f org/w3c/dom/xpath/$(am__dirstamp)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+       mostlyclean-am
+
+distclean: distclean-am
+       -rm -rf org/w3c/dom/$(DEPDIR) org/w3c/dom/bootstrap/$(DEPDIR) org/w3c/dom/css/$(DEPDIR) org/w3c/dom/events/$(DEPDIR) org/w3c/dom/html2/$(DEPDIR) org/w3c/dom/ls/$(DEPDIR) org/w3c/dom/ranges/$(DEPDIR) org/w3c/dom/stylesheets/$(DEPDIR) org/w3c/dom/traversal/$(DEPDIR) org/w3c/dom/views/$(DEPDIR) org/w3c/dom/xpath/$(DEPDIR)
+       -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+       distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -rf org/w3c/dom/$(DEPDIR) org/w3c/dom/bootstrap/$(DEPDIR) org/w3c/dom/css/$(DEPDIR) org/w3c/dom/events/$(DEPDIR) org/w3c/dom/html2/$(DEPDIR) org/w3c/dom/ls/$(DEPDIR) org/w3c/dom/ranges/$(DEPDIR) org/w3c/dom/stylesheets/$(DEPDIR) org/w3c/dom/traversal/$(DEPDIR) org/w3c/dom/views/$(DEPDIR) org/w3c/dom/xpath/$(DEPDIR)
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool mostlyclean-local
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
+       clean-generic clean-libtool clean-noinstLTLIBRARIES ctags \
+       distclean distclean-compile distclean-generic \
+       distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+       install-data-am install-exec install-exec-am install-info \
+       install-info-am install-man install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+       pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
+
+
+all-local: classes.stamp
+
+classes.stamp: $(libw3c_convenience_la_SOURCES)
+       here=`pwd`; cd $(srcdir); \
+       $(GCJ_WITH_FLAGS) -C -d $$here $(libw3c_convenience_la_SOURCES)
+       echo > classes.stamp
+
+mostlyclean-local:
+       find . -name '*.class' | xargs rm
+       rm classes.stamp
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/libjava/external/w3c_dom/README b/libjava/external/w3c_dom/README
new file mode 100644 (file)
index 0000000..6670651
--- /dev/null
+++ b/libjava/external/w3c_dom/README
@@ -0,0 +1,97 @@
+Bindings for the Document Object Model (DOM).
+DOM is not maintained as part of GNU Classpath, but is used with GNU Classpath.
+
+The packages includes are:
+
+Document Object Model (DOM) Level 3 Core Specification
+http://www.w3.org/TR/DOM-Level-3-Core/
+(07 April 2004)
+
+Document Object Model (DOM) Level 3 Load and Save Specification
+http://www.w3.org/TR/DOM-Level-3-LS/
+(07 April 2004)
+
+Document Object Model (DOM) Level 2 Events Specification
+http://www.w3.org/TR/DOM-Level-2-Events/
+(13 November 2000)
+Latest errata: 20021016
+
+Document Object Model (DOM) Level 2 Views Specification
+http://www.w3.org/TR/DOM-Level-2-Views/
+(13 November 2000)
+Latest errata: 20021016
+
+Document Object Model (DOM) Level 2 Style Specification
+http://www.w3.org/TR/DOM-Level-2-Style/
+(13 November 2000)
+Latest errata: 20021016
+
+Document Object Model (DOM) Level 2 Traversal and Range Specification
+http://www.w3.org/TR/DOM-Level-2-Traversal-Range/
+(13 November 2000)
+Latest errata: 20021016
+
+Document Object Model (DOM) Level 2 HTML Specification
+http://www.w3.org/TR/DOM-Level-2-HTML/
+(09 January 2003)
+
+Document Object Model (DOM) Level 3 XPath Specification
+http://www.w3.org/TR/DOM-Level-3-XPath/
+(26 February 2004)
+
+Errata can be found at:
+http://www.w3.org/2000/11/DOM-Level-2-errata
+http://www.w3.org/2004/01/DOM-Level-3-errata
+
+The only change to the sources is setting the additional fallback for
+org.w3c.dom.bootstrap.DOMImplementationRegistry.newInstance() to
+gnu.xml.dom.ImplementationSource.
+
+When importing new versions don't forget to update the Makefile.am
+to list any new files (or to remove old ones).
+
+All files are distributed under the following
+W3C Software Short Notice:
+
+  Copyright (c) 2004 World Wide Web Consortium,
+
+  (Massachusetts Institute of Technology, European Research Consortium for
+  Informatics and Mathematics, Keio University). All Rights Reserved. This
+  work is distributed under the W3C(r) Software License [1] 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.
+
+  [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+  Permission to copy, modify, and distribute this software and its
+  documentation, with or without modification, for any purpose and
+  without fee or royalty is hereby granted, provided that you include
+  the following on ALL copies of the software and documentation or
+  portions thereof, including modifications:
+
+  1. The full text of this NOTICE in a location viewable to users of
+  the redistributed or derivative work.
+  2. Any pre-existing intellectual property disclaimers, notices, or
+  terms and conditions. If none exist, the W3C Software Short Notice
+  should be included (hypertext is preferred, text is permitted) within
+  the body of any redistributed or derivative code.
+  3. Notice of any changes or modifications to the files, including
+  the date changes were made. (We recommend you provide URIs to the
+  location from which the code is derived.)
+
+  THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
+  HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+  INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
+  FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
+  DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+  TRADEMARKS OR OTHER RIGHTS.
+
+  COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
+  OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+  DOCUMENTATION.
+
+  The name and trademarks of copyright holders may NOT be used in
+  advertising or publicity pertaining to the software without specific,
+  written prior permission. Title to copyright in this software and any
+  associated documentation will at all times remain with copyright
+  holders.
diff --git a/libjava/external/w3c_dom/org/w3c/dom/Attr.java b/libjava/external/w3c_dom/org/w3c/dom/Attr.java
new file mode 100644 (file)
index 0000000..d9ed6ff
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/Attr.java
@@ -0,0 +1,275 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * The <code>Attr</code> interface represents an attribute in an 
+ * <code>Element</code> object. Typically the allowable values for the 
+ * attribute are defined in a schema associated with the document.
+ * <p><code>Attr</code> objects inherit the <code>Node</code> interface, but 
+ * since they are not actually child nodes of the element they describe, the 
+ * DOM does not consider them part of the document tree. Thus, the 
+ * <code>Node</code> attributes <code>parentNode</code>, 
+ * <code>previousSibling</code>, and <code>nextSibling</code> have a 
+ * <code>null</code> value for <code>Attr</code> objects. The DOM takes the 
+ * view that attributes are properties of elements rather than having a 
+ * separate identity from the elements they are associated with; this should 
+ * make it more efficient to implement such features as default attributes 
+ * associated with all elements of a given type. Furthermore, 
+ * <code>Attr</code> nodes may not be immediate children of a 
+ * <code>DocumentFragment</code>. However, they can be associated with 
+ * <code>Element</code> nodes contained within a 
+ * <code>DocumentFragment</code>. In short, users and implementors of the 
+ * DOM need to be aware that <code>Attr</code> nodes have some things in 
+ * common with other objects inheriting the <code>Node</code> interface, but 
+ * they also are quite distinct.
+ * <p>The attribute's effective value is determined as follows: if this 
+ * attribute has been explicitly assigned any value, that value is the 
+ * attribute's effective value; otherwise, if there is a declaration for 
+ * this attribute, and that declaration includes a default value, then that 
+ * default value is the attribute's effective value; otherwise, the 
+ * attribute does not exist on this element in the structure model until it 
+ * has been explicitly added. Note that the <code>Node.nodeValue</code> 
+ * attribute on the <code>Attr</code> instance can also be used to retrieve 
+ * the string version of the attribute's value(s).
+ * <p> If the attribute was not explicitly given a value in the instance 
+ * document but has a default value provided by the schema associated with 
+ * the document, an attribute node will be created with 
+ * <code>specified</code> set to <code>false</code>. Removing attribute 
+ * nodes for which a default value is defined in the schema generates a new 
+ * attribute node with the default value and <code>specified</code> set to 
+ * <code>false</code>. If validation occurred while invoking 
+ * <code>Document.normalizeDocument()</code>, attribute nodes with 
+ * <code>specified</code> equals to <code>false</code> are recomputed 
+ * according to the default attribute values provided by the schema. If no 
+ * default value is associate with this attribute in the schema, the 
+ * attribute node is discarded. 
+ * <p>In XML, where the value of an attribute can contain entity references, 
+ * the child nodes of the <code>Attr</code> node may be either 
+ * <code>Text</code> or <code>EntityReference</code> nodes (when these are 
+ * in use; see the description of <code>EntityReference</code> for 
+ * discussion). 
+ * <p>The DOM Core represents all attribute values as simple strings, even if 
+ * the DTD or schema associated with the document declares them of some 
+ * specific type such as tokenized. 
+ * <p>The way attribute value normalization is performed by the DOM 
+ * implementation depends on how much the implementation knows about the 
+ * schema in use. Typically, the <code>value</code> and 
+ * <code>nodeValue</code> attributes of an <code>Attr</code> node initially 
+ * returns the normalized value given by the parser. It is also the case 
+ * after <code>Document.normalizeDocument()</code> is called (assuming the 
+ * right options have been set). But this may not be the case after 
+ * mutation, independently of whether the mutation is performed by setting 
+ * the string value directly or by changing the <code>Attr</code> child 
+ * nodes. In particular, this is true when <a href='http://www.w3.org/TR/2004/REC-xml-20040204#dt-charref'>character 
+ * references</a> are involved, given that they are not represented in the DOM and they 
+ * impact attribute value normalization. On the other hand, if the 
+ * implementation knows about the schema in use when the attribute value is 
+ * changed, and it is of a different type than CDATA, it may normalize it 
+ * again at that time. This is especially true of specialized DOM 
+ * implementations, such as SVG DOM implementations, which store attribute 
+ * values in an internal form different from a string.
+ * <p>The following table gives some examples of the relations between the 
+ * attribute value in the original document (parsed attribute), the value as 
+ * exposed in the DOM, and the serialization of the value: 
+ * <table border='1' cellpadding='3'>
+ * <tr>
+ * <th>Examples</th>
+ * <th>Parsed 
+ * attribute value</th>
+ * <th>Initial <code>Attr.value</code></th>
+ * <th>Serialized attribute value</th>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * Character reference</td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <pre>"x&amp;#178;=5"</pre>
+ * </td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <pre>"x\u00b2=5"</pre>
+ * </td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <pre>"x&amp;#178;=5"</pre>
+ * </td>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'>Built-in 
+ * character entity</td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <pre>"y&amp;lt;6"</pre>
+ * </td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <pre>"y&lt;6"</pre>
+ * </td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <pre>"y&amp;lt;6"</pre>
+ * </td>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'>Literal newline between</td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <pre>
+ * "x=5&amp;#10;y=6"</pre>
+ * </td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <pre>"x=5 y=6"</pre>
+ * </td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <pre>"x=5&amp;#10;y=6"</pre>
+ * </td>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'>Normalized newline between</td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <pre>"x=5 
+ * y=6"</pre>
+ * </td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <pre>"x=5 y=6"</pre>
+ * </td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <pre>"x=5 y=6"</pre>
+ * </td>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'>Entity <code>e</code> with literal newline</td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <pre>
+ * &lt;!ENTITY e '...&amp;#10;...'&gt; [...]&gt; "x=5&amp;e;y=6"</pre>
+ * </td>
+ * <td valign='top' rowspan='1' colspan='1'><em>Dependent on Implementation and Load Options</em></td>
+ * <td valign='top' rowspan='1' colspan='1'><em>Dependent on Implementation and Load/Save Options</em></td>
+ * </tr>
+ * </table>
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface Attr extends Node {
+    /**
+     * Returns the name of this attribute. If <code>Node.localName</code> is 
+     * different from <code>null</code>, this attribute is a qualified name.
+     */
+    public String getName();
+
+    /**
+     *  <code>True</code> if this attribute was explicitly given a value in 
+     * the instance document, <code>false</code> otherwise. If the 
+     * application changed the value of this attribute node (even if it ends 
+     * up having the same value as the default value) then it is set to 
+     * <code>true</code>. The implementation may handle attributes with 
+     * default values from other schemas similarly but applications should 
+     * use <code>Document.normalizeDocument()</code> to guarantee this 
+     * information is up-to-date. 
+     */
+    public boolean getSpecified();
+
+    /**
+     * On retrieval, the value of the attribute is returned as a string. 
+     * Character and general entity references are replaced with their 
+     * values. See also the method <code>getAttribute</code> on the 
+     * <code>Element</code> interface.
+     * <br>On setting, this creates a <code>Text</code> node with the unparsed 
+     * contents of the string, i.e. any characters that an XML processor 
+     * would recognize as markup are instead treated as literal text. See 
+     * also the method <code>Element.setAttribute()</code>.
+     * <br> Some specialized implementations, such as some [<a href='http://www.w3.org/TR/2003/REC-SVG11-20030114/'>SVG 1.1</a>] 
+     * implementations, may do normalization automatically, even after 
+     * mutation; in such case, the value on retrieval may differ from the 
+     * value on setting. 
+     */
+    public String getValue();
+    /**
+     * On retrieval, the value of the attribute is returned as a string. 
+     * Character and general entity references are replaced with their 
+     * values. See also the method <code>getAttribute</code> on the 
+     * <code>Element</code> interface.
+     * <br>On setting, this creates a <code>Text</code> node with the unparsed 
+     * contents of the string, i.e. any characters that an XML processor 
+     * would recognize as markup are instead treated as literal text. See 
+     * also the method <code>Element.setAttribute()</code>.
+     * <br> Some specialized implementations, such as some [<a href='http://www.w3.org/TR/2003/REC-SVG11-20030114/'>SVG 1.1</a>] 
+     * implementations, may do normalization automatically, even after 
+     * mutation; in such case, the value on retrieval may differ from the 
+     * value on setting. 
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
+     */
+    public void setValue(String value)
+                            throws DOMException;
+
+    /**
+     * The <code>Element</code> node this attribute is attached to or 
+     * <code>null</code> if this attribute is not in use.
+     * @since DOM Level 2
+     */
+    public Element getOwnerElement();
+
+    /**
+     *  The type information associated with this attribute. While the type 
+     * information contained in this attribute is guarantee to be correct 
+     * after loading the document or invoking 
+     * <code>Document.normalizeDocument()</code>, <code>schemaTypeInfo</code>
+     *  may not be reliable if the node was moved. 
+     * @since DOM Level 3
+     */
+    public TypeInfo getSchemaTypeInfo();
+
+    /**
+     *  Returns whether this attribute is known to be of type ID (i.e. to 
+     * contain an identifier for its owner element) or not. When it is and 
+     * its value is unique, the <code>ownerElement</code> of this attribute 
+     * can be retrieved using the method <code>Document.getElementById</code>
+     * . The implementation could use several ways to determine if an 
+     * attribute node is known to contain an identifier: 
+     * <ul>
+     * <li> If validation 
+     * occurred using an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
+     *  while loading the document or while invoking 
+     * <code>Document.normalizeDocument()</code>, the post-schema-validation 
+     * infoset contributions (PSVI contributions) values are used to 
+     * determine if this attribute is a schema-determined ID attribute using 
+     * the <a href='http://www.w3.org/TR/2003/REC-xptr-framework-20030325/#term-sdi'>
+     * schema-determined ID</a> definition in [<a href='http://www.w3.org/TR/2003/REC-xptr-framework-20030325/'>XPointer</a>]
+     * . 
+     * </li>
+     * <li> If validation occurred using a DTD while loading the document or 
+     * while invoking <code>Document.normalizeDocument()</code>, the infoset <b>[type definition]</b> value is used to determine if this attribute is a DTD-determined ID 
+     * attribute using the <a href='http://www.w3.org/TR/2003/REC-xptr-framework-20030325/#term-ddi'>
+     * DTD-determined ID</a> definition in [<a href='http://www.w3.org/TR/2003/REC-xptr-framework-20030325/'>XPointer</a>]
+     * . 
+     * </li>
+     * <li> from the use of the methods <code>Element.setIdAttribute()</code>, 
+     * <code>Element.setIdAttributeNS()</code>, or 
+     * <code>Element.setIdAttributeNode()</code>, i.e. it is an 
+     * user-determined ID attribute; 
+     * <p ><b>Note:</b>  XPointer framework (see section 3.2 in [<a href='http://www.w3.org/TR/2003/REC-xptr-framework-20030325/'>XPointer</a>]
+     * ) consider the DOM user-determined ID attribute as being part of the 
+     * XPointer externally-determined ID definition. 
+     * </li>
+     * <li> using mechanisms that 
+     * are outside the scope of this specification, it is then an 
+     * externally-determined ID attribute. This includes using schema 
+     * languages different from XML schema and DTD. 
+     * </li>
+     * </ul>
+     * <br> If validation occurred while invoking 
+     * <code>Document.normalizeDocument()</code>, all user-determined ID 
+     * attributes are reset and all attribute nodes ID information are then 
+     * reevaluated in accordance to the schema used. As a consequence, if 
+     * the <code>Attr.schemaTypeInfo</code> attribute contains an ID type, 
+     * <code>isId</code> will always return true. 
+     * @since DOM Level 3
+     */
+    public boolean isId();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/CDATASection.java b/libjava/external/w3c_dom/org/w3c/dom/CDATASection.java
new file mode 100644 (file)
index 0000000..9267227
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/CDATASection.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * CDATA sections are used to escape blocks of text containing characters that 
+ * would otherwise be regarded as markup. The only delimiter that is 
+ * recognized in a CDATA section is the "]]&gt;" string that ends the CDATA 
+ * section. CDATA sections cannot be nested. Their primary purpose is for 
+ * including material such as XML fragments, without needing to escape all 
+ * the delimiters.
+ * <p>The <code>CharacterData.data</code> attribute holds the text that is 
+ * contained by the CDATA section. Note that this <em>may</em> contain characters that need to be escaped outside of CDATA sections and 
+ * that, depending on the character encoding ("charset") chosen for 
+ * serialization, it may be impossible to write out some characters as part 
+ * of a CDATA section.
+ * <p>The <code>CDATASection</code> interface inherits from the 
+ * <code>CharacterData</code> interface through the <code>Text</code> 
+ * interface. Adjacent <code>CDATASection</code> nodes are not merged by use 
+ * of the <code>normalize</code> method of the <code>Node</code> interface.
+ * <p> No lexical check is done on the content of a CDATA section and it is 
+ * therefore possible to have the character sequence <code>"]]&gt;"</code> 
+ * in the content, which is illegal in a CDATA section per section 2.7 of [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. The 
+ * presence of this character sequence must generate a fatal error during 
+ * serialization or the cdata section must be splitted before the 
+ * serialization (see also the parameter <code>"split-cdata-sections"</code> 
+ * in the <code>DOMConfiguration</code> interface). 
+ * <p ><b>Note:</b> Because no markup is recognized within a 
+ * <code>CDATASection</code>, character numeric references cannot be used as 
+ * an escape mechanism when serializing. Therefore, action needs to be taken 
+ * when serializing a <code>CDATASection</code> with a character encoding 
+ * where some of the contained characters cannot be represented. Failure to 
+ * do so would not produce well-formed XML.
+ * <p ><b>Note:</b> One potential solution in the serialization process is to 
+ * end the CDATA section before the character, output the character using a 
+ * character reference or entity reference, and open a new CDATA section for 
+ * any further characters in the text node. Note, however, that some code 
+ * conversion libraries at the time of writing do not return an error or 
+ * exception when a character is missing from the encoding, making the task 
+ * of ensuring that data is not corrupted on serialization more difficult.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface CDATASection extends Text {
+}
diff --git a/libjava/org/w3c/dom/CharacterData.java b/libjava/external/w3c_dom/org/w3c/dom/CharacterData.java
similarity index 76%
rename from libjava/org/w3c/dom/CharacterData.java
rename to libjava/external/w3c_dom/org/w3c/dom/CharacterData.java
index d459252..a12dced 100644 (file)
--- a/libjava/org/w3c/dom/CharacterData.java
+++ b/libjava/external/w3c_dom/org/w3c/dom/CharacterData.java
@@ -1,144 +1,153 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * The <code>CharacterData</code> interface extends Node with a set of \r
- * attributes and methods for accessing character data in the DOM. For \r
- * clarity this set is defined here rather than on each object that uses \r
- * these attributes and methods. No DOM objects correspond directly to \r
- * <code>CharacterData</code>, though <code>Text</code> and others do \r
- * inherit the interface from it. All <code>offsets</code> in this interface \r
- * start from <code>0</code>.\r
- * <p>As explained in the <code>DOMString</code> interface, text strings in \r
- * the DOM are represented in UTF-16, i.e. as a sequence of 16-bit units. In \r
- * the following, the term 16-bit units is used whenever necessary to \r
- * indicate that indexing on CharacterData is done in 16-bit units.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface CharacterData extends Node {\r
-    /**\r
-     * The character data of the node that implements this interface. The DOM \r
-     * implementation may not put arbitrary limits on the amount of data \r
-     * that may be stored in a <code>CharacterData</code> node. However, \r
-     * implementation limits may mean that the entirety of a node's data may \r
-     * not fit into a single <code>DOMString</code>. In such cases, the user \r
-     * may call <code>substringData</code> to retrieve the data in \r
-     * appropriately sized pieces.\r
-     * @exception DOMException\r
-     *   NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.\r
-     * @exception DOMException\r
-     *   DOMSTRING_SIZE_ERR: Raised when it would return more characters than \r
-     *   fit in a <code>DOMString</code> variable on the implementation \r
-     *   platform.\r
-     */\r
-    public String getData()\r
-                            throws DOMException;\r
-    public void setData(String data)\r
-                            throws DOMException;\r
-\r
-    /**\r
-     * The number of 16-bit units that are available through <code>data</code> \r
-     * and the <code>substringData</code> method below. This may have the \r
-     * value zero, i.e., <code>CharacterData</code> nodes may be empty.\r
-     */\r
-    public int getLength();\r
-\r
-    /**\r
-     * Extracts a range of data from the node.\r
-     * @param offsetStart offset of substring to extract.\r
-     * @param countThe number of 16-bit units to extract.\r
-     * @return The specified substring. If the sum of <code>offset</code> and \r
-     *   <code>count</code> exceeds the <code>length</code>, then all 16-bit \r
-     *   units to the end of the data are returned.\r
-     * @exception DOMException\r
-     *   INDEX_SIZE_ERR: Raised if the specified <code>offset</code> is \r
-     *   negative or greater than the number of 16-bit units in \r
-     *   <code>data</code>, or if the specified <code>count</code> is \r
-     *   negative.\r
-     *   <br>DOMSTRING_SIZE_ERR: Raised if the specified range of text does \r
-     *   not fit into a <code>DOMString</code>.\r
-     */\r
-    public String substringData(int offset, \r
-                                int count)\r
-                                throws DOMException;\r
-\r
-    /**\r
-     * Append the string to the end of the character data of the node. Upon \r
-     * success, <code>data</code> provides access to the concatenation of \r
-     * <code>data</code> and the <code>DOMString</code> specified.\r
-     * @param argThe <code>DOMString</code> to append.\r
-     * @exception DOMException\r
-     *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.\r
-     */\r
-    public void appendData(String arg)\r
-                           throws DOMException;\r
-\r
-    /**\r
-     * Insert a string at the specified 16-bit unit offset.\r
-     * @param offsetThe character offset at which to insert.\r
-     * @param argThe <code>DOMString</code> to insert.\r
-     * @exception DOMException\r
-     *   INDEX_SIZE_ERR: Raised if the specified <code>offset</code> is \r
-     *   negative or greater than the number of 16-bit units in \r
-     *   <code>data</code>.\r
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.\r
-     */\r
-    public void insertData(int offset, \r
-                           String arg)\r
-                           throws DOMException;\r
-\r
-    /**\r
-     * Remove a range of 16-bit units from the node. Upon success, \r
-     * <code>data</code> and <code>length</code> reflect the change.\r
-     * @param offsetThe offset from which to start removing.\r
-     * @param countThe number of 16-bit units to delete. If the sum of \r
-     *   <code>offset</code> and <code>count</code> exceeds \r
-     *   <code>length</code> then all 16-bit units from <code>offset</code> \r
-     *   to the end of the data are deleted.\r
-     * @exception DOMException\r
-     *   INDEX_SIZE_ERR: Raised if the specified <code>offset</code> is \r
-     *   negative or greater than the number of 16-bit units in \r
-     *   <code>data</code>, or if the specified <code>count</code> is \r
-     *   negative.\r
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.\r
-     */\r
-    public void deleteData(int offset, \r
-                           int count)\r
-                           throws DOMException;\r
-\r
-    /**\r
-     * Replace the characters starting at the specified 16-bit unit offset \r
-     * with the specified string.\r
-     * @param offsetThe offset from which to start replacing.\r
-     * @param countThe number of 16-bit units to replace. If the sum of \r
-     *   <code>offset</code> and <code>count</code> exceeds \r
-     *   <code>length</code>, then all 16-bit units to the end of the data \r
-     *   are replaced; (i.e., the effect is the same as a <code>remove</code>\r
-     *    method call with the same range, followed by an <code>append</code>\r
-     *    method invocation).\r
-     * @param argThe <code>DOMString</code> with which the range must be \r
-     *   replaced.\r
-     * @exception DOMException\r
-     *   INDEX_SIZE_ERR: Raised if the specified <code>offset</code> is \r
-     *   negative or greater than the number of 16-bit units in \r
-     *   <code>data</code>, or if the specified <code>count</code> is \r
-     *   negative.\r
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.\r
-     */\r
-    public void replaceData(int offset, \r
-                            int count, \r
-                            String arg)\r
-                            throws DOMException;\r
-\r
-}\r
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * The <code>CharacterData</code> interface extends Node with a set of 
+ * attributes and methods for accessing character data in the DOM. For 
+ * clarity this set is defined here rather than on each object that uses 
+ * these attributes and methods. No DOM objects correspond directly to 
+ * <code>CharacterData</code>, though <code>Text</code> and others do 
+ * inherit the interface from it. All <code>offsets</code> in this interface 
+ * start from <code>0</code>.
+ * <p>As explained in the <code>DOMString</code> interface, text strings in 
+ * the DOM are represented in UTF-16, i.e. as a sequence of 16-bit units. In 
+ * the following, the term 16-bit units is used whenever necessary to 
+ * indicate that indexing on CharacterData is done in 16-bit units.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface CharacterData extends Node {
+    /**
+     * The character data of the node that implements this interface. The DOM 
+     * implementation may not put arbitrary limits on the amount of data 
+     * that may be stored in a <code>CharacterData</code> node. However, 
+     * implementation limits may mean that the entirety of a node's data may 
+     * not fit into a single <code>DOMString</code>. In such cases, the user 
+     * may call <code>substringData</code> to retrieve the data in 
+     * appropriately sized pieces.
+     * @exception DOMException
+     *   DOMSTRING_SIZE_ERR: Raised when it would return more characters than 
+     *   fit in a <code>DOMString</code> variable on the implementation 
+     *   platform.
+     */
+    public String getData()
+                            throws DOMException;
+    /**
+     * The character data of the node that implements this interface. The DOM 
+     * implementation may not put arbitrary limits on the amount of data 
+     * that may be stored in a <code>CharacterData</code> node. However, 
+     * implementation limits may mean that the entirety of a node's data may 
+     * not fit into a single <code>DOMString</code>. In such cases, the user 
+     * may call <code>substringData</code> to retrieve the data in 
+     * appropriately sized pieces.
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
+     */
+    public void setData(String data)
+                            throws DOMException;
+
+    /**
+     * The number of 16-bit units that are available through <code>data</code> 
+     * and the <code>substringData</code> method below. This may have the 
+     * value zero, i.e., <code>CharacterData</code> nodes may be empty.
+     */
+    public int getLength();
+
+    /**
+     * Extracts a range of data from the node.
+     * @param offset Start offset of substring to extract.
+     * @param count The number of 16-bit units to extract.
+     * @return The specified substring. If the sum of <code>offset</code> and 
+     *   <code>count</code> exceeds the <code>length</code>, then all 16-bit 
+     *   units to the end of the data are returned.
+     * @exception DOMException
+     *   INDEX_SIZE_ERR: Raised if the specified <code>offset</code> is 
+     *   negative or greater than the number of 16-bit units in 
+     *   <code>data</code>, or if the specified <code>count</code> is 
+     *   negative.
+     *   <br>DOMSTRING_SIZE_ERR: Raised if the specified range of text does 
+     *   not fit into a <code>DOMString</code>.
+     */
+    public String substringData(int offset, 
+                                int count)
+                                throws DOMException;
+
+    /**
+     * Append the string to the end of the character data of the node. Upon 
+     * success, <code>data</code> provides access to the concatenation of 
+     * <code>data</code> and the <code>DOMString</code> specified.
+     * @param arg The <code>DOMString</code> to append.
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     */
+    public void appendData(String arg)
+                           throws DOMException;
+
+    /**
+     * Insert a string at the specified 16-bit unit offset.
+     * @param offset The character offset at which to insert.
+     * @param arg The <code>DOMString</code> to insert.
+     * @exception DOMException
+     *   INDEX_SIZE_ERR: Raised if the specified <code>offset</code> is 
+     *   negative or greater than the number of 16-bit units in 
+     *   <code>data</code>.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     */
+    public void insertData(int offset, 
+                           String arg)
+                           throws DOMException;
+
+    /**
+     * Remove a range of 16-bit units from the node. Upon success, 
+     * <code>data</code> and <code>length</code> reflect the change.
+     * @param offset The offset from which to start removing.
+     * @param count The number of 16-bit units to delete. If the sum of 
+     *   <code>offset</code> and <code>count</code> exceeds 
+     *   <code>length</code> then all 16-bit units from <code>offset</code> 
+     *   to the end of the data are deleted.
+     * @exception DOMException
+     *   INDEX_SIZE_ERR: Raised if the specified <code>offset</code> is 
+     *   negative or greater than the number of 16-bit units in 
+     *   <code>data</code>, or if the specified <code>count</code> is 
+     *   negative.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     */
+    public void deleteData(int offset, 
+                           int count)
+                           throws DOMException;
+
+    /**
+     * Replace the characters starting at the specified 16-bit unit offset 
+     * with the specified string.
+     * @param offset The offset from which to start replacing.
+     * @param count The number of 16-bit units to replace. If the sum of 
+     *   <code>offset</code> and <code>count</code> exceeds 
+     *   <code>length</code>, then all 16-bit units to the end of the data 
+     *   are replaced; (i.e., the effect is the same as a <code>remove</code>
+     *    method call with the same range, followed by an <code>append</code>
+     *    method invocation).
+     * @param arg The <code>DOMString</code> with which the range must be 
+     *   replaced.
+     * @exception DOMException
+     *   INDEX_SIZE_ERR: Raised if the specified <code>offset</code> is 
+     *   negative or greater than the number of 16-bit units in 
+     *   <code>data</code>, or if the specified <code>count</code> is 
+     *   negative.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     */
+    public void replaceData(int offset, 
+                            int count, 
+                            String arg)
+                            throws DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/Comment.java b/libjava/external/w3c_dom/org/w3c/dom/Comment.java
new file mode 100644 (file)
index 0000000..b04ed4d
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/Comment.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * This interface inherits from <code>CharacterData</code> and represents the 
+ * content of a comment, i.e., all the characters between the starting '
+ * <code>&lt;!--</code>' and ending '<code>--&gt;</code>'. Note that this is 
+ * the definition of a comment in XML, and, in practice, HTML, although some 
+ * HTML tools may implement the full SGML comment structure. 
+ * <p> No lexical check is done on the content of a comment and it is 
+ * therefore possible to have the character sequence <code>"--"</code> 
+ * (double-hyphen) in the content, which is illegal in a comment per section 
+ * 2.5 of [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. The 
+ * presence of this character sequence must generate a fatal error during 
+ * serialization. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface Comment extends CharacterData {
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/DOMConfiguration.java b/libjava/external/w3c_dom/org/w3c/dom/DOMConfiguration.java
new file mode 100644 (file)
index 0000000..7cce160
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/DOMConfiguration.java
@@ -0,0 +1,413 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ *  The <code>DOMConfiguration</code> interface represents the configuration 
+ * of a document and maintains a table of recognized parameters. Using the 
+ * configuration, it is possible to change 
+ * <code>Document.normalizeDocument()</code> behavior, such as replacing the 
+ * <code>CDATASection</code> nodes with <code>Text</code> nodes or 
+ * specifying the type of the schema that must be used when the validation 
+ * of the <code>Document</code> is requested. <code>DOMConfiguration</code> 
+ * objects are also used in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>DOM Level 3 Load and Save</a>]
+ *  in the <code>DOMParser</code> and <code>DOMSerializer</code> interfaces. 
+ * <p> The parameter names used by the <code>DOMConfiguration</code> object 
+ * are defined throughout the DOM Level 3 specifications. Names are 
+ * case-insensitive. To avoid possible conflicts, as a convention, names 
+ * referring to parameters defined outside the DOM specification should be 
+ * made unique. Because parameters are exposed as properties in the , names 
+ * are recommended to follow the section 5.16 Identifiers of [Unicode] with the addition of the character '-' (HYPHEN-MINUS) but it is not 
+ * enforced by the DOM implementation. DOM Level 3 Core Implementations are 
+ * required to recognize all parameters defined in this specification. Some 
+ * parameter values may also be required to be supported by the 
+ * implementation. Refer to the definition of the parameter to know if a 
+ * value must be supported or not. 
+ * <p ><b>Note:</b>  Parameters are similar to features and properties used in 
+ * SAX2 [<a href='http://www.saxproject.org/'>SAX</a>]. 
+ * <p> The following list of parameters defined in the DOM: 
+ * <dl>
+ * <dt>
+ * <code>"canonical-form"</code></dt>
+ * <dd>
+ * <dl>
+ * <dt><code>true</code></dt>
+ * <dd>[<em>optional</em>] Canonicalize the document according to the rules specified in [<a href='http://www.w3.org/TR/2001/REC-xml-c14n-20010315'>Canonical XML</a>], 
+ * such as removing the <code>DocumentType</code> node (if any) from the 
+ * tree, or removing superfluous namespace declarations from each element. 
+ * Note that this is limited to what can be represented in the DOM; in 
+ * particular, there is no way to specify the order of the attributes in the 
+ * DOM. In addition,  Setting this parameter to <code>true</code> will also 
+ * set the state of the parameters listed below. Later changes to the state 
+ * of one of those parameters will revert "canonical-form" back to 
+ * <code>false</code>. Parameters set to <code>false</code>: "entities", "
+ * normalize-characters", "cdata-sections". Parameters set to 
+ * <code>true</code>: "namespaces", "namespace-declarations", "well-formed", 
+ * "element-content-whitespace". Other parameters are not changed unless 
+ * explicitly specified in the description of the parameters.</dd>
+ * <dt>
+ * <code>false</code></dt>
+ * <dd>[<em>required</em>] (<em>default</em>)Do not canonicalize the document.</dd>
+ * </dl></dd>
+ * <dt><code>"cdata-sections"</code></dt>
+ * <dd>
+ * <dl>
+ * <dt>
+ * <code>true</code></dt>
+ * <dd>[<em>required</em>] (<em>default</em>)Keep <code>CDATASection</code> nodes in the document.</dd>
+ * <dt><code>false</code></dt>
+ * <dd>[<em>required</em>]Transform <code>CDATASection</code> nodes in the document into 
+ * <code>Text</code> nodes. The new <code>Text</code> node is then combined 
+ * with any adjacent <code>Text</code> node.</dd>
+ * </dl></dd>
+ * <dt>
+ * <code>"check-character-normalization"</code></dt>
+ * <dd>
+ * <dl>
+ * <dt><code>true</code></dt>
+ * <dd>[<em>optional</em>] Check if the characters in the document are <a href='http://www.w3.org/TR/2004/REC-xml11-20040204/#dt-fullnorm'>fully 
+ * normalized</a>, as defined in appendix B of [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]. When a 
+ * sequence of characters is encountered that fails normalization checking, 
+ * an error with the <code>DOMError.type</code> equals to 
+ * "check-character-normalization-failure" is issued. </dd>
+ * <dt><code>false</code></dt>
+ * <dd>[<em>required</em>] (<em>default</em>)Do not check if characters are normalized.</dd>
+ * </dl></dd>
+ * <dt><code>"comments"</code></dt>
+ * <dd>
+ * <dl>
+ * <dt>
+ * <code>true</code></dt>
+ * <dd>[<em>required</em>] (<em>default</em>)Keep <code>Comment</code> nodes in the document.</dd>
+ * <dt><code>false</code></dt>
+ * <dd>[<em>required</em>]Discard <code>Comment</code> nodes in the document.</dd>
+ * </dl></dd>
+ * <dt>
+ * <code>"datatype-normalization"</code></dt>
+ * <dd>
+ * <dl>
+ * <dt><code>true</code></dt>
+ * <dd>[<em>optional</em>] Expose schema normalized values in the tree, such as <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#key-nv'>XML 
+ * Schema normalized values</a> in the case of XML Schema. Since this parameter requires to have schema 
+ * information, the "validate" parameter will also be set to 
+ * <code>true</code>. Having this parameter activated when "validate" is 
+ * <code>false</code> has no effect and no schema-normalization will happen. 
+ * <p ><b>Note:</b>  Since the document contains the result of the XML 1.0 
+ * processing, this parameter does not apply to attribute value 
+ * normalization as defined in section 3.3.3 of [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] and is only 
+ * meant for schema languages other than Document Type Definition (DTD). </dd>
+ * <dt>
+ * <code>false</code></dt>
+ * <dd>[<em>required</em>] (<em>default</em>) Do not perform schema normalization on the tree. </dd>
+ * </dl></dd>
+ * <dt>
+ * <code>"element-content-whitespace"</code></dt>
+ * <dd>
+ * <dl>
+ * <dt><code>true</code></dt>
+ * <dd>[<em>required</em>] (<em>default</em>)Keep all whitespaces in the document.</dd>
+ * <dt><code>false</code></dt>
+ * <dd>[<em>optional</em>] Discard all <code>Text</code> nodes that contain whitespaces in element 
+ * content, as described in <a href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204#infoitem.character'>
+ * [element content whitespace]</a>. The implementation is expected to use the attribute 
+ * <code>Text.isElementContentWhitespace</code> to determine if a 
+ * <code>Text</code> node should be discarded or not.</dd>
+ * </dl></dd>
+ * <dt><code>"entities"</code></dt>
+ * <dd>
+ * <dl>
+ * <dt>
+ * <code>true</code></dt>
+ * <dd>[<em>required</em>] (<em>default</em>)Keep <code>EntityReference</code> nodes in the document.</dd>
+ * <dt>
+ * <code>false</code></dt>
+ * <dd>[<em>required</em>] Remove all <code>EntityReference</code> nodes from the document, 
+ * putting the entity expansions directly in their place. <code>Text</code> 
+ * nodes are normalized, as defined in <code>Node.normalize</code>. Only <a href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204/#infoitem.rse'>
+ * unexpanded entity references</a> are kept in the document. </dd>
+ * </dl>
+ * <p ><b>Note:</b>  This parameter does not affect <code>Entity</code> nodes. </dd>
+ * <dt>
+ * <code>"error-handler"</code></dt>
+ * <dd>[<em>required</em>] Contains a <code>DOMErrorHandler</code> object. If an error is 
+ * encountered in the document, the implementation will call back the 
+ * <code>DOMErrorHandler</code> registered using this parameter. The 
+ * implementation may provide a default <code>DOMErrorHandler</code> object. 
+ *  When called, <code>DOMError.relatedData</code> will contain the closest 
+ * node to where the error occurred. If the implementation is unable to 
+ * determine the node where the error occurs, 
+ * <code>DOMError.relatedData</code> will contain the <code>Document</code> 
+ * node. Mutations to the document from within an error handler will result 
+ * in implementation dependent behavior. </dd>
+ * <dt><code>"infoset"</code></dt>
+ * <dd>
+ * <dl>
+ * <dt>
+ * <code>true</code></dt>
+ * <dd>[<em>required</em>]Keep in the document the information defined in the XML Information Set [<a href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204/'>XML Information Set</a>]
+ * .This forces the following parameters to <code>false</code>: "
+ * validate-if-schema", "entities", "datatype-normalization", "cdata-sections
+ * ".This forces the following parameters to <code>true</code>: "
+ * namespace-declarations", "well-formed", "element-content-whitespace", "
+ * comments", "namespaces".Other parameters are not changed unless 
+ * explicitly specified in the description of the parameters. Note that 
+ * querying this parameter with <code>getParameter</code> returns 
+ * <code>true</code> only if the individual parameters specified above are 
+ * appropriately set.</dd>
+ * <dt><code>false</code></dt>
+ * <dd>Setting <code>infoset</code> to 
+ * <code>false</code> has no effect.</dd>
+ * </dl></dd>
+ * <dt><code>"namespaces"</code></dt>
+ * <dd>
+ * <dl>
+ * <dt>
+ * <code>true</code></dt>
+ * <dd>[<em>required</em>] (<em>default</em>) Perform the namespace processing as defined in . </dd>
+ * <dt><code>false</code></dt>
+ * <dd>[<em>optional</em>] Do not perform the namespace processing. </dd>
+ * </dl></dd>
+ * <dt>
+ * <code>"namespace-declarations"</code></dt>
+ * <dd> This parameter has no effect if the 
+ * parameter "namespaces" is set to <code>false</code>. 
+ * <dl>
+ * <dt><code>true</code></dt>
+ * <dd>[<em>required</em>] (<em>default</em>) Include namespace declaration attributes, specified or defaulted from 
+ * the schema, in the document. See also the sections "Declaring Namespaces" 
+ * in [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+ *  and [<a href='http://www.w3.org/TR/2004/REC-xml-names11-20040204/'>XML Namespaces 1.1</a>]
+ * .</dd>
+ * <dt><code>false</code></dt>
+ * <dd>[<em>required</em>]Discard all namespace declaration attributes. The namespace prefixes (
+ * <code>Node.prefix</code>) are retained even if this parameter is set to 
+ * <code>false</code>.</dd>
+ * </dl></dd>
+ * <dt><code>"normalize-characters"</code></dt>
+ * <dd>
+ * <dl>
+ * <dt><code>true</code></dt>
+ * <dd>[<em>optional</em>] <a href='http://www.w3.org/TR/2004/REC-xml11-20040204/#dt-fullnorm'>Fully 
+ * normalized</a> the characters in the document as defined in appendix B of [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]. </dd>
+ * <dt>
+ * <code>false</code></dt>
+ * <dd>[<em>required</em>] (<em>default</em>)Do not perform character normalization.</dd>
+ * </dl></dd>
+ * <dt><code>"schema-location"</code></dt>
+ * <dd>[<em>optional</em>] Represent a <code>DOMString</code> object containing a list of URIs, 
+ * separated by whitespaces (characters matching the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-S'>nonterminal 
+ * production S</a> defined in section 2.3 [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]), that 
+ * represents the schemas against which validation should occur, i.e. the 
+ * current schema. The types of schemas referenced in this list must match 
+ * the type specified with <code>schema-type</code>, otherwise the behavior 
+ * of an implementation is undefined.  The schemas specified using this 
+ * property take precedence to the schema information specified in the 
+ * document itself. For namespace aware schema, if a schema specified using 
+ * this property and a schema specified in the document instance (i.e. using 
+ * the <code>schemaLocation</code> attribute) in a schema document (i.e. 
+ * using schema <code>import</code> mechanisms) share the same 
+ * <code>targetNamespace</code>, the schema specified by the user using this 
+ * property will be used. If two schemas specified using this property share 
+ * the same <code>targetNamespace</code> or have no namespace, the behavior 
+ * is implementation dependent.  If no location has been provided, this 
+ * parameter is <code>null</code>. 
+ * <p ><b>Note:</b>  The <code>"schema-location"</code> parameter is ignored 
+ * unless the "schema-type" parameter value is set. It is strongly 
+ * recommended that <code>Document.documentURI</code> will be set so that an 
+ * implementation can successfully resolve any external entities referenced. </dd>
+ * <dt>
+ * <code>"schema-type"</code></dt>
+ * <dd>[<em>optional</em>] Represent a <code>DOMString</code> object containing an absolute URI 
+ * and representing the type of the schema language used to validate a 
+ * document against. Note that no lexical checking is done on the absolute 
+ * URI.  If this parameter is not set, a default value may be provided by 
+ * the implementation, based on the schema languages supported and on the 
+ * schema language used at load time. If no value is provided, this 
+ * parameter is <code>null</code>. 
+ * <p ><b>Note:</b>  For XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
+ * , applications must use the value 
+ * <code>"http://www.w3.org/2001/XMLSchema"</code>. For XML DTD [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>], 
+ * applications must use the value 
+ * <code>"http://www.w3.org/TR/REC-xml"</code>. Other schema languages are 
+ * outside the scope of the W3C and therefore should recommend an absolute 
+ * URI in order to use this method. </dd>
+ * <dt><code>"split-cdata-sections"</code></dt>
+ * <dd>
+ * <dl>
+ * <dt>
+ * <code>true</code></dt>
+ * <dd>[<em>required</em>] (<em>default</em>)Split CDATA sections containing the CDATA section termination marker 
+ * ']]&gt;'. When a CDATA section is split a warning is issued with a 
+ * <code>DOMError.type</code> equals to 
+ * <code>"cdata-sections-splitted"</code> and 
+ * <code>DOMError.relatedData</code> equals to the first 
+ * <code>CDATASection</code> node in document order resulting from the split.</dd>
+ * <dt>
+ * <code>false</code></dt>
+ * <dd>[<em>required</em>]Signal an error if a <code>CDATASection</code> contains an 
+ * unrepresentable character.</dd>
+ * </dl></dd>
+ * <dt><code>"validate"</code></dt>
+ * <dd>
+ * <dl>
+ * <dt><code>true</code></dt>
+ * <dd>[<em>optional</em>] Require the validation against a schema (i.e. XML schema, DTD, any 
+ * other type or representation of schema) of the document as it is being 
+ * normalized as defined by [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. If 
+ * validation errors are found, or no schema was found, the error handler is 
+ * notified. Schema-normalized values will not be exposed according to the 
+ * schema in used unless the parameter "datatype-normalization" is 
+ * <code>true</code>.  This parameter will reevaluate: 
+ * <ul>
+ * <li> Attribute nodes with 
+ * <code>Attr.specified</code> equals to <code>false</code>, as specified in 
+ * the description of the <code>Attr</code> interface; 
+ * </li>
+ * <li> The value of the 
+ * attribute <code>Text.isElementContentWhitespace</code> for all 
+ * <code>Text</code> nodes; 
+ * </li>
+ * <li> The value of the attribute 
+ * <code>Attr.isId</code> for all <code>Attr</code> nodes; 
+ * </li>
+ * <li> The attributes 
+ * <code>Element.schemaTypeInfo</code> and <code>Attr.schemaTypeInfo</code>. 
+ * </li>
+ * </ul>
+ * <p ><b>Note:</b>  "validate-if-schema" and "validate" are mutually 
+ * exclusive, setting one of them to <code>true</code> will set the other 
+ * one to <code>false</code>. Applications should also consider setting the 
+ * parameter "well-formed" to <code>true</code>, which is the default for 
+ * that option, when validating the document. </dd>
+ * <dt><code>false</code></dt>
+ * <dd>[<em>required</em>] (<em>default</em>) Do not accomplish schema processing, including the internal subset 
+ * processing. Default attribute values information are kept. Note that 
+ * validation might still happen if "validate-if-schema" is <code>true</code>
+ * . </dd>
+ * </dl></dd>
+ * <dt><code>"validate-if-schema"</code></dt>
+ * <dd>
+ * <dl>
+ * <dt><code>true</code></dt>
+ * <dd>[<em>optional</em>]Enable validation only if a declaration for the document element can be 
+ * found in a schema (independently of where it is found, i.e. XML schema, 
+ * DTD, or any other type or representation of schema). If validation is 
+ * enabled, this parameter has the same behavior as the parameter "validate" 
+ * set to <code>true</code>. 
+ * <p ><b>Note:</b>  "validate-if-schema" and "validate" are mutually 
+ * exclusive, setting one of them to <code>true</code> will set the other 
+ * one to <code>false</code>. </dd>
+ * <dt><code>false</code></dt>
+ * <dd>[<em>required</em>] (<em>default</em>) No schema processing should be performed if the document has a schema, 
+ * including internal subset processing. Default attribute values 
+ * information are kept. Note that validation must still happen if "validate
+ * " is <code>true</code>. </dd>
+ * </dl></dd>
+ * <dt><code>"well-formed"</code></dt>
+ * <dd>
+ * <dl>
+ * <dt><code>true</code></dt>
+ * <dd>[<em>required</em>] (<em>default</em>) Check if all nodes are XML well formed according to the XML version in 
+ * use in <code>Document.xmlVersion</code>: 
+ * <ul>
+ * <li> check if the attribute 
+ * <code>Node.nodeName</code> contains invalid characters according to its 
+ * node type and generate a <code>DOMError</code> of type 
+ * <code>"wf-invalid-character-in-node-name"</code>, with a 
+ * <code>DOMError.SEVERITY_ERROR</code> severity, if necessary; 
+ * </li>
+ * <li> check if 
+ * the text content inside <code>Attr</code>, <code>Element</code>, 
+ * <code>Comment</code>, <code>Text</code>, <code>CDATASection</code> nodes 
+ * for invalid characters and generate a <code>DOMError</code> of type 
+ * <code>"wf-invalid-character"</code>, with a 
+ * <code>DOMError.SEVERITY_ERROR</code> severity, if necessary; 
+ * </li>
+ * <li> check if 
+ * the data inside <code>ProcessingInstruction</code> nodes for invalid 
+ * characters and generate a <code>DOMError</code> of type 
+ * <code>"wf-invalid-character"</code>, with a 
+ * <code>DOMError.SEVERITY_ERROR</code> severity, if necessary; 
+ * </li>
+ * </ul></dd>
+ * <dt>
+ * <code>false</code></dt>
+ * <dd>[<em>optional</em>] Do not check for XML well-formedness. </dd>
+ * </dl></dd>
+ * </dl>
+ * <p> The resolution of the system identifiers associated with entities is 
+ * done using <code>Document.documentURI</code>. However, when the feature 
+ * "LS" defined in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>DOM Level 3 Load and Save</a>]
+ *  is supported by the DOM implementation, the parameter 
+ * "resource-resolver" can also be used on <code>DOMConfiguration</code> 
+ * objects attached to <code>Document</code> nodes. If this parameter is 
+ * set, <code>Document.normalizeDocument()</code> will invoke the resource 
+ * resolver instead of using <code>Document.documentURI</code>. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ * @since DOM Level 3
+ */
+public interface DOMConfiguration {
+    /**
+     * Set the value of a parameter.
+     * @param name The name of the parameter to set.
+     * @param value  The new value or <code>null</code> if the user wishes to 
+     *   unset the parameter. While the type of the value parameter is 
+     *   defined as <code>DOMUserData</code>, the object type must match the 
+     *   type defined by the definition of the parameter. For example, if 
+     *   the parameter is "error-handler", the value must be of type 
+     *   <code>DOMErrorHandler</code>. 
+     * @exception DOMException
+     *    NOT_FOUND_ERR: Raised when the parameter name is not recognized. 
+     *   <br> NOT_SUPPORTED_ERR: Raised when the parameter name is recognized 
+     *   but the requested value cannot be set. 
+     *   <br> TYPE_MISMATCH_ERR: Raised if the value type for this parameter 
+     *   name is incompatible with the expected value type. 
+     */
+    public void setParameter(String name, 
+                             Object value)
+                             throws DOMException;
+
+    /**
+     *  Return the value of a parameter if known. 
+     * @param name  The name of the parameter. 
+     * @return  The current object associated with the specified parameter or 
+     *   <code>null</code> if no object has been associated or if the 
+     *   parameter is not supported. 
+     * @exception DOMException
+     *    NOT_FOUND_ERR: Raised when the parameter name is not recognized. 
+     */
+    public Object getParameter(String name)
+                               throws DOMException;
+
+    /**
+     * Check if setting a parameter to a specific value is supported.
+     * @param name The name of the parameter to check.
+     * @param value  An object. if <code>null</code>, the returned value is 
+     *   <code>true</code>. 
+     * @return  <code>true</code> if the parameter could be successfully set 
+     *   to the specified value, or <code>false</code> if the parameter is 
+     *   not recognized or the requested value is not supported. This does 
+     *   not change the current value of the parameter itself. 
+     */
+    public boolean canSetParameter(String name, 
+                                   Object value);
+
+    /**
+     *  The list of the parameters supported by this 
+     * <code>DOMConfiguration</code> object and for which at least one value 
+     * can be set by the application. Note that this list can also contain 
+     * parameter names defined outside this specification. 
+     */
+    public DOMStringList getParameterNames();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/DOMError.java b/libjava/external/w3c_dom/org/w3c/dom/DOMError.java
new file mode 100644 (file)
index 0000000..37ed7d1
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/DOMError.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * <code>DOMError</code> is an interface that describes an error.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ * @since DOM Level 3
+ */
+public interface DOMError {
+    // ErrorSeverity
+    /**
+     * The severity of the error described by the <code>DOMError</code> is 
+     * warning. A <code>SEVERITY_WARNING</code> will not cause the 
+     * processing to stop, unless <code>DOMErrorHandler.handleError()</code> 
+     * returns <code>false</code>.
+     */
+    public static final short SEVERITY_WARNING          = 1;
+    /**
+     * The severity of the error described by the <code>DOMError</code> is 
+     * error. A <code>SEVERITY_ERROR</code> may not cause the processing to 
+     * stop if the error can be recovered, unless 
+     * <code>DOMErrorHandler.handleError()</code> returns <code>false</code>.
+     */
+    public static final short SEVERITY_ERROR            = 2;
+    /**
+     * The severity of the error described by the <code>DOMError</code> is 
+     * fatal error. A <code>SEVERITY_FATAL_ERROR</code> will cause the 
+     * normal processing to stop. The return value of 
+     * <code>DOMErrorHandler.handleError()</code> is ignored unless the 
+     * implementation chooses to continue, in which case the behavior 
+     * becomes undefined.
+     */
+    public static final short SEVERITY_FATAL_ERROR      = 3;
+
+    /**
+     * The severity of the error, either <code>SEVERITY_WARNING</code>, 
+     * <code>SEVERITY_ERROR</code>, or <code>SEVERITY_FATAL_ERROR</code>.
+     */
+    public short getSeverity();
+
+    /**
+     * An implementation specific string describing the error that occurred.
+     */
+    public String getMessage();
+
+    /**
+     *  A <code>DOMString</code> indicating which related data is expected in 
+     * <code>relatedData</code>. Users should refer to the specification of 
+     * the error in order to find its <code>DOMString</code> type and 
+     * <code>relatedData</code> definitions if any. 
+     * <p ><b>Note:</b>  As an example, 
+     * <code>Document.normalizeDocument()</code> does generate warnings when 
+     * the "split-cdata-sections" parameter is in use. Therefore, the method 
+     * generates a <code>SEVERITY_WARNING</code> with <code>type</code> 
+     * <code>"cdata-sections-splitted"</code> and the first 
+     * <code>CDATASection</code> node in document order resulting from the 
+     * split is returned by the <code>relatedData</code> attribute. 
+     */
+    public String getType();
+
+    /**
+     * The related platform dependent exception if any.
+     */
+    public Object getRelatedException();
+
+    /**
+     *  The related <code>DOMError.type</code> dependent data if any. 
+     */
+    public Object getRelatedData();
+
+    /**
+     * The location of the error.
+     */
+    public DOMLocator getLocation();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/DOMErrorHandler.java b/libjava/external/w3c_dom/org/w3c/dom/DOMErrorHandler.java
new file mode 100644 (file)
index 0000000..3d4ad2a
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/DOMErrorHandler.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ *  <code>DOMErrorHandler</code> is a callback interface that the DOM 
+ * implementation can call when reporting errors that happens while 
+ * processing XML data, or when doing some other processing (e.g. validating 
+ * a document). A <code>DOMErrorHandler</code> object can be attached to a 
+ * <code>Document</code> using the "error-handler" on the 
+ * <code>DOMConfiguration</code> interface. If more than one error needs to 
+ * be reported during an operation, the sequence and numbers of the errors 
+ * passed to the error handler are implementation dependent. 
+ * <p> The application that is using the DOM implementation is expected to 
+ * implement this interface. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ * @since DOM Level 3
+ */
+public interface DOMErrorHandler {
+    /**
+     * This method is called on the error handler when an error occurs.
+     * <br> If an exception is thrown from this method, it is considered to be 
+     * equivalent of returning <code>true</code>. 
+     * @param error  The error object that describes the error. This object 
+     *   may be reused by the DOM implementation across multiple calls to 
+     *   the <code>handleError</code> method. 
+     * @return  If the <code>handleError</code> method returns 
+     *   <code>false</code>, the DOM implementation should stop the current 
+     *   processing when possible. If the method returns <code>true</code>, 
+     *   the processing may continue depending on 
+     *   <code>DOMError.severity</code>. 
+     */
+    public boolean handleError(DOMError error);
+
+}
diff --git a/libjava/org/w3c/dom/DOMException.java b/libjava/external/w3c_dom/org/w3c/dom/DOMException.java
similarity index 60%
rename from libjava/org/w3c/dom/DOMException.java
rename to libjava/external/w3c_dom/org/w3c/dom/DOMException.java
index 41ad08a..0b2578f 100644 (file)
--- a/libjava/org/w3c/dom/DOMException.java
+++ b/libjava/external/w3c_dom/org/w3c/dom/DOMException.java
@@ -1,117 +1,131 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * DOM operations only raise exceptions in "exceptional" circumstances, i.e., \r
- * when an operation is impossible to perform (either for logical reasons, \r
- * because data is lost, or because the implementation has become unstable). \r
- * In general, DOM methods return specific error values in ordinary \r
- * processing situations, such as out-of-bound errors when using \r
- * <code>NodeList</code>. \r
- * <p>Implementations should raise other exceptions under other circumstances. \r
- * For example, implementations should raise an implementation-dependent \r
- * exception if a <code>null</code> argument is passed. \r
- * <p>Some languages and object systems do not support the concept of \r
- * exceptions. For such systems, error conditions may be indicated using \r
- * native error reporting mechanisms. For some bindings, for example, \r
- * methods may return error codes similar to those listed in the \r
- * corresponding method descriptions.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public class DOMException extends RuntimeException {\r
-    public DOMException(short code, String message) {\r
-       super(message);\r
-       this.code = code;\r
-    }\r
-    /** @serial */\r
-    public short   code;\r
-    // ExceptionCode\r
-    /**\r
-     * If index or size is negative, or greater than the allowed value\r
-     */\r
-    public static final short INDEX_SIZE_ERR            = 1;\r
-    /**\r
-     * If the specified range of text does not fit into a DOMString\r
-     */\r
-    public static final short DOMSTRING_SIZE_ERR        = 2;\r
-    /**\r
-     * If any node is inserted somewhere it doesn't belong\r
-     */\r
-    public static final short HIERARCHY_REQUEST_ERR     = 3;\r
-    /**\r
-     * If a node is used in a different document than the one that created it \r
-     * (that doesn't support it)\r
-     */\r
-    public static final short WRONG_DOCUMENT_ERR        = 4;\r
-    /**\r
-     * If an invalid or illegal character is specified, such as in a name. See \r
-     * production 2 in the XML specification for the definition of a legal \r
-     * character, and production 5 for the definition of a legal name \r
-     * character.\r
-     */\r
-    public static final short INVALID_CHARACTER_ERR     = 5;\r
-    /**\r
-     * If data is specified for a node which does not support data\r
-     */\r
-    public static final short NO_DATA_ALLOWED_ERR       = 6;\r
-    /**\r
-     * If an attempt is made to modify an object where modifications are not \r
-     * allowed\r
-     */\r
-    public static final short NO_MODIFICATION_ALLOWED_ERR = 7;\r
-    /**\r
-     * If an attempt is made to reference a node in a context where it does \r
-     * not exist\r
-     */\r
-    public static final short NOT_FOUND_ERR             = 8;\r
-    /**\r
-     * If the implementation does not support the requested type of object or \r
-     * operation.\r
-     */\r
-    public static final short NOT_SUPPORTED_ERR         = 9;\r
-    /**\r
-     * If an attempt is made to add an attribute that is already in use \r
-     * elsewhere\r
-     */\r
-    public static final short INUSE_ATTRIBUTE_ERR       = 10;\r
-    /**\r
-     * If an attempt is made to use an object that is not, or is no longer, \r
-     * usable.\r
-     * @since DOM Level 2\r
-     */\r
-    public static final short INVALID_STATE_ERR         = 11;\r
-    /**\r
-     * If an invalid or illegal string is specified.\r
-     * @since DOM Level 2\r
-     */\r
-    public static final short SYNTAX_ERR                = 12;\r
-    /**\r
-     * If an attempt is made to modify the type of the underlying object.\r
-     * @since DOM Level 2\r
-     */\r
-    public static final short INVALID_MODIFICATION_ERR  = 13;\r
-    /**\r
-     * If an attempt is made to create or change an object in a way which is \r
-     * incorrect with regard to namespaces.\r
-     * @since DOM Level 2\r
-     */\r
-    public static final short NAMESPACE_ERR             = 14;\r
-    /**\r
-     * If a parameter or an operation is not supported by the underlying \r
-     * object.\r
-     * @since DOM Level 2\r
-     */\r
-    public static final short INVALID_ACCESS_ERR        = 15;\r
-\r
-}\r
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * DOM operations only raise exceptions in "exceptional" circumstances, i.e., 
+ * when an operation is impossible to perform (either for logical reasons, 
+ * because data is lost, or because the implementation has become unstable). 
+ * In general, DOM methods return specific error values in ordinary 
+ * processing situations, such as out-of-bound errors when using 
+ * <code>NodeList</code>.
+ * <p>Implementations should raise other exceptions under other circumstances. 
+ * For example, implementations should raise an implementation-dependent 
+ * exception if a <code>null</code> argument is passed when <code>null</code>
+ *  was not expected.
+ * <p>Some languages and object systems do not support the concept of 
+ * exceptions. For such systems, error conditions may be indicated using 
+ * native error reporting mechanisms. For some bindings, for example, 
+ * methods may return error codes similar to those listed in the 
+ * corresponding method descriptions.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public class DOMException extends RuntimeException {
+    public DOMException(short code, String message) {
+       super(message);
+       this.code = code;
+    }
+    public short   code;
+    // ExceptionCode
+    /**
+     * If index or size is negative, or greater than the allowed value.
+     */
+    public static final short INDEX_SIZE_ERR            = 1;
+    /**
+     * If the specified range of text does not fit into a 
+     * <code>DOMString</code>.
+     */
+    public static final short DOMSTRING_SIZE_ERR        = 2;
+    /**
+     * If any <code>Node</code> is inserted somewhere it doesn't belong.
+     */
+    public static final short HIERARCHY_REQUEST_ERR     = 3;
+    /**
+     * If a <code>Node</code> is used in a different document than the one 
+     * that created it (that doesn't support it).
+     */
+    public static final short WRONG_DOCUMENT_ERR        = 4;
+    /**
+     * If an invalid or illegal character is specified, such as in an XML name.
+     */
+    public static final short INVALID_CHARACTER_ERR     = 5;
+    /**
+     * If data is specified for a <code>Node</code> which does not support 
+     * data.
+     */
+    public static final short NO_DATA_ALLOWED_ERR       = 6;
+    /**
+     * If an attempt is made to modify an object where modifications are not 
+     * allowed.
+     */
+    public static final short NO_MODIFICATION_ALLOWED_ERR = 7;
+    /**
+     * If an attempt is made to reference a <code>Node</code> in a context 
+     * where it does not exist.
+     */
+    public static final short NOT_FOUND_ERR             = 8;
+    /**
+     * If the implementation does not support the requested type of object or 
+     * operation.
+     */
+    public static final short NOT_SUPPORTED_ERR         = 9;
+    /**
+     * If an attempt is made to add an attribute that is already in use 
+     * elsewhere.
+     */
+    public static final short INUSE_ATTRIBUTE_ERR       = 10;
+    /**
+     * If an attempt is made to use an object that is not, or is no longer, 
+     * usable.
+     * @since DOM Level 2
+     */
+    public static final short INVALID_STATE_ERR         = 11;
+    /**
+     * If an invalid or illegal string is specified.
+     * @since DOM Level 2
+     */
+    public static final short SYNTAX_ERR                = 12;
+    /**
+     * If an attempt is made to modify the type of the underlying object.
+     * @since DOM Level 2
+     */
+    public static final short INVALID_MODIFICATION_ERR  = 13;
+    /**
+     * If an attempt is made to create or change an object in a way which is 
+     * incorrect with regard to namespaces.
+     * @since DOM Level 2
+     */
+    public static final short NAMESPACE_ERR             = 14;
+    /**
+     * If a parameter or an operation is not supported by the underlying 
+     * object.
+     * @since DOM Level 2
+     */
+    public static final short INVALID_ACCESS_ERR        = 15;
+    /**
+     * If a call to a method such as <code>insertBefore</code> or 
+     * <code>removeChild</code> would make the <code>Node</code> invalid 
+     * with respect to "partial validity", this exception would be raised 
+     * and the operation would not be done. This code is used in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Val-20040127/'>DOM Level 3 Validation</a>]
+     * . Refer to this specification for further information.
+     * @since DOM Level 3
+     */
+    public static final short VALIDATION_ERR            = 16;
+    /**
+     *  If the type of an object is incompatible with the expected type of the 
+     * parameter associated to the object. 
+     * @since DOM Level 3
+     */
+    public static final short TYPE_MISMATCH_ERR         = 17;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/DOMImplementation.java b/libjava/external/w3c_dom/org/w3c/dom/DOMImplementation.java
new file mode 100644 (file)
index 0000000..5bb71e2
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/DOMImplementation.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * The <code>DOMImplementation</code> interface provides a number of methods 
+ * for performing operations that are independent of any particular instance 
+ * of the document object model.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface DOMImplementation {
+    /**
+     * Test if the DOM implementation implements a specific feature and 
+     * version, as specified in .
+     * @param feature  The name of the feature to test. 
+     * @param version  This is the version number of the feature to test. 
+     * @return <code>true</code> if the feature is implemented in the 
+     *   specified version, <code>false</code> otherwise.
+     */
+    public boolean hasFeature(String feature, 
+                              String version);
+
+    /**
+     * Creates an empty <code>DocumentType</code> node. Entity declarations 
+     * and notations are not made available. Entity reference expansions and 
+     * default attribute additions do not occur..
+     * @param qualifiedName The qualified name of the document type to be 
+     *   created.
+     * @param publicId The external subset public identifier.
+     * @param systemId The external subset system identifier.
+     * @return A new <code>DocumentType</code> node with 
+     *   <code>Node.ownerDocument</code> set to <code>null</code>.
+     * @exception DOMException
+     *   INVALID_CHARACTER_ERR: Raised if the specified qualified name is not 
+     *   an XML name according to [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>].
+     *   <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is 
+     *   malformed.
+     *   <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not 
+     *   support the feature "XML" and the language exposed through the 
+     *   Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]). 
+     * @since DOM Level 2
+     */
+    public DocumentType createDocumentType(String qualifiedName, 
+                                           String publicId, 
+                                           String systemId)
+                                           throws DOMException;
+
+    /**
+     * Creates a DOM Document object of the specified type with its document 
+     * element.
+     * <br>Note that based on the <code>DocumentType</code> given to create 
+     * the document, the implementation may instantiate specialized 
+     * <code>Document</code> objects that support additional features than 
+     * the "Core", such as "HTML" [<a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>DOM Level 2 HTML</a>]
+     * . On the other hand, setting the <code>DocumentType</code> after the 
+     * document was created makes this very unlikely to happen. 
+     * Alternatively, specialized <code>Document</code> creation methods, 
+     * such as <code>createHTMLDocument</code> [<a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>DOM Level 2 HTML</a>]
+     * , can be used to obtain specific types of <code>Document</code> 
+     * objects.
+     * @param namespaceURI The namespace URI of the document element to 
+     *   create or <code>null</code>.
+     * @param qualifiedName The qualified name of the document element to be 
+     *   created or <code>null</code>.
+     * @param doctype The type of document to be created or <code>null</code>.
+     *   When <code>doctype</code> is not <code>null</code>, its 
+     *   <code>Node.ownerDocument</code> attribute is set to the document 
+     *   being created.
+     * @return A new <code>Document</code> object with its document element. 
+     *   If the <code>NamespaceURI</code>, <code>qualifiedName</code>, and 
+     *   <code>doctype</code> are <code>null</code>, the returned 
+     *   <code>Document</code> is empty with no document element.
+     * @exception DOMException
+     *   INVALID_CHARACTER_ERR: Raised if the specified qualified name is not 
+     *   an XML name according to [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>].
+     *   <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is 
+     *   malformed, if the <code>qualifiedName</code> has a prefix and the 
+     *   <code>namespaceURI</code> is <code>null</code>, or if the 
+     *   <code>qualifiedName</code> is <code>null</code> and the 
+     *   <code>namespaceURI</code> is different from <code>null</code>, or 
+     *   if the <code>qualifiedName</code> has a prefix that is "xml" and 
+     *   the <code>namespaceURI</code> is different from "<a href='http://www.w3.org/XML/1998/namespace'>
+     *   http://www.w3.org/XML/1998/namespace</a>" [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     *   , or if the DOM implementation does not support the 
+     *   <code>"XML"</code> feature but a non-null namespace URI was 
+     *   provided, since namespaces were defined by XML.
+     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>doctype</code> has already 
+     *   been used with a different document or was created from a different 
+     *   implementation.
+     *   <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not 
+     *   support the feature "XML" and the language exposed through the 
+     *   Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]). 
+     * @since DOM Level 2
+     */
+    public Document createDocument(String namespaceURI, 
+                                   String qualifiedName, 
+                                   DocumentType doctype)
+                                   throws DOMException;
+
+    /**
+     *  This method returns a specialized object which implements the 
+     * specialized APIs of the specified feature and version, as specified 
+     * in . The specialized object may also be obtained by using 
+     * binding-specific casting methods but is not necessarily expected to, 
+     * as discussed in . This method also allow the implementation to 
+     * provide specialized objects which do not support the 
+     * <code>DOMImplementation</code> interface. 
+     * @param feature  The name of the feature requested. Note that any plus 
+     *   sign "+" prepended to the name of the feature will be ignored since 
+     *   it is not significant in the context of this method. 
+     * @param version  This is the version number of the feature to test. 
+     * @return  Returns an object which implements the specialized APIs of 
+     *   the specified feature and version, if any, or <code>null</code> if 
+     *   there is no object which implements interfaces associated with that 
+     *   feature. If the <code>DOMObject</code> returned by this method 
+     *   implements the <code>DOMImplementation</code> interface, it must 
+     *   delegate to the primary core <code>DOMImplementation</code> and not 
+     *   return results inconsistent with the primary core 
+     *   <code>DOMImplementation</code> such as <code>hasFeature</code>, 
+     *   <code>getFeature</code>, etc. 
+     * @since DOM Level 3
+     */
+    public Object getFeature(String feature, 
+                             String version);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/DOMImplementationList.java b/libjava/external/w3c_dom/org/w3c/dom/DOMImplementationList.java
new file mode 100644 (file)
index 0000000..18349fd
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/DOMImplementationList.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ *  The <code>DOMImplementationList</code> interface provides the abstraction 
+ * of an ordered collection of DOM implementations, without defining or 
+ * constraining how this collection is implemented. The items in the 
+ * <code>DOMImplementationList</code> are accessible via an integral index, 
+ * starting from 0. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ * @since DOM Level 3
+ */
+public interface DOMImplementationList {
+    /**
+     *  Returns the <code>index</code>th item in the collection. If 
+     * <code>index</code> is greater than or equal to the number of 
+     * <code>DOMImplementation</code>s in the list, this returns 
+     * <code>null</code>. 
+     * @param index Index into the collection.
+     * @return  The <code>DOMImplementation</code> at the <code>index</code>
+     *   th position in the <code>DOMImplementationList</code>, or 
+     *   <code>null</code> if that is not a valid index. 
+     */
+    public DOMImplementation item(int index);
+
+    /**
+     *  The number of <code>DOMImplementation</code>s in the list. The range 
+     * of valid child node indices is 0 to <code>length-1</code> inclusive. 
+     */
+    public int getLength();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/DOMImplementationSource.java b/libjava/external/w3c_dom/org/w3c/dom/DOMImplementationSource.java
new file mode 100644 (file)
index 0000000..3c32c18
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/DOMImplementationSource.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * This interface permits a DOM implementer to supply one or more 
+ * implementations, based upon requested features and versions, as specified 
+ * in . Each implemented <code>DOMImplementationSource</code> object is 
+ * listed in the binding-specific list of available sources so that its 
+ * <code>DOMImplementation</code> objects are made available.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ * @since DOM Level 3
+ */
+public interface DOMImplementationSource {
+    /**
+     *  A method to request the first DOM implementation that supports the 
+     * specified features. 
+     * @param features  A string that specifies which features and versions 
+     *   are required. This is a space separated list in which each feature 
+     *   is specified by its name optionally followed by a space and a 
+     *   version number.  This method returns the first item of the list 
+     *   returned by <code>getDOMImplementationList</code>.  As an example, 
+     *   the string <code>"XML 3.0 Traversal +Events 2.0"</code> will 
+     *   request a DOM implementation that supports the module "XML" for its 
+     *   3.0 version, a module that support of the "Traversal" module for 
+     *   any version, and the module "Events" for its 2.0 version. The 
+     *   module "Events" must be accessible using the method 
+     *   <code>Node.getFeature()</code> and 
+     *   <code>DOMImplementation.getFeature()</code>. 
+     * @return The first DOM implementation that support the desired 
+     *   features, or <code>null</code> if this source has none.
+     */
+    public DOMImplementation getDOMImplementation(String features);
+
+    /**
+     * A method to request a list of DOM implementations that support the 
+     * specified features and versions, as specified in .
+     * @param features A string that specifies which features and versions 
+     *   are required. This is a space separated list in which each feature 
+     *   is specified by its name optionally followed by a space and a 
+     *   version number. This is something like: "XML 3.0 Traversal +Events 
+     *   2.0"
+     * @return A list of DOM implementations that support the desired 
+     *   features.
+     */
+    public DOMImplementationList getDOMImplementationList(String features);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/DOMLocator.java b/libjava/external/w3c_dom/org/w3c/dom/DOMLocator.java
new file mode 100644 (file)
index 0000000..fcaaa23
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/DOMLocator.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * <code>DOMLocator</code> is an interface that describes a location (e.g. 
+ * where an error occurred).
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ * @since DOM Level 3
+ */
+public interface DOMLocator {
+    /**
+     * The line number this locator is pointing to, or <code>-1</code> if 
+     * there is no column number available.
+     */
+    public int getLineNumber();
+
+    /**
+     * The column number this locator is pointing to, or <code>-1</code> if 
+     * there is no column number available.
+     */
+    public int getColumnNumber();
+
+    /**
+     * The byte offset into the input source this locator is pointing to or 
+     * <code>-1</code> if there is no byte offset available.
+     */
+    public int getByteOffset();
+
+    /**
+     * The UTF-16, as defined in [Unicode] and Amendment 1 of [ISO/IEC 10646], offset into the input source this locator is pointing to or 
+     * <code>-1</code> if there is no UTF-16 offset available.
+     */
+    public int getUtf16Offset();
+
+    /**
+     * The node this locator is pointing to, or <code>null</code> if no node 
+     * is available.
+     */
+    public Node getRelatedNode();
+
+    /**
+     * The URI this locator is pointing to, or <code>null</code> if no URI is 
+     * available.
+     */
+    public String getUri();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/DOMStringList.java b/libjava/external/w3c_dom/org/w3c/dom/DOMStringList.java
new file mode 100644 (file)
index 0000000..e6c348a
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/DOMStringList.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ *  The <code>DOMStringList</code> interface provides the abstraction of an 
+ * ordered collection of <code>DOMString</code> values, without defining or 
+ * constraining how this collection is implemented. The items in the 
+ * <code>DOMStringList</code> are accessible via an integral index, starting 
+ * from 0. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ * @since DOM Level 3
+ */
+public interface DOMStringList {
+    /**
+     *  Returns the <code>index</code>th item in the collection. If 
+     * <code>index</code> is greater than or equal to the number of 
+     * <code>DOMString</code>s in the list, this returns <code>null</code>. 
+     * @param index Index into the collection.
+     * @return  The <code>DOMString</code> at the <code>index</code>th 
+     *   position in the <code>DOMStringList</code>, or <code>null</code> if 
+     *   that is not a valid index. 
+     */
+    public String item(int index);
+
+    /**
+     * The number of <code>DOMString</code>s in the list. The range of valid 
+     * child node indices is 0 to <code>length-1</code> inclusive.
+     */
+    public int getLength();
+
+    /**
+     *  Test if a string is part of this <code>DOMStringList</code>. 
+     * @param str  The string to look for. 
+     * @return  <code>true</code> if the string has been found, 
+     *   <code>false</code> otherwise. 
+     */
+    public boolean contains(String str);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/Document.java b/libjava/external/w3c_dom/org/w3c/dom/Document.java
new file mode 100644 (file)
index 0000000..43ebd4e
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/Document.java
@@ -0,0 +1,814 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * The <code>Document</code> interface represents the entire HTML or XML 
+ * document. Conceptually, it is the root of the document tree, and provides 
+ * the primary access to the document's data.
+ * <p>Since elements, text nodes, comments, processing instructions, etc. 
+ * cannot exist outside the context of a <code>Document</code>, the 
+ * <code>Document</code> interface also contains the factory methods needed 
+ * to create these objects. The <code>Node</code> objects created have a 
+ * <code>ownerDocument</code> attribute which associates them with the 
+ * <code>Document</code> within whose context they were created.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface Document extends Node {
+    /**
+     * The Document Type Declaration (see <code>DocumentType</code>) 
+     * associated with this document. For XML documents without a document 
+     * type declaration this returns <code>null</code>. For HTML documents, 
+     * a <code>DocumentType</code> object may be returned, independently of 
+     * the presence or absence of document type declaration in the HTML 
+     * document.
+     * <br>This provides direct access to the <code>DocumentType</code> node, 
+     * child node of this <code>Document</code>. This node can be set at 
+     * document creation time and later changed through the use of child 
+     * nodes manipulation methods, such as <code>Node.insertBefore</code>, 
+     * or <code>Node.replaceChild</code>. Note, however, that while some 
+     * implementations may instantiate different types of 
+     * <code>Document</code> objects supporting additional features than the 
+     * "Core", such as "HTML" [<a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>DOM Level 2 HTML</a>]
+     * , based on the <code>DocumentType</code> specified at creation time, 
+     * changing it afterwards is very unlikely to result in a change of the 
+     * features supported.
+     * @version DOM Level 3
+     */
+    public DocumentType getDoctype();
+
+    /**
+     * The <code>DOMImplementation</code> object that handles this document. A 
+     * DOM application may use objects from multiple implementations.
+     */
+    public DOMImplementation getImplementation();
+
+    /**
+     * This is a convenience attribute that allows direct access to the child 
+     * node that is the document element of the document.
+     */
+    public Element getDocumentElement();
+
+    /**
+     * Creates an element of the type specified. Note that the instance 
+     * returned implements the <code>Element</code> interface, so attributes 
+     * can be specified directly on the returned object.
+     * <br>In addition, if there are known attributes with default values, 
+     * <code>Attr</code> nodes representing them are automatically created 
+     * and attached to the element.
+     * <br>To create an element with a qualified name and namespace URI, use 
+     * the <code>createElementNS</code> method.
+     * @param tagName The name of the element type to instantiate. For XML, 
+     *   this is case-sensitive, otherwise it depends on the 
+     *   case-sensitivity of the markup language in use. In that case, the 
+     *   name is mapped to the canonical form of that markup by the DOM 
+     *   implementation.
+     * @return A new <code>Element</code> object with the 
+     *   <code>nodeName</code> attribute set to <code>tagName</code>, and 
+     *   <code>localName</code>, <code>prefix</code>, and 
+     *   <code>namespaceURI</code> set to <code>null</code>.
+     * @exception DOMException
+     *   INVALID_CHARACTER_ERR: Raised if the specified name is not an XML 
+     *   name according to the XML version in use specified in the 
+     *   <code>Document.xmlVersion</code> attribute.
+     */
+    public Element createElement(String tagName)
+                                 throws DOMException;
+
+    /**
+     * Creates an empty <code>DocumentFragment</code> object.
+     * @return A new <code>DocumentFragment</code>.
+     */
+    public DocumentFragment createDocumentFragment();
+
+    /**
+     * Creates a <code>Text</code> node given the specified string.
+     * @param data The data for the node.
+     * @return The new <code>Text</code> object.
+     */
+    public Text createTextNode(String data);
+
+    /**
+     * Creates a <code>Comment</code> node given the specified string.
+     * @param data The data for the node.
+     * @return The new <code>Comment</code> object.
+     */
+    public Comment createComment(String data);
+
+    /**
+     * Creates a <code>CDATASection</code> node whose value is the specified 
+     * string.
+     * @param data The data for the <code>CDATASection</code> contents.
+     * @return The new <code>CDATASection</code> object.
+     * @exception DOMException
+     *   NOT_SUPPORTED_ERR: Raised if this document is an HTML document.
+     */
+    public CDATASection createCDATASection(String data)
+                                           throws DOMException;
+
+    /**
+     * Creates a <code>ProcessingInstruction</code> node given the specified 
+     * name and data strings.
+     * @param target The target part of the processing instruction.Unlike 
+     *   <code>Document.createElementNS</code> or 
+     *   <code>Document.createAttributeNS</code>, no namespace well-formed 
+     *   checking is done on the target name. Applications should invoke 
+     *   <code>Document.normalizeDocument()</code> with the parameter "
+     *   namespaces" set to <code>true</code> in order to ensure that the 
+     *   target name is namespace well-formed. 
+     * @param data The data for the node.
+     * @return The new <code>ProcessingInstruction</code> object.
+     * @exception DOMException
+     *   INVALID_CHARACTER_ERR: Raised if the specified target is not an XML 
+     *   name according to the XML version in use specified in the 
+     *   <code>Document.xmlVersion</code> attribute.
+     *   <br>NOT_SUPPORTED_ERR: Raised if this document is an HTML document.
+     */
+    public ProcessingInstruction createProcessingInstruction(String target, 
+                                                             String data)
+                                                             throws DOMException;
+
+    /**
+     * Creates an <code>Attr</code> of the given name. Note that the 
+     * <code>Attr</code> instance can then be set on an <code>Element</code> 
+     * using the <code>setAttributeNode</code> method. 
+     * <br>To create an attribute with a qualified name and namespace URI, use 
+     * the <code>createAttributeNS</code> method.
+     * @param name The name of the attribute.
+     * @return A new <code>Attr</code> object with the <code>nodeName</code> 
+     *   attribute set to <code>name</code>, and <code>localName</code>, 
+     *   <code>prefix</code>, and <code>namespaceURI</code> set to 
+     *   <code>null</code>. The value of the attribute is the empty string.
+     * @exception DOMException
+     *   INVALID_CHARACTER_ERR: Raised if the specified name is not an XML 
+     *   name according to the XML version in use specified in the 
+     *   <code>Document.xmlVersion</code> attribute.
+     */
+    public Attr createAttribute(String name)
+                                throws DOMException;
+
+    /**
+     * Creates an <code>EntityReference</code> object. In addition, if the 
+     * referenced entity is known, the child list of the 
+     * <code>EntityReference</code> node is made the same as that of the 
+     * corresponding <code>Entity</code> node.
+     * <p ><b>Note:</b> If any descendant of the <code>Entity</code> node has 
+     * an unbound namespace prefix, the corresponding descendant of the 
+     * created <code>EntityReference</code> node is also unbound; (its 
+     * <code>namespaceURI</code> is <code>null</code>). The DOM Level 2 and 
+     * 3 do not support any mechanism to resolve namespace prefixes in this 
+     * case.
+     * @param name The name of the entity to reference.Unlike 
+     *   <code>Document.createElementNS</code> or 
+     *   <code>Document.createAttributeNS</code>, no namespace well-formed 
+     *   checking is done on the entity name. Applications should invoke 
+     *   <code>Document.normalizeDocument()</code> with the parameter "
+     *   namespaces" set to <code>true</code> in order to ensure that the 
+     *   entity name is namespace well-formed. 
+     * @return The new <code>EntityReference</code> object.
+     * @exception DOMException
+     *   INVALID_CHARACTER_ERR: Raised if the specified name is not an XML 
+     *   name according to the XML version in use specified in the 
+     *   <code>Document.xmlVersion</code> attribute.
+     *   <br>NOT_SUPPORTED_ERR: Raised if this document is an HTML document.
+     */
+    public EntityReference createEntityReference(String name)
+                                                 throws DOMException;
+
+    /**
+     * Returns a <code>NodeList</code> of all the <code>Elements</code> in 
+     * document order with a given tag name and are contained in the 
+     * document.
+     * @param tagname  The name of the tag to match on. The special value "*" 
+     *   matches all tags. For XML, the <code>tagname</code> parameter is 
+     *   case-sensitive, otherwise it depends on the case-sensitivity of the 
+     *   markup language in use. 
+     * @return A new <code>NodeList</code> object containing all the matched 
+     *   <code>Elements</code>.
+     */
+    public NodeList getElementsByTagName(String tagname);
+
+    /**
+     * Imports a node from another document to this document, without altering 
+     * or removing the source node from the original document; this method 
+     * creates a new copy of the source node. The returned node has no 
+     * parent; (<code>parentNode</code> is <code>null</code>).
+     * <br>For all nodes, importing a node creates a node object owned by the 
+     * importing document, with attribute values identical to the source 
+     * node's <code>nodeName</code> and <code>nodeType</code>, plus the 
+     * attributes related to namespaces (<code>prefix</code>, 
+     * <code>localName</code>, and <code>namespaceURI</code>). As in the 
+     * <code>cloneNode</code> operation, the source node is not altered. 
+     * User data associated to the imported node is not carried over. 
+     * However, if any <code>UserDataHandlers</code> has been specified 
+     * along with the associated data these handlers will be called with the 
+     * appropriate parameters before this method returns.
+     * <br>Additional information is copied as appropriate to the 
+     * <code>nodeType</code>, attempting to mirror the behavior expected if 
+     * a fragment of XML or HTML source was copied from one document to 
+     * another, recognizing that the two documents may have different DTDs 
+     * in the XML case. The following list describes the specifics for each 
+     * type of node. 
+     * <dl>
+     * <dt>ATTRIBUTE_NODE</dt>
+     * <dd>The <code>ownerElement</code> attribute 
+     * is set to <code>null</code> and the <code>specified</code> flag is 
+     * set to <code>true</code> on the generated <code>Attr</code>. The 
+     * descendants of the source <code>Attr</code> are recursively imported 
+     * and the resulting nodes reassembled to form the corresponding subtree.
+     * Note that the <code>deep</code> parameter has no effect on 
+     * <code>Attr</code> nodes; they always carry their children with them 
+     * when imported.</dd>
+     * <dt>DOCUMENT_FRAGMENT_NODE</dt>
+     * <dd>If the <code>deep</code> option 
+     * was set to <code>true</code>, the descendants of the source 
+     * <code>DocumentFragment</code> are recursively imported and the 
+     * resulting nodes reassembled under the imported 
+     * <code>DocumentFragment</code> to form the corresponding subtree. 
+     * Otherwise, this simply generates an empty 
+     * <code>DocumentFragment</code>.</dd>
+     * <dt>DOCUMENT_NODE</dt>
+     * <dd><code>Document</code> 
+     * nodes cannot be imported.</dd>
+     * <dt>DOCUMENT_TYPE_NODE</dt>
+     * <dd><code>DocumentType</code> 
+     * nodes cannot be imported.</dd>
+     * <dt>ELEMENT_NODE</dt>
+     * <dd><em>Specified</em> attribute nodes of the source element are imported, and the generated 
+     * <code>Attr</code> nodes are attached to the generated 
+     * <code>Element</code>. Default attributes are <em>not</em> copied, though if the document being imported into defines default 
+     * attributes for this element name, those are assigned. If the 
+     * <code>importNode</code> <code>deep</code> parameter was set to 
+     * <code>true</code>, the descendants of the source element are 
+     * recursively imported and the resulting nodes reassembled to form the 
+     * corresponding subtree.</dd>
+     * <dt>ENTITY_NODE</dt>
+     * <dd><code>Entity</code> nodes can be 
+     * imported, however in the current release of the DOM the 
+     * <code>DocumentType</code> is readonly. Ability to add these imported 
+     * nodes to a <code>DocumentType</code> will be considered for addition 
+     * to a future release of the DOM.On import, the <code>publicId</code>, 
+     * <code>systemId</code>, and <code>notationName</code> attributes are 
+     * copied. If a <code>deep</code> import is requested, the descendants 
+     * of the the source <code>Entity</code> are recursively imported and 
+     * the resulting nodes reassembled to form the corresponding subtree.</dd>
+     * <dt>
+     * ENTITY_REFERENCE_NODE</dt>
+     * <dd>Only the <code>EntityReference</code> itself is 
+     * copied, even if a <code>deep</code> import is requested, since the 
+     * source and destination documents might have defined the entity 
+     * differently. If the document being imported into provides a 
+     * definition for this entity name, its value is assigned.</dd>
+     * <dt>NOTATION_NODE</dt>
+     * <dd>
+     * <code>Notation</code> nodes can be imported, however in the current 
+     * release of the DOM the <code>DocumentType</code> is readonly. Ability 
+     * to add these imported nodes to a <code>DocumentType</code> will be 
+     * considered for addition to a future release of the DOM.On import, the 
+     * <code>publicId</code> and <code>systemId</code> attributes are copied.
+     * Note that the <code>deep</code> parameter has no effect on this type 
+     * of nodes since they cannot have any children.</dd>
+     * <dt>
+     * PROCESSING_INSTRUCTION_NODE</dt>
+     * <dd>The imported node copies its 
+     * <code>target</code> and <code>data</code> values from those of the 
+     * source node.Note that the <code>deep</code> parameter has no effect 
+     * on this type of nodes since they cannot have any children.</dd>
+     * <dt>TEXT_NODE, 
+     * CDATA_SECTION_NODE, COMMENT_NODE</dt>
+     * <dd>These three types of nodes inheriting 
+     * from <code>CharacterData</code> copy their <code>data</code> and 
+     * <code>length</code> attributes from those of the source node.Note 
+     * that the <code>deep</code> parameter has no effect on these types of 
+     * nodes since they cannot have any children.</dd>
+     * </dl> 
+     * @param importedNode The node to import.
+     * @param deep If <code>true</code>, recursively import the subtree under 
+     *   the specified node; if <code>false</code>, import only the node 
+     *   itself, as explained above. This has no effect on nodes that cannot 
+     *   have any children, and on <code>Attr</code>, and 
+     *   <code>EntityReference</code> nodes.
+     * @return The imported node that belongs to this <code>Document</code>.
+     * @exception DOMException
+     *   NOT_SUPPORTED_ERR: Raised if the type of node being imported is not 
+     *   supported.
+     *   <br>INVALID_CHARACTER_ERR: Raised if one of the imported names is not 
+     *   an XML name according to the XML version in use specified in the 
+     *   <code>Document.xmlVersion</code> attribute. This may happen when 
+     *   importing an XML 1.1 [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>] element 
+     *   into an XML 1.0 document, for instance.
+     * @since DOM Level 2
+     */
+    public Node importNode(Node importedNode, 
+                           boolean deep)
+                           throws DOMException;
+
+    /**
+     * Creates an element of the given qualified name and namespace URI.
+     * <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     * , applications must use the value <code>null</code> as the 
+     * namespaceURI parameter for methods if they wish to have no namespace.
+     * @param namespaceURI The namespace URI of the element to create.
+     * @param qualifiedName The qualified name of the element type to 
+     *   instantiate.
+     * @return A new <code>Element</code> object with the following 
+     *   attributes:
+     * <table border='1' cellpadding='3'>
+     * <tr>
+     * <th>Attribute</th>
+     * <th>Value</th>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'><code>Node.nodeName</code></td>
+     * <td valign='top' rowspan='1' colspan='1'>
+     *   <code>qualifiedName</code></td>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'><code>Node.namespaceURI</code></td>
+     * <td valign='top' rowspan='1' colspan='1'>
+     *   <code>namespaceURI</code></td>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'><code>Node.prefix</code></td>
+     * <td valign='top' rowspan='1' colspan='1'>prefix, extracted 
+     *   from <code>qualifiedName</code>, or <code>null</code> if there is 
+     *   no prefix</td>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'><code>Node.localName</code></td>
+     * <td valign='top' rowspan='1' colspan='1'>local name, extracted from 
+     *   <code>qualifiedName</code></td>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'><code>Element.tagName</code></td>
+     * <td valign='top' rowspan='1' colspan='1'>
+     *   <code>qualifiedName</code></td>
+     * </tr>
+     * </table>
+     * @exception DOMException
+     *   INVALID_CHARACTER_ERR: Raised if the specified 
+     *   <code>qualifiedName</code> is not an XML name according to the XML 
+     *   version in use specified in the <code>Document.xmlVersion</code> 
+     *   attribute.
+     *   <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is a 
+     *   malformed qualified name, if the <code>qualifiedName</code> has a 
+     *   prefix and the <code>namespaceURI</code> is <code>null</code>, or 
+     *   if the <code>qualifiedName</code> has a prefix that is "xml" and 
+     *   the <code>namespaceURI</code> is different from "<a href='http://www.w3.org/XML/1998/namespace'>
+     *   http://www.w3.org/XML/1998/namespace</a>" [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     *   , or if the <code>qualifiedName</code> or its prefix is "xmlns" and 
+     *   the <code>namespaceURI</code> is different from "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>", or if the <code>namespaceURI</code> is "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>" and neither the <code>qualifiedName</code> nor its prefix is "xmlns".
+     *   <br>NOT_SUPPORTED_ERR: Always thrown if the current document does not 
+     *   support the <code>"XML"</code> feature, since namespaces were 
+     *   defined by XML.
+     * @since DOM Level 2
+     */
+    public Element createElementNS(String namespaceURI, 
+                                   String qualifiedName)
+                                   throws DOMException;
+
+    /**
+     * Creates an attribute of the given qualified name and namespace URI.
+     * <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     * , applications must use the value <code>null</code> as the 
+     * <code>namespaceURI</code> parameter for methods if they wish to have 
+     * no namespace.
+     * @param namespaceURI The namespace URI of the attribute to create.
+     * @param qualifiedName The qualified name of the attribute to 
+     *   instantiate.
+     * @return A new <code>Attr</code> object with the following attributes:
+     * <table border='1' cellpadding='3'>
+     * <tr>
+     * <th>
+     *   Attribute</th>
+     * <th>Value</th>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'><code>Node.nodeName</code></td>
+     * <td valign='top' rowspan='1' colspan='1'>qualifiedName</td>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'>
+     *   <code>Node.namespaceURI</code></td>
+     * <td valign='top' rowspan='1' colspan='1'><code>namespaceURI</code></td>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'>
+     *   <code>Node.prefix</code></td>
+     * <td valign='top' rowspan='1' colspan='1'>prefix, extracted from 
+     *   <code>qualifiedName</code>, or <code>null</code> if there is no 
+     *   prefix</td>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'><code>Node.localName</code></td>
+     * <td valign='top' rowspan='1' colspan='1'>local name, extracted from 
+     *   <code>qualifiedName</code></td>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'><code>Attr.name</code></td>
+     * <td valign='top' rowspan='1' colspan='1'>
+     *   <code>qualifiedName</code></td>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'><code>Node.nodeValue</code></td>
+     * <td valign='top' rowspan='1' colspan='1'>the empty 
+     *   string</td>
+     * </tr>
+     * </table>
+     * @exception DOMException
+     *   INVALID_CHARACTER_ERR: Raised if the specified 
+     *   <code>qualifiedName</code> is not an XML name according to the XML 
+     *   version in use specified in the <code>Document.xmlVersion</code> 
+     *   attribute.
+     *   <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is a 
+     *   malformed qualified name, if the <code>qualifiedName</code> has a 
+     *   prefix and the <code>namespaceURI</code> is <code>null</code>, if 
+     *   the <code>qualifiedName</code> has a prefix that is "xml" and the 
+     *   <code>namespaceURI</code> is different from "<a href='http://www.w3.org/XML/1998/namespace'>
+     *   http://www.w3.org/XML/1998/namespace</a>", if the <code>qualifiedName</code> or its prefix is "xmlns" and the 
+     *   <code>namespaceURI</code> is different from "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>", or if the <code>namespaceURI</code> is "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>" and neither the <code>qualifiedName</code> nor its prefix is "xmlns".
+     *   <br>NOT_SUPPORTED_ERR: Always thrown if the current document does not 
+     *   support the <code>"XML"</code> feature, since namespaces were 
+     *   defined by XML.
+     * @since DOM Level 2
+     */
+    public Attr createAttributeNS(String namespaceURI, 
+                                  String qualifiedName)
+                                  throws DOMException;
+
+    /**
+     * Returns a <code>NodeList</code> of all the <code>Elements</code> with a 
+     * given local name and namespace URI in document order.
+     * @param namespaceURI The namespace URI of the elements to match on. The 
+     *   special value <code>"*"</code> matches all namespaces.
+     * @param localName The local name of the elements to match on. The 
+     *   special value "*" matches all local names.
+     * @return A new <code>NodeList</code> object containing all the matched 
+     *   <code>Elements</code>.
+     * @since DOM Level 2
+     */
+    public NodeList getElementsByTagNameNS(String namespaceURI, 
+                                           String localName);
+
+    /**
+     * Returns the <code>Element</code> that has an ID attribute with the 
+     * given value. If no such element exists, this returns <code>null</code>
+     * . If more than one element has an ID attribute with that value, what 
+     * is returned is undefined. 
+     * <br> The DOM implementation is expected to use the attribute 
+     * <code>Attr.isId</code> to determine if an attribute is of type ID. 
+     * <p ><b>Note:</b> Attributes with the name "ID" or "id" are not of type 
+     * ID unless so defined.
+     * @param elementId The unique <code>id</code> value for an element.
+     * @return The matching element or <code>null</code> if there is none.
+     * @since DOM Level 2
+     */
+    public Element getElementById(String elementId);
+
+    /**
+     * An attribute specifying the encoding used for this document at the time 
+     * of the parsing. This is <code>null</code> when it is not known, such 
+     * as when the <code>Document</code> was created in memory.
+     * @since DOM Level 3
+     */
+    public String getInputEncoding();
+
+    /**
+     * An attribute specifying, as part of the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-XMLDecl'>XML declaration</a>, the encoding of this document. This is <code>null</code> when 
+     * unspecified or when it is not known, such as when the 
+     * <code>Document</code> was created in memory.
+     * @since DOM Level 3
+     */
+    public String getXmlEncoding();
+
+    /**
+     * An attribute specifying, as part of the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-XMLDecl'>XML declaration</a>, whether this document is standalone. This is <code>false</code> when 
+     * unspecified.
+     * <p ><b>Note:</b>  No verification is done on the value when setting 
+     * this attribute. Applications should use 
+     * <code>Document.normalizeDocument()</code> with the "validate" 
+     * parameter to verify if the value matches the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#sec-rmd'>validity 
+     * constraint for standalone document declaration</a> as defined in [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. 
+     * @since DOM Level 3
+     */
+    public boolean getXmlStandalone();
+    /**
+     * An attribute specifying, as part of the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-XMLDecl'>XML declaration</a>, whether this document is standalone. This is <code>false</code> when 
+     * unspecified.
+     * <p ><b>Note:</b>  No verification is done on the value when setting 
+     * this attribute. Applications should use 
+     * <code>Document.normalizeDocument()</code> with the "validate" 
+     * parameter to verify if the value matches the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#sec-rmd'>validity 
+     * constraint for standalone document declaration</a> as defined in [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. 
+     * @exception DOMException
+     *    NOT_SUPPORTED_ERR: Raised if this document does not support the 
+     *   "XML" feature. 
+     * @since DOM Level 3
+     */
+    public void setXmlStandalone(boolean xmlStandalone)
+                                  throws DOMException;
+
+    /**
+     *  An attribute specifying, as part of the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-XMLDecl'>XML declaration</a>, the version number of this document. If there is no declaration and if 
+     * this document supports the "XML" feature, the value is 
+     * <code>"1.0"</code>. If this document does not support the "XML" 
+     * feature, the value is always <code>null</code>. Changing this 
+     * attribute will affect methods that check for invalid characters in 
+     * XML names. Application should invoke 
+     * <code>Document.normalizeDocument()</code> in order to check for 
+     * invalid characters in the <code>Node</code>s that are already part of 
+     * this <code>Document</code>. 
+     * <br> DOM applications may use the 
+     * <code>DOMImplementation.hasFeature(feature, version)</code> method 
+     * with parameter values "XMLVersion" and "1.0" (respectively) to 
+     * determine if an implementation supports [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. DOM 
+     * applications may use the same method with parameter values 
+     * "XMLVersion" and "1.1" (respectively) to determine if an 
+     * implementation supports [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]. In both 
+     * cases, in order to support XML, an implementation must also support 
+     * the "XML" feature defined in this specification. <code>Document</code>
+     *  objects supporting a version of the "XMLVersion" feature must not 
+     * raise a <code>NOT_SUPPORTED_ERR</code> exception for the same version 
+     * number when using <code>Document.xmlVersion</code>. 
+     * @since DOM Level 3
+     */
+    public String getXmlVersion();
+    /**
+     *  An attribute specifying, as part of the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-XMLDecl'>XML declaration</a>, the version number of this document. If there is no declaration and if 
+     * this document supports the "XML" feature, the value is 
+     * <code>"1.0"</code>. If this document does not support the "XML" 
+     * feature, the value is always <code>null</code>. Changing this 
+     * attribute will affect methods that check for invalid characters in 
+     * XML names. Application should invoke 
+     * <code>Document.normalizeDocument()</code> in order to check for 
+     * invalid characters in the <code>Node</code>s that are already part of 
+     * this <code>Document</code>. 
+     * <br> DOM applications may use the 
+     * <code>DOMImplementation.hasFeature(feature, version)</code> method 
+     * with parameter values "XMLVersion" and "1.0" (respectively) to 
+     * determine if an implementation supports [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. DOM 
+     * applications may use the same method with parameter values 
+     * "XMLVersion" and "1.1" (respectively) to determine if an 
+     * implementation supports [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]. In both 
+     * cases, in order to support XML, an implementation must also support 
+     * the "XML" feature defined in this specification. <code>Document</code>
+     *  objects supporting a version of the "XMLVersion" feature must not 
+     * raise a <code>NOT_SUPPORTED_ERR</code> exception for the same version 
+     * number when using <code>Document.xmlVersion</code>. 
+     * @exception DOMException
+     *    NOT_SUPPORTED_ERR: Raised if the version is set to a value that is 
+     *   not supported by this <code>Document</code> or if this document 
+     *   does not support the "XML" feature. 
+     * @since DOM Level 3
+     */
+    public void setXmlVersion(String xmlVersion)
+                                  throws DOMException;
+
+    /**
+     * An attribute specifying whether error checking is enforced or not. When 
+     * set to <code>false</code>, the implementation is free to not test 
+     * every possible error case normally defined on DOM operations, and not 
+     * raise any <code>DOMException</code> on DOM operations or report 
+     * errors while using <code>Document.normalizeDocument()</code>. In case 
+     * of error, the behavior is undefined. This attribute is 
+     * <code>true</code> by default.
+     * @since DOM Level 3
+     */
+    public boolean getStrictErrorChecking();
+    /**
+     * An attribute specifying whether error checking is enforced or not. When 
+     * set to <code>false</code>, the implementation is free to not test 
+     * every possible error case normally defined on DOM operations, and not 
+     * raise any <code>DOMException</code> on DOM operations or report 
+     * errors while using <code>Document.normalizeDocument()</code>. In case 
+     * of error, the behavior is undefined. This attribute is 
+     * <code>true</code> by default.
+     * @since DOM Level 3
+     */
+    public void setStrictErrorChecking(boolean strictErrorChecking);
+
+    /**
+     *  The location of the document or <code>null</code> if undefined or if 
+     * the <code>Document</code> was created using 
+     * <code>DOMImplementation.createDocument</code>. No lexical checking is 
+     * performed when setting this attribute; this could result in a 
+     * <code>null</code> value returned when using <code>Node.baseURI</code>
+     * . 
+     * <br> Beware that when the <code>Document</code> supports the feature 
+     * "HTML" [<a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>DOM Level 2 HTML</a>]
+     * , the href attribute of the HTML BASE element takes precedence over 
+     * this attribute when computing <code>Node.baseURI</code>. 
+     * @since DOM Level 3
+     */
+    public String getDocumentURI();
+    /**
+     *  The location of the document or <code>null</code> if undefined or if 
+     * the <code>Document</code> was created using 
+     * <code>DOMImplementation.createDocument</code>. No lexical checking is 
+     * performed when setting this attribute; this could result in a 
+     * <code>null</code> value returned when using <code>Node.baseURI</code>
+     * . 
+     * <br> Beware that when the <code>Document</code> supports the feature 
+     * "HTML" [<a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>DOM Level 2 HTML</a>]
+     * , the href attribute of the HTML BASE element takes precedence over 
+     * this attribute when computing <code>Node.baseURI</code>. 
+     * @since DOM Level 3
+     */
+    public void setDocumentURI(String documentURI);
+
+    /**
+     *  Attempts to adopt a node from another document to this document. If 
+     * supported, it changes the <code>ownerDocument</code> of the source 
+     * node, its children, as well as the attached attribute nodes if there 
+     * are any. If the source node has a parent it is first removed from the 
+     * child list of its parent. This effectively allows moving a subtree 
+     * from one document to another (unlike <code>importNode()</code> which 
+     * create a copy of the source node instead of moving it). When it 
+     * fails, applications should use <code>Document.importNode()</code> 
+     * instead. Note that if the adopted node is already part of this 
+     * document (i.e. the source and target document are the same), this 
+     * method still has the effect of removing the source node from the 
+     * child list of its parent, if any. The following list describes the 
+     * specifics for each type of node. 
+     * <dl>
+     * <dt>ATTRIBUTE_NODE</dt>
+     * <dd>The 
+     * <code>ownerElement</code> attribute is set to <code>null</code> and 
+     * the <code>specified</code> flag is set to <code>true</code> on the 
+     * adopted <code>Attr</code>. The descendants of the source 
+     * <code>Attr</code> are recursively adopted.</dd>
+     * <dt>DOCUMENT_FRAGMENT_NODE</dt>
+     * <dd>The 
+     * descendants of the source node are recursively adopted.</dd>
+     * <dt>DOCUMENT_NODE</dt>
+     * <dd>
+     * <code>Document</code> nodes cannot be adopted.</dd>
+     * <dt>DOCUMENT_TYPE_NODE</dt>
+     * <dd>
+     * <code>DocumentType</code> nodes cannot be adopted.</dd>
+     * <dt>ELEMENT_NODE</dt>
+     * <dd><em>Specified</em> attribute nodes of the source element are adopted. Default attributes 
+     * are discarded, though if the document being adopted into defines 
+     * default attributes for this element name, those are assigned. The 
+     * descendants of the source element are recursively adopted.</dd>
+     * <dt>ENTITY_NODE</dt>
+     * <dd>
+     * <code>Entity</code> nodes cannot be adopted.</dd>
+     * <dt>ENTITY_REFERENCE_NODE</dt>
+     * <dd>Only 
+     * the <code>EntityReference</code> node itself is adopted, the 
+     * descendants are discarded, since the source and destination documents 
+     * might have defined the entity differently. If the document being 
+     * imported into provides a definition for this entity name, its value 
+     * is assigned.</dd>
+     * <dt>NOTATION_NODE</dt>
+     * <dd><code>Notation</code> nodes cannot be 
+     * adopted.</dd>
+     * <dt>PROCESSING_INSTRUCTION_NODE, TEXT_NODE, CDATA_SECTION_NODE, 
+     * COMMENT_NODE</dt>
+     * <dd>These nodes can all be adopted. No specifics.</dd>
+     * </dl> 
+     * <p ><b>Note:</b>  Since it does not create new nodes unlike the 
+     * <code>Document.importNode()</code> method, this method does not raise 
+     * an <code>INVALID_CHARACTER_ERR</code> exception, and applications 
+     * should use the <code>Document.normalizeDocument()</code> method to 
+     * check if an imported name is not an XML name according to the XML 
+     * version in use. 
+     * @param source The node to move into this document.
+     * @return The adopted node, or <code>null</code> if this operation 
+     *   fails, such as when the source node comes from a different 
+     *   implementation.
+     * @exception DOMException
+     *   NOT_SUPPORTED_ERR: Raised if the source node is of type 
+     *   <code>DOCUMENT</code>, <code>DOCUMENT_TYPE</code>.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised when the source node is 
+     *   readonly.
+     * @since DOM Level 3
+     */
+    public Node adoptNode(Node source)
+                          throws DOMException;
+
+    /**
+     *  The configuration used when <code>Document.normalizeDocument()</code> 
+     * is invoked. 
+     * @since DOM Level 3
+     */
+    public DOMConfiguration getDomConfig();
+
+    /**
+     *  This method acts as if the document was going through a save and load 
+     * cycle, putting the document in a "normal" form. As a consequence, 
+     * this method updates the replacement tree of 
+     * <code>EntityReference</code> nodes and normalizes <code>Text</code> 
+     * nodes, as defined in the method <code>Node.normalize()</code>. 
+     * <br> Otherwise, the actual result depends on the features being set on 
+     * the <code>Document.domConfig</code> object and governing what 
+     * operations actually take place. Noticeably this method could also 
+     * make the document namespace well-formed according to the algorithm 
+     * described in , check the character normalization, remove the 
+     * <code>CDATASection</code> nodes, etc. See 
+     * <code>DOMConfiguration</code> for details. 
+     * <pre>// Keep in the document 
+     * the information defined // in the XML Information Set (Java example) 
+     * DOMConfiguration docConfig = myDocument.getDomConfig(); 
+     * docConfig.setParameter("infoset", Boolean.TRUE); 
+     * myDocument.normalizeDocument();</pre>
+     * 
+     * <br>Mutation events, when supported, are generated to reflect the 
+     * changes occurring on the document.
+     * <br> If errors occur during the invocation of this method, such as an 
+     * attempt to update a read-only node or a <code>Node.nodeName</code> 
+     * contains an invalid character according to the XML version in use, 
+     * errors or warnings (<code>DOMError.SEVERITY_ERROR</code> or 
+     * <code>DOMError.SEVERITY_WARNING</code>) will be reported using the 
+     * <code>DOMErrorHandler</code> object associated with the "error-handler
+     * " parameter. Note this method might also report fatal errors (
+     * <code>DOMError.SEVERITY_FATAL_ERROR</code>) if an implementation 
+     * cannot recover from an error. 
+     * @since DOM Level 3
+     */
+    public void normalizeDocument();
+
+    /**
+     * Rename an existing node of type <code>ELEMENT_NODE</code> or 
+     * <code>ATTRIBUTE_NODE</code>.
+     * <br>When possible this simply changes the name of the given node, 
+     * otherwise this creates a new node with the specified name and 
+     * replaces the existing node with the new node as described below.
+     * <br>If simply changing the name of the given node is not possible, the 
+     * following operations are performed: a new node is created, any 
+     * registered event listener is registered on the new node, any user 
+     * data attached to the old node is removed from that node, the old node 
+     * is removed from its parent if it has one, the children are moved to 
+     * the new node, if the renamed node is an <code>Element</code> its 
+     * attributes are moved to the new node, the new node is inserted at the 
+     * position the old node used to have in its parent's child nodes list 
+     * if it has one, the user data that was attached to the old node is 
+     * attached to the new node.
+     * <br>When the node being renamed is an <code>Element</code> only the 
+     * specified attributes are moved, default attributes originated from 
+     * the DTD are updated according to the new element name. In addition, 
+     * the implementation may update default attributes from other schemas. 
+     * Applications should use <code>Document.normalizeDocument()</code> to 
+     * guarantee these attributes are up-to-date.
+     * <br>When the node being renamed is an <code>Attr</code> that is 
+     * attached to an <code>Element</code>, the node is first removed from 
+     * the <code>Element</code> attributes map. Then, once renamed, either 
+     * by modifying the existing node or creating a new one as described 
+     * above, it is put back.
+     * <br>In addition,
+     * <ul>
+     * <li> a user data event <code>NODE_RENAMED</code> is fired, 
+     * </li>
+     * <li> 
+     * when the implementation supports the feature "MutationNameEvents", 
+     * each mutation operation involved in this method fires the appropriate 
+     * event, and in the end the event {
+     * <code>http://www.w3.org/2001/xml-events</code>, 
+     * <code>DOMElementNameChanged</code>} or {
+     * <code>http://www.w3.org/2001/xml-events</code>, 
+     * <code>DOMAttributeNameChanged</code>} is fired. 
+     * </li>
+     * </ul>
+     * @param n The node to rename.
+     * @param namespaceURI The new namespace URI.
+     * @param qualifiedName The new qualified name.
+     * @return The renamed node. This is either the specified node or the new 
+     *   node that was created to replace the specified node.
+     * @exception DOMException
+     *   NOT_SUPPORTED_ERR: Raised when the type of the specified node is 
+     *   neither <code>ELEMENT_NODE</code> nor <code>ATTRIBUTE_NODE</code>, 
+     *   or if the implementation does not support the renaming of the 
+     *   document element.
+     *   <br>INVALID_CHARACTER_ERR: Raised if the new qualified name is not an 
+     *   XML name according to the XML version in use specified in the 
+     *   <code>Document.xmlVersion</code> attribute.
+     *   <br>WRONG_DOCUMENT_ERR: Raised when the specified node was created 
+     *   from a different document than this document.
+     *   <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is a 
+     *   malformed qualified name, if the <code>qualifiedName</code> has a 
+     *   prefix and the <code>namespaceURI</code> is <code>null</code>, or 
+     *   if the <code>qualifiedName</code> has a prefix that is "xml" and 
+     *   the <code>namespaceURI</code> is different from "<a href='http://www.w3.org/XML/1998/namespace'>
+     *   http://www.w3.org/XML/1998/namespace</a>" [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     *   . Also raised, when the node being renamed is an attribute, if the 
+     *   <code>qualifiedName</code>, or its prefix, is "xmlns" and the 
+     *   <code>namespaceURI</code> is different from "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>".
+     * @since DOM Level 3
+     */
+    public Node renameNode(Node n, 
+                           String namespaceURI, 
+                           String qualifiedName)
+                           throws DOMException;
+
+}
diff --git a/libjava/org/w3c/dom/DocumentFragment.java b/libjava/external/w3c_dom/org/w3c/dom/DocumentFragment.java
similarity index 74%
rename from libjava/org/w3c/dom/DocumentFragment.java
rename to libjava/external/w3c_dom/org/w3c/dom/DocumentFragment.java
index 9579eb7..8c4531e 100644 (file)
--- a/libjava/org/w3c/dom/DocumentFragment.java
+++ b/libjava/external/w3c_dom/org/w3c/dom/DocumentFragment.java
@@ -1,52 +1,53 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * <code>DocumentFragment</code> is a "lightweight" or "minimal" \r
- * <code>Document</code> object. It is very common to want to be able to \r
- * extract a portion of a document's tree or to create a new fragment of a \r
- * document. Imagine implementing a user command like cut or rearranging a \r
- * document by moving fragments around. It is desirable to have an object \r
- * which can hold such fragments and it is quite natural to use a Node for \r
- * this purpose. While it is true that a <code>Document</code> object could \r
- * fulfill this role, a <code>Document</code> object can potentially be a \r
- * heavyweight object, depending on the underlying implementation. What is \r
- * really needed for this is a very lightweight object. \r
- * <code>DocumentFragment</code> is such an object.\r
- * <p>Furthermore, various operations -- such as inserting nodes as children \r
- * of another <code>Node</code> -- may take <code>DocumentFragment</code> \r
- * objects as arguments; this results in all the child nodes of the \r
- * <code>DocumentFragment</code> being moved to the child list of this node.\r
- * <p>The children of a <code>DocumentFragment</code> node are zero or more \r
- * nodes representing the tops of any sub-trees defining the structure of \r
- * the document. <code>DocumentFragment</code> nodes do not need to be \r
- * well-formed XML documents (although they do need to follow the rules \r
- * imposed upon well-formed XML parsed entities, which can have multiple top \r
- * nodes). For example, a <code>DocumentFragment</code> might have only one \r
- * child and that child node could be a <code>Text</code> node. Such a \r
- * structure model represents neither an HTML document nor a well-formed XML \r
- * document.\r
- * <p>When a <code>DocumentFragment</code> is inserted into a \r
- * <code>Document</code> (or indeed any other <code>Node</code> that may \r
- * take children) the children of the <code>DocumentFragment</code> and not \r
- * the <code>DocumentFragment</code> itself are inserted into the \r
- * <code>Node</code>. This makes the <code>DocumentFragment</code> very \r
- * useful when the user wishes to create nodes that are siblings; the \r
- * <code>DocumentFragment</code> acts as the parent of these nodes so that \r
- * the user can use the standard methods from the <code>Node</code> \r
- * interface, such as <code>insertBefore</code> and <code>appendChild</code>.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface DocumentFragment extends Node {\r
-}\r
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * <code>DocumentFragment</code> is a "lightweight" or "minimal" 
+ * <code>Document</code> object. It is very common to want to be able to 
+ * extract a portion of a document's tree or to create a new fragment of a 
+ * document. Imagine implementing a user command like cut or rearranging a 
+ * document by moving fragments around. It is desirable to have an object 
+ * which can hold such fragments and it is quite natural to use a Node for 
+ * this purpose. While it is true that a <code>Document</code> object could 
+ * fulfill this role, a <code>Document</code> object can potentially be a 
+ * heavyweight object, depending on the underlying implementation. What is 
+ * really needed for this is a very lightweight object. 
+ * <code>DocumentFragment</code> is such an object.
+ * <p>Furthermore, various operations -- such as inserting nodes as children 
+ * of another <code>Node</code> -- may take <code>DocumentFragment</code> 
+ * objects as arguments; this results in all the child nodes of the 
+ * <code>DocumentFragment</code> being moved to the child list of this node.
+ * <p>The children of a <code>DocumentFragment</code> node are zero or more 
+ * nodes representing the tops of any sub-trees defining the structure of 
+ * the document. <code>DocumentFragment</code> nodes do not need to be 
+ * well-formed XML documents (although they do need to follow the rules 
+ * imposed upon well-formed XML parsed entities, which can have multiple top 
+ * nodes). For example, a <code>DocumentFragment</code> might have only one 
+ * child and that child node could be a <code>Text</code> node. Such a 
+ * structure model represents neither an HTML document nor a well-formed XML 
+ * document.
+ * <p>When a <code>DocumentFragment</code> is inserted into a 
+ * <code>Document</code> (or indeed any other <code>Node</code> that may 
+ * take children) the children of the <code>DocumentFragment</code> and not 
+ * the <code>DocumentFragment</code> itself are inserted into the 
+ * <code>Node</code>. This makes the <code>DocumentFragment</code> very 
+ * useful when the user wishes to create nodes that are siblings; the 
+ * <code>DocumentFragment</code> acts as the parent of these nodes so that 
+ * the user can use the standard methods from the <code>Node</code> 
+ * interface, such as <code>Node.insertBefore</code> and 
+ * <code>Node.appendChild</code>.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface DocumentFragment extends Node {
+}
diff --git a/libjava/org/w3c/dom/DocumentType.java b/libjava/external/w3c_dom/org/w3c/dom/DocumentType.java
similarity index 66%
rename from libjava/org/w3c/dom/DocumentType.java
rename to libjava/external/w3c_dom/org/w3c/dom/DocumentType.java
index 0bbcfac..6221c7b 100644 (file)
--- a/libjava/org/w3c/dom/DocumentType.java
+++ b/libjava/external/w3c_dom/org/w3c/dom/DocumentType.java
@@ -1,79 +1,83 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * Each <code>Document</code> has a <code>doctype</code> attribute whose value \r
- * is either <code>null</code> or a <code>DocumentType</code> object. The \r
- * <code>DocumentType</code> interface in the DOM Core provides an interface \r
- * to the list of entities that are defined for the document, and little \r
- * else because the effect of namespaces and the various XML schema efforts \r
- * on DTD representation are not clearly understood as of this writing.\r
- * <p>The DOM Level 2 doesn't support editing <code>DocumentType</code> nodes.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface DocumentType extends Node {\r
-    /**\r
-     * The name of DTD; i.e., the name immediately following the \r
-     * <code>DOCTYPE</code> keyword.\r
-     */\r
-    public String getName();\r
-\r
-    /**\r
-     * A <code>NamedNodeMap</code> containing the general entities, both \r
-     * external and internal, declared in the DTD. Parameter entities are \r
-     * not contained. Duplicates are discarded. For example in: \r
-     * <pre>&lt;!DOCTYPE \r
-     * ex SYSTEM "ex.dtd" [ &lt;!ENTITY foo "foo"&gt; &lt;!ENTITY bar \r
-     * "bar"&gt; &lt;!ENTITY bar "bar2"&gt; &lt;!ENTITY % baz "baz"&gt; \r
-     * ]&gt; &lt;ex/&gt;</pre>\r
-     *  the interface provides access to <code>foo</code> \r
-     * and the first declaration of <code>bar</code> but not the second \r
-     * declaration of <code>bar</code> or <code>baz</code>. Every node in \r
-     * this map also implements the <code>Entity</code> interface.\r
-     * <br>The DOM Level 2 does not support editing entities, therefore \r
-     * <code>entities</code> cannot be altered in any way.\r
-     */\r
-    public NamedNodeMap getEntities();\r
-\r
-    /**\r
-     * A <code>NamedNodeMap</code> containing the notations declared in the \r
-     * DTD. Duplicates are discarded. Every node in this map also implements \r
-     * the <code>Notation</code> interface.\r
-     * <br>The DOM Level 2 does not support editing notations, therefore \r
-     * <code>notations</code> cannot be altered in any way.\r
-     */\r
-    public NamedNodeMap getNotations();\r
-\r
-    /**\r
-     * The public identifier of the external subset.\r
-     * @since DOM Level 2\r
-     */\r
-    public String getPublicId();\r
-\r
-    /**\r
-     * The system identifier of the external subset.\r
-     * @since DOM Level 2\r
-     */\r
-    public String getSystemId();\r
-\r
-    /**\r
-     * The internal subset as a string.The actual content returned depends on \r
-     * how much information is available to the implementation. This may \r
-     * vary depending on various parameters, including the XML processor \r
-     * used to build the document.\r
-     * @since DOM Level 2\r
-     */\r
-    public String getInternalSubset();\r
-\r
-}\r
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * Each <code>Document</code> has a <code>doctype</code> attribute whose value 
+ * is either <code>null</code> or a <code>DocumentType</code> object. The 
+ * <code>DocumentType</code> interface in the DOM Core provides an interface 
+ * to the list of entities that are defined for the document, and little 
+ * else because the effect of namespaces and the various XML schema efforts 
+ * on DTD representation are not clearly understood as of this writing.
+ * <p>DOM Level 3 doesn't support editing <code>DocumentType</code> nodes. 
+ * <code>DocumentType</code> nodes are read-only.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface DocumentType extends Node {
+    /**
+     * The name of DTD; i.e., the name immediately following the 
+     * <code>DOCTYPE</code> keyword.
+     */
+    public String getName();
+
+    /**
+     * A <code>NamedNodeMap</code> containing the general entities, both 
+     * external and internal, declared in the DTD. Parameter entities are 
+     * not contained. Duplicates are discarded. For example in: 
+     * <pre>&lt;!DOCTYPE 
+     * ex SYSTEM "ex.dtd" [ &lt;!ENTITY foo "foo"&gt; &lt;!ENTITY bar 
+     * "bar"&gt; &lt;!ENTITY bar "bar2"&gt; &lt;!ENTITY % baz "baz"&gt; 
+     * ]&gt; &lt;ex/&gt;</pre>
+     *  the interface provides access to <code>foo</code> 
+     * and the first declaration of <code>bar</code> but not the second 
+     * declaration of <code>bar</code> or <code>baz</code>. Every node in 
+     * this map also implements the <code>Entity</code> interface.
+     * <br>The DOM Level 2 does not support editing entities, therefore 
+     * <code>entities</code> cannot be altered in any way.
+     */
+    public NamedNodeMap getEntities();
+
+    /**
+     * A <code>NamedNodeMap</code> containing the notations declared in the 
+     * DTD. Duplicates are discarded. Every node in this map also implements 
+     * the <code>Notation</code> interface.
+     * <br>The DOM Level 2 does not support editing notations, therefore 
+     * <code>notations</code> cannot be altered in any way.
+     */
+    public NamedNodeMap getNotations();
+
+    /**
+     * The public identifier of the external subset.
+     * @since DOM Level 2
+     */
+    public String getPublicId();
+
+    /**
+     * The system identifier of the external subset. This may be an absolute 
+     * URI or not.
+     * @since DOM Level 2
+     */
+    public String getSystemId();
+
+    /**
+     * The internal subset as a string, or <code>null</code> if there is none. 
+     * This is does not contain the delimiting square brackets.
+     * <p ><b>Note:</b> The actual content returned depends on how much 
+     * information is available to the implementation. This may vary 
+     * depending on various parameters, including the XML processor used to 
+     * build the document.
+     * @since DOM Level 2
+     */
+    public String getInternalSubset();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/Element.java b/libjava/external/w3c_dom/org/w3c/dom/Element.java
new file mode 100644 (file)
index 0000000..6a7f7e3
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/Element.java
@@ -0,0 +1,439 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * The <code>Element</code> interface represents an element in an HTML or XML 
+ * document. Elements may have attributes associated with them; since the 
+ * <code>Element</code> interface inherits from <code>Node</code>, the 
+ * generic <code>Node</code> interface attribute <code>attributes</code> may 
+ * be used to retrieve the set of all attributes for an element. There are 
+ * methods on the <code>Element</code> interface to retrieve either an 
+ * <code>Attr</code> object by name or an attribute value by name. In XML, 
+ * where an attribute value may contain entity references, an 
+ * <code>Attr</code> object should be retrieved to examine the possibly 
+ * fairly complex sub-tree representing the attribute value. On the other 
+ * hand, in HTML, where all attributes have simple string values, methods to 
+ * directly access an attribute value can safely be used as a convenience.
+ * <p ><b>Note:</b> In DOM Level 2, the method <code>normalize</code> is 
+ * inherited from the <code>Node</code> interface where it was moved.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface Element extends Node {
+    /**
+     * The name of the element. If <code>Node.localName</code> is different 
+     * from <code>null</code>, this attribute is a qualified name. For 
+     * example, in: 
+     * <pre> &lt;elementExample id="demo"&gt; ... 
+     * &lt;/elementExample&gt; , </pre>
+     *  <code>tagName</code> has the value 
+     * <code>"elementExample"</code>. Note that this is case-preserving in 
+     * XML, as are all of the operations of the DOM. The HTML DOM returns 
+     * the <code>tagName</code> of an HTML element in the canonical 
+     * uppercase form, regardless of the case in the source HTML document.
+     */
+    public String getTagName();
+
+    /**
+     * Retrieves an attribute value by name.
+     * @param name The name of the attribute to retrieve.
+     * @return The <code>Attr</code> value as a string, or the empty string 
+     *   if that attribute does not have a specified or default value.
+     */
+    public String getAttribute(String name);
+
+    /**
+     * Adds a new attribute. If an attribute with that name is already present 
+     * in the element, its value is changed to be that of the value 
+     * parameter. This value is a simple string; it is not parsed as it is 
+     * being set. So any markup (such as syntax to be recognized as an 
+     * entity reference) is treated as literal text, and needs to be 
+     * appropriately escaped by the implementation when it is written out. 
+     * In order to assign an attribute value that contains entity 
+     * references, the user must create an <code>Attr</code> node plus any 
+     * <code>Text</code> and <code>EntityReference</code> nodes, build the 
+     * appropriate subtree, and use <code>setAttributeNode</code> to assign 
+     * it as the value of an attribute.
+     * <br>To set an attribute with a qualified name and namespace URI, use 
+     * the <code>setAttributeNS</code> method.
+     * @param name The name of the attribute to create or alter.
+     * @param value Value to set in string form.
+     * @exception DOMException
+     *   INVALID_CHARACTER_ERR: Raised if the specified name is not an XML 
+     *   name according to the XML version in use specified in the 
+     *   <code>Document.xmlVersion</code> attribute.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     */
+    public void setAttribute(String name, 
+                             String value)
+                             throws DOMException;
+
+    /**
+     * Removes an attribute by name. If a default value for the removed 
+     * attribute is defined in the DTD, a new attribute immediately appears 
+     * with the default value as well as the corresponding namespace URI, 
+     * local name, and prefix when applicable. The implementation may handle 
+     * default values from other schemas similarly but applications should 
+     * use <code>Document.normalizeDocument()</code> to guarantee this 
+     * information is up-to-date.
+     * <br>If no attribute with this name is found, this method has no effect.
+     * <br>To remove an attribute by local name and namespace URI, use the 
+     * <code>removeAttributeNS</code> method.
+     * @param name The name of the attribute to remove.
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     */
+    public void removeAttribute(String name)
+                                throws DOMException;
+
+    /**
+     * Retrieves an attribute node by name.
+     * <br>To retrieve an attribute node by qualified name and namespace URI, 
+     * use the <code>getAttributeNodeNS</code> method.
+     * @param name The name (<code>nodeName</code>) of the attribute to 
+     *   retrieve.
+     * @return The <code>Attr</code> node with the specified name (
+     *   <code>nodeName</code>) or <code>null</code> if there is no such 
+     *   attribute.
+     */
+    public Attr getAttributeNode(String name);
+
+    /**
+     * Adds a new attribute node. If an attribute with that name (
+     * <code>nodeName</code>) is already present in the element, it is 
+     * replaced by the new one. Replacing an attribute node by itself has no 
+     * effect.
+     * <br>To add a new attribute node with a qualified name and namespace 
+     * URI, use the <code>setAttributeNodeNS</code> method.
+     * @param newAttr The <code>Attr</code> node to add to the attribute list.
+     * @return If the <code>newAttr</code> attribute replaces an existing 
+     *   attribute, the replaced <code>Attr</code> node is returned, 
+     *   otherwise <code>null</code> is returned.
+     * @exception DOMException
+     *   WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a 
+     *   different document than the one that created the element.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     *   <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an 
+     *   attribute of another <code>Element</code> object. The DOM user must 
+     *   explicitly clone <code>Attr</code> nodes to re-use them in other 
+     *   elements.
+     */
+    public Attr setAttributeNode(Attr newAttr)
+                                 throws DOMException;
+
+    /**
+     * Removes the specified attribute node. If a default value for the 
+     * removed <code>Attr</code> node is defined in the DTD, a new node 
+     * immediately appears with the default value as well as the 
+     * corresponding namespace URI, local name, and prefix when applicable. 
+     * The implementation may handle default values from other schemas 
+     * similarly but applications should use 
+     * <code>Document.normalizeDocument()</code> to guarantee this 
+     * information is up-to-date.
+     * @param oldAttr The <code>Attr</code> node to remove from the attribute 
+     *   list.
+     * @return The <code>Attr</code> node that was removed.
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     *   <br>NOT_FOUND_ERR: Raised if <code>oldAttr</code> is not an attribute 
+     *   of the element.
+     */
+    public Attr removeAttributeNode(Attr oldAttr)
+                                    throws DOMException;
+
+    /**
+     * Returns a <code>NodeList</code> of all descendant <code>Elements</code> 
+     * with a given tag name, in document order.
+     * @param name The name of the tag to match on. The special value "*" 
+     *   matches all tags.
+     * @return A list of matching <code>Element</code> nodes.
+     */
+    public NodeList getElementsByTagName(String name);
+
+    /**
+     * Retrieves an attribute value by local name and namespace URI.
+     * <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     * , applications must use the value <code>null</code> as the 
+     * <code>namespaceURI</code> parameter for methods if they wish to have 
+     * no namespace.
+     * @param namespaceURI The namespace URI of the attribute to retrieve.
+     * @param localName The local name of the attribute to retrieve.
+     * @return The <code>Attr</code> value as a string, or the empty string 
+     *   if that attribute does not have a specified or default value.
+     * @exception DOMException
+     *   NOT_SUPPORTED_ERR: May be raised if the implementation does not 
+     *   support the feature <code>"XML"</code> and the language exposed 
+     *   through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]). 
+     * @since DOM Level 2
+     */
+    public String getAttributeNS(String namespaceURI, 
+                                 String localName)
+                                 throws DOMException;
+
+    /**
+     * Adds a new attribute. If an attribute with the same local name and 
+     * namespace URI is already present on the element, its prefix is 
+     * changed to be the prefix part of the <code>qualifiedName</code>, and 
+     * its value is changed to be the <code>value</code> parameter. This 
+     * value is a simple string; it is not parsed as it is being set. So any 
+     * markup (such as syntax to be recognized as an entity reference) is 
+     * treated as literal text, and needs to be appropriately escaped by the 
+     * implementation when it is written out. In order to assign an 
+     * attribute value that contains entity references, the user must create 
+     * an <code>Attr</code> node plus any <code>Text</code> and 
+     * <code>EntityReference</code> nodes, build the appropriate subtree, 
+     * and use <code>setAttributeNodeNS</code> or 
+     * <code>setAttributeNode</code> to assign it as the value of an 
+     * attribute.
+     * <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     * , applications must use the value <code>null</code> as the 
+     * <code>namespaceURI</code> parameter for methods if they wish to have 
+     * no namespace.
+     * @param namespaceURI The namespace URI of the attribute to create or 
+     *   alter.
+     * @param qualifiedName The qualified name of the attribute to create or 
+     *   alter.
+     * @param value The value to set in string form.
+     * @exception DOMException
+     *   INVALID_CHARACTER_ERR: Raised if the specified qualified name is not 
+     *   an XML name according to the XML version in use specified in the 
+     *   <code>Document.xmlVersion</code> attribute.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     *   <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is 
+     *   malformed per the Namespaces in XML specification, if the 
+     *   <code>qualifiedName</code> has a prefix and the 
+     *   <code>namespaceURI</code> is <code>null</code>, if the 
+     *   <code>qualifiedName</code> has a prefix that is "xml" and the 
+     *   <code>namespaceURI</code> is different from "<a href='http://www.w3.org/XML/1998/namespace'>
+     *   http://www.w3.org/XML/1998/namespace</a>", if the <code>qualifiedName</code> or its prefix is "xmlns" and the 
+     *   <code>namespaceURI</code> is different from "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>", or if the <code>namespaceURI</code> is "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>" and neither the <code>qualifiedName</code> nor its prefix is "xmlns".
+     *   <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not 
+     *   support the feature <code>"XML"</code> and the language exposed 
+     *   through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]). 
+     * @since DOM Level 2
+     */
+    public void setAttributeNS(String namespaceURI, 
+                               String qualifiedName, 
+                               String value)
+                               throws DOMException;
+
+    /**
+     * Removes an attribute by local name and namespace URI. If a default 
+     * value for the removed attribute is defined in the DTD, a new 
+     * attribute immediately appears with the default value as well as the 
+     * corresponding namespace URI, local name, and prefix when applicable. 
+     * The implementation may handle default values from other schemas 
+     * similarly but applications should use 
+     * <code>Document.normalizeDocument()</code> to guarantee this 
+     * information is up-to-date.
+     * <br>If no attribute with this local name and namespace URI is found, 
+     * this method has no effect.
+     * <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     * , applications must use the value <code>null</code> as the 
+     * <code>namespaceURI</code> parameter for methods if they wish to have 
+     * no namespace.
+     * @param namespaceURI The namespace URI of the attribute to remove.
+     * @param localName The local name of the attribute to remove.
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     *   <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not 
+     *   support the feature <code>"XML"</code> and the language exposed 
+     *   through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]). 
+     * @since DOM Level 2
+     */
+    public void removeAttributeNS(String namespaceURI, 
+                                  String localName)
+                                  throws DOMException;
+
+    /**
+     * Retrieves an <code>Attr</code> node by local name and namespace URI.
+     * <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     * , applications must use the value <code>null</code> as the 
+     * <code>namespaceURI</code> parameter for methods if they wish to have 
+     * no namespace.
+     * @param namespaceURI The namespace URI of the attribute to retrieve.
+     * @param localName The local name of the attribute to retrieve.
+     * @return The <code>Attr</code> node with the specified attribute local 
+     *   name and namespace URI or <code>null</code> if there is no such 
+     *   attribute.
+     * @exception DOMException
+     *   NOT_SUPPORTED_ERR: May be raised if the implementation does not 
+     *   support the feature <code>"XML"</code> and the language exposed 
+     *   through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]). 
+     * @since DOM Level 2
+     */
+    public Attr getAttributeNodeNS(String namespaceURI, 
+                                   String localName)
+                                   throws DOMException;
+
+    /**
+     * Adds a new attribute. If an attribute with that local name and that 
+     * namespace URI is already present in the element, it is replaced by 
+     * the new one. Replacing an attribute node by itself has no effect.
+     * <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     * , applications must use the value <code>null</code> as the 
+     * <code>namespaceURI</code> parameter for methods if they wish to have 
+     * no namespace.
+     * @param newAttr The <code>Attr</code> node to add to the attribute list.
+     * @return If the <code>newAttr</code> attribute replaces an existing 
+     *   attribute with the same local name and namespace URI, the replaced 
+     *   <code>Attr</code> node is returned, otherwise <code>null</code> is 
+     *   returned.
+     * @exception DOMException
+     *   WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a 
+     *   different document than the one that created the element.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     *   <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an 
+     *   attribute of another <code>Element</code> object. The DOM user must 
+     *   explicitly clone <code>Attr</code> nodes to re-use them in other 
+     *   elements.
+     *   <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not 
+     *   support the feature <code>"XML"</code> and the language exposed 
+     *   through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]). 
+     * @since DOM Level 2
+     */
+    public Attr setAttributeNodeNS(Attr newAttr)
+                                   throws DOMException;
+
+    /**
+     * Returns a <code>NodeList</code> of all the descendant 
+     * <code>Elements</code> with a given local name and namespace URI in 
+     * document order.
+     * @param namespaceURI The namespace URI of the elements to match on. The 
+     *   special value "*" matches all namespaces.
+     * @param localName The local name of the elements to match on. The 
+     *   special value "*" matches all local names.
+     * @return A new <code>NodeList</code> object containing all the matched 
+     *   <code>Elements</code>.
+     * @exception DOMException
+     *   NOT_SUPPORTED_ERR: May be raised if the implementation does not 
+     *   support the feature <code>"XML"</code> and the language exposed 
+     *   through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]). 
+     * @since DOM Level 2
+     */
+    public NodeList getElementsByTagNameNS(String namespaceURI, 
+                                           String localName)
+                                           throws DOMException;
+
+    /**
+     * Returns <code>true</code> when an attribute with a given name is 
+     * specified on this element or has a default value, <code>false</code> 
+     * otherwise.
+     * @param name The name of the attribute to look for.
+     * @return <code>true</code> if an attribute with the given name is 
+     *   specified on this element or has a default value, <code>false</code>
+     *    otherwise.
+     * @since DOM Level 2
+     */
+    public boolean hasAttribute(String name);
+
+    /**
+     * Returns <code>true</code> when an attribute with a given local name and 
+     * namespace URI is specified on this element or has a default value, 
+     * <code>false</code> otherwise.
+     * <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     * , applications must use the value <code>null</code> as the 
+     * <code>namespaceURI</code> parameter for methods if they wish to have 
+     * no namespace.
+     * @param namespaceURI The namespace URI of the attribute to look for.
+     * @param localName The local name of the attribute to look for.
+     * @return <code>true</code> if an attribute with the given local name 
+     *   and namespace URI is specified or has a default value on this 
+     *   element, <code>false</code> otherwise.
+     * @exception DOMException
+     *   NOT_SUPPORTED_ERR: May be raised if the implementation does not 
+     *   support the feature <code>"XML"</code> and the language exposed 
+     *   through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]). 
+     * @since DOM Level 2
+     */
+    public boolean hasAttributeNS(String namespaceURI, 
+                                  String localName)
+                                  throws DOMException;
+
+    /**
+     *  The type information associated with this element. 
+     * @since DOM Level 3
+     */
+    public TypeInfo getSchemaTypeInfo();
+
+    /**
+     *  If the parameter <code>isId</code> is <code>true</code>, this method 
+     * declares the specified attribute to be a user-determined ID attribute
+     * . This affects the value of <code>Attr.isId</code> and the behavior 
+     * of <code>Document.getElementById</code>, but does not change any 
+     * schema that may be in use, in particular this does not affect the 
+     * <code>Attr.schemaTypeInfo</code> of the specified <code>Attr</code> 
+     * node. Use the value <code>false</code> for the parameter 
+     * <code>isId</code> to undeclare an attribute for being a 
+     * user-determined ID attribute. 
+     * <br> To specify an attribute by local name and namespace URI, use the 
+     * <code>setIdAttributeNS</code> method. 
+     * @param name The name of the attribute.
+     * @param isId Whether the attribute is a of type ID.
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     *   <br>NOT_FOUND_ERR: Raised if the specified node is not an attribute 
+     *   of this element.
+     * @since DOM Level 3
+     */
+    public void setIdAttribute(String name, 
+                               boolean isId)
+                               throws DOMException;
+
+    /**
+     *  If the parameter <code>isId</code> is <code>true</code>, this method 
+     * declares the specified attribute to be a user-determined ID attribute
+     * . This affects the value of <code>Attr.isId</code> and the behavior 
+     * of <code>Document.getElementById</code>, but does not change any 
+     * schema that may be in use, in particular this does not affect the 
+     * <code>Attr.schemaTypeInfo</code> of the specified <code>Attr</code> 
+     * node. Use the value <code>false</code> for the parameter 
+     * <code>isId</code> to undeclare an attribute for being a 
+     * user-determined ID attribute. 
+     * @param namespaceURI The namespace URI of the attribute.
+     * @param localName The local name of the attribute.
+     * @param isId Whether the attribute is a of type ID.
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     *   <br>NOT_FOUND_ERR: Raised if the specified node is not an attribute 
+     *   of this element.
+     * @since DOM Level 3
+     */
+    public void setIdAttributeNS(String namespaceURI, 
+                                 String localName, 
+                                 boolean isId)
+                                 throws DOMException;
+
+    /**
+     *  If the parameter <code>isId</code> is <code>true</code>, this method 
+     * declares the specified attribute to be a user-determined ID attribute
+     * . This affects the value of <code>Attr.isId</code> and the behavior 
+     * of <code>Document.getElementById</code>, but does not change any 
+     * schema that may be in use, in particular this does not affect the 
+     * <code>Attr.schemaTypeInfo</code> of the specified <code>Attr</code> 
+     * node. Use the value <code>false</code> for the parameter 
+     * <code>isId</code> to undeclare an attribute for being a 
+     * user-determined ID attribute. 
+     * @param idAttr The attribute node.
+     * @param isId Whether the attribute is a of type ID.
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     *   <br>NOT_FOUND_ERR: Raised if the specified node is not an attribute 
+     *   of this element.
+     * @since DOM Level 3
+     */
+    public void setIdAttributeNode(Attr idAttr, 
+                                   boolean isId)
+                                   throws DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/Entity.java b/libjava/external/w3c_dom/org/w3c/dom/Entity.java
new file mode 100644 (file)
index 0000000..f621c33
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/Entity.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * This interface represents a known entity, either parsed or unparsed, in an 
+ * XML document. Note that this models the entity itself <em>not</em> the entity declaration.
+ * <p>The <code>nodeName</code> attribute that is inherited from 
+ * <code>Node</code> contains the name of the entity.
+ * <p>An XML processor may choose to completely expand entities before the 
+ * structure model is passed to the DOM; in this case there will be no 
+ * <code>EntityReference</code> nodes in the document tree.
+ * <p>XML does not mandate that a non-validating XML processor read and 
+ * process entity declarations made in the external subset or declared in 
+ * parameter entities. This means that parsed entities declared in the 
+ * external subset need not be expanded by some classes of applications, and 
+ * that the replacement text of the entity may not be available. When the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#intern-replacement'>
+ * replacement text</a> is available, the corresponding <code>Entity</code> node's child list 
+ * represents the structure of that replacement value. Otherwise, the child 
+ * list is empty.
+ * <p>DOM Level 3 does not support editing <code>Entity</code> nodes; if a 
+ * user wants to make changes to the contents of an <code>Entity</code>, 
+ * every related <code>EntityReference</code> node has to be replaced in the 
+ * structure model by a clone of the <code>Entity</code>'s contents, and 
+ * then the desired changes must be made to each of those clones instead. 
+ * <code>Entity</code> nodes and all their descendants are readonly.
+ * <p>An <code>Entity</code> node does not have any parent.
+ * <p ><b>Note:</b> If the entity contains an unbound namespace prefix, the 
+ * <code>namespaceURI</code> of the corresponding node in the 
+ * <code>Entity</code> node subtree is <code>null</code>. The same is true 
+ * for <code>EntityReference</code> nodes that refer to this entity, when 
+ * they are created using the <code>createEntityReference</code> method of 
+ * the <code>Document</code> interface.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface Entity extends Node {
+    /**
+     * The public identifier associated with the entity if specified, and 
+     * <code>null</code> otherwise.
+     */
+    public String getPublicId();
+
+    /**
+     * The system identifier associated with the entity if specified, and 
+     * <code>null</code> otherwise. This may be an absolute URI or not.
+     */
+    public String getSystemId();
+
+    /**
+     * For unparsed entities, the name of the notation for the entity. For 
+     * parsed entities, this is <code>null</code>.
+     */
+    public String getNotationName();
+
+    /**
+     * An attribute specifying the encoding used for this entity at the time 
+     * of parsing, when it is an external parsed entity. This is 
+     * <code>null</code> if it an entity from the internal subset or if it 
+     * is not known.
+     * @since DOM Level 3
+     */
+    public String getInputEncoding();
+
+    /**
+     * An attribute specifying, as part of the text declaration, the encoding 
+     * of this entity, when it is an external parsed entity. This is 
+     * <code>null</code> otherwise.
+     * @since DOM Level 3
+     */
+    public String getXmlEncoding();
+
+    /**
+     * An attribute specifying, as part of the text declaration, the version 
+     * number of this entity, when it is an external parsed entity. This is 
+     * <code>null</code> otherwise.
+     * @since DOM Level 3
+     */
+    public String getXmlVersion();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/EntityReference.java b/libjava/external/w3c_dom/org/w3c/dom/EntityReference.java
new file mode 100644 (file)
index 0000000..b42b091
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/EntityReference.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * <code>EntityReference</code> nodes may be used to represent an entity 
+ * reference in the tree. Note that character references and references to 
+ * predefined entities are considered to be expanded by the HTML or XML 
+ * processor so that characters are represented by their Unicode equivalent 
+ * rather than by an entity reference. Moreover, the XML processor may 
+ * completely expand references to entities while building the 
+ * <code>Document</code>, instead of providing <code>EntityReference</code> 
+ * nodes. If it does provide such nodes, then for an 
+ * <code>EntityReference</code> node that represents a reference to a known 
+ * entity an <code>Entity</code> exists, and the subtree of the 
+ * <code>EntityReference</code> node is a copy of the <code>Entity</code> 
+ * node subtree. However, the latter may not be true when an entity contains 
+ * an unbound namespace prefix. In such a case, because the namespace prefix 
+ * resolution depends on where the entity reference is, the descendants of 
+ * the <code>EntityReference</code> node may be bound to different namespace 
+ * URIs. When an <code>EntityReference</code> node represents a reference to 
+ * an unknown entity, the node has no children and its replacement value, 
+ * when used by <code>Attr.value</code> for example, is empty.
+ * <p>As for <code>Entity</code> nodes, <code>EntityReference</code> nodes and 
+ * all their descendants are readonly.
+ * <p ><b>Note:</b> <code>EntityReference</code> nodes may cause element 
+ * content and attribute value normalization problems when, such as in XML 
+ * 1.0 and XML Schema, the normalization is performed after entity reference 
+ * are expanded.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface EntityReference extends Node {
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/NameList.java b/libjava/external/w3c_dom/org/w3c/dom/NameList.java
new file mode 100644 (file)
index 0000000..10caa90
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/NameList.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ *  The <code>NameList</code> interface provides the abstraction of an ordered 
+ * collection of parallel pairs of name and namespace values (which could be 
+ * null values), without defining or constraining how this collection is 
+ * implemented. The items in the <code>NameList</code> are accessible via an 
+ * integral index, starting from 0. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ * @since DOM Level 3
+ */
+public interface NameList {
+    /**
+     *  Returns the <code>index</code>th name item in the collection. 
+     * @param index Index into the collection.
+     * @return  The name at the <code>index</code>th position in the 
+     *   <code>NameList</code>, or <code>null</code> if there is no name for 
+     *   the specified index or if the index is out of range. 
+     */
+    public String getName(int index);
+
+    /**
+     *  Returns the <code>index</code>th namespaceURI item in the collection. 
+     * @param index Index into the collection.
+     * @return  The namespace URI at the <code>index</code>th position in the 
+     *   <code>NameList</code>, or <code>null</code> if there is no name for 
+     *   the specified index or if the index is out of range. 
+     */
+    public String getNamespaceURI(int index);
+
+    /**
+     *  The number of pairs (name and namespaceURI) in the list. The range of 
+     * valid child node indices is 0 to <code>length-1</code> inclusive. 
+     */
+    public int getLength();
+
+    /**
+     *  Test if a name is part of this <code>NameList</code>. 
+     * @param str  The name to look for. 
+     * @return  <code>true</code> if the name has been found, 
+     *   <code>false</code> otherwise. 
+     */
+    public boolean contains(String str);
+
+    /**
+     *  Test if the pair namespaceURI/name is part of this 
+     * <code>NameList</code>. 
+     * @param namespaceURI  The namespace URI to look for. 
+     * @param name  The name to look for. 
+     * @return  <code>true</code> if the pair namespaceURI/name has been 
+     *   found, <code>false</code> otherwise. 
+     */
+    public boolean containsNS(String namespaceURI, 
+                              String name);
+
+}
diff --git a/libjava/org/w3c/dom/NamedNodeMap.java b/libjava/external/w3c_dom/org/w3c/dom/NamedNodeMap.java
similarity index 62%
rename from libjava/org/w3c/dom/NamedNodeMap.java
rename to libjava/external/w3c_dom/org/w3c/dom/NamedNodeMap.java
index d57ba8d..ad1e67b 100644 (file)
--- a/libjava/org/w3c/dom/NamedNodeMap.java
+++ b/libjava/external/w3c_dom/org/w3c/dom/NamedNodeMap.java
@@ -1,156 +1,183 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * Objects implementing the <code>NamedNodeMap</code> interface are used to \r
- * represent collections of nodes that can be accessed by name. Note that \r
- * <code>NamedNodeMap</code> does not inherit from <code>NodeList</code>; \r
- * <code>NamedNodeMaps</code> are not maintained in any particular order. \r
- * Objects contained in an object implementing <code>NamedNodeMap</code> may \r
- * also be accessed by an ordinal index, but this is simply to allow \r
- * convenient enumeration of the contents of a <code>NamedNodeMap</code>, \r
- * and does not imply that the DOM specifies an order to these Nodes. \r
- * <p><code>NamedNodeMap</code> objects in the DOM are live.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface NamedNodeMap {\r
-    /**\r
-     * Retrieves a node specified by name.\r
-     * @param nameThe <code>nodeName</code> of a node to retrieve.\r
-     * @return A <code>Node</code> (of any type) with the specified \r
-     *   <code>nodeName</code>, or <code>null</code> if it does not identify \r
-     *   any node in this map.\r
-     */\r
-    public Node getNamedItem(String name);\r
-\r
-    /**\r
-     * Adds a node using its <code>nodeName</code> attribute. If a node with \r
-     * that name is already present in this map, it is replaced by the new \r
-     * one.\r
-     * <br>As the <code>nodeName</code> attribute is used to derive the name \r
-     * which the node must be stored under, multiple nodes of certain types \r
-     * (those that have a "special" string value) cannot be stored as the \r
-     * names would clash. This is seen as preferable to allowing nodes to be \r
-     * aliased.\r
-     * @param argA node to store in this map. The node will later be \r
-     *   accessible using the value of its <code>nodeName</code> attribute.\r
-     * @return If the new <code>Node</code> replaces an existing node the \r
-     *   replaced <code>Node</code> is returned, otherwise <code>null</code> \r
-     *   is returned.\r
-     * @exception DOMException\r
-     *   WRONG_DOCUMENT_ERR: Raised if <code>arg</code> was created from a \r
-     *   different document than the one that created this map.\r
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.\r
-     *   <br>INUSE_ATTRIBUTE_ERR: Raised if <code>arg</code> is an \r
-     *   <code>Attr</code> that is already an attribute of another \r
-     *   <code>Element</code> object. The DOM user must explicitly clone \r
-     *   <code>Attr</code> nodes to re-use them in other elements.\r
-     */\r
-    public Node setNamedItem(Node arg)\r
-                             throws DOMException;\r
-\r
-    /**\r
-     * Removes a node specified by name. When this map contains the attributes \r
-     * attached to an element, if the removed attribute is known to have a \r
-     * default value, an attribute immediately appears containing the \r
-     * default value as well as the corresponding namespace URI, local name, \r
-     * and prefix when applicable.\r
-     * @param nameThe <code>nodeName</code> of the node to remove.\r
-     * @return The node removed from this map if a node with such a name \r
-     *   exists.\r
-     * @exception DOMException\r
-     *   NOT_FOUND_ERR: Raised if there is no node named <code>name</code> in \r
-     *   this map.\r
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.\r
-     */\r
-    public Node removeNamedItem(String name)\r
-                                throws DOMException;\r
-\r
-    /**\r
-     * Returns the <code>index</code>th item in the map. If <code>index</code> \r
-     * is greater than or equal to the number of nodes in this map, this \r
-     * returns <code>null</code>.\r
-     * @param indexIndex into this map.\r
-     * @return The node at the <code>index</code>th position in the map, or \r
-     *   <code>null</code> if that is not a valid index.\r
-     */\r
-    public Node item(int index);\r
-\r
-    /**\r
-     * The number of nodes in this map. The range of valid child node indices \r
-     * is <code>0</code> to <code>length-1</code> inclusive. \r
-     */\r
-    public int getLength();\r
-\r
-    /**\r
-     * Retrieves a node specified by local name and namespace URI. HTML-only \r
-     * DOM implementations do not need to implement this method.\r
-     * @param namespaceURIThe namespace URI of the node to retrieve.\r
-     * @param localNameThe local name of the node to retrieve.\r
-     * @return A <code>Node</code> (of any type) with the specified local \r
-     *   name and namespace URI, or <code>null</code> if they do not \r
-     *   identify any node in this map.\r
-     * @since DOM Level 2\r
-     */\r
-    public Node getNamedItemNS(String namespaceURI, \r
-                               String localName);\r
-\r
-    /**\r
-     * Adds a node using its <code>namespaceURI</code> and \r
-     * <code>localName</code>. If a node with that namespace URI and that \r
-     * local name is already present in this map, it is replaced by the new \r
-     * one.\r
-     * <br>HTML-only DOM implementations do not need to implement this method.\r
-     * @param argA node to store in this map. The node will later be \r
-     *   accessible using the value of its <code>namespaceURI</code> and \r
-     *   <code>localName</code> attributes.\r
-     * @return If the new <code>Node</code> replaces an existing node the \r
-     *   replaced <code>Node</code> is returned, otherwise <code>null</code> \r
-     *   is returned.\r
-     * @exception DOMException\r
-     *   WRONG_DOCUMENT_ERR: Raised if <code>arg</code> was created from a \r
-     *   different document than the one that created this map.\r
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.\r
-     *   <br>INUSE_ATTRIBUTE_ERR: Raised if <code>arg</code> is an \r
-     *   <code>Attr</code> that is already an attribute of another \r
-     *   <code>Element</code> object. The DOM user must explicitly clone \r
-     *   <code>Attr</code> nodes to re-use them in other elements.\r
-     * @since DOM Level 2\r
-     */\r
-    public Node setNamedItemNS(Node arg)\r
-                               throws DOMException;\r
-\r
-    /**\r
-     * Removes a node specified by local name and namespace URI. A removed \r
-     * attribute may be known to have a default value when this map contains \r
-     * the attributes attached to an element, as returned by the attributes \r
-     * attribute of the <code>Node</code> interface. If so, an attribute \r
-     * immediately appears containing the default value as well as the \r
-     * corresponding namespace URI, local name, and prefix when applicable.\r
-     * <br>HTML-only DOM implementations do not need to implement this method.\r
-     * @param namespaceURIThe namespace URI of the node to remove.\r
-     * @param localNameThe local name of the node to remove.\r
-     * @return The node removed from this map if a node with such a local \r
-     *   name and namespace URI exists.\r
-     * @exception DOMException\r
-     *   NOT_FOUND_ERR: Raised if there is no node with the specified \r
-     *   <code>namespaceURI</code> and <code>localName</code> in this map.\r
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.\r
-     * @since DOM Level 2\r
-     */\r
-    public Node removeNamedItemNS(String namespaceURI, \r
-                                  String localName)\r
-                                  throws DOMException;\r
-\r
-}\r
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * Objects implementing the <code>NamedNodeMap</code> interface are used to 
+ * represent collections of nodes that can be accessed by name. Note that 
+ * <code>NamedNodeMap</code> does not inherit from <code>NodeList</code>; 
+ * <code>NamedNodeMaps</code> are not maintained in any particular order. 
+ * Objects contained in an object implementing <code>NamedNodeMap</code> may 
+ * also be accessed by an ordinal index, but this is simply to allow 
+ * convenient enumeration of the contents of a <code>NamedNodeMap</code>, 
+ * and does not imply that the DOM specifies an order to these Nodes. 
+ * <p><code>NamedNodeMap</code> objects in the DOM are live.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface NamedNodeMap {
+    /**
+     * Retrieves a node specified by name.
+     * @param name The <code>nodeName</code> of a node to retrieve.
+     * @return A <code>Node</code> (of any type) with the specified 
+     *   <code>nodeName</code>, or <code>null</code> if it does not identify 
+     *   any node in this map.
+     */
+    public Node getNamedItem(String name);
+
+    /**
+     * Adds a node using its <code>nodeName</code> attribute. If a node with 
+     * that name is already present in this map, it is replaced by the new 
+     * one. Replacing a node by itself has no effect.
+     * <br>As the <code>nodeName</code> attribute is used to derive the name 
+     * which the node must be stored under, multiple nodes of certain types 
+     * (those that have a "special" string value) cannot be stored as the 
+     * names would clash. This is seen as preferable to allowing nodes to be 
+     * aliased.
+     * @param arg A node to store in this map. The node will later be 
+     *   accessible using the value of its <code>nodeName</code> attribute.
+     * @return If the new <code>Node</code> replaces an existing node the 
+     *   replaced <code>Node</code> is returned, otherwise <code>null</code> 
+     *   is returned.
+     * @exception DOMException
+     *   WRONG_DOCUMENT_ERR: Raised if <code>arg</code> was created from a 
+     *   different document than the one that created this map.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
+     *   <br>INUSE_ATTRIBUTE_ERR: Raised if <code>arg</code> is an 
+     *   <code>Attr</code> that is already an attribute of another 
+     *   <code>Element</code> object. The DOM user must explicitly clone 
+     *   <code>Attr</code> nodes to re-use them in other elements.
+     *   <br>HIERARCHY_REQUEST_ERR: Raised if an attempt is made to add a node 
+     *   doesn't belong in this NamedNodeMap. Examples would include trying 
+     *   to insert something other than an Attr node into an Element's map 
+     *   of attributes, or a non-Entity node into the DocumentType's map of 
+     *   Entities.
+     */
+    public Node setNamedItem(Node arg)
+                             throws DOMException;
+
+    /**
+     * Removes a node specified by name. When this map contains the attributes 
+     * attached to an element, if the removed attribute is known to have a 
+     * default value, an attribute immediately appears containing the 
+     * default value as well as the corresponding namespace URI, local name, 
+     * and prefix when applicable.
+     * @param name The <code>nodeName</code> of the node to remove.
+     * @return The node removed from this map if a node with such a name 
+     *   exists.
+     * @exception DOMException
+     *   NOT_FOUND_ERR: Raised if there is no node named <code>name</code> in 
+     *   this map.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
+     */
+    public Node removeNamedItem(String name)
+                                throws DOMException;
+
+    /**
+     * Returns the <code>index</code>th item in the map. If <code>index</code> 
+     * is greater than or equal to the number of nodes in this map, this 
+     * returns <code>null</code>.
+     * @param index Index into this map.
+     * @return The node at the <code>index</code>th position in the map, or 
+     *   <code>null</code> if that is not a valid index.
+     */
+    public Node item(int index);
+
+    /**
+     * The number of nodes in this map. The range of valid child node indices 
+     * is <code>0</code> to <code>length-1</code> inclusive.
+     */
+    public int getLength();
+
+    /**
+     * Retrieves a node specified by local name and namespace URI.
+     * <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     * , applications must use the value null as the namespaceURI parameter 
+     * for methods if they wish to have no namespace.
+     * @param namespaceURI The namespace URI of the node to retrieve.
+     * @param localName The local name of the node to retrieve.
+     * @return A <code>Node</code> (of any type) with the specified local 
+     *   name and namespace URI, or <code>null</code> if they do not 
+     *   identify any node in this map.
+     * @exception DOMException
+     *   NOT_SUPPORTED_ERR: May be raised if the implementation does not 
+     *   support the feature "XML" and the language exposed through the 
+     *   Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]). 
+     * @since DOM Level 2
+     */
+    public Node getNamedItemNS(String namespaceURI, 
+                               String localName)
+                               throws DOMException;
+
+    /**
+     * Adds a node using its <code>namespaceURI</code> and 
+     * <code>localName</code>. If a node with that namespace URI and that 
+     * local name is already present in this map, it is replaced by the new 
+     * one. Replacing a node by itself has no effect.
+     * <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     * , applications must use the value null as the namespaceURI parameter 
+     * for methods if they wish to have no namespace.
+     * @param arg A node to store in this map. The node will later be 
+     *   accessible using the value of its <code>namespaceURI</code> and 
+     *   <code>localName</code> attributes.
+     * @return If the new <code>Node</code> replaces an existing node the 
+     *   replaced <code>Node</code> is returned, otherwise <code>null</code> 
+     *   is returned.
+     * @exception DOMException
+     *   WRONG_DOCUMENT_ERR: Raised if <code>arg</code> was created from a 
+     *   different document than the one that created this map.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
+     *   <br>INUSE_ATTRIBUTE_ERR: Raised if <code>arg</code> is an 
+     *   <code>Attr</code> that is already an attribute of another 
+     *   <code>Element</code> object. The DOM user must explicitly clone 
+     *   <code>Attr</code> nodes to re-use them in other elements.
+     *   <br>HIERARCHY_REQUEST_ERR: Raised if an attempt is made to add a node 
+     *   doesn't belong in this NamedNodeMap. Examples would include trying 
+     *   to insert something other than an Attr node into an Element's map 
+     *   of attributes, or a non-Entity node into the DocumentType's map of 
+     *   Entities.
+     *   <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not 
+     *   support the feature "XML" and the language exposed through the 
+     *   Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]). 
+     * @since DOM Level 2
+     */
+    public Node setNamedItemNS(Node arg)
+                               throws DOMException;
+
+    /**
+     * Removes a node specified by local name and namespace URI. A removed 
+     * attribute may be known to have a default value when this map contains 
+     * the attributes attached to an element, as returned by the attributes 
+     * attribute of the <code>Node</code> interface. If so, an attribute 
+     * immediately appears containing the default value as well as the 
+     * corresponding namespace URI, local name, and prefix when applicable.
+     * <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     * , applications must use the value null as the namespaceURI parameter 
+     * for methods if they wish to have no namespace.
+     * @param namespaceURI The namespace URI of the node to remove.
+     * @param localName The local name of the node to remove.
+     * @return The node removed from this map if a node with such a local 
+     *   name and namespace URI exists.
+     * @exception DOMException
+     *   NOT_FOUND_ERR: Raised if there is no node with the specified 
+     *   <code>namespaceURI</code> and <code>localName</code> in this map.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
+     *   <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not 
+     *   support the feature "XML" and the language exposed through the 
+     *   Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]). 
+     * @since DOM Level 2
+     */
+    public Node removeNamedItemNS(String namespaceURI, 
+                                  String localName)
+                                  throws DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/Node.java b/libjava/external/w3c_dom/org/w3c/dom/Node.java
new file mode 100644 (file)
index 0000000..989d49a
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/Node.java
@@ -0,0 +1,900 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * The <code>Node</code> interface is the primary datatype for the entire 
+ * Document Object Model. It represents a single node in the document tree. 
+ * While all objects implementing the <code>Node</code> interface expose 
+ * methods for dealing with children, not all objects implementing the 
+ * <code>Node</code> interface may have children. For example, 
+ * <code>Text</code> nodes may not have children, and adding children to 
+ * such nodes results in a <code>DOMException</code> being raised.
+ * <p>The attributes <code>nodeName</code>, <code>nodeValue</code> and 
+ * <code>attributes</code> are included as a mechanism to get at node 
+ * information without casting down to the specific derived interface. In 
+ * cases where there is no obvious mapping of these attributes for a 
+ * specific <code>nodeType</code> (e.g., <code>nodeValue</code> for an 
+ * <code>Element</code> or <code>attributes</code> for a <code>Comment</code>
+ * ), this returns <code>null</code>. Note that the specialized interfaces 
+ * may contain additional and more convenient mechanisms to get and set the 
+ * relevant information.
+ * <p>The values of <code>nodeName</code>, 
+ * <code>nodeValue</code>, and <code>attributes</code> vary according to the 
+ * node type as follows: 
+ * <table border='1' cellpadding='3'>
+ * <tr>
+ * <th>Interface</th>
+ * <th>nodeName</th>
+ * <th>nodeValue</th>
+ * <th>attributes</th>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <code>Attr</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>same as <code>Attr.name</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>same as 
+ * <code>Attr.value</code></td>
+ * <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'><code>CDATASection</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <code>"#cdata-section"</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>same as <code>CharacterData.data</code>, the 
+ * content of the CDATA Section</td>
+ * <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'><code>Comment</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <code>"#comment"</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>same as <code>CharacterData.data</code>, the 
+ * content of the comment</td>
+ * <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'><code>Document</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <code>"#document"</code></td>
+ * <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
+ * <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <code>DocumentFragment</code></td>
+ * <td valign='top' rowspan='1' colspan='1'><code>"#document-fragment"</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <code>null</code></td>
+ * <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'><code>DocumentType</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>same as 
+ * <code>DocumentType.name</code></td>
+ * <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
+ * <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <code>Element</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>same as <code>Element.tagName</code></td>
+ * <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <code>NamedNodeMap</code></td>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'><code>Entity</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>entity name</td>
+ * <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <code>null</code></td>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'><code>EntityReference</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>name of entity referenced</td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <code>null</code></td>
+ * <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'><code>Notation</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>notation name</td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <code>null</code></td>
+ * <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'><code>ProcessingInstruction</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>same 
+ * as <code>ProcessingInstruction.target</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>same as 
+ * <code>ProcessingInstruction.data</code></td>
+ * <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
+ * </tr>
+ * <tr>
+ * <td valign='top' rowspan='1' colspan='1'><code>Text</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>
+ * <code>"#text"</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>same as <code>CharacterData.data</code>, the content 
+ * of the text node</td>
+ * <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
+ * </tr>
+ * </table> 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface Node {
+    // NodeType
+    /**
+     * The node is an <code>Element</code>.
+     */
+    public static final short ELEMENT_NODE              = 1;
+    /**
+     * The node is an <code>Attr</code>.
+     */
+    public static final short ATTRIBUTE_NODE            = 2;
+    /**
+     * The node is a <code>Text</code> node.
+     */
+    public static final short TEXT_NODE                 = 3;
+    /**
+     * The node is a <code>CDATASection</code>.
+     */
+    public static final short CDATA_SECTION_NODE        = 4;
+    /**
+     * The node is an <code>EntityReference</code>.
+     */
+    public static final short ENTITY_REFERENCE_NODE     = 5;
+    /**
+     * The node is an <code>Entity</code>.
+     */
+    public static final short ENTITY_NODE               = 6;
+    /**
+     * The node is a <code>ProcessingInstruction</code>.
+     */
+    public static final short PROCESSING_INSTRUCTION_NODE = 7;
+    /**
+     * The node is a <code>Comment</code>.
+     */
+    public static final short COMMENT_NODE              = 8;
+    /**
+     * The node is a <code>Document</code>.
+     */
+    public static final short DOCUMENT_NODE             = 9;
+    /**
+     * The node is a <code>DocumentType</code>.
+     */
+    public static final short DOCUMENT_TYPE_NODE        = 10;
+    /**
+     * The node is a <code>DocumentFragment</code>.
+     */
+    public static final short DOCUMENT_FRAGMENT_NODE    = 11;
+    /**
+     * The node is a <code>Notation</code>.
+     */
+    public static final short NOTATION_NODE             = 12;
+
+    /**
+     * The name of this node, depending on its type; see the table above.
+     */
+    public String getNodeName();
+
+    /**
+     * The value of this node, depending on its type; see the table above. 
+     * When it is defined to be <code>null</code>, setting it has no effect, 
+     * including if the node is read-only.
+     * @exception DOMException
+     *   DOMSTRING_SIZE_ERR: Raised when it would return more characters than 
+     *   fit in a <code>DOMString</code> variable on the implementation 
+     *   platform.
+     */
+    public String getNodeValue()
+                              throws DOMException;
+    /**
+     * The value of this node, depending on its type; see the table above. 
+     * When it is defined to be <code>null</code>, setting it has no effect, 
+     * including if the node is read-only.
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly and if 
+     *   it is not defined to be <code>null</code>.
+     */
+    public void setNodeValue(String nodeValue)
+                              throws DOMException;
+
+    /**
+     * A code representing the type of the underlying object, as defined above.
+     */
+    public short getNodeType();
+
+    /**
+     * The parent of this node. All nodes, except <code>Attr</code>, 
+     * <code>Document</code>, <code>DocumentFragment</code>, 
+     * <code>Entity</code>, and <code>Notation</code> may have a parent. 
+     * However, if a node has just been created and not yet added to the 
+     * tree, or if it has been removed from the tree, this is 
+     * <code>null</code>. 
+     */
+    public Node getParentNode();
+
+    /**
+     * A <code>NodeList</code> that contains all children of this node. If 
+     * there are no children, this is a <code>NodeList</code> containing no 
+     * nodes.
+     */
+    public NodeList getChildNodes();
+
+    /**
+     * The first child of this node. If there is no such node, this returns 
+     * <code>null</code>.
+     */
+    public Node getFirstChild();
+
+    /**
+     * The last child of this node. If there is no such node, this returns 
+     * <code>null</code>.
+     */
+    public Node getLastChild();
+
+    /**
+     * The node immediately preceding this node. If there is no such node, 
+     * this returns <code>null</code>.
+     */
+    public Node getPreviousSibling();
+
+    /**
+     * The node immediately following this node. If there is no such node, 
+     * this returns <code>null</code>.
+     */
+    public Node getNextSibling();
+
+    /**
+     * A <code>NamedNodeMap</code> containing the attributes of this node (if 
+     * it is an <code>Element</code>) or <code>null</code> otherwise.
+     */
+    public NamedNodeMap getAttributes();
+
+    /**
+     * The <code>Document</code> object associated with this node. This is 
+     * also the <code>Document</code> object used to create new nodes. When 
+     * this node is a <code>Document</code> or a <code>DocumentType</code> 
+     * which is not used with any <code>Document</code> yet, this is 
+     * <code>null</code>.
+     * @version DOM Level 2
+     */
+    public Document getOwnerDocument();
+
+    /**
+     * Inserts the node <code>newChild</code> before the existing child node 
+     * <code>refChild</code>. If <code>refChild</code> is <code>null</code>, 
+     * insert <code>newChild</code> at the end of the list of children.
+     * <br>If <code>newChild</code> is a <code>DocumentFragment</code> object, 
+     * all of its children are inserted, in the same order, before 
+     * <code>refChild</code>. If the <code>newChild</code> is already in the 
+     * tree, it is first removed.
+     * <p ><b>Note:</b>  Inserting a node before itself is implementation 
+     * dependent. 
+     * @param newChild The node to insert.
+     * @param refChild The reference node, i.e., the node before which the 
+     *   new node must be inserted.
+     * @return The node being inserted.
+     * @exception DOMException
+     *   HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not 
+     *   allow children of the type of the <code>newChild</code> node, or if 
+     *   the node to insert is one of this node's ancestors or this node 
+     *   itself, or if this node is of type <code>Document</code> and the 
+     *   DOM application attempts to insert a second 
+     *   <code>DocumentType</code> or <code>Element</code> node.
+     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>newChild</code> was created 
+     *   from a different document than the one that created this node.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly or 
+     *   if the parent of the node being inserted is readonly.
+     *   <br>NOT_FOUND_ERR: Raised if <code>refChild</code> is not a child of 
+     *   this node.
+     *   <br>NOT_SUPPORTED_ERR: if this node is of type <code>Document</code>, 
+     *   this exception might be raised if the DOM implementation doesn't 
+     *   support the insertion of a <code>DocumentType</code> or 
+     *   <code>Element</code> node.
+     * @version DOM Level 3
+     */
+    public Node insertBefore(Node newChild, 
+                             Node refChild)
+                             throws DOMException;
+
+    /**
+     * Replaces the child node <code>oldChild</code> with <code>newChild</code>
+     *  in the list of children, and returns the <code>oldChild</code> node.
+     * <br>If <code>newChild</code> is a <code>DocumentFragment</code> object, 
+     * <code>oldChild</code> is replaced by all of the 
+     * <code>DocumentFragment</code> children, which are inserted in the 
+     * same order. If the <code>newChild</code> is already in the tree, it 
+     * is first removed.
+     * <p ><b>Note:</b>  Replacing a node with itself is implementation 
+     * dependent. 
+     * @param newChild The new node to put in the child list.
+     * @param oldChild The node being replaced in the list.
+     * @return The node replaced.
+     * @exception DOMException
+     *   HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not 
+     *   allow children of the type of the <code>newChild</code> node, or if 
+     *   the node to put in is one of this node's ancestors or this node 
+     *   itself, or if this node is of type <code>Document</code> and the 
+     *   result of the replacement operation would add a second 
+     *   <code>DocumentType</code> or <code>Element</code> on the 
+     *   <code>Document</code> node.
+     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>newChild</code> was created 
+     *   from a different document than the one that created this node.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node or the parent of 
+     *   the new node is readonly.
+     *   <br>NOT_FOUND_ERR: Raised if <code>oldChild</code> is not a child of 
+     *   this node.
+     *   <br>NOT_SUPPORTED_ERR: if this node is of type <code>Document</code>, 
+     *   this exception might be raised if the DOM implementation doesn't 
+     *   support the replacement of the <code>DocumentType</code> child or 
+     *   <code>Element</code> child.
+     * @version DOM Level 3
+     */
+    public Node replaceChild(Node newChild, 
+                             Node oldChild)
+                             throws DOMException;
+
+    /**
+     * Removes the child node indicated by <code>oldChild</code> from the list 
+     * of children, and returns it.
+     * @param oldChild The node being removed.
+     * @return The node removed.
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     *   <br>NOT_FOUND_ERR: Raised if <code>oldChild</code> is not a child of 
+     *   this node.
+     *   <br>NOT_SUPPORTED_ERR: if this node is of type <code>Document</code>, 
+     *   this exception might be raised if the DOM implementation doesn't 
+     *   support the removal of the <code>DocumentType</code> child or the 
+     *   <code>Element</code> child.
+     * @version DOM Level 3
+     */
+    public Node removeChild(Node oldChild)
+                            throws DOMException;
+
+    /**
+     * Adds the node <code>newChild</code> to the end of the list of children 
+     * of this node. If the <code>newChild</code> is already in the tree, it 
+     * is first removed.
+     * @param newChild The node to add.If it is a 
+     *   <code>DocumentFragment</code> object, the entire contents of the 
+     *   document fragment are moved into the child list of this node
+     * @return The node added.
+     * @exception DOMException
+     *   HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not 
+     *   allow children of the type of the <code>newChild</code> node, or if 
+     *   the node to append is one of this node's ancestors or this node 
+     *   itself, or if this node is of type <code>Document</code> and the 
+     *   DOM application attempts to append a second 
+     *   <code>DocumentType</code> or <code>Element</code> node.
+     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>newChild</code> was created 
+     *   from a different document than the one that created this node.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly or 
+     *   if the previous parent of the node being inserted is readonly.
+     *   <br>NOT_SUPPORTED_ERR: if the <code>newChild</code> node is a child 
+     *   of the <code>Document</code> node, this exception might be raised 
+     *   if the DOM implementation doesn't support the removal of the 
+     *   <code>DocumentType</code> child or <code>Element</code> child.
+     * @version DOM Level 3
+     */
+    public Node appendChild(Node newChild)
+                            throws DOMException;
+
+    /**
+     * Returns whether this node has any children.
+     * @return Returns <code>true</code> if this node has any children, 
+     *   <code>false</code> otherwise.
+     */
+    public boolean hasChildNodes();
+
+    /**
+     * Returns a duplicate of this node, i.e., serves as a generic copy 
+     * constructor for nodes. The duplicate node has no parent (
+     * <code>parentNode</code> is <code>null</code>) and no user data. User 
+     * data associated to the imported node is not carried over. However, if 
+     * any <code>UserDataHandlers</code> has been specified along with the 
+     * associated data these handlers will be called with the appropriate 
+     * parameters before this method returns.
+     * <br>Cloning an <code>Element</code> copies all attributes and their 
+     * values, including those generated by the XML processor to represent 
+     * defaulted attributes, but this method does not copy any children it 
+     * contains unless it is a deep clone. This includes text contained in 
+     * an the <code>Element</code> since the text is contained in a child 
+     * <code>Text</code> node. Cloning an <code>Attr</code> directly, as 
+     * opposed to be cloned as part of an <code>Element</code> cloning 
+     * operation, returns a specified attribute (<code>specified</code> is 
+     * <code>true</code>). Cloning an <code>Attr</code> always clones its 
+     * children, since they represent its value, no matter whether this is a 
+     * deep clone or not. Cloning an <code>EntityReference</code> 
+     * automatically constructs its subtree if a corresponding 
+     * <code>Entity</code> is available, no matter whether this is a deep 
+     * clone or not. Cloning any other type of node simply returns a copy of 
+     * this node.
+     * <br>Note that cloning an immutable subtree results in a mutable copy, 
+     * but the children of an <code>EntityReference</code> clone are readonly
+     * . In addition, clones of unspecified <code>Attr</code> nodes are 
+     * specified. And, cloning <code>Document</code>, 
+     * <code>DocumentType</code>, <code>Entity</code>, and 
+     * <code>Notation</code> nodes is implementation dependent.
+     * @param deep If <code>true</code>, recursively clone the subtree under 
+     *   the specified node; if <code>false</code>, clone only the node 
+     *   itself (and its attributes, if it is an <code>Element</code>).
+     * @return The duplicate node.
+     */
+    public Node cloneNode(boolean deep);
+
+    /**
+     *  Puts all <code>Text</code> nodes in the full depth of the sub-tree 
+     * underneath this <code>Node</code>, including attribute nodes, into a 
+     * "normal" form where only structure (e.g., elements, comments, 
+     * processing instructions, CDATA sections, and entity references) 
+     * separates <code>Text</code> nodes, i.e., there are neither adjacent 
+     * <code>Text</code> nodes nor empty <code>Text</code> nodes. This can 
+     * be used to ensure that the DOM view of a document is the same as if 
+     * it were saved and re-loaded, and is useful when operations (such as 
+     * XPointer [<a href='http://www.w3.org/TR/2003/REC-xptr-framework-20030325/'>XPointer</a>]
+     *  lookups) that depend on a particular document tree structure are to 
+     * be used. If the parameter "normalize-characters" of the 
+     * <code>DOMConfiguration</code> object attached to the 
+     * <code>Node.ownerDocument</code> is <code>true</code>, this method 
+     * will also fully normalize the characters of the <code>Text</code> 
+     * nodes. 
+     * <p ><b>Note:</b> In cases where the document contains 
+     * <code>CDATASections</code>, the normalize operation alone may not be 
+     * sufficient, since XPointers do not differentiate between 
+     * <code>Text</code> nodes and <code>CDATASection</code> nodes.
+     * @version DOM Level 3
+     */
+    public void normalize();
+
+    /**
+     *  Tests whether the DOM implementation implements a specific feature and 
+     * that feature is supported by this node, as specified in . 
+     * @param feature  The name of the feature to test. 
+     * @param version  This is the version number of the feature to test. 
+     * @return Returns <code>true</code> if the specified feature is 
+     *   supported on this node, <code>false</code> otherwise.
+     * @since DOM Level 2
+     */
+    public boolean isSupported(String feature, 
+                               String version);
+
+    /**
+     * The namespace URI of this node, or <code>null</code> if it is 
+     * unspecified (see ).
+     * <br>This is not a computed value that is the result of a namespace 
+     * lookup based on an examination of the namespace declarations in 
+     * scope. It is merely the namespace URI given at creation time.
+     * <br>For nodes of any type other than <code>ELEMENT_NODE</code> and 
+     * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1 
+     * method, such as <code>Document.createElement()</code>, this is always 
+     * <code>null</code>.
+     * <p ><b>Note:</b> Per the <em>Namespaces in XML</em> Specification [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     *  an attribute does not inherit its namespace from the element it is 
+     * attached to. If an attribute is not explicitly given a namespace, it 
+     * simply has no namespace.
+     * @since DOM Level 2
+     */
+    public String getNamespaceURI();
+
+    /**
+     * The namespace prefix of this node, or <code>null</code> if it is 
+     * unspecified. When it is defined to be <code>null</code>, setting it 
+     * has no effect, including if the node is read-only.
+     * <br>Note that setting this attribute, when permitted, changes the 
+     * <code>nodeName</code> attribute, which holds the qualified name, as 
+     * well as the <code>tagName</code> and <code>name</code> attributes of 
+     * the <code>Element</code> and <code>Attr</code> interfaces, when 
+     * applicable.
+     * <br>Setting the prefix to <code>null</code> makes it unspecified, 
+     * setting it to an empty string is implementation dependent.
+     * <br>Note also that changing the prefix of an attribute that is known to 
+     * have a default value, does not make a new attribute with the default 
+     * value and the original prefix appear, since the 
+     * <code>namespaceURI</code> and <code>localName</code> do not change.
+     * <br>For nodes of any type other than <code>ELEMENT_NODE</code> and 
+     * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1 
+     * method, such as <code>createElement</code> from the 
+     * <code>Document</code> interface, this is always <code>null</code>.
+     * @since DOM Level 2
+     */
+    public String getPrefix();
+    /**
+     * The namespace prefix of this node, or <code>null</code> if it is 
+     * unspecified. When it is defined to be <code>null</code>, setting it 
+     * has no effect, including if the node is read-only.
+     * <br>Note that setting this attribute, when permitted, changes the 
+     * <code>nodeName</code> attribute, which holds the qualified name, as 
+     * well as the <code>tagName</code> and <code>name</code> attributes of 
+     * the <code>Element</code> and <code>Attr</code> interfaces, when 
+     * applicable.
+     * <br>Setting the prefix to <code>null</code> makes it unspecified, 
+     * setting it to an empty string is implementation dependent.
+     * <br>Note also that changing the prefix of an attribute that is known to 
+     * have a default value, does not make a new attribute with the default 
+     * value and the original prefix appear, since the 
+     * <code>namespaceURI</code> and <code>localName</code> do not change.
+     * <br>For nodes of any type other than <code>ELEMENT_NODE</code> and 
+     * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1 
+     * method, such as <code>createElement</code> from the 
+     * <code>Document</code> interface, this is always <code>null</code>.
+     * @exception DOMException
+     *   INVALID_CHARACTER_ERR: Raised if the specified prefix contains an 
+     *   illegal character according to the XML version in use specified in 
+     *   the <code>Document.xmlVersion</code> attribute.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     *   <br>NAMESPACE_ERR: Raised if the specified <code>prefix</code> is 
+     *   malformed per the Namespaces in XML specification, if the 
+     *   <code>namespaceURI</code> of this node is <code>null</code>, if the 
+     *   specified prefix is "xml" and the <code>namespaceURI</code> of this 
+     *   node is different from "<a href='http://www.w3.org/XML/1998/namespace'>
+     *   http://www.w3.org/XML/1998/namespace</a>", if this node is an attribute and the specified prefix is "xmlns" and 
+     *   the <code>namespaceURI</code> of this node is different from "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>", or if this node is an attribute and the <code>qualifiedName</code> of 
+     *   this node is "xmlns" [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     *   .
+     * @since DOM Level 2
+     */
+    public void setPrefix(String prefix)
+                               throws DOMException;
+
+    /**
+     * Returns the local part of the qualified name of this node.
+     * <br>For nodes of any type other than <code>ELEMENT_NODE</code> and 
+     * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1 
+     * method, such as <code>Document.createElement()</code>, this is always 
+     * <code>null</code>.
+     * @since DOM Level 2
+     */
+    public String getLocalName();
+
+    /**
+     * Returns whether this node (if it is an element) has any attributes.
+     * @return Returns <code>true</code> if this node has any attributes, 
+     *   <code>false</code> otherwise.
+     * @since DOM Level 2
+     */
+    public boolean hasAttributes();
+
+    /**
+     * The absolute base URI of this node or <code>null</code> if the 
+     * implementation wasn't able to obtain an absolute URI. This value is 
+     * computed as described in . However, when the <code>Document</code> 
+     * supports the feature "HTML" [<a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>DOM Level 2 HTML</a>]
+     * , the base URI is computed using first the value of the href 
+     * attribute of the HTML BASE element if any, and the value of the 
+     * <code>documentURI</code> attribute from the <code>Document</code> 
+     * interface otherwise.
+     * @since DOM Level 3
+     */
+    public String getBaseURI();
+
+    // DocumentPosition
+    /**
+     * The two nodes are disconnected. Order between disconnected nodes is 
+     * always implementation-specific.
+     */
+    public static final short DOCUMENT_POSITION_DISCONNECTED = 0x01;
+    /**
+     * The second node precedes the reference node.
+     */
+    public static final short DOCUMENT_POSITION_PRECEDING = 0x02;
+    /**
+     * The node follows the reference node.
+     */
+    public static final short DOCUMENT_POSITION_FOLLOWING = 0x04;
+    /**
+     * The node contains the reference node. A node which contains is always 
+     * preceding, too.
+     */
+    public static final short DOCUMENT_POSITION_CONTAINS = 0x08;
+    /**
+     * The node is contained by the reference node. A node which is contained 
+     * is always following, too.
+     */
+    public static final short DOCUMENT_POSITION_CONTAINED_BY = 0x10;
+    /**
+     * The determination of preceding versus following is 
+     * implementation-specific.
+     */
+    public static final short DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 0x20;
+
+    /**
+     * Compares the reference node, i.e. the node on which this method is 
+     * being called, with a node, i.e. the one passed as a parameter, with 
+     * regard to their position in the document and according to the 
+     * document order.
+     * @param other The node to compare against the reference node.
+     * @return Returns how the node is positioned relatively to the reference 
+     *   node.
+     * @exception DOMException
+     *   NOT_SUPPORTED_ERR: when the compared nodes are from different DOM 
+     *   implementations that do not coordinate to return consistent 
+     *   implementation-specific results.
+     * @since DOM Level 3
+     */
+    public short compareDocumentPosition(Node other)
+                                         throws DOMException;
+
+    /**
+     * This attribute returns the text content of this node and its 
+     * descendants. When it is defined to be <code>null</code>, setting it 
+     * has no effect. On setting, any possible children this node may have 
+     * are removed and, if it the new string is not empty or 
+     * <code>null</code>, replaced by a single <code>Text</code> node 
+     * containing the string this attribute is set to. 
+     * <br> On getting, no serialization is performed, the returned string 
+     * does not contain any markup. No whitespace normalization is performed 
+     * and the returned string does not contain the white spaces in element 
+     * content (see the attribute 
+     * <code>Text.isElementContentWhitespace</code>). Similarly, on setting, 
+     * no parsing is performed either, the input string is taken as pure 
+     * textual content. 
+     * <br>The string returned is made of the text content of this node 
+     * depending on its type, as defined below: 
+     * <table border='1' cellpadding='3'>
+     * <tr>
+     * <th>Node type</th>
+     * <th>Content</th>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'>
+     * ELEMENT_NODE, ATTRIBUTE_NODE, ENTITY_NODE, ENTITY_REFERENCE_NODE, 
+     * DOCUMENT_FRAGMENT_NODE</td>
+     * <td valign='top' rowspan='1' colspan='1'>concatenation of the <code>textContent</code> 
+     * attribute value of every child node, excluding COMMENT_NODE and 
+     * PROCESSING_INSTRUCTION_NODE nodes. This is the empty string if the 
+     * node has no children.</td>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'>TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE, 
+     * PROCESSING_INSTRUCTION_NODE</td>
+     * <td valign='top' rowspan='1' colspan='1'><code>nodeValue</code></td>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'>DOCUMENT_NODE, 
+     * DOCUMENT_TYPE_NODE, NOTATION_NODE</td>
+     * <td valign='top' rowspan='1' colspan='1'><em>null</em></td>
+     * </tr>
+     * </table>
+     * @exception DOMException
+     *   DOMSTRING_SIZE_ERR: Raised when it would return more characters than 
+     *   fit in a <code>DOMString</code> variable on the implementation 
+     *   platform.
+     * @since DOM Level 3
+     */
+    public String getTextContent()
+                                         throws DOMException;
+    /**
+     * This attribute returns the text content of this node and its 
+     * descendants. When it is defined to be <code>null</code>, setting it 
+     * has no effect. On setting, any possible children this node may have 
+     * are removed and, if it the new string is not empty or 
+     * <code>null</code>, replaced by a single <code>Text</code> node 
+     * containing the string this attribute is set to. 
+     * <br> On getting, no serialization is performed, the returned string 
+     * does not contain any markup. No whitespace normalization is performed 
+     * and the returned string does not contain the white spaces in element 
+     * content (see the attribute 
+     * <code>Text.isElementContentWhitespace</code>). Similarly, on setting, 
+     * no parsing is performed either, the input string is taken as pure 
+     * textual content. 
+     * <br>The string returned is made of the text content of this node 
+     * depending on its type, as defined below: 
+     * <table border='1' cellpadding='3'>
+     * <tr>
+     * <th>Node type</th>
+     * <th>Content</th>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'>
+     * ELEMENT_NODE, ATTRIBUTE_NODE, ENTITY_NODE, ENTITY_REFERENCE_NODE, 
+     * DOCUMENT_FRAGMENT_NODE</td>
+     * <td valign='top' rowspan='1' colspan='1'>concatenation of the <code>textContent</code> 
+     * attribute value of every child node, excluding COMMENT_NODE and 
+     * PROCESSING_INSTRUCTION_NODE nodes. This is the empty string if the 
+     * node has no children.</td>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'>TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE, 
+     * PROCESSING_INSTRUCTION_NODE</td>
+     * <td valign='top' rowspan='1' colspan='1'><code>nodeValue</code></td>
+     * </tr>
+     * <tr>
+     * <td valign='top' rowspan='1' colspan='1'>DOCUMENT_NODE, 
+     * DOCUMENT_TYPE_NODE, NOTATION_NODE</td>
+     * <td valign='top' rowspan='1' colspan='1'><em>null</em></td>
+     * </tr>
+     * </table>
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
+     * @since DOM Level 3
+     */
+    public void setTextContent(String textContent)
+                                         throws DOMException;
+
+    /**
+     * Returns whether this node is the same node as the given one.
+     * <br>This method provides a way to determine whether two 
+     * <code>Node</code> references returned by the implementation reference 
+     * the same object. When two <code>Node</code> references are references 
+     * to the same object, even if through a proxy, the references may be 
+     * used completely interchangeably, such that all attributes have the 
+     * same values and calling the same DOM method on either reference 
+     * always has exactly the same effect.
+     * @param other The node to test against.
+     * @return Returns <code>true</code> if the nodes are the same, 
+     *   <code>false</code> otherwise.
+     * @since DOM Level 3
+     */
+    public boolean isSameNode(Node other);
+
+    /**
+     * Look up the prefix associated to the given namespace URI, starting from 
+     * this node. The default namespace declarations are ignored by this 
+     * method.
+     * <br>See  for details on the algorithm used by this method.
+     * @param namespaceURI The namespace URI to look for.
+     * @return Returns an associated namespace prefix if found or 
+     *   <code>null</code> if none is found. If more than one prefix are 
+     *   associated to the namespace prefix, the returned namespace prefix 
+     *   is implementation dependent.
+     * @since DOM Level 3
+     */
+    public String lookupPrefix(String namespaceURI);
+
+    /**
+     *  This method checks if the specified <code>namespaceURI</code> is the 
+     * default namespace or not. 
+     * @param namespaceURI The namespace URI to look for.
+     * @return Returns <code>true</code> if the specified 
+     *   <code>namespaceURI</code> is the default namespace, 
+     *   <code>false</code> otherwise. 
+     * @since DOM Level 3
+     */
+    public boolean isDefaultNamespace(String namespaceURI);
+
+    /**
+     * Look up the namespace URI associated to the given prefix, starting from 
+     * this node.
+     * <br>See  for details on the algorithm used by this method.
+     * @param prefix The prefix to look for. If this parameter is 
+     *   <code>null</code>, the method will return the default namespace URI 
+     *   if any.
+     * @return Returns the associated namespace URI or <code>null</code> if 
+     *   none is found.
+     * @since DOM Level 3
+     */
+    public String lookupNamespaceURI(String prefix);
+
+    /**
+     * Tests whether two nodes are equal.
+     * <br>This method tests for equality of nodes, not sameness (i.e., 
+     * whether the two nodes are references to the same object) which can be 
+     * tested with <code>Node.isSameNode()</code>. All nodes that are the 
+     * same will also be equal, though the reverse may not be true.
+     * <br>Two nodes are equal if and only if the following conditions are 
+     * satisfied: 
+     * <ul>
+     * <li>The two nodes are of the same type.
+     * </li>
+     * <li>The following string 
+     * attributes are equal: <code>nodeName</code>, <code>localName</code>, 
+     * <code>namespaceURI</code>, <code>prefix</code>, <code>nodeValue</code>
+     * . This is: they are both <code>null</code>, or they have the same 
+     * length and are character for character identical.
+     * </li>
+     * <li>The 
+     * <code>attributes</code> <code>NamedNodeMaps</code> are equal. This 
+     * is: they are both <code>null</code>, or they have the same length and 
+     * for each node that exists in one map there is a node that exists in 
+     * the other map and is equal, although not necessarily at the same 
+     * index.
+     * </li>
+     * <li>The <code>childNodes</code> <code>NodeLists</code> are equal. 
+     * This is: they are both <code>null</code>, or they have the same 
+     * length and contain equal nodes at the same index. Note that 
+     * normalization can affect equality; to avoid this, nodes should be 
+     * normalized before being compared.
+     * </li>
+     * </ul> 
+     * <br>For two <code>DocumentType</code> nodes to be equal, the following 
+     * conditions must also be satisfied: 
+     * <ul>
+     * <li>The following string attributes 
+     * are equal: <code>publicId</code>, <code>systemId</code>, 
+     * <code>internalSubset</code>.
+     * </li>
+     * <li>The <code>entities</code> 
+     * <code>NamedNodeMaps</code> are equal.
+     * </li>
+     * <li>The <code>notations</code> 
+     * <code>NamedNodeMaps</code> are equal.
+     * </li>
+     * </ul> 
+     * <br>On the other hand, the following do not affect equality: the 
+     * <code>ownerDocument</code>, <code>baseURI</code>, and 
+     * <code>parentNode</code> attributes, the <code>specified</code> 
+     * attribute for <code>Attr</code> nodes, the <code>schemaTypeInfo</code>
+     *  attribute for <code>Attr</code> and <code>Element</code> nodes, the 
+     * <code>Text.isElementContentWhitespace</code> attribute for 
+     * <code>Text</code> nodes, as well as any user data or event listeners 
+     * registered on the nodes. 
+     * <p ><b>Note:</b>  As a general rule, anything not mentioned in the 
+     * description above is not significant in consideration of equality 
+     * checking. Note that future versions of this specification may take 
+     * into account more attributes and implementations conform to this 
+     * specification are expected to be updated accordingly. 
+     * @param arg The node to compare equality with.
+     * @return Returns <code>true</code> if the nodes are equal, 
+     *   <code>false</code> otherwise.
+     * @since DOM Level 3
+     */
+    public boolean isEqualNode(Node arg);
+
+    /**
+     *  This method returns a specialized object which implements the 
+     * specialized APIs of the specified feature and version, as specified 
+     * in . The specialized object may also be obtained by using 
+     * binding-specific casting methods but is not necessarily expected to, 
+     * as discussed in . This method also allow the implementation to 
+     * provide specialized objects which do not support the <code>Node</code>
+     *  interface. 
+     * @param feature  The name of the feature requested. Note that any plus 
+     *   sign "+" prepended to the name of the feature will be ignored since 
+     *   it is not significant in the context of this method. 
+     * @param version  This is the version number of the feature to test. 
+     * @return  Returns an object which implements the specialized APIs of 
+     *   the specified feature and version, if any, or <code>null</code> if 
+     *   there is no object which implements interfaces associated with that 
+     *   feature. If the <code>DOMObject</code> returned by this method 
+     *   implements the <code>Node</code> interface, it must delegate to the 
+     *   primary core <code>Node</code> and not return results inconsistent 
+     *   with the primary core <code>Node</code> such as attributes, 
+     *   childNodes, etc. 
+     * @since DOM Level 3
+     */
+    public Object getFeature(String feature, 
+                             String version);
+
+    /**
+     * Associate an object to a key on this node. The object can later be 
+     * retrieved from this node by calling <code>getUserData</code> with the 
+     * same key.
+     * @param key The key to associate the object to.
+     * @param data The object to associate to the given key, or 
+     *   <code>null</code> to remove any existing association to that key.
+     * @param handler The handler to associate to that key, or 
+     *   <code>null</code>.
+     * @return Returns the <code>DOMUserData</code> previously associated to 
+     *   the given key on this node, or <code>null</code> if there was none.
+     * @since DOM Level 3
+     */
+    public Object setUserData(String key, 
+                              Object data, 
+                              UserDataHandler handler);
+
+    /**
+     * Retrieves the object associated to a key on a this node. The object 
+     * must first have been set to this node by calling 
+     * <code>setUserData</code> with the same key.
+     * @param key The key the object is associated to.
+     * @return Returns the <code>DOMUserData</code> associated to the given 
+     *   key on this node, or <code>null</code> if there was none.
+     * @since DOM Level 3
+     */
+    public Object getUserData(String key);
+
+}
diff --git a/libjava/org/w3c/dom/NodeList.java b/libjava/external/w3c_dom/org/w3c/dom/NodeList.java
similarity index 53%
rename from libjava/org/w3c/dom/NodeList.java
rename to libjava/external/w3c_dom/org/w3c/dom/NodeList.java
index f4033f3..e4204ec 100644 (file)
--- a/libjava/org/w3c/dom/NodeList.java
+++ b/libjava/external/w3c_dom/org/w3c/dom/NodeList.java
@@ -1,41 +1,41 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * The <code>NodeList</code> interface provides the abstraction of an ordered \r
- * collection of nodes, without defining or constraining how this collection \r
- * is implemented. <code>NodeList</code> objects in the DOM are live.\r
- * <p>The items in the <code>NodeList</code> are accessible via an integral \r
- * index, starting from 0.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface NodeList {\r
-    /**\r
-     * Returns the <code>index</code>th item in the collection. If \r
-     * <code>index</code> is greater than or equal to the number of nodes in \r
-     * the list, this returns <code>null</code>.\r
-     * @param indexIndex into the collection.\r
-     * @return The node at the <code>index</code>th position in the \r
-     *   <code>NodeList</code>, or <code>null</code> if that is not a valid \r
-     *   index.\r
-     */\r
-    public Node item(int index);\r
-\r
-    /**\r
-     * The number of nodes in the list. The range of valid child node indices \r
-     * is 0 to <code>length-1</code> inclusive. \r
-     */\r
-    public int getLength();\r
-\r
-}\r
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * The <code>NodeList</code> interface provides the abstraction of an ordered 
+ * collection of nodes, without defining or constraining how this collection 
+ * is implemented. <code>NodeList</code> objects in the DOM are live.
+ * <p>The items in the <code>NodeList</code> are accessible via an integral 
+ * index, starting from 0.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface NodeList {
+    /**
+     * Returns the <code>index</code>th item in the collection. If 
+     * <code>index</code> is greater than or equal to the number of nodes in 
+     * the list, this returns <code>null</code>.
+     * @param index Index into the collection.
+     * @return The node at the <code>index</code>th position in the 
+     *   <code>NodeList</code>, or <code>null</code> if that is not a valid 
+     *   index.
+     */
+    public Node item(int index);
+
+    /**
+     * The number of nodes in the list. The range of valid child node indices 
+     * is 0 to <code>length-1</code> inclusive.
+     */
+    public int getLength();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/Notation.java b/libjava/external/w3c_dom/org/w3c/dom/Notation.java
new file mode 100644 (file)
index 0000000..3739f92
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/Notation.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * This interface represents a notation declared in the DTD. A notation either 
+ * declares, by name, the format of an unparsed entity (see <a href='http://www.w3.org/TR/2004/REC-xml-20040204#Notations'>section 4.7</a> of the XML 1.0 specification [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]), or is 
+ * used for formal declaration of processing instruction targets (see <a href='http://www.w3.org/TR/2004/REC-xml-20040204#sec-pi'>section 2.6</a> of the XML 1.0 specification [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]). The 
+ * <code>nodeName</code> attribute inherited from <code>Node</code> is set 
+ * to the declared name of the notation.
+ * <p>The DOM Core does not support editing <code>Notation</code> nodes; they 
+ * are therefore readonly.
+ * <p>A <code>Notation</code> node does not have any parent.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface Notation extends Node {
+    /**
+     * The public identifier of this notation. If the public identifier was 
+     * not specified, this is <code>null</code>.
+     */
+    public String getPublicId();
+
+    /**
+     * The system identifier of this notation. If the system identifier was 
+     * not specified, this is <code>null</code>. This may be an absolute URI 
+     * or not.
+     */
+    public String getSystemId();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/ProcessingInstruction.java b/libjava/external/w3c_dom/org/w3c/dom/ProcessingInstruction.java
new file mode 100644 (file)
index 0000000..0b6825f
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/ProcessingInstruction.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * The <code>ProcessingInstruction</code> interface represents a "processing 
+ * instruction", used in XML as a way to keep processor-specific information 
+ * in the text of the document.
+ * <p> No lexical check is done on the content of a processing instruction and 
+ * it is therefore possible to have the character sequence 
+ * <code>"?&gt;"</code> in the content, which is illegal a processing 
+ * instruction per section 2.6 of [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. The 
+ * presence of this character sequence must generate a fatal error during 
+ * serialization. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface ProcessingInstruction extends Node {
+    /**
+     * The target of this processing instruction. XML defines this as being 
+     * the first token following the markup that begins the processing 
+     * instruction.
+     */
+    public String getTarget();
+
+    /**
+     * The content of this processing instruction. This is from the first non 
+     * white space character after the target to the character immediately 
+     * preceding the <code>?&gt;</code>.
+     */
+    public String getData();
+    /**
+     * The content of this processing instruction. This is from the first non 
+     * white space character after the target to the character immediately 
+     * preceding the <code>?&gt;</code>.
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
+     */
+    public void setData(String data)
+                                   throws DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/Text.java b/libjava/external/w3c_dom/org/w3c/dom/Text.java
new file mode 100644 (file)
index 0000000..9c294a4
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/Text.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * The <code>Text</code> interface inherits from <code>CharacterData</code> 
+ * and represents the textual content (termed <a href='http://www.w3.org/TR/2004/REC-xml-20040204#syntax'>character data</a> in XML) of an <code>Element</code> or <code>Attr</code>. If there is no 
+ * markup inside an element's content, the text is contained in a single 
+ * object implementing the <code>Text</code> interface that is the only 
+ * child of the element. If there is markup, it is parsed into the 
+ * information items (elements, comments, etc.) and <code>Text</code> nodes 
+ * that form the list of children of the element.
+ * <p>When a document is first made available via the DOM, there is only one 
+ * <code>Text</code> node for each block of text. Users may create adjacent 
+ * <code>Text</code> nodes that represent the contents of a given element 
+ * without any intervening markup, but should be aware that there is no way 
+ * to represent the separations between these nodes in XML or HTML, so they 
+ * will not (in general) persist between DOM editing sessions. The 
+ * <code>Node.normalize()</code> method merges any such adjacent 
+ * <code>Text</code> objects into a single node for each block of text.
+ * <p> No lexical check is done on the content of a <code>Text</code> node 
+ * and, depending on its position in the document, some characters must be 
+ * escaped during serialization using character references; e.g. the 
+ * characters "&lt;&amp;" if the textual content is part of an element or of 
+ * an attribute, the character sequence "]]&gt;" when part of an element, 
+ * the quotation mark character " or the apostrophe character ' when part of 
+ * an attribute. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ */
+public interface Text extends CharacterData {
+    /**
+     * Breaks this node into two nodes at the specified <code>offset</code>, 
+     * keeping both in the tree as siblings. After being split, this node 
+     * will contain all the content up to the <code>offset</code> point. A 
+     * new node of the same type, which contains all the content at and 
+     * after the <code>offset</code> point, is returned. If the original 
+     * node had a parent node, the new node is inserted as the next sibling 
+     * of the original node. When the <code>offset</code> is equal to the 
+     * length of this node, the new node has no data.
+     * @param offset The 16-bit unit offset at which to split, starting from 
+     *   <code>0</code>.
+     * @return The new node, of the same type as this node.
+     * @exception DOMException
+     *   INDEX_SIZE_ERR: Raised if the specified offset is negative or greater 
+     *   than the number of 16-bit units in <code>data</code>.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
+     */
+    public Text splitText(int offset)
+                          throws DOMException;
+
+    /**
+     * Returns whether this text node contains <a href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204#infoitem.character'>
+     * element content whitespace</a>, often abusively called "ignorable whitespace". The text node is 
+     * determined to contain whitespace in element content during the load 
+     * of the document or if validation occurs while using 
+     * <code>Document.normalizeDocument()</code>.
+     * @since DOM Level 3
+     */
+    public boolean isElementContentWhitespace();
+
+    /**
+     * Returns all text of <code>Text</code> nodes logically-adjacent text 
+     * nodes to this node, concatenated in document order.
+     * <br>For instance, in the example below <code>wholeText</code> on the 
+     * <code>Text</code> node that contains "bar" returns "barfoo", while on 
+     * the <code>Text</code> node that contains "foo" it returns "barfoo". 
+     * @since DOM Level 3
+     */
+    public String getWholeText();
+
+    /**
+     * Replaces the text of the current node and all logically-adjacent text 
+     * nodes with the specified text. All logically-adjacent text nodes are 
+     * removed including the current node unless it was the recipient of the 
+     * replacement text.
+     * <br>This method returns the node which received the replacement text. 
+     * The returned node is: 
+     * <ul>
+     * <li><code>null</code>, when the replacement text is 
+     * the empty string;
+     * </li>
+     * <li>the current node, except when the current node is 
+     * read-only;
+     * </li>
+     * <li> a new <code>Text</code> node of the same type (
+     * <code>Text</code> or <code>CDATASection</code>) as the current node 
+     * inserted at the location of the replacement.
+     * </li>
+     * </ul>
+     * <br>For instance, in the above example calling 
+     * <code>replaceWholeText</code> on the <code>Text</code> node that 
+     * contains "bar" with "yo" in argument results in the following: 
+     * <br>Where the nodes to be removed are read-only descendants of an 
+     * <code>EntityReference</code>, the <code>EntityReference</code> must 
+     * be removed instead of the read-only nodes. If any 
+     * <code>EntityReference</code> to be removed has descendants that are 
+     * not <code>EntityReference</code>, <code>Text</code>, or 
+     * <code>CDATASection</code> nodes, the <code>replaceWholeText</code> 
+     * method must fail before performing any modification of the document, 
+     * raising a <code>DOMException</code> with the code 
+     * <code>NO_MODIFICATION_ALLOWED_ERR</code>.
+     * <br>For instance, in the example below calling 
+     * <code>replaceWholeText</code> on the <code>Text</code> node that 
+     * contains "bar" fails, because the <code>EntityReference</code> node 
+     * "ent" contains an <code>Element</code> node which cannot be removed.
+     * @param content The content of the replacing <code>Text</code> node.
+     * @return The <code>Text</code> node created with the specified content.
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised if one of the <code>Text</code> 
+     *   nodes being replaced is readonly.
+     * @since DOM Level 3
+     */
+    public Text replaceWholeText(String content)
+                                 throws DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/TypeInfo.java b/libjava/external/w3c_dom/org/w3c/dom/TypeInfo.java
new file mode 100644 (file)
index 0000000..054f990
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/TypeInfo.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ *  The <code>TypeInfo</code> interface represents a type referenced from 
+ * <code>Element</code> or <code>Attr</code> nodes, specified in the schemas 
+ * associated with the document. The type is a pair of a namespace URI and 
+ * name properties, and depends on the document's schema. 
+ * <p> If the document's schema is an XML DTD [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>], the values 
+ * are computed as follows: 
+ * <ul>
+ * <li> If this type is referenced from an 
+ * <code>Attr</code> node, <code>typeNamespace</code> is 
+ * <code>"http://www.w3.org/TR/REC-xml"</code> and <code>typeName</code> 
+ * represents the <b>[attribute type]</b> property in the [<a href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204/'>XML Information Set</a>]
+ * . If there is no declaration for the attribute, <code>typeNamespace</code>
+ *  and <code>typeName</code> are <code>null</code>. 
+ * </li>
+ * <li> If this type is 
+ * referenced from an <code>Element</code> node, <code>typeNamespace</code> 
+ * and <code>typeName</code> are <code>null</code>. 
+ * </li>
+ * </ul>
+ * <p> If the document's schema is an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
+ * , the values are computed as follows using the post-schema-validation 
+ * infoset contributions (also called PSVI contributions): 
+ * <ul>
+ * <li> If the <b>[validity]</b> property exists AND is <em>"invalid"</em> or <em>"notKnown"</em>: the {target namespace} and {name} properties of the declared type if 
+ * available, otherwise <code>null</code>. 
+ * <p ><b>Note:</b>  At the time of writing, the XML Schema specification does 
+ * not require exposing the declared type. Thus, DOM implementations might 
+ * choose not to provide type information if validity is not valid. 
+ * </li>
+ * <li> If the <b>[validity]</b> property exists and is <em>"valid"</em>: 
+ * <ol>
+ * <li> If <b>[member type definition]</b> exists: 
+ * <ol>
+ * <li>If {name} is not absent, then expose {name} and {target 
+ * namespace} properties of the <b>[member type definition]</b> property;
+ * </li>
+ * <li>Otherwise, expose the namespace and local name of the 
+ * corresponding anonymous type name.
+ * </li>
+ * </ol>
+ * </li>
+ * <li> If the <b>[type definition]</b> property exists: 
+ * <ol>
+ * <li>If {name} is not absent, then expose {name} and {target 
+ * namespace} properties of the <b>[type definition]</b> property;
+ * </li>
+ * <li>Otherwise, expose the namespace and local name of the 
+ * corresponding anonymous type name.
+ * </li>
+ * </ol> 
+ * </li>
+ * <li> If the <b>[member type definition anonymous]</b> exists: 
+ * <ol>
+ * <li>If it is false, then expose <b>[member type definition name]</b> and <b>[member type definition namespace]</b> properties;
+ * </li>
+ * <li>Otherwise, expose the namespace and local name of the 
+ * corresponding anonymous type name.
+ * </li>
+ * </ol> 
+ * </li>
+ * <li> If the <b>[type definition anonymous]</b> exists: 
+ * <ol>
+ * <li>If it is false, then expose <b>[type definition name]</b> and <b>[type definition namespace]</b> properties;
+ * </li>
+ * <li>Otherwise, expose the namespace and local name of the 
+ * corresponding anonymous type name.
+ * </li>
+ * </ol> 
+ * </li>
+ * </ol>
+ * </li>
+ * </ul>
+ * <p ><b>Note:</b>  Other schema languages are outside the scope of the W3C 
+ * and therefore should define how to represent their type systems using 
+ * <code>TypeInfo</code>. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ * @since DOM Level 3
+ */
+public interface TypeInfo {
+    /**
+     *  The name of a type declared for the associated element or attribute, 
+     * or <code>null</code> if unknown. 
+     */
+    public String getTypeName();
+
+    /**
+     *  The namespace of the type declared for the associated element or 
+     * attribute or <code>null</code> if the element does not have 
+     * declaration or if no namespace information is available. 
+     */
+    public String getTypeNamespace();
+
+    // DerivationMethods
+    /**
+     *  If the document's schema is an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
+     * , this constant represents the derivation by <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#key-typeRestriction'>
+     * restriction</a> if complex types are involved, or a <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#element-restriction'>
+     * restriction</a> if simple types are involved. 
+     * <br>  The reference type definition is derived by restriction from the 
+     * other type definition if the other type definition is the same as the 
+     * reference type definition, or if the other type definition can be 
+     * reached recursively following the {base type definition} property 
+     * from the reference type definition, and all the <em>derivation methods</em> involved are restriction. 
+     */
+    public static final int DERIVATION_RESTRICTION    = 0x00000001;
+    /**
+     *  If the document's schema is an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
+     * , this constant represents the derivation by <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#key-typeExtension'>
+     * extension</a>. 
+     * <br>  The reference type definition is derived by extension from the 
+     * other type definition if the other type definition can be reached 
+     * recursively following the {base type definition} property from the 
+     * reference type definition, and at least one of the <em>derivation methods</em> involved is an extension. 
+     */
+    public static final int DERIVATION_EXTENSION      = 0x00000002;
+    /**
+     *  If the document's schema is an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
+     * , this constant represents the <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#element-union'>
+     * union</a> if simple types are involved. 
+     * <br> The reference type definition is derived by union from the other 
+     * type definition if there exists two type definitions T1 and T2 such 
+     * as the reference type definition is derived from T1 by 
+     * <code>DERIVATION_RESTRICTION</code> or 
+     * <code>DERIVATION_EXTENSION</code>, T2 is derived from the other type 
+     * definition by <code>DERIVATION_RESTRICTION</code>, T1 has {variety} <em>union</em>, and one of the {member type definitions} is T2. Note that T1 could be 
+     * the same as the reference type definition, and T2 could be the same 
+     * as the other type definition. 
+     */
+    public static final int DERIVATION_UNION          = 0x00000004;
+    /**
+     *  If the document's schema is an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
+     * , this constant represents the <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#element-list'>list</a>. 
+     * <br> The reference type definition is derived by list from the other 
+     * type definition if there exists two type definitions T1 and T2 such 
+     * as the reference type definition is derived from T1 by 
+     * <code>DERIVATION_RESTRICTION</code> or 
+     * <code>DERIVATION_EXTENSION</code>, T2 is derived from the other type 
+     * definition by <code>DERIVATION_RESTRICTION</code>, T1 has {variety} <em>list</em>, and T2 is the {item type definition}. Note that T1 could be the same as 
+     * the reference type definition, and T2 could be the same as the other 
+     * type definition. 
+     */
+    public static final int DERIVATION_LIST           = 0x00000008;
+
+    /**
+     *  This method returns if there is a derivation between the reference 
+     * type definition, i.e. the <code>TypeInfo</code> on which the method 
+     * is being called, and the other type definition, i.e. the one passed 
+     * as parameters. 
+     * @param typeNamespaceArg  the namespace of the other type definition. 
+     * @param typeNameArg  the name of the other type definition. 
+     * @param derivationMethod  the type of derivation and conditions applied 
+     *   between two types, as described in the list of constants provided 
+     *   in this interface. 
+     * @return  If the document's schema is a DTD or no schema is associated 
+     *   with the document, this method will always return <code>false</code>
+     *   .  If the document's schema is an XML Schema, the method will 
+     *   <code>true</code> if the reference type definition is derived from 
+     *   the other type definition according to the derivation parameter. If 
+     *   the value of the parameter is <code>0</code> (no bit is set to 
+     *   <code>1</code> for the <code>derivationMethod</code> parameter), 
+     *   the method will return <code>true</code> if the other type 
+     *   definition can be reached by recursing any combination of {base 
+     *   type definition}, {item type definition}, or {member type 
+     *   definitions} from the reference type definition. 
+     */
+    public boolean isDerivedFrom(String typeNamespaceArg, 
+                                 String typeNameArg, 
+                                 int derivationMethod);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/UserDataHandler.java b/libjava/external/w3c_dom/org/w3c/dom/UserDataHandler.java
new file mode 100644 (file)
index 0000000..a16ea73
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/UserDataHandler.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom;
+
+/**
+ * When associating an object to a key on a node using 
+ * <code>Node.setUserData()</code> the application can provide a handler 
+ * that gets called when the node the object is associated to is being 
+ * cloned, imported, or renamed. This can be used by the application to 
+ * implement various behaviors regarding the data it associates to the DOM 
+ * nodes. This interface defines that handler. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
+ * @since DOM Level 3
+ */
+public interface UserDataHandler {
+    // OperationType
+    /**
+     * The node is cloned, using <code>Node.cloneNode()</code>.
+     */
+    public static final short NODE_CLONED               = 1;
+    /**
+     * The node is imported, using <code>Document.importNode()</code>.
+     */
+    public static final short NODE_IMPORTED             = 2;
+    /**
+     * The node is deleted.
+     * <p ><b>Note:</b> This may not be supported or may not be reliable in 
+     * certain environments, such as Java, where the implementation has no 
+     * real control over when objects are actually deleted.
+     */
+    public static final short NODE_DELETED              = 3;
+    /**
+     * The node is renamed, using <code>Document.renameNode()</code>.
+     */
+    public static final short NODE_RENAMED              = 4;
+    /**
+     * The node is adopted, using <code>Document.adoptNode()</code>.
+     */
+    public static final short NODE_ADOPTED              = 5;
+
+    /**
+     * This method is called whenever the node for which this handler is 
+     * registered is imported or cloned.
+     * <br> DOM applications must not raise exceptions in a 
+     * <code>UserDataHandler</code>. The effect of throwing exceptions from 
+     * the handler is DOM implementation dependent. 
+     * @param operation Specifies the type of operation that is being 
+     *   performed on the node.
+     * @param key Specifies the key for which this handler is being called. 
+     * @param data Specifies the data for which this handler is being called. 
+     * @param src Specifies the node being cloned, adopted, imported, or 
+     *   renamed. This is <code>null</code> when the node is being deleted.
+     * @param dst Specifies the node newly created if any, or 
+     *   <code>null</code>.
+     */
+    public void handle(short operation, 
+                       String key, 
+                       Object data, 
+                       Node src, 
+                       Node dst);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/bootstrap/DOMImplementationRegistry.java b/libjava/external/w3c_dom/org/w3c/dom/bootstrap/DOMImplementationRegistry.java
new file mode 100644 (file)
index 0000000..be73f39
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/bootstrap/DOMImplementationRegistry.java
@@ -0,0 +1,387 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+
+package org.w3c.dom.bootstrap;
+
+import java.util.StringTokenizer;
+import java.util.Vector;
+import org.w3c.dom.DOMImplementationSource;
+import org.w3c.dom.DOMImplementationList;
+import org.w3c.dom.DOMImplementation;
+import java.io.InputStream;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * A factory that enables applications to obtain instances of
+ * <code>DOMImplementation</code>.
+ *
+ * <p>
+ * Example:
+ * </p>
+ *
+ * <pre class='example'>
+ *  // get an instance of the DOMImplementation registry
+ *  DOMImplementationRegistry registry =
+ *       DOMImplementationRegistry.newInstance();
+ *  // get a DOM implementation the Level 3 XML module
+ *  DOMImplementation domImpl =
+ *       registry.getDOMImplementation("XML 3.0");
+ * </pre>
+ *
+ * <p>
+ * This provides an application with an implementation-independent starting
+ * point. DOM implementations may modify this class to meet new security
+ * standards or to provide *additional* fallbacks for the list of
+ * DOMImplementationSources.
+ * </p>
+ *
+ * @see DOMImplementation
+ * @see DOMImplementationSource
+ * @since DOM Level 3
+ */
+public final class DOMImplementationRegistry {
+    /**
+     * The system property to specify the
+     * DOMImplementationSource class names.
+     */
+    public static final String PROPERTY =
+       "org.w3c.dom.DOMImplementationSourceList";
+    
+    /**
+     * Default columns per line.
+     */
+    private static final int DEFAULT_LINE_LENGTH = 80;
+    
+    /**
+     * The list of DOMImplementationSources.
+     */
+    private Vector sources;
+    
+    /**
+     * Private constructor.
+     * @param srcs Vector List of DOMImplementationSources
+     */
+    private DOMImplementationRegistry(final Vector srcs) {
+       sources = srcs;
+    }
+    
+    /**
+     * Obtain a new instance of a <code>DOMImplementationRegistry</code>.
+     *
+
+     * The <code>DOMImplementationRegistry</code> is initialized by the
+     * application or the implementation, depending on the context, by
+     * first checking the value of the Java system property
+     * <code>org.w3c.dom.DOMImplementationSourceList</code> and
+     * the the service provider whose contents are at
+     * "<code>META_INF/services/org.w3c.dom.DOMImplementationSourceList</code>"
+     * The value of this property is a white-space separated list of
+     * names of availables classes implementing the
+     * <code>DOMImplementationSource</code> interface. Each class listed
+     * in the class name list is instantiated and any exceptions
+     * encountered are thrown to the application.
+     *
+     * @return an initialized instance of DOMImplementationRegistry
+     * @throws ClassNotFoundException
+     *     If any specified class can not be found
+     * @throws InstantiationException
+     *     If any specified class is an interface or abstract class
+     * @throws IllegalAccessException
+     *     If the default constructor of a specified class is not accessible
+     * @throws ClassCastException
+     *     If any specified class does not implement
+     * <code>DOMImplementationSource</code>
+     */
+    public static DOMImplementationRegistry newInstance()
+       throws
+       ClassNotFoundException,
+       InstantiationException,
+       IllegalAccessException,
+       ClassCastException {
+       Vector sources = new Vector();
+       
+       ClassLoader classLoader = getClassLoader();
+       // fetch system property:
+       String p = getSystemProperty(PROPERTY);
+       
+       //
+       // if property is not specified then use contents of
+        // META_INF/org.w3c.dom.DOMImplementationSourceList from classpath
+       if (p == null) {
+           p = getServiceValue(classLoader);
+       } 
+        if (p == null) {
+           //
+           // DOM Implementations can modify here to add *additional* fallback
+           // mechanisms to access a list of default DOMImplementationSources.
+           p = "gnu.xml.dom.ImplementationSource";
+       }
+       if (p != null) {
+           StringTokenizer st = new StringTokenizer(p);
+           while (st.hasMoreTokens()) {
+               String sourceName = st.nextToken();
+               // Use context class loader, falling back to Class.forName
+               // if and only if this fails...
+               Class sourceClass = null;
+               if (classLoader != null) {
+                   sourceClass = classLoader.loadClass(sourceName);
+               } else {
+                   sourceClass = Class.forName(sourceName);
+               }
+               DOMImplementationSource source =
+                   (DOMImplementationSource) sourceClass.newInstance();
+               sources.addElement(source);
+           }
+       }
+       return new DOMImplementationRegistry(sources);
+    }
+    
+    /**
+     * Return the first implementation that has the desired
+     * features, or <code>null</code> if none is found.
+     *
+     * @param features
+     *            A string that specifies which features are required. This is
+     *            a space separated list in which each feature is specified by
+     *            its name optionally followed by a space and a version number.
+     *            This is something like: "XML 1.0 Traversal +Events 2.0"
+     * @return An implementation that has the desired features,
+     *         or <code>null</code> if none found.
+     */
+    public DOMImplementation getDOMImplementation(final String features) {
+       int size = sources.size();
+       String name = null;
+       for (int i = 0; i < size; i++) {
+           DOMImplementationSource source =
+               (DOMImplementationSource) sources.elementAt(i);
+           DOMImplementation impl = source.getDOMImplementation(features);
+           if (impl != null) {
+               return impl;
+           }
+       }
+       return null;
+    }
+    
+    /**
+     * Return a list of implementations that support the
+     * desired features.
+     *
+     * @param features
+     *            A string that specifies which features are required. This is
+     *            a space separated list in which each feature is specified by
+     *            its name optionally followed by a space and a version number.
+     *            This is something like: "XML 1.0 Traversal +Events 2.0"
+     * @return A list of DOMImplementations that support the desired features.
+     */
+    public DOMImplementationList getDOMImplementationList(final String features) {
+       final Vector implementations = new Vector();
+       int size = sources.size();
+       for (int i = 0; i < size; i++) {
+           DOMImplementationSource source =
+               (DOMImplementationSource) sources.elementAt(i);
+           DOMImplementationList impls =
+               source.getDOMImplementationList(features);
+           for (int j = 0; j < impls.getLength(); j++) {
+               DOMImplementation impl = impls.item(j);
+               implementations.addElement(impl);
+           }
+       }
+       return new DOMImplementationList() {
+               public DOMImplementation item(final int index) {
+                   if (index >= 0 && index < implementations.size()) {
+                       try {
+                           return (DOMImplementation)
+                               implementations.elementAt(index);
+                       } catch (ArrayIndexOutOfBoundsException e) {
+                           return null;
+                       }
+                   }
+                   return null;
+               }
+               
+               public int getLength() {
+                   return implementations.size();
+               }
+           };
+    }
+    
+    /**
+     * Register an implementation.
+     *
+     * @param s The source to be registered, may not be <code>null</code>
+     */
+    public void addSource(final DOMImplementationSource s) {
+       if (s == null) {
+           throw new NullPointerException();
+       }
+       if (!sources.contains(s)) {
+           sources.addElement(s);
+       }
+    }
+    
+    /**
+     *
+     * Gets a class loader.
+     *
+     * @return A class loader, possibly <code>null</code>
+     */
+    private static ClassLoader getClassLoader() {
+       try {
+           ClassLoader contextClassLoader = getContextClassLoader();
+           
+           if (contextClassLoader != null) {
+               return contextClassLoader;
+           }
+       } catch (Exception e) {
+           // Assume that the DOM application is in a JRE 1.1, use the
+           // current ClassLoader
+           return DOMImplementationRegistry.class.getClassLoader();
+       }
+       return DOMImplementationRegistry.class.getClassLoader();
+    }
+    
+    /**
+     * This method attempts to return the first line of the resource
+     * META_INF/services/org.w3c.dom.DOMImplementationSourceList
+     * from the provided ClassLoader.
+     *
+     * @param classLoader classLoader, may not be <code>null</code>.
+     * @return first line of resource, or <code>null</code>
+     */
+    private static String getServiceValue(final ClassLoader classLoader) {
+       String serviceId = "META-INF/services/" + PROPERTY;
+       // try to find services in CLASSPATH
+       try {
+           InputStream is = getResourceAsStream(classLoader, serviceId);
+           
+           if (is != null) {
+               BufferedReader rd;
+               try {
+                   rd =
+                       new BufferedReader(new InputStreamReader(is, "UTF-8"),
+                                          DEFAULT_LINE_LENGTH);
+               } catch (java.io.UnsupportedEncodingException e) {
+                   rd =
+                       new BufferedReader(new InputStreamReader(is),
+                                          DEFAULT_LINE_LENGTH);
+               }               
+               String serviceValue = rd.readLine();
+               rd.close();
+               if (serviceValue != null && serviceValue.length() > 0) {
+                   return serviceValue;
+               }
+           }
+       } catch (Exception ex) {
+           return null;
+       }
+       return null;
+    }
+    
+    /**
+     * A simple JRE (Java Runtime Environment) 1.1 test
+     *
+     * @return <code>true</code> if JRE 1.1 
+     */
+    private static boolean isJRE11() {
+       try {
+           Class c = Class.forName("java.security.AccessController");
+           // java.security.AccessController existed since 1.2 so, if no
+           // exception was thrown, the DOM application is running in a JRE
+           // 1.2 or higher
+           return false;
+       } catch (Exception ex) {
+           // ignore 
+       }
+       return true;
+    }
+    
+    /**
+     * This method returns the ContextClassLoader or <code>null</code> if
+     * running in a JRE 1.1
+     *
+     * @return The Context Classloader
+     */
+    private static ClassLoader getContextClassLoader() {
+       return isJRE11()
+           ? null
+           : (ClassLoader)
+             AccessController.doPrivileged(new PrivilegedAction() {
+                   public Object run() {
+                       ClassLoader classLoader = null;
+                       try {
+                           classLoader =
+                               Thread.currentThread().getContextClassLoader();
+                       } catch (SecurityException ex) {
+                       }
+                       return classLoader;
+                   }
+               });
+    }
+    
+    /**
+     * This method returns the system property indicated by the specified name
+     * after checking access control privileges. For a JRE 1.1, this check is
+     * not done.
+     *          
+     * @param name the name of the system property      
+     * @return the system property
+     */
+    private static String getSystemProperty(final String name) {
+       return isJRE11()
+           ? (String) System.getProperty(name)
+           : (String) AccessController.doPrivileged(new PrivilegedAction() {
+                   public Object run() {
+                       return System.getProperty(name);
+                   }
+               });
+    }
+    
+    /**
+     * This method returns an Inputstream for the reading resource
+     * META_INF/services/org.w3c.dom.DOMImplementationSourceList after checking
+     * access control privileges. For a JRE 1.1, this check is not done.
+     *
+     * @param classLoader classLoader   
+     * @param name the resource         
+     * @return an Inputstream for the resource specified
+     */
+    private static InputStream getResourceAsStream(final ClassLoader classLoader,
+                                                  final String name) {
+       if (isJRE11()) {
+           InputStream ris;
+           if (classLoader == null) {
+               ris = ClassLoader.getSystemResourceAsStream(name);
+           } else {
+               ris = classLoader.getResourceAsStream(name);
+           }    
+           return ris;
+       } else {
+           return (InputStream)
+               AccessController.doPrivileged(new PrivilegedAction() {
+                       public Object run() {
+                           InputStream ris;
+                           if (classLoader == null) {
+                               ris =
+                                   ClassLoader.getSystemResourceAsStream(name);
+                           } else {
+                               ris = classLoader.getResourceAsStream(name);
+                           }
+                           return ris;
+                       }
+                   });
+       }
+    }
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/CSS2Properties.java b/libjava/external/w3c_dom/org/w3c/dom/css/CSS2Properties.java
new file mode 100644 (file)
index 0000000..89ccf50
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/CSS2Properties.java
@@ -0,0 +1,1777 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  The <code>CSS2Properties</code> interface represents a convenience 
+ * mechanism for retrieving and setting properties within a 
+ * <code>CSSStyleDeclaration</code>. The attributes of this interface 
+ * correspond to all the properties specified in CSS2. Getting an attribute 
+ * of this interface is equivalent to calling the 
+ * <code>getPropertyValue</code> method of the 
+ * <code>CSSStyleDeclaration</code> interface. Setting an attribute of this 
+ * interface is equivalent to calling the <code>setProperty</code> method of 
+ * the <code>CSSStyleDeclaration</code> interface. 
+ * <p> A conformant implementation of the CSS module is not required to 
+ * implement the <code>CSS2Properties</code> interface. If an implementation 
+ * does implement this interface, the expectation is that language-specific 
+ * methods can be used to cast from an instance of the 
+ * <code>CSSStyleDeclaration</code> interface to the 
+ * <code>CSS2Properties</code> interface. 
+ * <p> If an implementation does implement this interface, it is expected to 
+ * understand the specific syntax of the shorthand properties, and apply 
+ * their semantics; when the <code>margin</code> property is set, for 
+ * example, the <code>marginTop</code>, <code>marginRight</code>, 
+ * <code>marginBottom</code> and <code>marginLeft</code> properties are 
+ * actually being set by the underlying implementation. 
+ * <p> When dealing with CSS "shorthand" properties, the shorthand properties 
+ * should be decomposed into their component longhand properties as 
+ * appropriate, and when querying for their value, the form returned should 
+ * be the shortest form exactly equivalent to the declarations made in the 
+ * ruleset. However, if there is no shorthand declaration that could be 
+ * added to the ruleset without changing in any way the rules already 
+ * declared in the ruleset (i.e., by adding longhand rules that were 
+ * previously not declared in the ruleset), then the empty string should be 
+ * returned for the shorthand property. 
+ * <p> For example, querying for the <code>font</code> property should not 
+ * return "normal normal normal 14pt/normal Arial, sans-serif", when "14pt 
+ * Arial, sans-serif" suffices. (The normals are initial values, and are 
+ * implied by use of the longhand property.) 
+ * <p> If the values for all the longhand properties that compose a particular 
+ * string are the initial values, then a string consisting of all the 
+ * initial values should be returned (e.g. a <code>border-width</code> value 
+ * of "medium" should be returned as such, not as ""). 
+ * <p> For some shorthand properties that take missing values from other 
+ * sides, such as the <code>margin</code>, <code>padding</code>, and 
+ * <code>border-[width|style|color]</code> properties, the minimum number of 
+ * sides possible should be used; i.e., "0px 10px" will be returned instead 
+ * of "0px 10px 0px 10px". 
+ * <p> If the value of a shorthand property can not be decomposed into its 
+ * component longhand properties, as is the case for the <code>font</code> 
+ * property with a value of "menu", querying for the values of the component 
+ * longhand properties should return the empty string. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface CSS2Properties {
+    /**
+     *  See the azimuth property definition in CSS2. 
+     */
+    public String getAzimuth();
+    /**
+     *  See the azimuth property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setAzimuth(String azimuth)
+                                             throws DOMException;
+
+    /**
+     *  See the background property definition in CSS2. 
+     */
+    public String getBackground();
+    /**
+     *  See the background property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBackground(String background)
+                                             throws DOMException;
+
+    /**
+     *  See the background-attachment property definition in CSS2. 
+     */
+    public String getBackgroundAttachment();
+    /**
+     *  See the background-attachment property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBackgroundAttachment(String backgroundAttachment)
+                                             throws DOMException;
+
+    /**
+     *  See the background-color property definition in CSS2. 
+     */
+    public String getBackgroundColor();
+    /**
+     *  See the background-color property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBackgroundColor(String backgroundColor)
+                                             throws DOMException;
+
+    /**
+     *  See the background-image property definition in CSS2. 
+     */
+    public String getBackgroundImage();
+    /**
+     *  See the background-image property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBackgroundImage(String backgroundImage)
+                                             throws DOMException;
+
+    /**
+     *  See the background-position property definition in CSS2. 
+     */
+    public String getBackgroundPosition();
+    /**
+     *  See the background-position property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBackgroundPosition(String backgroundPosition)
+                                             throws DOMException;
+
+    /**
+     *  See the background-repeat property definition in CSS2. 
+     */
+    public String getBackgroundRepeat();
+    /**
+     *  See the background-repeat property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBackgroundRepeat(String backgroundRepeat)
+                                             throws DOMException;
+
+    /**
+     *  See the border property definition in CSS2. 
+     */
+    public String getBorder();
+    /**
+     *  See the border property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorder(String border)
+                                             throws DOMException;
+
+    /**
+     *  See the border-collapse property definition in CSS2. 
+     */
+    public String getBorderCollapse();
+    /**
+     *  See the border-collapse property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderCollapse(String borderCollapse)
+                                             throws DOMException;
+
+    /**
+     *  See the border-color property definition in CSS2. 
+     */
+    public String getBorderColor();
+    /**
+     *  See the border-color property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderColor(String borderColor)
+                                             throws DOMException;
+
+    /**
+     *  See the border-spacing property definition in CSS2. 
+     */
+    public String getBorderSpacing();
+    /**
+     *  See the border-spacing property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderSpacing(String borderSpacing)
+                                             throws DOMException;
+
+    /**
+     *  See the border-style property definition in CSS2. 
+     */
+    public String getBorderStyle();
+    /**
+     *  See the border-style property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderStyle(String borderStyle)
+                                             throws DOMException;
+
+    /**
+     *  See the border-top property definition in CSS2. 
+     */
+    public String getBorderTop();
+    /**
+     *  See the border-top property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderTop(String borderTop)
+                                             throws DOMException;
+
+    /**
+     *  See the border-right property definition in CSS2. 
+     */
+    public String getBorderRight();
+    /**
+     *  See the border-right property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderRight(String borderRight)
+                                             throws DOMException;
+
+    /**
+     *  See the border-bottom property definition in CSS2. 
+     */
+    public String getBorderBottom();
+    /**
+     *  See the border-bottom property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderBottom(String borderBottom)
+                                             throws DOMException;
+
+    /**
+     *  See the border-left property definition in CSS2. 
+     */
+    public String getBorderLeft();
+    /**
+     *  See the border-left property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderLeft(String borderLeft)
+                                             throws DOMException;
+
+    /**
+     *  See the border-top-color property definition in CSS2. 
+     */
+    public String getBorderTopColor();
+    /**
+     *  See the border-top-color property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderTopColor(String borderTopColor)
+                                             throws DOMException;
+
+    /**
+     *  See the border-right-color property definition in CSS2. 
+     */
+    public String getBorderRightColor();
+    /**
+     *  See the border-right-color property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderRightColor(String borderRightColor)
+                                             throws DOMException;
+
+    /**
+     *  See the border-bottom-color property definition in CSS2. 
+     */
+    public String getBorderBottomColor();
+    /**
+     *  See the border-bottom-color property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderBottomColor(String borderBottomColor)
+                                             throws DOMException;
+
+    /**
+     *  See the border-left-color property definition in CSS2. 
+     */
+    public String getBorderLeftColor();
+    /**
+     *  See the border-left-color property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderLeftColor(String borderLeftColor)
+                                             throws DOMException;
+
+    /**
+     *  See the border-top-style property definition in CSS2. 
+     */
+    public String getBorderTopStyle();
+    /**
+     *  See the border-top-style property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderTopStyle(String borderTopStyle)
+                                             throws DOMException;
+
+    /**
+     *  See the border-right-style property definition in CSS2. 
+     */
+    public String getBorderRightStyle();
+    /**
+     *  See the border-right-style property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderRightStyle(String borderRightStyle)
+                                             throws DOMException;
+
+    /**
+     *  See the border-bottom-style property definition in CSS2. 
+     */
+    public String getBorderBottomStyle();
+    /**
+     *  See the border-bottom-style property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderBottomStyle(String borderBottomStyle)
+                                             throws DOMException;
+
+    /**
+     *  See the border-left-style property definition in CSS2. 
+     */
+    public String getBorderLeftStyle();
+    /**
+     *  See the border-left-style property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderLeftStyle(String borderLeftStyle)
+                                             throws DOMException;
+
+    /**
+     *  See the border-top-width property definition in CSS2. 
+     */
+    public String getBorderTopWidth();
+    /**
+     *  See the border-top-width property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderTopWidth(String borderTopWidth)
+                                             throws DOMException;
+
+    /**
+     *  See the border-right-width property definition in CSS2. 
+     */
+    public String getBorderRightWidth();
+    /**
+     *  See the border-right-width property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderRightWidth(String borderRightWidth)
+                                             throws DOMException;
+
+    /**
+     *  See the border-bottom-width property definition in CSS2. 
+     */
+    public String getBorderBottomWidth();
+    /**
+     *  See the border-bottom-width property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderBottomWidth(String borderBottomWidth)
+                                             throws DOMException;
+
+    /**
+     *  See the border-left-width property definition in CSS2. 
+     */
+    public String getBorderLeftWidth();
+    /**
+     *  See the border-left-width property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderLeftWidth(String borderLeftWidth)
+                                             throws DOMException;
+
+    /**
+     *  See the border-width property definition in CSS2. 
+     */
+    public String getBorderWidth();
+    /**
+     *  See the border-width property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBorderWidth(String borderWidth)
+                                             throws DOMException;
+
+    /**
+     *  See the bottom property definition in CSS2. 
+     */
+    public String getBottom();
+    /**
+     *  See the bottom property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setBottom(String bottom)
+                                             throws DOMException;
+
+    /**
+     *  See the caption-side property definition in CSS2. 
+     */
+    public String getCaptionSide();
+    /**
+     *  See the caption-side property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setCaptionSide(String captionSide)
+                                             throws DOMException;
+
+    /**
+     *  See the clear property definition in CSS2. 
+     */
+    public String getClear();
+    /**
+     *  See the clear property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setClear(String clear)
+                                             throws DOMException;
+
+    /**
+     *  See the clip property definition in CSS2. 
+     */
+    public String getClip();
+    /**
+     *  See the clip property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setClip(String clip)
+                                             throws DOMException;
+
+    /**
+     *  See the color property definition in CSS2. 
+     */
+    public String getColor();
+    /**
+     *  See the color property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setColor(String color)
+                                             throws DOMException;
+
+    /**
+     *  See the content property definition in CSS2. 
+     */
+    public String getContent();
+    /**
+     *  See the content property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setContent(String content)
+                                             throws DOMException;
+
+    /**
+     *  See the counter-increment property definition in CSS2. 
+     */
+    public String getCounterIncrement();
+    /**
+     *  See the counter-increment property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setCounterIncrement(String counterIncrement)
+                                             throws DOMException;
+
+    /**
+     *  See the counter-reset property definition in CSS2. 
+     */
+    public String getCounterReset();
+    /**
+     *  See the counter-reset property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setCounterReset(String counterReset)
+                                             throws DOMException;
+
+    /**
+     *  See the cue property definition in CSS2. 
+     */
+    public String getCue();
+    /**
+     *  See the cue property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setCue(String cue)
+                                             throws DOMException;
+
+    /**
+     *  See the cue-after property definition in CSS2. 
+     */
+    public String getCueAfter();
+    /**
+     *  See the cue-after property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setCueAfter(String cueAfter)
+                                             throws DOMException;
+
+    /**
+     *  See the cue-before property definition in CSS2. 
+     */
+    public String getCueBefore();
+    /**
+     *  See the cue-before property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setCueBefore(String cueBefore)
+                                             throws DOMException;
+
+    /**
+     *  See the cursor property definition in CSS2. 
+     */
+    public String getCursor();
+    /**
+     *  See the cursor property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setCursor(String cursor)
+                                             throws DOMException;
+
+    /**
+     *  See the direction property definition in CSS2. 
+     */
+    public String getDirection();
+    /**
+     *  See the direction property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setDirection(String direction)
+                                             throws DOMException;
+
+    /**
+     *  See the display property definition in CSS2. 
+     */
+    public String getDisplay();
+    /**
+     *  See the display property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setDisplay(String display)
+                                             throws DOMException;
+
+    /**
+     *  See the elevation property definition in CSS2. 
+     */
+    public String getElevation();
+    /**
+     *  See the elevation property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setElevation(String elevation)
+                                             throws DOMException;
+
+    /**
+     *  See the empty-cells property definition in CSS2. 
+     */
+    public String getEmptyCells();
+    /**
+     *  See the empty-cells property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setEmptyCells(String emptyCells)
+                                             throws DOMException;
+
+    /**
+     *  See the float property definition in CSS2. 
+     */
+    public String getCssFloat();
+    /**
+     *  See the float property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setCssFloat(String cssFloat)
+                                             throws DOMException;
+
+    /**
+     *  See the font property definition in CSS2. 
+     */
+    public String getFont();
+    /**
+     *  See the font property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setFont(String font)
+                                             throws DOMException;
+
+    /**
+     *  See the font-family property definition in CSS2. 
+     */
+    public String getFontFamily();
+    /**
+     *  See the font-family property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setFontFamily(String fontFamily)
+                                             throws DOMException;
+
+    /**
+     *  See the font-size property definition in CSS2. 
+     */
+    public String getFontSize();
+    /**
+     *  See the font-size property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setFontSize(String fontSize)
+                                             throws DOMException;
+
+    /**
+     *  See the font-size-adjust property definition in CSS2. 
+     */
+    public String getFontSizeAdjust();
+    /**
+     *  See the font-size-adjust property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setFontSizeAdjust(String fontSizeAdjust)
+                                             throws DOMException;
+
+    /**
+     *  See the font-stretch property definition in CSS2. 
+     */
+    public String getFontStretch();
+    /**
+     *  See the font-stretch property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setFontStretch(String fontStretch)
+                                             throws DOMException;
+
+    /**
+     *  See the font-style property definition in CSS2. 
+     */
+    public String getFontStyle();
+    /**
+     *  See the font-style property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setFontStyle(String fontStyle)
+                                             throws DOMException;
+
+    /**
+     *  See the font-variant property definition in CSS2. 
+     */
+    public String getFontVariant();
+    /**
+     *  See the font-variant property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setFontVariant(String fontVariant)
+                                             throws DOMException;
+
+    /**
+     *  See the font-weight property definition in CSS2. 
+     */
+    public String getFontWeight();
+    /**
+     *  See the font-weight property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setFontWeight(String fontWeight)
+                                             throws DOMException;
+
+    /**
+     *  See the height property definition in CSS2. 
+     */
+    public String getHeight();
+    /**
+     *  See the height property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setHeight(String height)
+                                             throws DOMException;
+
+    /**
+     *  See the left property definition in CSS2. 
+     */
+    public String getLeft();
+    /**
+     *  See the left property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setLeft(String left)
+                                             throws DOMException;
+
+    /**
+     *  See the letter-spacing property definition in CSS2. 
+     */
+    public String getLetterSpacing();
+    /**
+     *  See the letter-spacing property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setLetterSpacing(String letterSpacing)
+                                             throws DOMException;
+
+    /**
+     *  See the line-height property definition in CSS2. 
+     */
+    public String getLineHeight();
+    /**
+     *  See the line-height property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setLineHeight(String lineHeight)
+                                             throws DOMException;
+
+    /**
+     *  See the list-style property definition in CSS2. 
+     */
+    public String getListStyle();
+    /**
+     *  See the list-style property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setListStyle(String listStyle)
+                                             throws DOMException;
+
+    /**
+     *  See the list-style-image property definition in CSS2. 
+     */
+    public String getListStyleImage();
+    /**
+     *  See the list-style-image property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setListStyleImage(String listStyleImage)
+                                             throws DOMException;
+
+    /**
+     *  See the list-style-position property definition in CSS2. 
+     */
+    public String getListStylePosition();
+    /**
+     *  See the list-style-position property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setListStylePosition(String listStylePosition)
+                                             throws DOMException;
+
+    /**
+     *  See the list-style-type property definition in CSS2. 
+     */
+    public String getListStyleType();
+    /**
+     *  See the list-style-type property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setListStyleType(String listStyleType)
+                                             throws DOMException;
+
+    /**
+     *  See the margin property definition in CSS2. 
+     */
+    public String getMargin();
+    /**
+     *  See the margin property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setMargin(String margin)
+                                             throws DOMException;
+
+    /**
+     *  See the margin-top property definition in CSS2. 
+     */
+    public String getMarginTop();
+    /**
+     *  See the margin-top property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setMarginTop(String marginTop)
+                                             throws DOMException;
+
+    /**
+     *  See the margin-right property definition in CSS2. 
+     */
+    public String getMarginRight();
+    /**
+     *  See the margin-right property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setMarginRight(String marginRight)
+                                             throws DOMException;
+
+    /**
+     *  See the margin-bottom property definition in CSS2. 
+     */
+    public String getMarginBottom();
+    /**
+     *  See the margin-bottom property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setMarginBottom(String marginBottom)
+                                             throws DOMException;
+
+    /**
+     *  See the margin-left property definition in CSS2. 
+     */
+    public String getMarginLeft();
+    /**
+     *  See the margin-left property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setMarginLeft(String marginLeft)
+                                             throws DOMException;
+
+    /**
+     *  See the marker-offset property definition in CSS2. 
+     */
+    public String getMarkerOffset();
+    /**
+     *  See the marker-offset property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setMarkerOffset(String markerOffset)
+                                             throws DOMException;
+
+    /**
+     *  See the marks property definition in CSS2. 
+     */
+    public String getMarks();
+    /**
+     *  See the marks property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setMarks(String marks)
+                                             throws DOMException;
+
+    /**
+     *  See the max-height property definition in CSS2. 
+     */
+    public String getMaxHeight();
+    /**
+     *  See the max-height property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setMaxHeight(String maxHeight)
+                                             throws DOMException;
+
+    /**
+     *  See the max-width property definition in CSS2. 
+     */
+    public String getMaxWidth();
+    /**
+     *  See the max-width property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setMaxWidth(String maxWidth)
+                                             throws DOMException;
+
+    /**
+     *  See the min-height property definition in CSS2. 
+     */
+    public String getMinHeight();
+    /**
+     *  See the min-height property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setMinHeight(String minHeight)
+                                             throws DOMException;
+
+    /**
+     *  See the min-width property definition in CSS2. 
+     */
+    public String getMinWidth();
+    /**
+     *  See the min-width property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setMinWidth(String minWidth)
+                                             throws DOMException;
+
+    /**
+     *  See the orphans property definition in CSS2. 
+     */
+    public String getOrphans();
+    /**
+     *  See the orphans property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setOrphans(String orphans)
+                                             throws DOMException;
+
+    /**
+     *  See the outline property definition in CSS2. 
+     */
+    public String getOutline();
+    /**
+     *  See the outline property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setOutline(String outline)
+                                             throws DOMException;
+
+    /**
+     *  See the outline-color property definition in CSS2. 
+     */
+    public String getOutlineColor();
+    /**
+     *  See the outline-color property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setOutlineColor(String outlineColor)
+                                             throws DOMException;
+
+    /**
+     *  See the outline-style property definition in CSS2. 
+     */
+    public String getOutlineStyle();
+    /**
+     *  See the outline-style property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setOutlineStyle(String outlineStyle)
+                                             throws DOMException;
+
+    /**
+     *  See the outline-width property definition in CSS2. 
+     */
+    public String getOutlineWidth();
+    /**
+     *  See the outline-width property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setOutlineWidth(String outlineWidth)
+                                             throws DOMException;
+
+    /**
+     *  See the overflow property definition in CSS2. 
+     */
+    public String getOverflow();
+    /**
+     *  See the overflow property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setOverflow(String overflow)
+                                             throws DOMException;
+
+    /**
+     *  See the padding property definition in CSS2. 
+     */
+    public String getPadding();
+    /**
+     *  See the padding property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setPadding(String padding)
+                                             throws DOMException;
+
+    /**
+     *  See the padding-top property definition in CSS2. 
+     */
+    public String getPaddingTop();
+    /**
+     *  See the padding-top property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setPaddingTop(String paddingTop)
+                                             throws DOMException;
+
+    /**
+     *  See the padding-right property definition in CSS2. 
+     */
+    public String getPaddingRight();
+    /**
+     *  See the padding-right property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setPaddingRight(String paddingRight)
+                                             throws DOMException;
+
+    /**
+     *  See the padding-bottom property definition in CSS2. 
+     */
+    public String getPaddingBottom();
+    /**
+     *  See the padding-bottom property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setPaddingBottom(String paddingBottom)
+                                             throws DOMException;
+
+    /**
+     *  See the padding-left property definition in CSS2. 
+     */
+    public String getPaddingLeft();
+    /**
+     *  See the padding-left property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setPaddingLeft(String paddingLeft)
+                                             throws DOMException;
+
+    /**
+     *  See the page property definition in CSS2. 
+     */
+    public String getPage();
+    /**
+     *  See the page property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setPage(String page)
+                                             throws DOMException;
+
+    /**
+     *  See the page-break-after property definition in CSS2. 
+     */
+    public String getPageBreakAfter();
+    /**
+     *  See the page-break-after property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setPageBreakAfter(String pageBreakAfter)
+                                             throws DOMException;
+
+    /**
+     *  See the page-break-before property definition in CSS2. 
+     */
+    public String getPageBreakBefore();
+    /**
+     *  See the page-break-before property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setPageBreakBefore(String pageBreakBefore)
+                                             throws DOMException;
+
+    /**
+     *  See the page-break-inside property definition in CSS2. 
+     */
+    public String getPageBreakInside();
+    /**
+     *  See the page-break-inside property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setPageBreakInside(String pageBreakInside)
+                                             throws DOMException;
+
+    /**
+     *  See the pause property definition in CSS2. 
+     */
+    public String getPause();
+    /**
+     *  See the pause property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setPause(String pause)
+                                             throws DOMException;
+
+    /**
+     *  See the pause-after property definition in CSS2. 
+     */
+    public String getPauseAfter();
+    /**
+     *  See the pause-after property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setPauseAfter(String pauseAfter)
+                                             throws DOMException;
+
+    /**
+     *  See the pause-before property definition in CSS2. 
+     */
+    public String getPauseBefore();
+    /**
+     *  See the pause-before property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setPauseBefore(String pauseBefore)
+                                             throws DOMException;
+
+    /**
+     *  See the pitch property definition in CSS2. 
+     */
+    public String getPitch();
+    /**
+     *  See the pitch property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setPitch(String pitch)
+                                             throws DOMException;
+
+    /**
+     *  See the pitch-range property definition in CSS2. 
+     */
+    public String getPitchRange();
+    /**
+     *  See the pitch-range property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setPitchRange(String pitchRange)
+                                             throws DOMException;
+
+    /**
+     *  See the play-during property definition in CSS2. 
+     */
+    public String getPlayDuring();
+    /**
+     *  See the play-during property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setPlayDuring(String playDuring)
+                                             throws DOMException;
+
+    /**
+     *  See the position property definition in CSS2. 
+     */
+    public String getPosition();
+    /**
+     *  See the position property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setPosition(String position)
+                                             throws DOMException;
+
+    /**
+     *  See the quotes property definition in CSS2. 
+     */
+    public String getQuotes();
+    /**
+     *  See the quotes property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setQuotes(String quotes)
+                                             throws DOMException;
+
+    /**
+     *  See the richness property definition in CSS2. 
+     */
+    public String getRichness();
+    /**
+     *  See the richness property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setRichness(String richness)
+                                             throws DOMException;
+
+    /**
+     *  See the right property definition in CSS2. 
+     */
+    public String getRight();
+    /**
+     *  See the right property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setRight(String right)
+                                             throws DOMException;
+
+    /**
+     *  See the size property definition in CSS2. 
+     */
+    public String getSize();
+    /**
+     *  See the size property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setSize(String size)
+                                             throws DOMException;
+
+    /**
+     *  See the speak property definition in CSS2. 
+     */
+    public String getSpeak();
+    /**
+     *  See the speak property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setSpeak(String speak)
+                                             throws DOMException;
+
+    /**
+     *  See the speak-header property definition in CSS2. 
+     */
+    public String getSpeakHeader();
+    /**
+     *  See the speak-header property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setSpeakHeader(String speakHeader)
+                                             throws DOMException;
+
+    /**
+     *  See the speak-numeral property definition in CSS2. 
+     */
+    public String getSpeakNumeral();
+    /**
+     *  See the speak-numeral property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setSpeakNumeral(String speakNumeral)
+                                             throws DOMException;
+
+    /**
+     *  See the speak-punctuation property definition in CSS2. 
+     */
+    public String getSpeakPunctuation();
+    /**
+     *  See the speak-punctuation property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setSpeakPunctuation(String speakPunctuation)
+                                             throws DOMException;
+
+    /**
+     *  See the speech-rate property definition in CSS2. 
+     */
+    public String getSpeechRate();
+    /**
+     *  See the speech-rate property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setSpeechRate(String speechRate)
+                                             throws DOMException;
+
+    /**
+     *  See the stress property definition in CSS2. 
+     */
+    public String getStress();
+    /**
+     *  See the stress property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setStress(String stress)
+                                             throws DOMException;
+
+    /**
+     *  See the table-layout property definition in CSS2. 
+     */
+    public String getTableLayout();
+    /**
+     *  See the table-layout property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setTableLayout(String tableLayout)
+                                             throws DOMException;
+
+    /**
+     *  See the text-align property definition in CSS2. 
+     */
+    public String getTextAlign();
+    /**
+     *  See the text-align property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setTextAlign(String textAlign)
+                                             throws DOMException;
+
+    /**
+     *  See the text-decoration property definition in CSS2. 
+     */
+    public String getTextDecoration();
+    /**
+     *  See the text-decoration property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setTextDecoration(String textDecoration)
+                                             throws DOMException;
+
+    /**
+     *  See the text-indent property definition in CSS2. 
+     */
+    public String getTextIndent();
+    /**
+     *  See the text-indent property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setTextIndent(String textIndent)
+                                             throws DOMException;
+
+    /**
+     *  See the text-shadow property definition in CSS2. 
+     */
+    public String getTextShadow();
+    /**
+     *  See the text-shadow property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setTextShadow(String textShadow)
+                                             throws DOMException;
+
+    /**
+     *  See the text-transform property definition in CSS2. 
+     */
+    public String getTextTransform();
+    /**
+     *  See the text-transform property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setTextTransform(String textTransform)
+                                             throws DOMException;
+
+    /**
+     *  See the top property definition in CSS2. 
+     */
+    public String getTop();
+    /**
+     *  See the top property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setTop(String top)
+                                             throws DOMException;
+
+    /**
+     *  See the unicode-bidi property definition in CSS2. 
+     */
+    public String getUnicodeBidi();
+    /**
+     *  See the unicode-bidi property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setUnicodeBidi(String unicodeBidi)
+                                             throws DOMException;
+
+    /**
+     *  See the vertical-align property definition in CSS2. 
+     */
+    public String getVerticalAlign();
+    /**
+     *  See the vertical-align property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setVerticalAlign(String verticalAlign)
+                                             throws DOMException;
+
+    /**
+     *  See the visibility property definition in CSS2. 
+     */
+    public String getVisibility();
+    /**
+     *  See the visibility property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setVisibility(String visibility)
+                                             throws DOMException;
+
+    /**
+     *  See the voice-family property definition in CSS2. 
+     */
+    public String getVoiceFamily();
+    /**
+     *  See the voice-family property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setVoiceFamily(String voiceFamily)
+                                             throws DOMException;
+
+    /**
+     *  See the volume property definition in CSS2. 
+     */
+    public String getVolume();
+    /**
+     *  See the volume property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setVolume(String volume)
+                                             throws DOMException;
+
+    /**
+     *  See the white-space property definition in CSS2. 
+     */
+    public String getWhiteSpace();
+    /**
+     *  See the white-space property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setWhiteSpace(String whiteSpace)
+                                             throws DOMException;
+
+    /**
+     *  See the widows property definition in CSS2. 
+     */
+    public String getWidows();
+    /**
+     *  See the widows property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setWidows(String widows)
+                                             throws DOMException;
+
+    /**
+     *  See the width property definition in CSS2. 
+     */
+    public String getWidth();
+    /**
+     *  See the width property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setWidth(String width)
+                                             throws DOMException;
+
+    /**
+     *  See the word-spacing property definition in CSS2. 
+     */
+    public String getWordSpacing();
+    /**
+     *  See the word-spacing property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setWordSpacing(String wordSpacing)
+                                             throws DOMException;
+
+    /**
+     *  See the z-index property definition in CSS2. 
+     */
+    public String getZIndex();
+    /**
+     *  See the z-index property definition in CSS2. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the new value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setZIndex(String zIndex)
+                                             throws DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/CSSCharsetRule.java b/libjava/external/w3c_dom/org/w3c/dom/css/CSSCharsetRule.java
new file mode 100644 (file)
index 0000000..8c0defa
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/CSSCharsetRule.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  The <code>CSSCharsetRule</code> interface represents a @charset rule in a 
+ * CSS style sheet. The value of the <code>encoding</code> attribute does 
+ * not affect the encoding of text data in the DOM objects; this encoding is 
+ * always UTF-16. After a stylesheet is loaded, the value of the 
+ * <code>encoding</code> attribute is the value found in the 
+ * <code>@charset</code> rule. If there was no <code>@charset</code> in the 
+ * original document, then no <code>CSSCharsetRule</code> is created. The 
+ * value of the <code>encoding</code> attribute may also be used as a hint 
+ * for the encoding used on serialization of the style sheet. 
+ * <p> The value of the @charset rule (and therefore of the 
+ * <code>CSSCharsetRule</code>) may not correspond to the encoding the 
+ * document actually came in; character encoding information e.g. in an HTTP 
+ * header, has priority (see CSS document representation) but this is not 
+ * reflected in the <code>CSSCharsetRule</code>. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface CSSCharsetRule extends CSSRule {
+    /**
+     *  The encoding information used in this <code>@charset</code> rule. 
+     */
+    public String getEncoding();
+    /**
+     *  The encoding information used in this <code>@charset</code> rule. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the specified encoding value has a syntax error 
+     *   and is unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this encoding rule is 
+     *   readonly.
+     */
+    public void setEncoding(String encoding)
+                           throws DOMException;
+
+}
diff --git a/libjava/org/w3c/dom/Comment.java b/libjava/external/w3c_dom/org/w3c/dom/css/CSSFontFaceRule.java
similarity index 53%
rename from libjava/org/w3c/dom/Comment.java
rename to libjava/external/w3c_dom/org/w3c/dom/css/CSSFontFaceRule.java
index 7c37d96..a179570 100644 (file)
--- a/libjava/org/w3c/dom/Comment.java
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/CSSFontFaceRule.java
@@ -1,24 +1,28 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * This interface inherits from <code>CharacterData</code> and represents the \r
- * content of a comment, i.e., all the characters between the starting '\r
- * <code>&lt;!--</code>' and ending '<code>--&gt;</code>'. Note that this is \r
- * the definition of a comment in XML, and, in practice, HTML, although some \r
- * HTML tools may implement the full SGML comment structure.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface Comment extends CharacterData {\r
-}\r
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+/**
+ *  The <code>CSSFontFaceRule</code> interface represents a @font-face rule in 
+ * a CSS style sheet. The <code>@font-face</code> rule is used to hold a set 
+ * of font descriptions. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface CSSFontFaceRule extends CSSRule {
+    /**
+     *  The declaration-block of this rule. 
+     */
+    public CSSStyleDeclaration getStyle();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/CSSImportRule.java b/libjava/external/w3c_dom/org/w3c/dom/css/CSSImportRule.java
new file mode 100644 (file)
index 0000000..e18ad56
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/CSSImportRule.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+import org.w3c.dom.stylesheets.MediaList;
+
+/**
+ *  The <code>CSSImportRule</code> interface represents a @import rule within 
+ * a CSS style sheet. The <code>@import</code> rule is used to import style 
+ * rules from other style sheets. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface CSSImportRule extends CSSRule {
+    /**
+     *  The location of the style sheet to be imported. The attribute will not 
+     * contain the <code>"url(...)"</code> specifier around the URI. 
+     */
+    public String getHref();
+
+    /**
+     *  A list of media types for which this style sheet may be used. 
+     */
+    public MediaList getMedia();
+
+    /**
+     * The style sheet referred to by this rule, if it has been loaded. The 
+     * value of this attribute is <code>null</code> if the style sheet has 
+     * not yet been loaded or if it will not be loaded (e.g. if the style 
+     * sheet is for a media type not supported by the user agent). 
+     */
+    public CSSStyleSheet getStyleSheet();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/CSSMediaRule.java b/libjava/external/w3c_dom/org/w3c/dom/css/CSSMediaRule.java
new file mode 100644 (file)
index 0000000..68a7304
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/CSSMediaRule.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.stylesheets.MediaList;
+
+/**
+ *  The <code>CSSMediaRule</code> interface represents a @media rule in a CSS 
+ * style sheet. A <code>@media</code> rule can be used to delimit style 
+ * rules for specific media types. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface CSSMediaRule extends CSSRule {
+    /**
+     *  A list of media types for this rule. 
+     */
+    public MediaList getMedia();
+
+    /**
+     *  A list of all CSS rules contained within the media block. 
+     */
+    public CSSRuleList getCssRules();
+
+    /**
+     *  Used to insert a new rule into the media block. 
+     * @param rule  The parsable text representing the rule. For rule sets 
+     *   this contains both the selector and the style declaration. For 
+     *   at-rules, this specifies both the at-identifier and the rule 
+     *   content. 
+     * @param index  The index within the media block's rule collection of 
+     *   the rule before which to insert the specified rule. If the 
+     *   specified index is equal to the length of the media blocks's rule 
+     *   collection, the rule will be added to the end of the media block. 
+     * @return  The index within the media block's rule collection of the 
+     *   newly inserted rule. 
+     * @exception DOMException
+     *   HIERARCHY_REQUEST_ERR: Raised if the rule cannot be inserted at the 
+     *   specified index, e.g., if an <code>@import</code> rule is inserted 
+     *   after a standard rule set or other at-rule.
+     *   <br>INDEX_SIZE_ERR: Raised if the specified index is not a valid 
+     *   insertion point.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this media rule is 
+     *   readonly.
+     *   <br>SYNTAX_ERR: Raised if the specified rule has a syntax error and 
+     *   is unparsable.
+     */
+    public int insertRule(String rule, 
+                          int index)
+                          throws DOMException;
+
+    /**
+     *  Used to delete a rule from the media block. 
+     * @param index  The index within the media block's rule collection of 
+     *   the rule to remove. 
+     * @exception DOMException
+     *   INDEX_SIZE_ERR: Raised if the specified index does not correspond to 
+     *   a rule in the media rule list.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this media rule is 
+     *   readonly.
+     */
+    public void deleteRule(int index)
+                           throws DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/CSSPageRule.java b/libjava/external/w3c_dom/org/w3c/dom/css/CSSPageRule.java
new file mode 100644 (file)
index 0000000..538626a
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/CSSPageRule.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  The <code>CSSPageRule</code> interface represents a @page rule within a 
+ * CSS style sheet. The <code>@page</code> rule is used to specify the 
+ * dimensions, orientation, margins, etc. of a page box for paged media. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface CSSPageRule extends CSSRule {
+    /**
+     *  The parsable textual representation of the page selector for the rule. 
+     */
+    public String getSelectorText();
+    /**
+     *  The parsable textual representation of the page selector for the rule. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the specified CSS string value has a syntax 
+     *   error and is unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this rule is readonly.
+     */
+    public void setSelectorText(String selectorText)
+                           throws DOMException;
+
+    /**
+     *  The declaration-block of this rule. 
+     */
+    public CSSStyleDeclaration getStyle();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/CSSPrimitiveValue.java b/libjava/external/w3c_dom/org/w3c/dom/css/CSSPrimitiveValue.java
new file mode 100644 (file)
index 0000000..4131d26
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/CSSPrimitiveValue.java
@@ -0,0 +1,296 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  The <code>CSSPrimitiveValue</code> interface represents a single CSS value
+ * . This interface may be used to determine the value of a specific style 
+ * property currently set in a block or to set a specific style property 
+ * explicitly within the block. An instance of this interface might be 
+ * obtained from the <code>getPropertyCSSValue</code> method of the 
+ * <code>CSSStyleDeclaration</code> interface. A 
+ * <code>CSSPrimitiveValue</code> object only occurs in a context of a CSS 
+ * property. 
+ * <p> Conversions are allowed between absolute values (from millimeters to 
+ * centimeters, from degrees to radians, and so on) but not between relative 
+ * values. (For example, a pixel value cannot be converted to a centimeter 
+ * value.) Percentage values can't be converted since they are relative to 
+ * the parent value (or another property value). There is one exception for 
+ * color percentage values: since a color percentage value is relative to 
+ * the range 0-255, a color percentage value can be converted to a number; 
+ * (see also the <code>RGBColor</code> interface). 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface CSSPrimitiveValue extends CSSValue {
+    // UnitTypes
+    /**
+     * The value is not a recognized CSS2 value. The value can only be 
+     * obtained by using the <code>cssText</code> attribute.
+     */
+    public static final short CSS_UNKNOWN               = 0;
+    /**
+     * The value is a simple number. The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_NUMBER                = 1;
+    /**
+     * The value is a percentage. The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_PERCENTAGE            = 2;
+    /**
+     * The value is a length (ems). The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_EMS                   = 3;
+    /**
+     * The value is a length (exs). The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_EXS                   = 4;
+    /**
+     * The value is a length (px). The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_PX                    = 5;
+    /**
+     * The value is a length (cm). The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_CM                    = 6;
+    /**
+     * The value is a length (mm). The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_MM                    = 7;
+    /**
+     * The value is a length (in). The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_IN                    = 8;
+    /**
+     * The value is a length (pt). The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_PT                    = 9;
+    /**
+     * The value is a length (pc). The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_PC                    = 10;
+    /**
+     * The value is an angle (deg). The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_DEG                   = 11;
+    /**
+     * The value is an angle (rad). The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_RAD                   = 12;
+    /**
+     * The value is an angle (grad). The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_GRAD                  = 13;
+    /**
+     * The value is a time (ms). The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_MS                    = 14;
+    /**
+     * The value is a time (s). The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_S                     = 15;
+    /**
+     * The value is a frequency (Hz). The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_HZ                    = 16;
+    /**
+     * The value is a frequency (kHz). The value can be obtained by using the 
+     * <code>getFloatValue</code> method.
+     */
+    public static final short CSS_KHZ                   = 17;
+    /**
+     * The value is a number with an unknown dimension. The value can be 
+     * obtained by using the <code>getFloatValue</code> method.
+     */
+    public static final short CSS_DIMENSION             = 18;
+    /**
+     * The value is a STRING. The value can be obtained by using the 
+     * <code>getStringValue</code> method.
+     */
+    public static final short CSS_STRING                = 19;
+    /**
+     * The value is a URI. The value can be obtained by using the 
+     * <code>getStringValue</code> method.
+     */
+    public static final short CSS_URI                   = 20;
+    /**
+     * The value is an identifier. The value can be obtained by using the 
+     * <code>getStringValue</code> method.
+     */
+    public static final short CSS_IDENT                 = 21;
+    /**
+     * The value is a attribute function. The value can be obtained by using 
+     * the <code>getStringValue</code> method.
+     */
+    public static final short CSS_ATTR                  = 22;
+    /**
+     * The value is a counter or counters function. The value can be obtained 
+     * by using the <code>getCounterValue</code> method.
+     */
+    public static final short CSS_COUNTER               = 23;
+    /**
+     * The value is a rect function. The value can be obtained by using the 
+     * <code>getRectValue</code> method.
+     */
+    public static final short CSS_RECT                  = 24;
+    /**
+     * The value is a RGB color. The value can be obtained by using the 
+     * <code>getRGBColorValue</code> method.
+     */
+    public static final short CSS_RGBCOLOR              = 25;
+
+    /**
+     * The type of the value as defined by the constants specified above.
+     */
+    public short getPrimitiveType();
+
+    /**
+     *  A method to set the float value with a specified unit. If the property 
+     * attached with this value can not accept the specified unit or the 
+     * float value, the value will be unchanged and a 
+     * <code>DOMException</code> will be raised. 
+     * @param unitType  A unit code as defined above. The unit code can only 
+     *   be a float unit type (i.e. <code>CSS_NUMBER</code>, 
+     *   <code>CSS_PERCENTAGE</code>, <code>CSS_EMS</code>, 
+     *   <code>CSS_EXS</code>, <code>CSS_PX</code>, <code>CSS_CM</code>, 
+     *   <code>CSS_MM</code>, <code>CSS_IN</code>, <code>CSS_PT</code>, 
+     *   <code>CSS_PC</code>, <code>CSS_DEG</code>, <code>CSS_RAD</code>, 
+     *   <code>CSS_GRAD</code>, <code>CSS_MS</code>, <code>CSS_S</code>, 
+     *   <code>CSS_HZ</code>, <code>CSS_KHZ</code>, 
+     *   <code>CSS_DIMENSION</code>). 
+     * @param floatValue  The new float value. 
+     * @exception DOMException
+     *    INVALID_ACCESS_ERR: Raised if the attached property doesn't support 
+     *   the float value or the unit type.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setFloatValue(short unitType, 
+                              float floatValue)
+                              throws DOMException;
+
+    /**
+     *  This method is used to get a float value in a specified unit. If this 
+     * CSS value doesn't contain a float value or can't be converted into 
+     * the specified unit, a <code>DOMException</code> is raised. 
+     * @param unitType  A unit code to get the float value. The unit code can 
+     *   only be a float unit type (i.e. <code>CSS_NUMBER</code>, 
+     *   <code>CSS_PERCENTAGE</code>, <code>CSS_EMS</code>, 
+     *   <code>CSS_EXS</code>, <code>CSS_PX</code>, <code>CSS_CM</code>, 
+     *   <code>CSS_MM</code>, <code>CSS_IN</code>, <code>CSS_PT</code>, 
+     *   <code>CSS_PC</code>, <code>CSS_DEG</code>, <code>CSS_RAD</code>, 
+     *   <code>CSS_GRAD</code>, <code>CSS_MS</code>, <code>CSS_S</code>, 
+     *   <code>CSS_HZ</code>, <code>CSS_KHZ</code>, 
+     *   <code>CSS_DIMENSION</code>). 
+     * @return  The float value in the specified unit. 
+     * @exception DOMException
+     *    INVALID_ACCESS_ERR: Raised if the CSS value doesn't contain a float 
+     *   value or if the float value can't be converted into the specified 
+     *   unit. 
+     */
+    public float getFloatValue(short unitType)
+                               throws DOMException;
+
+    /**
+     *  A method to set the string value with the specified unit. If the 
+     * property attached to this value can't accept the specified unit or 
+     * the string value, the value will be unchanged and a 
+     * <code>DOMException</code> will be raised. 
+     * @param stringType  A string code as defined above. The string code can 
+     *   only be a string unit type (i.e. <code>CSS_STRING</code>, 
+     *   <code>CSS_URI</code>, <code>CSS_IDENT</code>, and 
+     *   <code>CSS_ATTR</code>). 
+     * @param stringValue  The new string value. 
+     * @exception DOMException
+     *    INVALID_ACCESS_ERR: Raised if the CSS value doesn't contain a string 
+     *   value or if the string value can't be converted into the specified 
+     *   unit.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly.
+     */
+    public void setStringValue(short stringType, 
+                               String stringValue)
+                               throws DOMException;
+
+    /**
+     *  This method is used to get the string value. If the CSS value doesn't 
+     * contain a string value, a <code>DOMException</code> is raised.  Some 
+     * properties (like 'font-family' or 'voice-family') convert a 
+     * whitespace separated list of idents to a string. 
+     * @return  The string value in the current unit. The current 
+     *   <code>primitiveType</code> can only be a string unit type (i.e. 
+     *   <code>CSS_STRING</code>, <code>CSS_URI</code>, 
+     *   <code>CSS_IDENT</code> and <code>CSS_ATTR</code>). 
+     * @exception DOMException
+     *    INVALID_ACCESS_ERR: Raised if the CSS value doesn't contain a string 
+     *   value. 
+     */
+    public String getStringValue()
+                                 throws DOMException;
+
+    /**
+     *  This method is used to get the Counter value. If this CSS value 
+     * doesn't contain a counter value, a <code>DOMException</code> is 
+     * raised. Modification to the corresponding style property can be 
+     * achieved using the <code>Counter</code> interface. 
+     * @return The Counter value.
+     * @exception DOMException
+     *    INVALID_ACCESS_ERR: Raised if the CSS value doesn't contain a 
+     *   Counter value (e.g. this is not <code>CSS_COUNTER</code>). 
+     */
+    public Counter getCounterValue()
+                                   throws DOMException;
+
+    /**
+     *  This method is used to get the Rect value. If this CSS value doesn't 
+     * contain a rect value, a <code>DOMException</code> is raised. 
+     * Modification to the corresponding style property can be achieved 
+     * using the <code>Rect</code> interface. 
+     * @return The Rect value.
+     * @exception DOMException
+     *    INVALID_ACCESS_ERR: Raised if the CSS value doesn't contain a Rect 
+     *   value. (e.g. this is not <code>CSS_RECT</code>). 
+     */
+    public Rect getRectValue()
+                             throws DOMException;
+
+    /**
+     *  This method is used to get the RGB color. If this CSS value doesn't 
+     * contain a RGB color value, a <code>DOMException</code> is raised. 
+     * Modification to the corresponding style property can be achieved 
+     * using the <code>RGBColor</code> interface. 
+     * @return the RGB color value.
+     * @exception DOMException
+     *    INVALID_ACCESS_ERR: Raised if the attached property can't return a 
+     *   RGB color value (e.g. this is not <code>CSS_RGBCOLOR</code>). 
+     */
+    public RGBColor getRGBColorValue()
+                                     throws DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/CSSRule.java b/libjava/external/w3c_dom/org/w3c/dom/css/CSSRule.java
new file mode 100644 (file)
index 0000000..788f946
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/CSSRule.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  The <code>CSSRule</code> interface is the abstract base interface for any 
+ * type of CSS statement. This includes both rule sets and at-rules. An 
+ * implementation is expected to preserve all rules specified in a CSS style 
+ * sheet, even if the rule is not recognized by the parser. Unrecognized 
+ * rules are represented using the <code>CSSUnknownRule</code> interface. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface CSSRule {
+    // RuleType
+    /**
+     * The rule is a <code>CSSUnknownRule</code>.
+     */
+    public static final short UNKNOWN_RULE              = 0;
+    /**
+     * The rule is a <code>CSSStyleRule</code>.
+     */
+    public static final short STYLE_RULE                = 1;
+    /**
+     * The rule is a <code>CSSCharsetRule</code>.
+     */
+    public static final short CHARSET_RULE              = 2;
+    /**
+     * The rule is a <code>CSSImportRule</code>.
+     */
+    public static final short IMPORT_RULE               = 3;
+    /**
+     * The rule is a <code>CSSMediaRule</code>.
+     */
+    public static final short MEDIA_RULE                = 4;
+    /**
+     * The rule is a <code>CSSFontFaceRule</code>.
+     */
+    public static final short FONT_FACE_RULE            = 5;
+    /**
+     * The rule is a <code>CSSPageRule</code>.
+     */
+    public static final short PAGE_RULE                 = 6;
+
+    /**
+     *  The type of the rule, as defined above. The expectation is that 
+     * binding-specific casting methods can be used to cast down from an 
+     * instance of the <code>CSSRule</code> interface to the specific 
+     * derived interface implied by the <code>type</code>. 
+     */
+    public short getType();
+
+    /**
+     *  The parsable textual representation of the rule. This reflects the 
+     * current state of the rule and not its initial value. 
+     */
+    public String getCssText();
+    /**
+     *  The parsable textual representation of the rule. This reflects the 
+     * current state of the rule and not its initial value. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the specified CSS string value has a syntax 
+     *   error and is unparsable.
+     *   <br>INVALID_MODIFICATION_ERR: Raised if the specified CSS string 
+     *   value represents a different type of rule than the current one.
+     *   <br>HIERARCHY_REQUEST_ERR: Raised if the rule cannot be inserted at 
+     *   this point in the style sheet.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if the rule is readonly.
+     */
+    public void setCssText(String cssText)
+                        throws DOMException;
+
+    /**
+     *  The style sheet that contains this rule. 
+     */
+    public CSSStyleSheet getParentStyleSheet();
+
+    /**
+     *  If this rule is contained inside another rule (e.g. a style rule 
+     * inside an @media block), this is the containing rule. If this rule is 
+     * not nested inside any other rules, this returns <code>null</code>. 
+     */
+    public CSSRule getParentRule();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/CSSRuleList.java b/libjava/external/w3c_dom/org/w3c/dom/css/CSSRuleList.java
new file mode 100644 (file)
index 0000000..41c2c68
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/CSSRuleList.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+/**
+ *  The <code>CSSRuleList</code> interface provides the abstraction of an 
+ * ordered collection of CSS rules. 
+ * <p> The items in the <code>CSSRuleList</code> are accessible via an 
+ * integral index, starting from 0. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface CSSRuleList {
+    /**
+     *  The number of <code>CSSRules</code> in the list. The range of valid 
+     * child rule indices is <code>0</code> to <code>length-1</code> 
+     * inclusive. 
+     */
+    public int getLength();
+
+    /**
+     *  Used to retrieve a CSS rule by ordinal index. The order in this 
+     * collection represents the order of the rules in the CSS style sheet. 
+     * If index is greater than or equal to the number of rules in the list, 
+     * this returns <code>null</code>. 
+     * @param index Index into the collection
+     * @return The style rule at the <code>index</code> position in the 
+     *   <code>CSSRuleList</code>, or <code>null</code> if that is not a 
+     *   valid index. 
+     */
+    public CSSRule item(int index);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/CSSStyleDeclaration.java b/libjava/external/w3c_dom/org/w3c/dom/css/CSSStyleDeclaration.java
new file mode 100644 (file)
index 0000000..e5e346b
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/CSSStyleDeclaration.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  The <code>CSSStyleDeclaration</code> interface represents a single CSS 
+ * declaration block. This interface may be used to determine the style 
+ * properties currently set in a block or to set style properties explicitly 
+ * within the block. 
+ * <p> While an implementation may not recognize all CSS properties within a 
+ * CSS declaration block, it is expected to provide access to all specified 
+ * properties in the style sheet through the <code>CSSStyleDeclaration</code>
+ *  interface. Furthermore, implementations that support a specific level of 
+ * CSS should correctly handle CSS shorthand properties for that level. For 
+ * a further discussion of shorthand properties, see the 
+ * <code>CSS2Properties</code> interface. 
+ * <p> This interface is also used to provide a read-only access to the 
+ * computed values of an element. See also the <code>ViewCSS</code> 
+ * interface.  The CSS Object Model doesn't provide an access to the 
+ * specified or actual values of the CSS cascade. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface CSSStyleDeclaration {
+    /**
+     *  The parsable textual representation of the declaration block 
+     * (excluding the surrounding curly braces). Setting this attribute will 
+     * result in the parsing of the new value and resetting of all the 
+     * properties in the declaration block including the removal or addition 
+     * of properties. 
+     */
+    public String getCssText();
+    /**
+     *  The parsable textual representation of the declaration block 
+     * (excluding the surrounding curly braces). Setting this attribute will 
+     * result in the parsing of the new value and resetting of all the 
+     * properties in the declaration block including the removal or addition 
+     * of properties. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the specified CSS string value has a syntax 
+     *   error and is unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this declaration is 
+     *   readonly or a property is readonly.
+     */
+    public void setCssText(String cssText)
+                       throws DOMException;
+
+    /**
+     *  Used to retrieve the value of a CSS property if it has been explicitly 
+     * set within this declaration block. 
+     * @param propertyName  The name of the CSS property. See the CSS 
+     *   property index. 
+     * @return  Returns the value of the property if it has been explicitly 
+     *   set for this declaration block. Returns the empty string if the 
+     *   property has not been set. 
+     */
+    public String getPropertyValue(String propertyName);
+
+    /**
+     *  Used to retrieve the object representation of the value of a CSS 
+     * property if it has been explicitly set within this declaration block. 
+     * This method returns <code>null</code> if the property is a shorthand 
+     * property. Shorthand property values can only be accessed and modified 
+     * as strings, using the <code>getPropertyValue</code> and 
+     * <code>setProperty</code> methods. 
+     * @param propertyName  The name of the CSS property. See the CSS 
+     *   property index. 
+     * @return  Returns the value of the property if it has been explicitly 
+     *   set for this declaration block. Returns <code>null</code> if the 
+     *   property has not been set. 
+     */
+    public CSSValue getPropertyCSSValue(String propertyName);
+
+    /**
+     *  Used to remove a CSS property if it has been explicitly set within 
+     * this declaration block. 
+     * @param propertyName  The name of the CSS property. See the CSS 
+     *   property index. 
+     * @return  Returns the value of the property if it has been explicitly 
+     *   set for this declaration block. Returns the empty string if the 
+     *   property has not been set or the property name does not correspond 
+     *   to a known CSS property. 
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised if this declaration is readonly 
+     *   or the property is readonly.
+     */
+    public String removeProperty(String propertyName)
+                                 throws DOMException;
+
+    /**
+     *  Used to retrieve the priority of a CSS property (e.g. the 
+     * <code>"important"</code> qualifier) if the priority has been 
+     * explicitly set in this declaration block. 
+     * @param propertyName  The name of the CSS property. See the CSS 
+     *   property index. 
+     * @return  A string representing the priority (e.g. 
+     *   <code>"important"</code>) if the property has been explicitly set 
+     *   in this declaration block and has a priority specified. The empty 
+     *   string otherwise. 
+     */
+    public String getPropertyPriority(String propertyName);
+
+    /**
+     *  Used to set a property value and priority within this declaration 
+     * block. <code>setProperty</code> permits to modify a property or add a 
+     * new one in the declaration block. Any call to this method may modify 
+     * the order of properties in the <code>item</code> method.
+     * @param propertyName  The name of the CSS property. See the CSS 
+     *   property index. 
+     * @param value  The new value of the property. 
+     * @param priority  The new priority of the property (e.g. 
+     *   <code>"important"</code>) or the empty string if none.  
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the specified value has a syntax error and is 
+     *   unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this declaration is 
+     *   readonly or the property is readonly.
+     */
+    public void setProperty(String propertyName, 
+                            String value, 
+                            String priority)
+                            throws DOMException;
+
+    /**
+     *  The number of properties that have been explicitly set in this 
+     * declaration block. The range of valid indices is 0 to length-1 
+     * inclusive. 
+     */
+    public int getLength();
+
+    /**
+     *  Used to retrieve the properties that have been explicitly set in this 
+     * declaration block. The order of the properties retrieved using this 
+     * method does not have to be the order in which they were set. This 
+     * method can be used to iterate over all properties in this declaration 
+     * block. 
+     * @param index  Index of the property name to retrieve. 
+     * @return  The name of the property at this ordinal position. The empty 
+     *   string if no property exists at this position. 
+     */
+    public String item(int index);
+
+    /**
+     *  The CSS rule that contains this declaration block or <code>null</code> 
+     * if this <code>CSSStyleDeclaration</code> is not attached to a 
+     * <code>CSSRule</code>. 
+     */
+    public CSSRule getParentRule();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/CSSStyleRule.java b/libjava/external/w3c_dom/org/w3c/dom/css/CSSStyleRule.java
new file mode 100644 (file)
index 0000000..626f322
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/CSSStyleRule.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  The <code>CSSStyleRule</code> interface represents a single rule set in a 
+ * CSS style sheet. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface CSSStyleRule extends CSSRule {
+    /**
+     *  The textual representation of the selector for the rule set. The 
+     * implementation may have stripped out insignificant whitespace while 
+     * parsing the selector. 
+     */
+    public String getSelectorText();
+    /**
+     *  The textual representation of the selector for the rule set. The 
+     * implementation may have stripped out insignificant whitespace while 
+     * parsing the selector. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the specified CSS string value has a syntax 
+     *   error and is unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this rule is readonly.
+     */
+    public void setSelectorText(String selectorText)
+                        throws DOMException;
+
+    /**
+     *  The declaration-block of this rule set. 
+     */
+    public CSSStyleDeclaration getStyle();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/CSSStyleSheet.java b/libjava/external/w3c_dom/org/w3c/dom/css/CSSStyleSheet.java
new file mode 100644 (file)
index 0000000..b529e5d
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/CSSStyleSheet.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.stylesheets.StyleSheet;
+
+/**
+ *  The <code>CSSStyleSheet</code> interface is a concrete interface used to 
+ * represent a CSS style sheet i.e., a style sheet whose content type is 
+ * "text/css". 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface CSSStyleSheet extends StyleSheet {
+    /**
+     *  If this style sheet comes from an <code>@import</code> rule, the 
+     * <code>ownerRule</code> attribute will contain the 
+     * <code>CSSImportRule</code>. In that case, the <code>ownerNode</code> 
+     * attribute in the <code>StyleSheet</code> interface will be 
+     * <code>null</code>. If the style sheet comes from an element or a 
+     * processing instruction, the <code>ownerRule</code> attribute will be 
+     * <code>null</code> and the <code>ownerNode</code> attribute will 
+     * contain the <code>Node</code>. 
+     */
+    public CSSRule getOwnerRule();
+
+    /**
+     *  The list of all CSS rules contained within the style sheet. This 
+     * includes both rule sets and at-rules. 
+     */
+    public CSSRuleList getCssRules();
+
+    /**
+     *  Used to insert a new rule into the style sheet. The new rule now 
+     * becomes part of the cascade. 
+     * @param rule  The parsable text representing the rule. For rule sets 
+     *   this contains both the selector and the style declaration. For 
+     *   at-rules, this specifies both the at-identifier and the rule 
+     *   content. 
+     * @param index  The index within the style sheet's rule list of the rule 
+     *   before which to insert the specified rule. If the specified index 
+     *   is equal to the length of the style sheet's rule collection, the 
+     *   rule will be added to the end of the style sheet. 
+     * @return  The index within the style sheet's rule collection of the 
+     *   newly inserted rule. 
+     * @exception DOMException
+     *   HIERARCHY_REQUEST_ERR: Raised if the rule cannot be inserted at the 
+     *   specified index e.g. if an <code>@import</code> rule is inserted 
+     *   after a standard rule set or other at-rule.
+     *   <br>INDEX_SIZE_ERR: Raised if the specified index is not a valid 
+     *   insertion point.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this style sheet is 
+     *   readonly.
+     *   <br>SYNTAX_ERR: Raised if the specified rule has a syntax error and 
+     *   is unparsable.
+     */
+    public int insertRule(String rule, 
+                          int index)
+                          throws DOMException;
+
+    /**
+     *  Used to delete a rule from the style sheet. 
+     * @param index  The index within the style sheet's rule list of the rule 
+     *   to remove. 
+     * @exception DOMException
+     *   INDEX_SIZE_ERR: Raised if the specified index does not correspond to 
+     *   a rule in the style sheet's rule list.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this style sheet is 
+     *   readonly.
+     */
+    public void deleteRule(int index)
+                           throws DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/CSSUnknownRule.java b/libjava/external/w3c_dom/org/w3c/dom/css/CSSUnknownRule.java
new file mode 100644 (file)
index 0000000..763d5f1
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/CSSUnknownRule.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+/**
+ *  The <code>CSSUnknownRule</code> interface represents an at-rule not 
+ * supported by this user agent. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface CSSUnknownRule extends CSSRule {
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/CSSValue.java b/libjava/external/w3c_dom/org/w3c/dom/css/CSSValue.java
new file mode 100644 (file)
index 0000000..0285bcc
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/CSSValue.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  The <code>CSSValue</code> interface represents a simple or a complex 
+ * value. A <code>CSSValue</code> object only occurs in a context of a CSS 
+ * property. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface CSSValue {
+    // UnitTypes
+    /**
+     * The value is inherited and the <code>cssText</code> contains "inherit".
+     */
+    public static final short CSS_INHERIT               = 0;
+    /**
+     * The value is a primitive value and an instance of the 
+     * <code>CSSPrimitiveValue</code> interface can be obtained by using 
+     * binding-specific casting methods on this instance of the 
+     * <code>CSSValue</code> interface.
+     */
+    public static final short CSS_PRIMITIVE_VALUE       = 1;
+    /**
+     * The value is a <code>CSSValue</code> list and an instance of the 
+     * <code>CSSValueList</code> interface can be obtained by using 
+     * binding-specific casting methods on this instance of the 
+     * <code>CSSValue</code> interface.
+     */
+    public static final short CSS_VALUE_LIST            = 2;
+    /**
+     * The value is a custom value.
+     */
+    public static final short CSS_CUSTOM                = 3;
+
+    /**
+     *  A string representation of the current value. 
+     */
+    public String getCssText();
+    /**
+     *  A string representation of the current value. 
+     * @exception DOMException
+     *    SYNTAX_ERR: Raised if the specified CSS string value has a syntax 
+     *   error (according to the attached property) or is unparsable. 
+     *   <br>INVALID_MODIFICATION_ERR: Raised if the specified CSS string 
+     *   value represents a different type of values than the values allowed 
+     *   by the CSS property.
+     *   <br> NO_MODIFICATION_ALLOWED_ERR: Raised if this value is readonly. 
+     */
+    public void setCssText(String cssText)
+                       throws DOMException;
+
+    /**
+     *  A code defining the type of the value as defined above. 
+     */
+    public short getCssValueType();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/CSSValueList.java b/libjava/external/w3c_dom/org/w3c/dom/css/CSSValueList.java
new file mode 100644 (file)
index 0000000..bf15bb3
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/CSSValueList.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+/**
+ * The <code>CSSValueList</code> interface provides the abstraction of an 
+ * ordered collection of CSS values.
+ * <p> Some properties allow an empty list into their syntax. In that case, 
+ * these properties take the <code>none</code> identifier. So, an empty list 
+ * means that the property has the value <code>none</code>. 
+ * <p> The items in the <code>CSSValueList</code> are accessible via an 
+ * integral index, starting from 0. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface CSSValueList extends CSSValue {
+    /**
+     * The number of <code>CSSValues</code> in the list. The range of valid 
+     * values of the indices is <code>0</code> to <code>length-1</code> 
+     * inclusive.
+     */
+    public int getLength();
+
+    /**
+     * Used to retrieve a <code>CSSValue</code> by ordinal index. The order in 
+     * this collection represents the order of the values in the CSS style 
+     * property. If index is greater than or equal to the number of values 
+     * in the list, this returns <code>null</code>.
+     * @param index Index into the collection.
+     * @return The <code>CSSValue</code> at the <code>index</code> position 
+     *   in the <code>CSSValueList</code>, or <code>null</code> if that is 
+     *   not a valid index.
+     */
+    public CSSValue item(int index);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/Counter.java b/libjava/external/w3c_dom/org/w3c/dom/css/Counter.java
new file mode 100644 (file)
index 0000000..8cd4967
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/Counter.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+/**
+ *  The <code>Counter</code> interface is used to represent any counter or 
+ * counters function value. This interface reflects the values in the 
+ * underlying style property. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface Counter {
+    /**
+     *  This attribute is used for the identifier of the counter. 
+     */
+    public String getIdentifier();
+
+    /**
+     *  This attribute is used for the style of the list. 
+     */
+    public String getListStyle();
+
+    /**
+     *  This attribute is used for the separator of the nested counters. 
+     */
+    public String getSeparator();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/DOMImplementationCSS.java b/libjava/external/w3c_dom/org/w3c/dom/css/DOMImplementationCSS.java
new file mode 100644 (file)
index 0000000..65c9729
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/DOMImplementationCSS.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.DOMException;
+
+/**
+ *  This interface allows the DOM user to create a <code>CSSStyleSheet</code> 
+ * outside the context of a document. There is no way to associate the new 
+ * <code>CSSStyleSheet</code> with a document in DOM Level 2. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM   Level 2
+ */
+public interface DOMImplementationCSS extends DOMImplementation {
+    /**
+     * Creates a new <code>CSSStyleSheet</code>.
+     * @param title  The advisory title. See also the  section. 
+     * @param media  The comma-separated list of media associated with the 
+     *   new style sheet. See also the  section. 
+     * @return A new CSS style sheet.
+     * @exception DOMException
+     *    SYNTAX_ERR: Raised if the specified media string value has a syntax 
+     *   error and is unparsable. 
+     */
+    public CSSStyleSheet createCSSStyleSheet(String title, 
+                                             String media)
+                                             throws DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/DocumentCSS.java b/libjava/external/w3c_dom/org/w3c/dom/css/DocumentCSS.java
new file mode 100644 (file)
index 0000000..8fe93c7
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/DocumentCSS.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.stylesheets.DocumentStyle;
+
+/**
+ * This interface represents a document with a CSS view.
+ * <p> The <code>getOverrideStyle</code> method provides a mechanism through 
+ * which a DOM author could effect immediate change to the style of an 
+ * element without modifying the explicitly linked style sheets of a 
+ * document or the inline style of elements in the style sheets. This style 
+ * sheet comes after the author style sheet in the cascade algorithm and is 
+ * called override style sheet. The override style sheet takes precedence 
+ * over author style sheets. An "!important" declaration still takes 
+ * precedence over a normal declaration. Override, author, and user style 
+ * sheets all may contain "!important" declarations. User "!important" rules 
+ * take precedence over both override and author "!important" rules, and 
+ * override "!important" rules take precedence over author "!important" 
+ * rules. 
+ * <p> The expectation is that an instance of the <code>DocumentCSS</code> 
+ * interface can be obtained by using binding-specific casting methods on an 
+ * instance of the <code>Document</code> interface. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface DocumentCSS extends DocumentStyle {
+    /**
+     *  This method is used to retrieve the override style declaration for a 
+     * specified element and a specified pseudo-element. 
+     * @param elt  The element whose style is to be modified. This parameter 
+     *   cannot be null. 
+     * @param pseudoElt  The pseudo-element or <code>null</code> if none. 
+     * @return  The override style declaration. 
+     */
+    public CSSStyleDeclaration getOverrideStyle(Element elt, 
+                                                String pseudoElt);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/ElementCSSInlineStyle.java b/libjava/external/w3c_dom/org/w3c/dom/css/ElementCSSInlineStyle.java
new file mode 100644 (file)
index 0000000..98b60bf
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/ElementCSSInlineStyle.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+/**
+ *  Inline style information attached to elements is exposed through the 
+ * <code>style</code> attribute. This represents the contents of the STYLE 
+ * attribute for HTML elements (or elements in other schemas or DTDs which 
+ * use the STYLE attribute in the same way). The expectation is that an 
+ * instance of the ElementCSSInlineStyle interface can be obtained by using 
+ * binding-specific casting methods on an instance of the Element interface 
+ * when the element supports inline CSS style informations. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface ElementCSSInlineStyle {
+    /**
+     *  The style attribute. 
+     */
+    public CSSStyleDeclaration getStyle();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/RGBColor.java b/libjava/external/w3c_dom/org/w3c/dom/css/RGBColor.java
new file mode 100644 (file)
index 0000000..cd5daa5
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/RGBColor.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+/**
+ *  The <code>RGBColor</code> interface is used to represent any RGB color 
+ * value. This interface reflects the values in the underlying style 
+ * property. Hence, modifications made to the <code>CSSPrimitiveValue</code> 
+ * objects modify the style property. 
+ * <p> A specified RGB color is not clipped (even if the number is outside the 
+ * range 0-255 or 0%-100%). A computed RGB color is clipped depending on the 
+ * device. 
+ * <p> Even if a style sheet can only contain an integer for a color value, 
+ * the internal storage of this integer is a float, and this can be used as 
+ * a float in the specified or the computed style. 
+ * <p> A color percentage value can always be converted to a number and vice 
+ * versa. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface RGBColor {
+    /**
+     *  This attribute is used for the red value of the RGB color. 
+     */
+    public CSSPrimitiveValue getRed();
+
+    /**
+     *  This attribute is used for the green value of the RGB color. 
+     */
+    public CSSPrimitiveValue getGreen();
+
+    /**
+     *  This attribute is used for the blue value of the RGB color. 
+     */
+    public CSSPrimitiveValue getBlue();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/Rect.java b/libjava/external/w3c_dom/org/w3c/dom/css/Rect.java
new file mode 100644 (file)
index 0000000..f5efb10
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/Rect.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+/**
+ *  The <code>Rect</code> interface is used to represent any rect value. This 
+ * interface reflects the values in the underlying style property. Hence, 
+ * modifications made to the <code>CSSPrimitiveValue</code> objects modify 
+ * the style property. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface Rect {
+    /**
+     *  This attribute is used for the top of the rect. 
+     */
+    public CSSPrimitiveValue getTop();
+
+    /**
+     *  This attribute is used for the right of the rect. 
+     */
+    public CSSPrimitiveValue getRight();
+
+    /**
+     *  This attribute is used for the bottom of the rect. 
+     */
+    public CSSPrimitiveValue getBottom();
+
+    /**
+     *  This attribute is used for the left of the rect. 
+     */
+    public CSSPrimitiveValue getLeft();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/css/ViewCSS.java b/libjava/external/w3c_dom/org/w3c/dom/css/ViewCSS.java
new file mode 100644 (file)
index 0000000..76b585a
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/css/ViewCSS.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.css;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.views.AbstractView;
+
+/**
+ *  This interface represents a CSS view. The <code>getComputedStyle</code> 
+ * method provides a read only access to the computed values of an element. 
+ * <p> The expectation is that an instance of the <code>ViewCSS</code> 
+ * interface can be obtained by using binding-specific casting methods on an 
+ * instance of the <code>AbstractView</code> interface. 
+ * <p> Since a computed style is related to an <code>Element</code> node, if 
+ * this element is removed from the document, the associated 
+ * <code>CSSStyleDeclaration</code> and <code>CSSValue</code> related to 
+ * this declaration are no longer valid. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface ViewCSS extends AbstractView {
+    /**
+     *  This method is used to get the computed style as it is defined in [<a href='http://www.w3.org/TR/1998/REC-CSS2-19980512'>CSS2</a>]. 
+     * @param elt  The element whose style is to be computed. This parameter 
+     *   cannot be null. 
+     * @param pseudoElt  The pseudo-element or <code>null</code> if none. 
+     * @return  The computed style. The <code>CSSStyleDeclaration</code> is 
+     *   read-only and contains only absolute values. 
+     */
+    public CSSStyleDeclaration getComputedStyle(Element elt, 
+                                                String pseudoElt);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/events/DocumentEvent.java b/libjava/external/w3c_dom/org/w3c/dom/events/DocumentEvent.java
new file mode 100644 (file)
index 0000000..76644bc
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/events/DocumentEvent.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.events;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  The <code>DocumentEvent</code> interface provides a mechanism by which the 
+ * user can create an Event of a type supported by the implementation. It is 
+ * expected that the <code>DocumentEvent</code> interface will be 
+ * implemented on the same object which implements the <code>Document</code> 
+ * interface in an implementation which supports the Event model. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
+ * @since DOM Level 2
+ */
+public interface DocumentEvent {
+    /**
+     * 
+     * @param eventType The <code>eventType</code> parameter specifies the 
+     *   type of <code>Event</code> interface to be created. If the 
+     *   <code>Event</code> interface specified is supported by the 
+     *   implementation this method will return a new <code>Event</code> of 
+     *   the interface type requested. If the <code>Event</code> is to be 
+     *   dispatched via the <code>dispatchEvent</code> method the 
+     *   appropriate event init method must be called after creation in 
+     *   order to initialize the <code>Event</code>'s values. As an example, 
+     *   a user wishing to synthesize some kind of <code>UIEvent</code> 
+     *   would call <code>createEvent</code> with the parameter "UIEvents". 
+     *   The <code>initUIEvent</code> method could then be called on the 
+     *   newly created <code>UIEvent</code> to set the specific type of 
+     *   UIEvent to be dispatched and set its context information.The 
+     *   <code>createEvent</code> method is used in creating 
+     *   <code>Event</code>s when it is either inconvenient or unnecessary 
+     *   for the user to create an <code>Event</code> themselves. In cases 
+     *   where the implementation provided <code>Event</code> is 
+     *   insufficient, users may supply their own <code>Event</code> 
+     *   implementations for use with the <code>dispatchEvent</code> method.
+     * @return The newly created <code>Event</code>
+     * @exception DOMException
+     *   NOT_SUPPORTED_ERR: Raised if the implementation does not support the 
+     *   type of <code>Event</code> interface requested
+     */
+    public Event createEvent(String eventType)
+                             throws DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/events/Event.java b/libjava/external/w3c_dom/org/w3c/dom/events/Event.java
new file mode 100644 (file)
index 0000000..14a9239
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/events/Event.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.events;
+
+/**
+ * The <code>Event</code> interface is used to provide contextual information 
+ * about an event to the handler processing the event. An object which 
+ * implements the <code>Event</code> interface is generally passed as the 
+ * first parameter to an event handler. More specific context information is 
+ * passed to event handlers by deriving additional interfaces from 
+ * <code>Event</code> which contain information directly relating to the 
+ * type of event they accompany. These derived interfaces are also 
+ * implemented by the object passed to the event listener. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
+ * @since DOM Level 2
+ */
+public interface Event {
+    // PhaseType
+    /**
+     * The current event phase is the capturing phase.
+     */
+    public static final short CAPTURING_PHASE           = 1;
+    /**
+     * The event is currently being evaluated at the target 
+     * <code>EventTarget</code>.
+     */
+    public static final short AT_TARGET                 = 2;
+    /**
+     * The current event phase is the bubbling phase.
+     */
+    public static final short BUBBLING_PHASE            = 3;
+
+    /**
+     * The name of the event (case-insensitive). The name must be an XML name.
+     */
+    public String getType();
+
+    /**
+     * Used to indicate the <code>EventTarget</code> to which the event was 
+     * originally dispatched. 
+     */
+    public EventTarget getTarget();
+
+    /**
+     * Used to indicate the <code>EventTarget</code> whose 
+     * <code>EventListeners</code> are currently being processed. This is 
+     * particularly useful during capturing and bubbling. 
+     */
+    public EventTarget getCurrentTarget();
+
+    /**
+     * Used to indicate which phase of event flow is currently being 
+     * evaluated. 
+     */
+    public short getEventPhase();
+
+    /**
+     * Used to indicate whether or not an event is a bubbling event. If the 
+     * event can bubble the value is true, else the value is false. 
+     */
+    public boolean getBubbles();
+
+    /**
+     * Used to indicate whether or not an event can have its default action 
+     * prevented. If the default action can be prevented the value is true, 
+     * else the value is false. 
+     */
+    public boolean getCancelable();
+
+    /**
+     *  Used to specify the time (in milliseconds relative to the epoch) at 
+     * which the event was created. Due to the fact that some systems may 
+     * not provide this information the value of <code>timeStamp</code> may 
+     * be not available for all events. When not available, a value of 0 
+     * will be returned. Examples of epoch time are the time of the system 
+     * start or 0:0:0 UTC 1st January 1970. 
+     */
+    public long getTimeStamp();
+
+    /**
+     * The <code>stopPropagation</code> method is used prevent further 
+     * propagation of an event during event flow. If this method is called 
+     * by any <code>EventListener</code> the event will cease propagating 
+     * through the tree. The event will complete dispatch to all listeners 
+     * on the current <code>EventTarget</code> before event flow stops. This 
+     * method may be used during any stage of event flow.
+     */
+    public void stopPropagation();
+
+    /**
+     * If an event is cancelable, the <code>preventDefault</code> method is 
+     * used to signify that the event is to be canceled, meaning any default 
+     * action normally taken by the implementation as a result of the event 
+     * will not occur. If, during any stage of event flow, the 
+     * <code>preventDefault</code> method is called the event is canceled. 
+     * Any default action associated with the event will not occur. Calling 
+     * this method for a non-cancelable event has no effect. Once 
+     * <code>preventDefault</code> has been called it will remain in effect 
+     * throughout the remainder of the event's propagation. This method may 
+     * be used during any stage of event flow. 
+     */
+    public void preventDefault();
+
+    /**
+     * The <code>initEvent</code> method is used to initialize the value of an 
+     * <code>Event</code> created through the <code>DocumentEvent</code> 
+     * interface. This method may only be called before the 
+     * <code>Event</code> has been dispatched via the 
+     * <code>dispatchEvent</code> method, though it may be called multiple 
+     * times during that phase if necessary. If called multiple times the 
+     * final invocation takes precedence. If called from a subclass of 
+     * <code>Event</code> interface only the values specified in the 
+     * <code>initEvent</code> method are modified, all other attributes are 
+     * left unchanged.
+     * @param eventTypeArg Specifies the event type. This type may be any 
+     *   event type currently defined in this specification or a new event 
+     *   type.. The string must be an XML name. Any new event type must not 
+     *   begin with any upper, lower, or mixed case version of the string 
+     *   "DOM". This prefix is reserved for future DOM event sets. It is 
+     *   also strongly recommended that third parties adding their own 
+     *   events use their own prefix to avoid confusion and lessen the 
+     *   probability of conflicts with other new events.
+     * @param canBubbleArg Specifies whether or not the event can bubble.
+     * @param cancelableArg Specifies whether or not the event's default 
+     *   action can be prevented.
+     */
+    public void initEvent(String eventTypeArg, 
+                          boolean canBubbleArg, 
+                          boolean cancelableArg);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/events/EventException.java b/libjava/external/w3c_dom/org/w3c/dom/events/EventException.java
new file mode 100644 (file)
index 0000000..7a6ff26
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/events/EventException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.events;
+
+/**
+ *  Event operations may throw an <code>EventException</code> as specified in 
+ * their method descriptions. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
+ * @since DOM Level 2
+ */
+public class EventException extends RuntimeException {
+    public EventException(short code, String message) {
+       super(message);
+       this.code = code;
+    }
+    public short   code;
+    // EventExceptionCode
+    /**
+     *  If the <code>Event</code>'s type was not specified by initializing the 
+     * event before the method was called. Specification of the Event's type 
+     * as <code>null</code> or an empty string will also trigger this 
+     * exception. 
+     */
+    public static final short UNSPECIFIED_EVENT_TYPE_ERR = 0;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/events/EventListener.java b/libjava/external/w3c_dom/org/w3c/dom/events/EventListener.java
new file mode 100644 (file)
index 0000000..1df8020
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/events/EventListener.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.events;
+
+/**
+ *  The <code>EventListener</code> interface is the primary method for 
+ * handling events. Users implement the <code>EventListener</code> interface 
+ * and register their listener on an <code>EventTarget</code> using the 
+ * <code>AddEventListener</code> method. The users should also remove their 
+ * <code>EventListener</code> from its <code>EventTarget</code> after they 
+ * have completed using the listener. 
+ * <p> When a <code>Node</code> is copied using the <code>cloneNode</code> 
+ * method the <code>EventListener</code>s attached to the source 
+ * <code>Node</code> are not attached to the copied <code>Node</code>. If 
+ * the user wishes the same <code>EventListener</code>s to be added to the 
+ * newly created copy the user must add them manually. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
+ * @since DOM Level 2
+ */
+public interface EventListener {
+    /**
+     *  This method is called whenever an event occurs of the type for which 
+     * the <code> EventListener</code> interface was registered. 
+     * @param evt  The <code>Event</code> contains contextual information 
+     *   about the event. It also contains the <code>stopPropagation</code> 
+     *   and <code>preventDefault</code> methods which are used in 
+     *   determining the event's flow and default action. 
+     */
+    public void handleEvent(Event evt);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/events/EventTarget.java b/libjava/external/w3c_dom/org/w3c/dom/events/EventTarget.java
new file mode 100644 (file)
index 0000000..f076636
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/events/EventTarget.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.events;
+
+/**
+ *  The <code>EventTarget</code> interface is implemented by all 
+ * <code>Nodes</code> in an implementation which supports the DOM Event 
+ * Model. Therefore, this interface can be obtained by using 
+ * binding-specific casting methods on an instance of the <code>Node</code> 
+ * interface. The interface allows registration and removal of 
+ * <code>EventListeners</code> on an <code>EventTarget</code> and dispatch 
+ * of events to that <code>EventTarget</code>.
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
+ * @since DOM Level 2
+ */
+public interface EventTarget {
+    /**
+     * This method allows the registration of event listeners on the event 
+     * target. If an <code>EventListener</code> is added to an 
+     * <code>EventTarget</code> while it is processing an event, it will not 
+     * be triggered by the current actions but may be triggered during a 
+     * later stage of event flow, such as the bubbling phase. 
+     * <br> If multiple identical <code>EventListener</code>s are registered 
+     * on the same <code>EventTarget</code> with the same parameters the 
+     * duplicate instances are discarded. They do not cause the 
+     * <code>EventListener</code> to be called twice and since they are 
+     * discarded they do not need to be removed with the 
+     * <code>removeEventListener</code> method. 
+     * @param type The event type for which the user is registering
+     * @param listener The <code>listener</code> parameter takes an interface 
+     *   implemented by the user which contains the methods to be called 
+     *   when the event occurs.
+     * @param useCapture If true, <code>useCapture</code> indicates that the 
+     *   user wishes to initiate capture. After initiating capture, all 
+     *   events of the specified type will be dispatched to the registered 
+     *   <code>EventListener</code> before being dispatched to any 
+     *   <code>EventTargets</code> beneath them in the tree. Events which 
+     *   are bubbling upward through the tree will not trigger an 
+     *   <code>EventListener</code> designated to use capture.
+     */
+    public void addEventListener(String type, 
+                                 EventListener listener, 
+                                 boolean useCapture);
+
+    /**
+     * This method allows the removal of event listeners from the event 
+     * target. If an <code>EventListener</code> is removed from an 
+     * <code>EventTarget</code> while it is processing an event, it will not 
+     * be triggered by the current actions. <code>EventListener</code>s can 
+     * never be invoked after being removed.
+     * <br>Calling <code>removeEventListener</code> with arguments which do 
+     * not identify any currently registered <code>EventListener</code> on 
+     * the <code>EventTarget</code> has no effect.
+     * @param type Specifies the event type of the <code>EventListener</code> 
+     *   being removed. 
+     * @param listener The <code>EventListener</code> parameter indicates the 
+     *   <code>EventListener </code> to be removed. 
+     * @param useCapture Specifies whether the <code>EventListener</code> 
+     *   being removed was registered as a capturing listener or not. If a 
+     *   listener was registered twice, one with capture and one without, 
+     *   each must be removed separately. Removal of a capturing listener 
+     *   does not affect a non-capturing version of the same listener, and 
+     *   vice versa. 
+     */
+    public void removeEventListener(String type, 
+                                    EventListener listener, 
+                                    boolean useCapture);
+
+    /**
+     * This method allows the dispatch of events into the implementations 
+     * event model. Events dispatched in this manner will have the same 
+     * capturing and bubbling behavior as events dispatched directly by the 
+     * implementation. The target of the event is the 
+     * <code> EventTarget</code> on which <code>dispatchEvent</code> is 
+     * called. 
+     * @param evt Specifies the event type, behavior, and contextual 
+     *   information to be used in processing the event.
+     * @return The return value of <code>dispatchEvent</code> indicates 
+     *   whether any of the listeners which handled the event called 
+     *   <code>preventDefault</code>. If <code>preventDefault</code> was 
+     *   called the value is false, else the value is true. 
+     * @exception EventException
+     *   UNSPECIFIED_EVENT_TYPE_ERR: Raised if the <code>Event</code>'s type 
+     *   was not specified by initializing the event before 
+     *   <code>dispatchEvent</code> was called. Specification of the 
+     *   <code>Event</code>'s type as <code>null</code> or an empty string 
+     *   will also trigger this exception.
+     */
+    public boolean dispatchEvent(Event evt)
+                                 throws EventException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/events/MouseEvent.java b/libjava/external/w3c_dom/org/w3c/dom/events/MouseEvent.java
new file mode 100644 (file)
index 0000000..be78035
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/events/MouseEvent.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.events;
+
+import org.w3c.dom.views.AbstractView;
+
+/**
+ * The <code>MouseEvent</code> interface provides specific contextual 
+ * information associated with Mouse events.
+ * <p>The <code>detail</code> attribute inherited from <code>UIEvent</code> 
+ * indicates the number of times a mouse button has been pressed and 
+ * released over the same screen location during a user action. The 
+ * attribute value is 1 when the user begins this action and increments by 1 
+ * for each full sequence of pressing and releasing. If the user moves the 
+ * mouse between the mousedown and mouseup the value will be set to 0, 
+ * indicating that no click is occurring.
+ * <p>In the case of nested elements mouse events are always targeted at the 
+ * most deeply nested element. Ancestors of the targeted element may use 
+ * bubbling to obtain notification of mouse events which occur within its 
+ * descendent elements.
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
+ * @since DOM Level 2
+ */
+public interface MouseEvent extends UIEvent {
+    /**
+     * The horizontal coordinate at which the event occurred relative to the 
+     * origin of the screen coordinate system.
+     */
+    public int getScreenX();
+
+    /**
+     * The vertical coordinate at which the event occurred relative to the 
+     * origin of the screen coordinate system.
+     */
+    public int getScreenY();
+
+    /**
+     * The horizontal coordinate at which the event occurred relative to the 
+     * DOM implementation's client area.
+     */
+    public int getClientX();
+
+    /**
+     * The vertical coordinate at which the event occurred relative to the DOM 
+     * implementation's client area.
+     */
+    public int getClientY();
+
+    /**
+     * Used to indicate whether the 'ctrl' key was depressed during the firing 
+     * of the event.
+     */
+    public boolean getCtrlKey();
+
+    /**
+     * Used to indicate whether the 'shift' key was depressed during the 
+     * firing of the event.
+     */
+    public boolean getShiftKey();
+
+    /**
+     * Used to indicate whether the 'alt' key was depressed during the firing 
+     * of the event. On some platforms this key may map to an alternative 
+     * key name.
+     */
+    public boolean getAltKey();
+
+    /**
+     * Used to indicate whether the 'meta' key was depressed during the firing 
+     * of the event. On some platforms this key may map to an alternative 
+     * key name.
+     */
+    public boolean getMetaKey();
+
+    /**
+     * During mouse events caused by the depression or release of a mouse 
+     * button, <code>button</code> is used to indicate which mouse button 
+     * changed state. The values for <code>button</code> range from zero to 
+     * indicate the left button of the mouse, one to indicate the middle 
+     * button if present, and two to indicate the right button. For mice 
+     * configured for left handed use in which the button actions are 
+     * reversed the values are instead read from right to left.
+     */
+    public short getButton();
+
+    /**
+     * Used to identify a secondary <code>EventTarget</code> related to a UI 
+     * event. Currently this attribute is used with the mouseover event to 
+     * indicate the <code>EventTarget</code> which the pointing device 
+     * exited and with the mouseout event to indicate the 
+     * <code>EventTarget</code> which the pointing device entered.
+     */
+    public EventTarget getRelatedTarget();
+
+    /**
+     * The <code>initMouseEvent</code> method is used to initialize the value 
+     * of a <code>MouseEvent</code> created through the 
+     * <code>DocumentEvent</code> interface. This method may only be called 
+     * before the <code>MouseEvent</code> has been dispatched via the 
+     * <code>dispatchEvent</code> method, though it may be called multiple 
+     * times during that phase if necessary. If called multiple times, the 
+     * final invocation takes precedence.
+     * @param typeArg Specifies the event type.
+     * @param canBubbleArg Specifies whether or not the event can bubble.
+     * @param cancelableArg Specifies whether or not the event's default 
+     *   action can be prevented.
+     * @param viewArg Specifies the <code>Event</code>'s 
+     *   <code>AbstractView</code>.
+     * @param detailArg Specifies the <code>Event</code>'s mouse click count.
+     * @param screenXArg Specifies the <code>Event</code>'s screen x 
+     *   coordinate
+     * @param screenYArg Specifies the <code>Event</code>'s screen y 
+     *   coordinate
+     * @param clientXArg Specifies the <code>Event</code>'s client x 
+     *   coordinate
+     * @param clientYArg Specifies the <code>Event</code>'s client y 
+     *   coordinate
+     * @param ctrlKeyArg Specifies whether or not control key was depressed 
+     *   during the <code>Event</code>.
+     * @param altKeyArg Specifies whether or not alt key was depressed during 
+     *   the <code>Event</code>.
+     * @param shiftKeyArg Specifies whether or not shift key was depressed 
+     *   during the <code>Event</code>.
+     * @param metaKeyArg Specifies whether or not meta key was depressed 
+     *   during the <code>Event</code>.
+     * @param buttonArg Specifies the <code>Event</code>'s mouse button.
+     * @param relatedTargetArg Specifies the <code>Event</code>'s related 
+     *   <code>EventTarget</code>.
+     */
+    public void initMouseEvent(String typeArg, 
+                               boolean canBubbleArg, 
+                               boolean cancelableArg, 
+                               AbstractView viewArg, 
+                               int detailArg, 
+                               int screenXArg, 
+                               int screenYArg, 
+                               int clientXArg, 
+                               int clientYArg, 
+                               boolean ctrlKeyArg, 
+                               boolean altKeyArg, 
+                               boolean shiftKeyArg, 
+                               boolean metaKeyArg, 
+                               short buttonArg, 
+                               EventTarget relatedTargetArg);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/events/MutationEvent.java b/libjava/external/w3c_dom/org/w3c/dom/events/MutationEvent.java
new file mode 100644 (file)
index 0000000..3db4003
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/events/MutationEvent.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.events;
+
+import org.w3c.dom.Node;
+
+/**
+ * The <code>MutationEvent</code> interface provides specific contextual 
+ * information associated with Mutation events. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
+ * @since DOM Level 2
+ */
+public interface MutationEvent extends Event {
+    // attrChangeType
+    /**
+     * The <code>Attr</code> was modified in place.
+     */
+    public static final short MODIFICATION              = 1;
+    /**
+     * The <code>Attr</code> was just added.
+     */
+    public static final short ADDITION                  = 2;
+    /**
+     * The <code>Attr</code> was just removed.
+     */
+    public static final short REMOVAL                   = 3;
+
+    /**
+     *  <code>relatedNode</code> is used to identify a secondary node related 
+     * to a mutation event. For example, if a mutation event is dispatched 
+     * to a node indicating that its parent has changed, the 
+     * <code>relatedNode</code> is the changed parent. If an event is 
+     * instead dispatched to a subtree indicating a node was changed within 
+     * it, the <code>relatedNode</code> is the changed node. In the case of 
+     * the DOMAttrModified event it indicates the <code>Attr</code> node 
+     * which was modified, added, or removed. 
+     */
+    public Node getRelatedNode();
+
+    /**
+     *  <code>prevValue</code> indicates the previous value of the 
+     * <code>Attr</code> node in DOMAttrModified events, and of the 
+     * <code>CharacterData</code> node in DOMCharacterDataModified events. 
+     */
+    public String getPrevValue();
+
+    /**
+     *  <code>newValue</code> indicates the new value of the <code>Attr</code> 
+     * node in DOMAttrModified events, and of the <code>CharacterData</code> 
+     * node in DOMCharacterDataModified events. 
+     */
+    public String getNewValue();
+
+    /**
+     *  <code>attrName</code> indicates the name of the changed 
+     * <code>Attr</code> node in a DOMAttrModified event. 
+     */
+    public String getAttrName();
+
+    /**
+     *  <code>attrChange</code> indicates the type of change which triggered 
+     * the DOMAttrModified event. The values can be <code>MODIFICATION</code>
+     * , <code>ADDITION</code>, or <code>REMOVAL</code>. 
+     */
+    public short getAttrChange();
+
+    /**
+     * The <code>initMutationEvent</code> method is used to initialize the 
+     * value of a <code>MutationEvent</code> created through the 
+     * <code>DocumentEvent</code> interface. This method may only be called 
+     * before the <code>MutationEvent</code> has been dispatched via the 
+     * <code>dispatchEvent</code> method, though it may be called multiple 
+     * times during that phase if necessary. If called multiple times, the 
+     * final invocation takes precedence.
+     * @param typeArg Specifies the event type.
+     * @param canBubbleArg Specifies whether or not the event can bubble.
+     * @param cancelableArg Specifies whether or not the event's default 
+     *   action can be prevented.
+     * @param relatedNodeArg Specifies the <code>Event</code>'s related Node.
+     * @param prevValueArg Specifies the <code>Event</code>'s 
+     *   <code>prevValue</code> attribute. This value may be null.
+     * @param newValueArg Specifies the <code>Event</code>'s 
+     *   <code>newValue</code> attribute. This value may be null.
+     * @param attrNameArg Specifies the <code>Event</code>'s 
+     *   <code>attrName</code> attribute. This value may be null.
+     * @param attrChangeArg Specifies the <code>Event</code>'s 
+     *   <code>attrChange</code> attribute
+     */
+    public void initMutationEvent(String typeArg, 
+                                  boolean canBubbleArg, 
+                                  boolean cancelableArg, 
+                                  Node relatedNodeArg, 
+                                  String prevValueArg, 
+                                  String newValueArg, 
+                                  String attrNameArg, 
+                                  short attrChangeArg);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/events/UIEvent.java b/libjava/external/w3c_dom/org/w3c/dom/events/UIEvent.java
new file mode 100644 (file)
index 0000000..15affe8
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/events/UIEvent.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.events;
+
+import org.w3c.dom.views.AbstractView;
+
+/**
+ * The <code>UIEvent</code> interface provides specific contextual information 
+ * associated with User Interface events.
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
+ * @since DOM Level 2
+ */
+public interface UIEvent extends Event {
+    /**
+     * The <code>view</code> attribute identifies the <code>AbstractView</code>
+     *  from which the event was generated.
+     */
+    public AbstractView getView();
+
+    /**
+     * Specifies some detail information about the <code>Event</code>, 
+     * depending on the type of event.
+     */
+    public int getDetail();
+
+    /**
+     * The <code>initUIEvent</code> method is used to initialize the value of 
+     * a <code>UIEvent</code> created through the <code>DocumentEvent</code> 
+     * interface. This method may only be called before the 
+     * <code>UIEvent</code> has been dispatched via the 
+     * <code>dispatchEvent</code> method, though it may be called multiple 
+     * times during that phase if necessary. If called multiple times, the 
+     * final invocation takes precedence.
+     * @param typeArg Specifies the event type.
+     * @param canBubbleArg Specifies whether or not the event can bubble.
+     * @param cancelableArg Specifies whether or not the event's default 
+     *   action can be prevented.
+     * @param viewArg Specifies the <code>Event</code>'s 
+     *   <code>AbstractView</code>.
+     * @param detailArg Specifies the <code>Event</code>'s detail.
+     */
+    public void initUIEvent(String typeArg, 
+                            boolean canBubbleArg, 
+                            boolean cancelableArg, 
+                            AbstractView viewArg, 
+                            int detailArg);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLAnchorElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLAnchorElement.java
new file mode 100644 (file)
index 0000000..eaac35c
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLAnchorElement.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * The anchor element. See the A element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLAnchorElement extends HTMLElement {
+    /**
+     * A single character access key to give access to the form control. See 
+     * the accesskey attribute definition in HTML 4.01.
+     */
+    public String getAccessKey();
+    /**
+     * A single character access key to give access to the form control. See 
+     * the accesskey attribute definition in HTML 4.01.
+     */
+    public void setAccessKey(String accessKey);
+
+    /**
+     * The character encoding of the linked resource. See the charset 
+     * attribute definition in HTML 4.01.
+     */
+    public String getCharset();
+    /**
+     * The character encoding of the linked resource. See the charset 
+     * attribute definition in HTML 4.01.
+     */
+    public void setCharset(String charset);
+
+    /**
+     * Comma-separated list of lengths, defining an active region geometry. 
+     * See also <code>shape</code> for the shape of the region. See the 
+     * coords attribute definition in HTML 4.01.
+     */
+    public String getCoords();
+    /**
+     * Comma-separated list of lengths, defining an active region geometry. 
+     * See also <code>shape</code> for the shape of the region. See the 
+     * coords attribute definition in HTML 4.01.
+     */
+    public void setCoords(String coords);
+
+    /**
+     * The absolute URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] of the linked resource. See the href attribute 
+     * definition in HTML 4.01.
+     */
+    public String getHref();
+    /**
+     * The absolute URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] of the linked resource. See the href attribute 
+     * definition in HTML 4.01.
+     */
+    public void setHref(String href);
+
+    /**
+     * Language code of the linked resource. See the hreflang attribute 
+     * definition in HTML 4.01.
+     */
+    public String getHreflang();
+    /**
+     * Language code of the linked resource. See the hreflang attribute 
+     * definition in HTML 4.01.
+     */
+    public void setHreflang(String hreflang);
+
+    /**
+     * Anchor name. See the name attribute definition in HTML 4.01.
+     */
+    public String getName();
+    /**
+     * Anchor name. See the name attribute definition in HTML 4.01.
+     */
+    public void setName(String name);
+
+    /**
+     * Forward link type. See the rel attribute definition in HTML 4.01.
+     */
+    public String getRel();
+    /**
+     * Forward link type. See the rel attribute definition in HTML 4.01.
+     */
+    public void setRel(String rel);
+
+    /**
+     * Reverse link type. See the rev attribute definition in HTML 4.01.
+     */
+    public String getRev();
+    /**
+     * Reverse link type. See the rev attribute definition in HTML 4.01.
+     */
+    public void setRev(String rev);
+
+    /**
+     * The shape of the active area. The coordinates are given by 
+     * <code>coords</code>. See the shape attribute definition in HTML 4.01.
+     */
+    public String getShape();
+    /**
+     * The shape of the active area. The coordinates are given by 
+     * <code>coords</code>. See the shape attribute definition in HTML 4.01.
+     */
+    public void setShape(String shape);
+
+    /**
+     * Index that represents the element's position in the tabbing order. See 
+     * the tabindex attribute definition in HTML 4.01.
+     */
+    public int getTabIndex();
+    /**
+     * Index that represents the element's position in the tabbing order. See 
+     * the tabindex attribute definition in HTML 4.01.
+     */
+    public void setTabIndex(int tabIndex);
+
+    /**
+     * Frame to render the resource in. See the target attribute definition in 
+     * HTML 4.01.
+     */
+    public String getTarget();
+    /**
+     * Frame to render the resource in. See the target attribute definition in 
+     * HTML 4.01.
+     */
+    public void setTarget(String target);
+
+    /**
+     * Advisory content type. See the type attribute definition in HTML 4.01.
+     */
+    public String getType();
+    /**
+     * Advisory content type. See the type attribute definition in HTML 4.01.
+     */
+    public void setType(String type);
+
+    /**
+     * Removes keyboard focus from this element.
+     */
+    public void blur();
+
+    /**
+     * Gives keyboard focus to this element.
+     */
+    public void focus();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLAppletElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLAppletElement.java
new file mode 100644 (file)
index 0000000..f27b51a
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLAppletElement.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * An embedded Java applet. See the APPLET element definition in HTML 4.01. 
+ * This element is deprecated in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLAppletElement extends HTMLElement {
+    /**
+     * Aligns this object (vertically or horizontally) with respect to its 
+     * surrounding text. See the align attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public String getAlign();
+    /**
+     * Aligns this object (vertically or horizontally) with respect to its 
+     * surrounding text. See the align attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public void setAlign(String align);
+
+    /**
+     * Alternate text for user agents not rendering the normal content of this 
+     * element. See the alt attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public String getAlt();
+    /**
+     * Alternate text for user agents not rendering the normal content of this 
+     * element. See the alt attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public void setAlt(String alt);
+
+    /**
+     * Comma-separated archive list. See the archive attribute definition in 
+     * HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public String getArchive();
+    /**
+     * Comma-separated archive list. See the archive attribute definition in 
+     * HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setArchive(String archive);
+
+    /**
+     * Applet class file. See the code attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public String getCode();
+    /**
+     * Applet class file. See the code attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public void setCode(String code);
+
+    /**
+     * Optional base URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] for applet. See the codebase attribute definition in 
+     * HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public String getCodeBase();
+    /**
+     * Optional base URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] for applet. See the codebase attribute definition in 
+     * HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setCodeBase(String codeBase);
+
+    /**
+     * Override height. See the height attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public String getHeight();
+    /**
+     * Override height. See the height attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public void setHeight(String height);
+
+    /**
+     * Horizontal space, in pixels, to the left and right of this image, 
+     * applet, or object. See the hspace attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     * @version DOM Level 2
+     */
+    public int getHspace();
+    /**
+     * Horizontal space, in pixels, to the left and right of this image, 
+     * applet, or object. See the hspace attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     * @version DOM Level 2
+     */
+    public void setHspace(int hspace);
+
+    /**
+     * The name of the applet. See the name attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public String getName();
+    /**
+     * The name of the applet. See the name attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public void setName(String name);
+
+    /**
+     * The value of the "object" attribute. See the object attribute definition
+     *  in HTML 4.01. This attribute is deprecated in HTML 4.01. 
+     * @version DOM Level 2
+     */
+    public String getObject();
+    /**
+     * The value of the "object" attribute. See the object attribute definition
+     *  in HTML 4.01. This attribute is deprecated in HTML 4.01. 
+     * @version DOM Level 2
+     */
+    public void setObject(String object);
+
+    /**
+     * Vertical space, in pixels, above and below this image, applet, or 
+     * object. See the vspace attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     * @version DOM Level 2
+     */
+    public int getVspace();
+    /**
+     * Vertical space, in pixels, above and below this image, applet, or 
+     * object. See the vspace attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     * @version DOM Level 2
+     */
+    public void setVspace(int vspace);
+
+    /**
+     * Override width. See the width attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public String getWidth();
+    /**
+     * Override width. See the width attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public void setWidth(String width);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLAreaElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLAreaElement.java
new file mode 100644 (file)
index 0000000..75d1dc5
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLAreaElement.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Client-side image map area definition. See the AREA element definition in 
+ * HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLAreaElement extends HTMLElement {
+    /**
+     * A single character access key to give access to the form control. See 
+     * the accesskey attribute definition in HTML 4.01.
+     */
+    public String getAccessKey();
+    /**
+     * A single character access key to give access to the form control. See 
+     * the accesskey attribute definition in HTML 4.01.
+     */
+    public void setAccessKey(String accessKey);
+
+    /**
+     * Alternate text for user agents not rendering the normal content of this 
+     * element. See the alt attribute definition in HTML 4.01.
+     */
+    public String getAlt();
+    /**
+     * Alternate text for user agents not rendering the normal content of this 
+     * element. See the alt attribute definition in HTML 4.01.
+     */
+    public void setAlt(String alt);
+
+    /**
+     * Comma-separated list of lengths, defining an active region geometry. 
+     * See also <code>shape</code> for the shape of the region. See the 
+     * coords attribute definition in HTML 4.01.
+     */
+    public String getCoords();
+    /**
+     * Comma-separated list of lengths, defining an active region geometry. 
+     * See also <code>shape</code> for the shape of the region. See the 
+     * coords attribute definition in HTML 4.01.
+     */
+    public void setCoords(String coords);
+
+    /**
+     * The URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] of the linked resource. See the href attribute definition in 
+     * HTML 4.01.
+     */
+    public String getHref();
+    /**
+     * The URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] of the linked resource. See the href attribute definition in 
+     * HTML 4.01.
+     */
+    public void setHref(String href);
+
+    /**
+     * Specifies that this area is inactive, i.e., has no associated action. 
+     * See the nohref attribute definition in HTML 4.01.
+     */
+    public boolean getNoHref();
+    /**
+     * Specifies that this area is inactive, i.e., has no associated action. 
+     * See the nohref attribute definition in HTML 4.01.
+     */
+    public void setNoHref(boolean noHref);
+
+    /**
+     * The shape of the active area. The coordinates are given by 
+     * <code>coords</code>. See the shape attribute definition in HTML 4.01.
+     */
+    public String getShape();
+    /**
+     * The shape of the active area. The coordinates are given by 
+     * <code>coords</code>. See the shape attribute definition in HTML 4.01.
+     */
+    public void setShape(String shape);
+
+    /**
+     * Index that represents the element's position in the tabbing order. See 
+     * the tabindex attribute definition in HTML 4.01.
+     */
+    public int getTabIndex();
+    /**
+     * Index that represents the element's position in the tabbing order. See 
+     * the tabindex attribute definition in HTML 4.01.
+     */
+    public void setTabIndex(int tabIndex);
+
+    /**
+     * Frame to render the resource in. See the target attribute definition in 
+     * HTML 4.01.
+     */
+    public String getTarget();
+    /**
+     * Frame to render the resource in. See the target attribute definition in 
+     * HTML 4.01.
+     */
+    public void setTarget(String target);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLBRElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLBRElement.java
new file mode 100644 (file)
index 0000000..a865d28
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLBRElement.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Force a line break. See the BR element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLBRElement extends HTMLElement {
+    /**
+     * Control flow of text around floats. See the clear attribute definition 
+     * in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public String getClear();
+    /**
+     * Control flow of text around floats. See the clear attribute definition 
+     * in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setClear(String clear);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLBaseElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLBaseElement.java
new file mode 100644 (file)
index 0000000..7b52dbc
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLBaseElement.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Document base URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]. See the BASE element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLBaseElement extends HTMLElement {
+    /**
+     * The base URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]. See the href attribute definition in HTML 4.01.
+     */
+    public String getHref();
+    /**
+     * The base URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]. See the href attribute definition in HTML 4.01.
+     */
+    public void setHref(String href);
+
+    /**
+     * The default target frame. See the target attribute definition in HTML 
+     * 4.01.
+     */
+    public String getTarget();
+    /**
+     * The default target frame. See the target attribute definition in HTML 
+     * 4.01.
+     */
+    public void setTarget(String target);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLBaseFontElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLBaseFontElement.java
new file mode 100644 (file)
index 0000000..5a3c5c9
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLBaseFontElement.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Base font. See the BASEFONT element definition in HTML 4.01. This element 
+ * is deprecated in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLBaseFontElement extends HTMLElement {
+    /**
+     * Font color. See the color attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public String getColor();
+    /**
+     * Font color. See the color attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public void setColor(String color);
+
+    /**
+     * Font face identifier. See the face attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public String getFace();
+    /**
+     * Font face identifier. See the face attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public void setFace(String face);
+
+    /**
+     * Computed font size. See the size attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     * @version DOM Level 2
+     */
+    public int getSize();
+    /**
+     * Computed font size. See the size attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     * @version DOM Level 2
+     */
+    public void setSize(int size);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLBodyElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLBodyElement.java
new file mode 100644 (file)
index 0000000..8898c5d
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLBodyElement.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * The HTML document body. This element is always present in the DOM API, even 
+ * if the tags are not present in the source document. See the BODY element 
+ * definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLBodyElement extends HTMLElement {
+    /**
+     * Color of active links (after mouse-button down, but before mouse-button 
+     * up). See the alink attribute definition in HTML 4.01. This attribute 
+     * is deprecated in HTML 4.01.
+     */
+    public String getALink();
+    /**
+     * Color of active links (after mouse-button down, but before mouse-button 
+     * up). See the alink attribute definition in HTML 4.01. This attribute 
+     * is deprecated in HTML 4.01.
+     */
+    public void setALink(String aLink);
+
+    /**
+     * URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] of the background texture tile image. See the background attribute 
+     * definition in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public String getBackground();
+    /**
+     * URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] of the background texture tile image. See the background attribute 
+     * definition in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setBackground(String background);
+
+    /**
+     * Document background color. See the bgcolor attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public String getBgColor();
+    /**
+     * Document background color. See the bgcolor attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setBgColor(String bgColor);
+
+    /**
+     * Color of links that are not active and unvisited. See the link 
+     * attribute definition in HTML 4.01. This attribute is deprecated in 
+     * HTML 4.01.
+     */
+    public String getLink();
+    /**
+     * Color of links that are not active and unvisited. See the link 
+     * attribute definition in HTML 4.01. This attribute is deprecated in 
+     * HTML 4.01.
+     */
+    public void setLink(String link);
+
+    /**
+     * Document text color. See the text attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public String getText();
+    /**
+     * Document text color. See the text attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public void setText(String text);
+
+    /**
+     * Color of links that have been visited by the user. See the vlink 
+     * attribute definition in HTML 4.01. This attribute is deprecated in 
+     * HTML 4.01.
+     */
+    public String getVLink();
+    /**
+     * Color of links that have been visited by the user. See the vlink 
+     * attribute definition in HTML 4.01. This attribute is deprecated in 
+     * HTML 4.01.
+     */
+    public void setVLink(String vLink);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLButtonElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLButtonElement.java
new file mode 100644 (file)
index 0000000..7efe183
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLButtonElement.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Push button. See the BUTTON element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLButtonElement extends HTMLElement {
+    /**
+     * Returns the <code>FORM</code> element containing this control. Returns 
+     * <code>null</code> if this control is not within the context of a 
+     * form. 
+     */
+    public HTMLFormElement getForm();
+
+    /**
+     * A single character access key to give access to the form control. See 
+     * the accesskey attribute definition in HTML 4.01.
+     */
+    public String getAccessKey();
+    /**
+     * A single character access key to give access to the form control. See 
+     * the accesskey attribute definition in HTML 4.01.
+     */
+    public void setAccessKey(String accessKey);
+
+    /**
+     * The control is unavailable in this context. See the disabled attribute 
+     * definition in HTML 4.01.
+     */
+    public boolean getDisabled();
+    /**
+     * The control is unavailable in this context. See the disabled attribute 
+     * definition in HTML 4.01.
+     */
+    public void setDisabled(boolean disabled);
+
+    /**
+     * Form control or object name when submitted with a form. See the name 
+     * attribute definition in HTML 4.01.
+     */
+    public String getName();
+    /**
+     * Form control or object name when submitted with a form. See the name 
+     * attribute definition in HTML 4.01.
+     */
+    public void setName(String name);
+
+    /**
+     * Index that represents the element's position in the tabbing order. See 
+     * the tabindex attribute definition in HTML 4.01.
+     */
+    public int getTabIndex();
+    /**
+     * Index that represents the element's position in the tabbing order. See 
+     * the tabindex attribute definition in HTML 4.01.
+     */
+    public void setTabIndex(int tabIndex);
+
+    /**
+     * The type of button (all lower case). See the type attribute definition 
+     * in HTML 4.01.
+     */
+    public String getType();
+
+    /**
+     * The current form control value. See the value attribute definition in 
+     * HTML 4.01.
+     */
+    public String getValue();
+    /**
+     * The current form control value. See the value attribute definition in 
+     * HTML 4.01.
+     */
+    public void setValue(String value);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLCollection.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLCollection.java
new file mode 100644 (file)
index 0000000..6b67517
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLCollection.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+import org.w3c.dom.Node;
+
+/**
+ * An <code>HTMLCollection</code> is a list of nodes. An individual node may 
+ * be accessed by either ordinal index or the node's <code>name</code> or 
+ * <code>id</code> attributes. Collections in the HTML DOM are assumed to be 
+ * live meaning that they are automatically updated when the underlying 
+ * document is changed. 
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLCollection {
+    /**
+     * This attribute specifies the length or size of the list. 
+     */
+    public int getLength();
+
+    /**
+     * This method retrieves a node specified by ordinal index. Nodes are 
+     * numbered in tree order (depth-first traversal order).
+     * @param index The index of the node to be fetched. The index origin is 
+     *   <code>0</code>.
+     * @return The <code>Node</code> at the corresponding position upon 
+     *   success. A value of <code>null</code> is returned if the index is 
+     *   out of range. 
+     */
+    public Node item(int index);
+
+    /**
+     * This method retrieves a <code>Node</code> using a name. With [<a href='http://www.w3.org/TR/1999/REC-html401-19991224'>HTML 4.01</a>] 
+     * documents, it first searches for a <code>Node</code> with a matching 
+     * <code>id</code> attribute. If it doesn't find one, it then searches 
+     * for a <code>Node</code> with a matching <code>name</code> attribute, 
+     * but only on those elements that are allowed a name attribute. With [<a href='http://www.w3.org/TR/2002/REC-xhtml1-20020801'>XHTML 1.0</a>] 
+     * documents, this method only searches for <code>Nodes</code> with a 
+     * matching <code>id</code> attribute. This method is case insensitive 
+     * in HTML documents and case sensitive in XHTML documents.
+     * @param name The name of the <code>Node</code> to be fetched.
+     * @return The <code>Node</code> with a <code>name</code> or 
+     *   <code>id</code> attribute whose value corresponds to the specified 
+     *   string. Upon failure (e.g., no node with this name exists), returns 
+     *   <code>null</code>.
+     */
+    public Node namedItem(String name);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLDListElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLDListElement.java
new file mode 100644 (file)
index 0000000..e8a3bb4
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLDListElement.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Definition list. See the DL element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLDListElement extends HTMLElement {
+    /**
+     * Reduce spacing between list items. See the compact attribute definition 
+     * in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public boolean getCompact();
+    /**
+     * Reduce spacing between list items. See the compact attribute definition 
+     * in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setCompact(boolean compact);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLDirectoryElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLDirectoryElement.java
new file mode 100644 (file)
index 0000000..5a405c8
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLDirectoryElement.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Directory list. See the DIR element definition in HTML 4.01. This element 
+ * is deprecated in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLDirectoryElement extends HTMLElement {
+    /**
+     * Reduce spacing between list items. See the compact attribute definition 
+     * in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public boolean getCompact();
+    /**
+     * Reduce spacing between list items. See the compact attribute definition 
+     * in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setCompact(boolean compact);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLDivElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLDivElement.java
new file mode 100644 (file)
index 0000000..31107c5
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLDivElement.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Generic block container. See the DIV element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLDivElement extends HTMLElement {
+    /**
+     * Horizontal text alignment. See the align attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public String getAlign();
+    /**
+     * Horizontal text alignment. See the align attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setAlign(String align);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLDocument.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLDocument.java
new file mode 100644 (file)
index 0000000..79ad1b3
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLDocument.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.DOMException;
+
+/**
+ * An <code>HTMLDocument</code> is the root of the HTML hierarchy and holds 
+ * the entire content. Besides providing access to the hierarchy, it also 
+ * provides some convenience methods for accessing certain sets of 
+ * information from the document.
+ * <p>The following properties have been deprecated in favor of the 
+ * corresponding ones for the <code>BODY</code> element:alinkColorbackground
+ * bgColorfgColorlinkColorvlinkColorIn DOM Level 2, the method 
+ * <code>getElementById</code> is inherited from the <code>Document</code> 
+ * interface where it was moved to.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLDocument extends Document {
+    /**
+     * The title of a document as specified by the <code>TITLE</code> element 
+     * in the head of the document. 
+     */
+    public String getTitle();
+    /**
+     * The title of a document as specified by the <code>TITLE</code> element 
+     * in the head of the document. 
+     */
+    public void setTitle(String title);
+
+    /**
+     * Returns the URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] of the page that linked to this page. The value is an 
+     * empty string if the user navigated to the page directly (not through 
+     * a link, but, for example, via a bookmark). 
+     */
+    public String getReferrer();
+
+    /**
+     * The domain name of the server that served the document, or 
+     * <code>null</code> if the server cannot be identified by a domain 
+     * name. 
+     */
+    public String getDomain();
+
+    /**
+     * The absolute URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] of the document. 
+     */
+    public String getURL();
+
+    /**
+     * The element that contains the content for the document. In documents 
+     * with <code>BODY</code> contents, returns the <code>BODY</code> 
+     * element. In frameset documents, this returns the outermost 
+     * <code>FRAMESET</code> element. 
+     */
+    public HTMLElement getBody();
+    /**
+     * The element that contains the content for the document. In documents 
+     * with <code>BODY</code> contents, returns the <code>BODY</code> 
+     * element. In frameset documents, this returns the outermost 
+     * <code>FRAMESET</code> element. 
+     */
+    public void setBody(HTMLElement body);
+
+    /**
+     * A collection of all the <code>IMG</code> elements in a document. The 
+     * behavior is limited to <code>IMG</code> elements for backwards 
+     * compatibility. As suggested by [<a href='http://www.w3.org/TR/1999/REC-html401-19991224'>HTML 4.01</a>], to include images, authors may use 
+     * the <code>OBJECT</code> element or the <code>IMG</code> element. 
+     * Therefore, it is recommended not to use this attribute to find the 
+     * images in the document but <code>getElementsByTagName</code> with 
+     * HTML 4.01 or <code>getElementsByTagNameNS</code> with XHTML 1.0.
+     */
+    public HTMLCollection getImages();
+
+    /**
+     * A collection of all the <code>OBJECT</code> elements that include 
+     * applets and <code>APPLET</code> (deprecated) elements in a document. 
+     */
+    public HTMLCollection getApplets();
+
+    /**
+     * A collection of all <code>AREA</code> elements and anchor (
+     * <code>A</code>) elements in a document with a value for the 
+     * <code>href</code> attribute. 
+     */
+    public HTMLCollection getLinks();
+
+    /**
+     * A collection of all the forms of a document. 
+     */
+    public HTMLCollection getForms();
+
+    /**
+     *  A collection of all the anchor (<code>A</code>) elements in a document 
+     * with a value for the <code>name</code> attribute. For reasons of 
+     * backward compatibility, the returned set of anchors only contains 
+     * those anchors created with the <code>name</code> attribute, not those 
+     * created with the <code>id</code> attribute. Note that in [<a href='http://www.w3.org/TR/2002/REC-xhtml1-20020801'>XHTML 1.0</a>], the 
+     * <code>name</code> attribute (see section 4.10) has no semantics and 
+     * is only present for legacy user agents: the <code>id</code> attribute 
+     * is used instead. Users should prefer the iterator mechanisms provided 
+     * by [<a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>DOM Level 2 Traversal</a>] instead. 
+     */
+    public HTMLCollection getAnchors();
+
+    /**
+     *  This mutable string attribute denotes persistent state information 
+     * that (1) is associated with the current frame or document and (2) is 
+     * composed of information described by the <code>cookies</code> 
+     * non-terminal of [<a href='http://www.ietf.org/rfc/rfc2965.txt'>IETF RFC 2965</a>], Section 4.2.2. 
+     * <br> If no persistent state information is available for the current 
+     * frame or document document, then this property's value is an empty 
+     * string. 
+     * <br> When this attribute is read, all cookies are returned as a single 
+     * string, with each cookie's name-value pair concatenated into a list 
+     * of name-value pairs, each list item being separated by a ';' 
+     * (semicolon). 
+     * <br> When this attribute is set, the value it is set to should be a 
+     * string that adheres to the <code>cookie</code> non-terminal of [<a href='http://www.ietf.org/rfc/rfc2965.txt'>IETF RFC 2965</a>]; that 
+     * is, it should be a single name-value pair followed by zero or more 
+     * cookie attribute values. If no domain attribute is specified, then 
+     * the domain attribute for the new value defaults to the host portion 
+     * of an absolute URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] of the current frame or document. If no path 
+     * attribute is specified, then the path attribute for the new value 
+     * defaults to the absolute path portion of the URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] of the current 
+     * frame or document. If no max-age attribute is specified, then the 
+     * max-age attribute for the new value defaults to a user agent defined 
+     * value. If a cookie with the specified name is already associated with 
+     * the current frame or document, then the new value as well as the new 
+     * attributes replace the old value and attributes. If a max-age 
+     * attribute of 0 is specified for the new value, then any existing 
+     * cookies of the specified name are removed from the cookie storage.  
+     * See [<a href='http://www.ietf.org/rfc/rfc2965.txt'>IETF RFC 2965</a>] for the semantics of persistent state item attribute value 
+     * pairs.  The precise nature of a user agent session is not defined by 
+     * this specification. 
+     */
+    public String getCookie();
+    /**
+     *  This mutable string attribute denotes persistent state information 
+     * that (1) is associated with the current frame or document and (2) is 
+     * composed of information described by the <code>cookies</code> 
+     * non-terminal of [<a href='http://www.ietf.org/rfc/rfc2965.txt'>IETF RFC 2965</a>], Section 4.2.2. 
+     * <br> If no persistent state information is available for the current 
+     * frame or document document, then this property's value is an empty 
+     * string. 
+     * <br> When this attribute is read, all cookies are returned as a single 
+     * string, with each cookie's name-value pair concatenated into a list 
+     * of name-value pairs, each list item being separated by a ';' 
+     * (semicolon). 
+     * <br> When this attribute is set, the value it is set to should be a 
+     * string that adheres to the <code>cookie</code> non-terminal of [<a href='http://www.ietf.org/rfc/rfc2965.txt'>IETF RFC 2965</a>]; that 
+     * is, it should be a single name-value pair followed by zero or more 
+     * cookie attribute values. If no domain attribute is specified, then 
+     * the domain attribute for the new value defaults to the host portion 
+     * of an absolute URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] of the current frame or document. If no path 
+     * attribute is specified, then the path attribute for the new value 
+     * defaults to the absolute path portion of the URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] of the current 
+     * frame or document. If no max-age attribute is specified, then the 
+     * max-age attribute for the new value defaults to a user agent defined 
+     * value. If a cookie with the specified name is already associated with 
+     * the current frame or document, then the new value as well as the new 
+     * attributes replace the old value and attributes. If a max-age 
+     * attribute of 0 is specified for the new value, then any existing 
+     * cookies of the specified name are removed from the cookie storage.  
+     * See [<a href='http://www.ietf.org/rfc/rfc2965.txt'>IETF RFC 2965</a>] for the semantics of persistent state item attribute value 
+     * pairs.  The precise nature of a user agent session is not defined by 
+     * this specification. 
+     * @exception DOMException
+     *    SYNTAX_ERR: If the new value does not adhere to the cookie syntax 
+     *   specified by [<a href='http://www.ietf.org/rfc/rfc2965.txt'>IETF RFC 2965</a>]. 
+     */
+    public void setCookie(String cookie)
+                                      throws DOMException;
+
+    /**
+     * Open a document stream for writing. If a document exists in the target, 
+     * this method clears it. This method and the ones following allow a 
+     * user to add to or replace the structure model of a document using 
+     * strings of unparsed HTML. At the time of writing alternate methods 
+     * for providing similar functionality for both HTML and XML documents 
+     * were being considered (see [<a href='http://www.w3.org/TR/2002/WD-DOM-Level-3-LS-20020725'>DOM Level 3 Load and Save</a>]).
+     */
+    public void open();
+
+    /**
+     * Closes a document stream opened by <code>open()</code> and forces 
+     * rendering.
+     */
+    public void close();
+
+    /**
+     * Write a string of text to a document stream opened by 
+     * <code>open()</code>. Note that the function will produce a document 
+     * which is not necessarily driven by a DTD and therefore might be 
+     * produce an invalid result in the context of the document.
+     * @param text The string to be parsed into some structure in the 
+     *   document structure model.
+     */
+    public void write(String text);
+
+    /**
+     * Write a string of text followed by a newline character to a document 
+     * stream opened by <code>open()</code>. Note that the function will 
+     * produce a document which is not necessarily driven by a DTD and 
+     * therefore might be produce an invalid result in the context of the 
+     * document
+     * @param text The string to be parsed into some structure in the 
+     *   document structure model.
+     */
+    public void writeln(String text);
+
+    /**
+     *  With [<a href='http://www.w3.org/TR/1999/REC-html401-19991224'>HTML 4.01</a>] documents, this method returns the (possibly empty) collection 
+     * of elements whose <code>name</code> value is given by 
+     * <code>elementName</code>. In [<a href='http://www.w3.org/TR/2002/REC-xhtml1-20020801'>XHTML 1.0</a>] documents, this methods only return the 
+     * (possibly empty) collection of form controls with matching name. This 
+     * method is case sensitive. 
+     * @param elementName The <code>name</code> attribute value for an 
+     *   element.
+     * @return The matching elements.
+     */
+    public NodeList getElementsByName(String elementName);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLElement.java
new file mode 100644 (file)
index 0000000..ed37419
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLElement.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+import org.w3c.dom.Element;
+
+/**
+ *  All HTML element interfaces derive from this class. Elements that only 
+ * expose the HTML core attributes are represented by the base 
+ * <code>HTMLElement</code> interface. These elements are as follows: 
+ * special: SUB, SUP, SPAN, BDOfont: TT, I, B, U, S, STRIKE, BIG, SMALL
+ * phrase: EM, STRONG, DFN, CODE, SAMP, KBD, VAR, CITE, ACRONYM, ABBRlist: 
+ * DD, DTNOFRAMES, NOSCRIPTADDRESS, CENTERThe <code>style</code> attribute 
+ * of an HTML element is accessible through the 
+ * <code>ElementCSSInlineStyle</code> interface which is defined in the CSS 
+ * module [<a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>DOM Level 2 Style Sheets and CSS</a>]. 
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLElement extends Element {
+    /**
+     * The element's identifier. See the id attribute definition in HTML 4.01.
+     */
+    public String getId();
+    /**
+     * The element's identifier. See the id attribute definition in HTML 4.01.
+     */
+    public void setId(String id);
+
+    /**
+     * The element's advisory title. See the title attribute definition in 
+     * HTML 4.01.
+     */
+    public String getTitle();
+    /**
+     * The element's advisory title. See the title attribute definition in 
+     * HTML 4.01.
+     */
+    public void setTitle(String title);
+
+    /**
+     * Language code defined in RFC 1766. See the lang attribute definition in 
+     * HTML 4.01.
+     */
+    public String getLang();
+    /**
+     * Language code defined in RFC 1766. See the lang attribute definition in 
+     * HTML 4.01.
+     */
+    public void setLang(String lang);
+
+    /**
+     * Specifies the base direction of directionally neutral text and the 
+     * directionality of tables. See the dir attribute definition in HTML 
+     * 4.01.
+     */
+    public String getDir();
+    /**
+     * Specifies the base direction of directionally neutral text and the 
+     * directionality of tables. See the dir attribute definition in HTML 
+     * 4.01.
+     */
+    public void setDir(String dir);
+
+    /**
+     * The class attribute of the element. This attribute has been renamed due 
+     * to conflicts with the "class" keyword exposed by many languages. See 
+     * the class attribute definition in HTML 4.01.
+     */
+    public String getClassName();
+    /**
+     * The class attribute of the element. This attribute has been renamed due 
+     * to conflicts with the "class" keyword exposed by many languages. See 
+     * the class attribute definition in HTML 4.01.
+     */
+    public void setClassName(String className);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFieldSetElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFieldSetElement.java
new file mode 100644 (file)
index 0000000..c962a56
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFieldSetElement.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Organizes form controls into logical groups. See the FIELDSET element 
+ * definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLFieldSetElement extends HTMLElement {
+    /**
+     * Returns the <code>FORM</code> element containing this control. Returns 
+     * <code>null</code> if this control is not within the context of a 
+     * form. 
+     */
+    public HTMLFormElement getForm();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFontElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFontElement.java
new file mode 100644 (file)
index 0000000..8fa2589
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFontElement.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Local change to font. See the FONT element definition in HTML 4.01. This 
+ * element is deprecated in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLFontElement extends HTMLElement {
+    /**
+     * Font color. See the color attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public String getColor();
+    /**
+     * Font color. See the color attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public void setColor(String color);
+
+    /**
+     * Font face identifier. See the face attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public String getFace();
+    /**
+     * Font face identifier. See the face attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public void setFace(String face);
+
+    /**
+     * Font size. See the size attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public String getSize();
+    /**
+     * Font size. See the size attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public void setSize(String size);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFormElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFormElement.java
new file mode 100644 (file)
index 0000000..109f31a
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFormElement.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * The <code>FORM</code> element encompasses behavior similar to a collection 
+ * and an element. It provides direct access to the contained form controls 
+ * as well as the attributes of the form element. See the FORM element 
+ * definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLFormElement extends HTMLElement {
+    /**
+     * Returns a collection of all form control elements in the form. 
+     */
+    public HTMLCollection getElements();
+
+    /**
+     * The number of form controls in the form.
+     */
+    public int getLength();
+
+    /**
+     * Names the form. 
+     */
+    public String getName();
+    /**
+     * Names the form. 
+     */
+    public void setName(String name);
+
+    /**
+     * List of character sets supported by the server. See the accept-charset 
+     * attribute definition in HTML 4.01.
+     */
+    public String getAcceptCharset();
+    /**
+     * List of character sets supported by the server. See the accept-charset 
+     * attribute definition in HTML 4.01.
+     */
+    public void setAcceptCharset(String acceptCharset);
+
+    /**
+     * Server-side form handler. See the action attribute definition in HTML 
+     * 4.01.
+     */
+    public String getAction();
+    /**
+     * Server-side form handler. See the action attribute definition in HTML 
+     * 4.01.
+     */
+    public void setAction(String action);
+
+    /**
+     * The content type of the submitted form, generally 
+     * "application/x-www-form-urlencoded". See the enctype attribute 
+     * definition in HTML 4.01. The onsubmit even handler is not guaranteed 
+     * to be triggered when invoking this method. The behavior is 
+     * inconsistent for historical reasons and authors should not rely on a 
+     * particular one. 
+     */
+    public String getEnctype();
+    /**
+     * The content type of the submitted form, generally 
+     * "application/x-www-form-urlencoded". See the enctype attribute 
+     * definition in HTML 4.01. The onsubmit even handler is not guaranteed 
+     * to be triggered when invoking this method. The behavior is 
+     * inconsistent for historical reasons and authors should not rely on a 
+     * particular one. 
+     */
+    public void setEnctype(String enctype);
+
+    /**
+     * HTTP method [<a href='http://www.ietf.org/rfc/rfc2616.txt'>IETF RFC 2616</a>] used to submit form. See the method attribute definition 
+     * in HTML 4.01.
+     */
+    public String getMethod();
+    /**
+     * HTTP method [<a href='http://www.ietf.org/rfc/rfc2616.txt'>IETF RFC 2616</a>] used to submit form. See the method attribute definition 
+     * in HTML 4.01.
+     */
+    public void setMethod(String method);
+
+    /**
+     * Frame to render the resource in. See the target attribute definition in 
+     * HTML 4.01.
+     */
+    public String getTarget();
+    /**
+     * Frame to render the resource in. See the target attribute definition in 
+     * HTML 4.01.
+     */
+    public void setTarget(String target);
+
+    /**
+     * Submits the form. It performs the same action as a submit button.
+     */
+    public void submit();
+
+    /**
+     * Restores a form element's default values. It performs the same action 
+     * as a reset button.
+     */
+    public void reset();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFrameElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFrameElement.java
new file mode 100644 (file)
index 0000000..d610081
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFrameElement.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+import org.w3c.dom.Document;
+
+/**
+ * Create a frame. See the FRAME element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLFrameElement extends HTMLElement {
+    /**
+     * Request frame borders. See the frameborder attribute definition in HTML 
+     * 4.01.
+     */
+    public String getFrameBorder();
+    /**
+     * Request frame borders. See the frameborder attribute definition in HTML 
+     * 4.01.
+     */
+    public void setFrameBorder(String frameBorder);
+
+    /**
+     * URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating a long description of this image or frame. See the 
+     * longdesc attribute definition in HTML 4.01.
+     */
+    public String getLongDesc();
+    /**
+     * URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating a long description of this image or frame. See the 
+     * longdesc attribute definition in HTML 4.01.
+     */
+    public void setLongDesc(String longDesc);
+
+    /**
+     * Frame margin height, in pixels. See the marginheight attribute 
+     * definition in HTML 4.01.
+     */
+    public String getMarginHeight();
+    /**
+     * Frame margin height, in pixels. See the marginheight attribute 
+     * definition in HTML 4.01.
+     */
+    public void setMarginHeight(String marginHeight);
+
+    /**
+     * Frame margin width, in pixels. See the marginwidth attribute definition 
+     * in HTML 4.01.
+     */
+    public String getMarginWidth();
+    /**
+     * Frame margin width, in pixels. See the marginwidth attribute definition 
+     * in HTML 4.01.
+     */
+    public void setMarginWidth(String marginWidth);
+
+    /**
+     * The frame name (object of the <code>target</code> attribute). See the 
+     * name attribute definition in HTML 4.01.
+     */
+    public String getName();
+    /**
+     * The frame name (object of the <code>target</code> attribute). See the 
+     * name attribute definition in HTML 4.01.
+     */
+    public void setName(String name);
+
+    /**
+     * When true, forbid user from resizing frame. See the noresize attribute 
+     * definition in HTML 4.01.
+     */
+    public boolean getNoResize();
+    /**
+     * When true, forbid user from resizing frame. See the noresize attribute 
+     * definition in HTML 4.01.
+     */
+    public void setNoResize(boolean noResize);
+
+    /**
+     * Specify whether or not the frame should have scrollbars. See the 
+     * scrolling attribute definition in HTML 4.01.
+     */
+    public String getScrolling();
+    /**
+     * Specify whether or not the frame should have scrollbars. See the 
+     * scrolling attribute definition in HTML 4.01.
+     */
+    public void setScrolling(String scrolling);
+
+    /**
+     * A URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating the initial frame contents. See the src attribute 
+     * definition in HTML 4.01.
+     */
+    public String getSrc();
+    /**
+     * A URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating the initial frame contents. See the src attribute 
+     * definition in HTML 4.01.
+     */
+    public void setSrc(String src);
+
+    /**
+     * The document this frame contains, if there is any and it is available, 
+     * or <code>null</code> otherwise.
+     * @since DOM Level 2
+     */
+    public Document getContentDocument();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFrameSetElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFrameSetElement.java
new file mode 100644 (file)
index 0000000..4e5d75b
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLFrameSetElement.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Create a grid of frames. See the FRAMESET element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLFrameSetElement extends HTMLElement {
+    /**
+     * The number of columns of frames in the frameset. See the cols attribute 
+     * definition in HTML 4.01.
+     */
+    public String getCols();
+    /**
+     * The number of columns of frames in the frameset. See the cols attribute 
+     * definition in HTML 4.01.
+     */
+    public void setCols(String cols);
+
+    /**
+     * The number of rows of frames in the frameset. See the rows attribute 
+     * definition in HTML 4.01.
+     */
+    public String getRows();
+    /**
+     * The number of rows of frames in the frameset. See the rows attribute 
+     * definition in HTML 4.01.
+     */
+    public void setRows(String rows);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLHRElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLHRElement.java
new file mode 100644 (file)
index 0000000..b09ec0f
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLHRElement.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Create a horizontal rule. See the HR element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLHRElement extends HTMLElement {
+    /**
+     * Align the rule on the page. See the align attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public String getAlign();
+    /**
+     * Align the rule on the page. See the align attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setAlign(String align);
+
+    /**
+     * Indicates to the user agent that there should be no shading in the 
+     * rendering of this element. See the noshade attribute definition in 
+     * HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public boolean getNoShade();
+    /**
+     * Indicates to the user agent that there should be no shading in the 
+     * rendering of this element. See the noshade attribute definition in 
+     * HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setNoShade(boolean noShade);
+
+    /**
+     * The height of the rule. See the size attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public String getSize();
+    /**
+     * The height of the rule. See the size attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public void setSize(String size);
+
+    /**
+     * The width of the rule. See the width attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public String getWidth();
+    /**
+     * The width of the rule. See the width attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public void setWidth(String width);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLHeadElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLHeadElement.java
new file mode 100644 (file)
index 0000000..c4550a5
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLHeadElement.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Document head information. See the HEAD element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLHeadElement extends HTMLElement {
+    /**
+     * URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating a metadata profile. See the profile attribute 
+     * definition in HTML 4.01.
+     */
+    public String getProfile();
+    /**
+     * URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating a metadata profile. See the profile attribute 
+     * definition in HTML 4.01.
+     */
+    public void setProfile(String profile);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLHeadingElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLHeadingElement.java
new file mode 100644 (file)
index 0000000..1497525
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLHeadingElement.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * For the <code>H1</code> to <code>H6</code> elements. See the H1 element 
+ * definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLHeadingElement extends HTMLElement {
+    /**
+     * Horizontal text alignment. See the align attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public String getAlign();
+    /**
+     * Horizontal text alignment. See the align attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setAlign(String align);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLHtmlElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLHtmlElement.java
new file mode 100644 (file)
index 0000000..5ba30fe
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLHtmlElement.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Root of an HTML document. See the HTML element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLHtmlElement extends HTMLElement {
+    /**
+     * Version information about the document's DTD. See the version attribute 
+     * definition in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public String getVersion();
+    /**
+     * Version information about the document's DTD. See the version attribute 
+     * definition in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setVersion(String version);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLIFrameElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLIFrameElement.java
new file mode 100644 (file)
index 0000000..7cac12f
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLIFrameElement.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+import org.w3c.dom.Document;
+
+/**
+ * Inline subwindows. See the IFRAME element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLIFrameElement extends HTMLElement {
+    /**
+     * Aligns this object (vertically or horizontally) with respect to its 
+     * surrounding text. See the align attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public String getAlign();
+    /**
+     * Aligns this object (vertically or horizontally) with respect to its 
+     * surrounding text. See the align attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public void setAlign(String align);
+
+    /**
+     * Request frame borders. See the frameborder attribute definition in HTML 
+     * 4.01.
+     */
+    public String getFrameBorder();
+    /**
+     * Request frame borders. See the frameborder attribute definition in HTML 
+     * 4.01.
+     */
+    public void setFrameBorder(String frameBorder);
+
+    /**
+     * Frame height. See the height attribute definition in HTML 4.01.
+     */
+    public String getHeight();
+    /**
+     * Frame height. See the height attribute definition in HTML 4.01.
+     */
+    public void setHeight(String height);
+
+    /**
+     * URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating a long description of this image or frame. See the 
+     * longdesc attribute definition in HTML 4.01.
+     */
+    public String getLongDesc();
+    /**
+     * URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating a long description of this image or frame. See the 
+     * longdesc attribute definition in HTML 4.01.
+     */
+    public void setLongDesc(String longDesc);
+
+    /**
+     * Frame margin height, in pixels. See the marginheight attribute 
+     * definition in HTML 4.01.
+     */
+    public String getMarginHeight();
+    /**
+     * Frame margin height, in pixels. See the marginheight attribute 
+     * definition in HTML 4.01.
+     */
+    public void setMarginHeight(String marginHeight);
+
+    /**
+     * Frame margin width, in pixels. See the marginwidth attribute definition 
+     * in HTML 4.01.
+     */
+    public String getMarginWidth();
+    /**
+     * Frame margin width, in pixels. See the marginwidth attribute definition 
+     * in HTML 4.01.
+     */
+    public void setMarginWidth(String marginWidth);
+
+    /**
+     * The frame name (object of the <code>target</code> attribute). See the 
+     * name attribute definition in HTML 4.01.
+     */
+    public String getName();
+    /**
+     * The frame name (object of the <code>target</code> attribute). See the 
+     * name attribute definition in HTML 4.01.
+     */
+    public void setName(String name);
+
+    /**
+     * Specify whether or not the frame should have scrollbars. See the 
+     * scrolling attribute definition in HTML 4.01.
+     */
+    public String getScrolling();
+    /**
+     * Specify whether or not the frame should have scrollbars. See the 
+     * scrolling attribute definition in HTML 4.01.
+     */
+    public void setScrolling(String scrolling);
+
+    /**
+     * A URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating the initial frame contents. See the src attribute 
+     * definition in HTML 4.01.
+     */
+    public String getSrc();
+    /**
+     * A URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating the initial frame contents. See the src attribute 
+     * definition in HTML 4.01.
+     */
+    public void setSrc(String src);
+
+    /**
+     * Frame width. See the width attribute definition in HTML 4.01.
+     */
+    public String getWidth();
+    /**
+     * Frame width. See the width attribute definition in HTML 4.01.
+     */
+    public void setWidth(String width);
+
+    /**
+     * The document this frame contains, if there is any and it is available, 
+     * or <code>null</code> otherwise.
+     * @since DOM Level 2
+     */
+    public Document getContentDocument();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLImageElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLImageElement.java
new file mode 100644 (file)
index 0000000..8e81421
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLImageElement.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Embedded image. See the IMG element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLImageElement extends HTMLElement {
+    /**
+     * The name of the element (for backwards compatibility). 
+     */
+    public String getName();
+    /**
+     * The name of the element (for backwards compatibility). 
+     */
+    public void setName(String name);
+
+    /**
+     * Aligns this object (vertically or horizontally) with respect to its 
+     * surrounding text. See the align attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public String getAlign();
+    /**
+     * Aligns this object (vertically or horizontally) with respect to its 
+     * surrounding text. See the align attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public void setAlign(String align);
+
+    /**
+     * Alternate text for user agents not rendering the normal content of this 
+     * element. See the alt attribute definition in HTML 4.01.
+     */
+    public String getAlt();
+    /**
+     * Alternate text for user agents not rendering the normal content of this 
+     * element. See the alt attribute definition in HTML 4.01.
+     */
+    public void setAlt(String alt);
+
+    /**
+     * Width of border around image. See the  border attribute definition in 
+     * HTML 4.01. This attribute is deprecated in HTML 4.01. Note that the 
+     * type of this attribute was <code>DOMString</code> in DOM Level 1 HTML [<a href='http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001'>DOM Level 1</a>]
+     * .
+     */
+    public String getBorder();
+    /**
+     * Width of border around image. See the  border attribute definition in 
+     * HTML 4.01. This attribute is deprecated in HTML 4.01. Note that the 
+     * type of this attribute was <code>DOMString</code> in DOM Level 1 HTML [<a href='http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001'>DOM Level 1</a>]
+     * .
+     */
+    public void setBorder(String border);
+
+    /**
+     * Height of the image in pixels. See the height attribute definition in 
+     * HTML 4.01. Note that the type of this attribute was 
+     * <code>DOMString</code> in DOM Level 1 HTML [<a href='http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001'>DOM Level 1</a>].
+     * @version DOM Level 2
+     */
+    public int getHeight();
+    /**
+     * Height of the image in pixels. See the height attribute definition in 
+     * HTML 4.01. Note that the type of this attribute was 
+     * <code>DOMString</code> in DOM Level 1 HTML [<a href='http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001'>DOM Level 1</a>].
+     * @version DOM Level 2
+     */
+    public void setHeight(int height);
+
+    /**
+     * Horizontal space to the left and right of this image in pixels. See the 
+     * hspace attribute definition in HTML 4.01. This attribute is 
+     * deprecated in HTML 4.01. Note that the type of this attribute was 
+     * <code>DOMString</code> in DOM Level 1 HTML [<a href='http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001'>DOM Level 1</a>].
+     * @version DOM Level 2
+     */
+    public int getHspace();
+    /**
+     * Horizontal space to the left and right of this image in pixels. See the 
+     * hspace attribute definition in HTML 4.01. This attribute is 
+     * deprecated in HTML 4.01. Note that the type of this attribute was 
+     * <code>DOMString</code> in DOM Level 1 HTML [<a href='http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001'>DOM Level 1</a>].
+     * @version DOM Level 2
+     */
+    public void setHspace(int hspace);
+
+    /**
+     * Use server-side image map. See the ismap attribute definition in HTML 
+     * 4.01.
+     */
+    public boolean getIsMap();
+    /**
+     * Use server-side image map. See the ismap attribute definition in HTML 
+     * 4.01.
+     */
+    public void setIsMap(boolean isMap);
+
+    /**
+     * URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating a long description of this image or frame. See the 
+     * longdesc attribute definition in HTML 4.01.
+     */
+    public String getLongDesc();
+    /**
+     * URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating a long description of this image or frame. See the 
+     * longdesc attribute definition in HTML 4.01.
+     */
+    public void setLongDesc(String longDesc);
+
+    /**
+     * URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating the source of this image. See the src attribute 
+     * definition in HTML 4.01.
+     */
+    public String getSrc();
+    /**
+     * URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating the source of this image. See the src attribute 
+     * definition in HTML 4.01.
+     */
+    public void setSrc(String src);
+
+    /**
+     * Use client-side image map. See the usemap attribute definition in HTML 
+     * 4.01.
+     */
+    public String getUseMap();
+    /**
+     * Use client-side image map. See the usemap attribute definition in HTML 
+     * 4.01.
+     */
+    public void setUseMap(String useMap);
+
+    /**
+     * Vertical space above and below this image in pixels. See the vspace 
+     * attribute definition in HTML 4.01. This attribute is deprecated in 
+     * HTML 4.01. Note that the type of this attribute was "DOMString" in 
+     * DOM Level 1 HTML [<a href='http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001'>DOM Level 1</a>].
+     * @version DOM Level 2
+     */
+    public int getVspace();
+    /**
+     * Vertical space above and below this image in pixels. See the vspace 
+     * attribute definition in HTML 4.01. This attribute is deprecated in 
+     * HTML 4.01. Note that the type of this attribute was "DOMString" in 
+     * DOM Level 1 HTML [<a href='http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001'>DOM Level 1</a>].
+     * @version DOM Level 2
+     */
+    public void setVspace(int vspace);
+
+    /**
+     * The width of the image in pixels. See the width attribute definition in 
+     * HTML 4.01. Note that the type of this attribute was 
+     * <code>DOMString</code> in DOM Level 1 HTML [<a href='http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001'>DOM Level 1</a>].
+     * @version DOM Level 2
+     */
+    public int getWidth();
+    /**
+     * The width of the image in pixels. See the width attribute definition in 
+     * HTML 4.01. Note that the type of this attribute was 
+     * <code>DOMString</code> in DOM Level 1 HTML [<a href='http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001'>DOM Level 1</a>].
+     * @version DOM Level 2
+     */
+    public void setWidth(int width);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLInputElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLInputElement.java
new file mode 100644 (file)
index 0000000..b0d0d9d
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLInputElement.java
@@ -0,0 +1,303 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Form control.Depending upon the environment in which the page is being 
+ * viewed, the value property may be read-only for the file upload input 
+ * type. For the "password" input type, the actual value returned may be 
+ * masked to prevent unauthorized use. See the INPUT element definition in [<a href='http://www.w3.org/TR/1999/REC-html401-19991224'>HTML 4.01</a>].
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLInputElement extends HTMLElement {
+    /**
+     * When the <code>type</code> attribute of the element has the value 
+     * "text", "file" or "password", this represents the HTML value 
+     * attribute of the element. The value of this attribute does not change 
+     * if the contents of the corresponding form control, in an interactive 
+     * user agent, changes. See the value attribute definition in HTML 4.01.
+     */
+    public String getDefaultValue();
+    /**
+     * When the <code>type</code> attribute of the element has the value 
+     * "text", "file" or "password", this represents the HTML value 
+     * attribute of the element. The value of this attribute does not change 
+     * if the contents of the corresponding form control, in an interactive 
+     * user agent, changes. See the value attribute definition in HTML 4.01.
+     */
+    public void setDefaultValue(String defaultValue);
+
+    /**
+     * When <code>type</code> has the value "radio" or "checkbox", this 
+     * represents the HTML checked attribute of the element. The value of 
+     * this attribute does not change if the state of the corresponding form 
+     * control, in an interactive user agent, changes. See the checked 
+     * attribute definition in HTML 4.01.
+     */
+    public boolean getDefaultChecked();
+    /**
+     * When <code>type</code> has the value "radio" or "checkbox", this 
+     * represents the HTML checked attribute of the element. The value of 
+     * this attribute does not change if the state of the corresponding form 
+     * control, in an interactive user agent, changes. See the checked 
+     * attribute definition in HTML 4.01.
+     */
+    public void setDefaultChecked(boolean defaultChecked);
+
+    /**
+     * Returns the <code>FORM</code> element containing this control. Returns 
+     * <code>null</code> if this control is not within the context of a 
+     * form. 
+     */
+    public HTMLFormElement getForm();
+
+    /**
+     * A comma-separated list of content types that a server processing this 
+     * form will handle correctly. See the accept attribute definition in 
+     * HTML 4.01.
+     */
+    public String getAccept();
+    /**
+     * A comma-separated list of content types that a server processing this 
+     * form will handle correctly. See the accept attribute definition in 
+     * HTML 4.01.
+     */
+    public void setAccept(String accept);
+
+    /**
+     * A single character access key to give access to the form control. See 
+     * the accesskey attribute definition in HTML 4.01.
+     */
+    public String getAccessKey();
+    /**
+     * A single character access key to give access to the form control. See 
+     * the accesskey attribute definition in HTML 4.01.
+     */
+    public void setAccessKey(String accessKey);
+
+    /**
+     * Aligns this object (vertically or horizontally) with respect to its 
+     * surrounding text. See the align attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public String getAlign();
+    /**
+     * Aligns this object (vertically or horizontally) with respect to its 
+     * surrounding text. See the align attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public void setAlign(String align);
+
+    /**
+     * Alternate text for user agents not rendering the normal content of this 
+     * element. See the alt attribute definition in HTML 4.01.
+     */
+    public String getAlt();
+    /**
+     * Alternate text for user agents not rendering the normal content of this 
+     * element. See the alt attribute definition in HTML 4.01.
+     */
+    public void setAlt(String alt);
+
+    /**
+     * When the <code>type</code> attribute of the element has the value 
+     * "radio" or "checkbox", this represents the current state of the form 
+     * control, in an interactive user agent. Changes to this attribute 
+     * change the state of the form control, but do not change the value of 
+     * the HTML checked attribute of the INPUT element.During the handling 
+     * of a click event on an input element with a type attribute that has 
+     * the value "radio" or "checkbox", some implementations may change the 
+     * value of this property before the event is being dispatched in the 
+     * document. If the default action of the event is canceled, the value 
+     * of the property may be changed back to its original value. This means 
+     * that the value of this property during the handling of click events 
+     * is implementation dependent.
+     */
+    public boolean getChecked();
+    /**
+     * When the <code>type</code> attribute of the element has the value 
+     * "radio" or "checkbox", this represents the current state of the form 
+     * control, in an interactive user agent. Changes to this attribute 
+     * change the state of the form control, but do not change the value of 
+     * the HTML checked attribute of the INPUT element.During the handling 
+     * of a click event on an input element with a type attribute that has 
+     * the value "radio" or "checkbox", some implementations may change the 
+     * value of this property before the event is being dispatched in the 
+     * document. If the default action of the event is canceled, the value 
+     * of the property may be changed back to its original value. This means 
+     * that the value of this property during the handling of click events 
+     * is implementation dependent.
+     */
+    public void setChecked(boolean checked);
+
+    /**
+     * The control is unavailable in this context. See the disabled attribute 
+     * definition in HTML 4.01.
+     */
+    public boolean getDisabled();
+    /**
+     * The control is unavailable in this context. See the disabled attribute 
+     * definition in HTML 4.01.
+     */
+    public void setDisabled(boolean disabled);
+
+    /**
+     * Maximum number of characters for text fields, when <code>type</code> 
+     * has the value "text" or "password". See the maxlength attribute 
+     * definition in HTML 4.01.
+     */
+    public int getMaxLength();
+    /**
+     * Maximum number of characters for text fields, when <code>type</code> 
+     * has the value "text" or "password". See the maxlength attribute 
+     * definition in HTML 4.01.
+     */
+    public void setMaxLength(int maxLength);
+
+    /**
+     * Form control or object name when submitted with a form. See the name 
+     * attribute definition in HTML 4.01.
+     */
+    public String getName();
+    /**
+     * Form control or object name when submitted with a form. See the name 
+     * attribute definition in HTML 4.01.
+     */
+    public void setName(String name);
+
+    /**
+     * This control is read-only. Relevant only when <code>type</code> has the 
+     * value "text" or "password". See the readonly attribute definition in 
+     * HTML 4.01.
+     */
+    public boolean getReadOnly();
+    /**
+     * This control is read-only. Relevant only when <code>type</code> has the 
+     * value "text" or "password". See the readonly attribute definition in 
+     * HTML 4.01.
+     */
+    public void setReadOnly(boolean readOnly);
+
+    /**
+     * Size information. The precise meaning is specific to each type of 
+     * field. See the size attribute definition in HTML 4.01.
+     * @version DOM Level 2
+     */
+    public int getSize();
+    /**
+     * Size information. The precise meaning is specific to each type of 
+     * field. See the size attribute definition in HTML 4.01.
+     * @version DOM Level 2
+     */
+    public void setSize(int size);
+
+    /**
+     * When the <code>type</code> attribute has the value "image", this 
+     * attribute specifies the location of the image to be used to decorate 
+     * the graphical submit button. See the src attribute definition in HTML 
+     * 4.01.
+     */
+    public String getSrc();
+    /**
+     * When the <code>type</code> attribute has the value "image", this 
+     * attribute specifies the location of the image to be used to decorate 
+     * the graphical submit button. See the src attribute definition in HTML 
+     * 4.01.
+     */
+    public void setSrc(String src);
+
+    /**
+     * Index that represents the element's position in the tabbing order. See 
+     * the tabindex attribute definition in HTML 4.01.
+     */
+    public int getTabIndex();
+    /**
+     * Index that represents the element's position in the tabbing order. See 
+     * the tabindex attribute definition in HTML 4.01.
+     */
+    public void setTabIndex(int tabIndex);
+
+    /**
+     * The type of control created (all lower case). See the type attribute 
+     * definition in HTML 4.01.
+     * @version DOM Level 2
+     */
+    public String getType();
+    /**
+     * The type of control created (all lower case). See the type attribute 
+     * definition in HTML 4.01.
+     * @version DOM Level 2
+     */
+    public void setType(String type);
+
+    /**
+     * Use client-side image map. See the usemap attribute definition in HTML 
+     * 4.01.
+     */
+    public String getUseMap();
+    /**
+     * Use client-side image map. See the usemap attribute definition in HTML 
+     * 4.01.
+     */
+    public void setUseMap(String useMap);
+
+    /**
+     * When the <code>type</code> attribute of the element has the value 
+     * "text", "file" or "password", this represents the current contents of 
+     * the corresponding form control, in an interactive user agent. 
+     * Changing this attribute changes the contents of the form control, but 
+     * does not change the value of the HTML value attribute of the element. 
+     * When the <code>type</code> attribute of the element has the value 
+     * "button", "hidden", "submit", "reset", "image", "checkbox" or 
+     * "radio", this represents the HTML value attribute of the element. See 
+     * the value attribute definition in HTML 4.01.
+     */
+    public String getValue();
+    /**
+     * When the <code>type</code> attribute of the element has the value 
+     * "text", "file" or "password", this represents the current contents of 
+     * the corresponding form control, in an interactive user agent. 
+     * Changing this attribute changes the contents of the form control, but 
+     * does not change the value of the HTML value attribute of the element. 
+     * When the <code>type</code> attribute of the element has the value 
+     * "button", "hidden", "submit", "reset", "image", "checkbox" or 
+     * "radio", this represents the HTML value attribute of the element. See 
+     * the value attribute definition in HTML 4.01.
+     */
+    public void setValue(String value);
+
+    /**
+     * Removes keyboard focus from this element.
+     */
+    public void blur();
+
+    /**
+     * Gives keyboard focus to this element.
+     */
+    public void focus();
+
+    /**
+     * Select the contents of the text area. For <code>INPUT</code> elements 
+     * whose <code>type</code> attribute has one of the following values: 
+     * "text", "file", or "password".
+     */
+    public void select();
+
+    /**
+     * Simulate a mouse-click. For <code>INPUT</code> elements whose 
+     * <code>type</code> attribute has one of the following values: 
+     * "button", "checkbox", "radio", "reset", or "submit".
+     */
+    public void click();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLIsIndexElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLIsIndexElement.java
new file mode 100644 (file)
index 0000000..898b9e4
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLIsIndexElement.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * This element is used for single-line text input. See the ISINDEX element 
+ * definition in HTML 4.01. This element is deprecated in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLIsIndexElement extends HTMLElement {
+    /**
+     * Returns the <code>FORM</code> element containing this control. Returns 
+     * <code>null</code> if this control is not within the context of a 
+     * form. 
+     */
+    public HTMLFormElement getForm();
+
+    /**
+     * The prompt message. See the prompt attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public String getPrompt();
+    /**
+     * The prompt message. See the prompt attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public void setPrompt(String prompt);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLLIElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLLIElement.java
new file mode 100644 (file)
index 0000000..df20c00
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLLIElement.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * List item. See the LI element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLLIElement extends HTMLElement {
+    /**
+     * List item bullet style. See the type attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public String getType();
+    /**
+     * List item bullet style. See the type attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public void setType(String type);
+
+    /**
+     * Reset sequence number when used in <code>OL</code>. See the value 
+     * attribute definition in HTML 4.01. This attribute is deprecated in 
+     * HTML 4.01.
+     */
+    public int getValue();
+    /**
+     * Reset sequence number when used in <code>OL</code>. See the value 
+     * attribute definition in HTML 4.01. This attribute is deprecated in 
+     * HTML 4.01.
+     */
+    public void setValue(int value);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLLabelElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLLabelElement.java
new file mode 100644 (file)
index 0000000..69a1040
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLLabelElement.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Form field label text. See the LABEL element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLLabelElement extends HTMLElement {
+    /**
+     * Returns the <code>FORM</code> element containing this control. Returns 
+     * <code>null</code> if this control is not within the context of a 
+     * form. 
+     */
+    public HTMLFormElement getForm();
+
+    /**
+     * A single character access key to give access to the form control. See 
+     * the accesskey attribute definition in HTML 4.01.
+     */
+    public String getAccessKey();
+    /**
+     * A single character access key to give access to the form control. See 
+     * the accesskey attribute definition in HTML 4.01.
+     */
+    public void setAccessKey(String accessKey);
+
+    /**
+     * This attribute links this label with another form control by 
+     * <code>id</code> attribute. See the for attribute definition in HTML 
+     * 4.01.
+     */
+    public String getHtmlFor();
+    /**
+     * This attribute links this label with another form control by 
+     * <code>id</code> attribute. See the for attribute definition in HTML 
+     * 4.01.
+     */
+    public void setHtmlFor(String htmlFor);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLLegendElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLLegendElement.java
new file mode 100644 (file)
index 0000000..b976d09
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLLegendElement.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Provides a caption for a <code>FIELDSET</code> grouping. See the LEGEND 
+ * element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLLegendElement extends HTMLElement {
+    /**
+     * Returns the <code>FORM</code> element containing this control. Returns 
+     * <code>null</code> if this control is not within the context of a 
+     * form. 
+     */
+    public HTMLFormElement getForm();
+
+    /**
+     * A single character access key to give access to the form control. See 
+     * the accesskey attribute definition in HTML 4.01.
+     */
+    public String getAccessKey();
+    /**
+     * A single character access key to give access to the form control. See 
+     * the accesskey attribute definition in HTML 4.01.
+     */
+    public void setAccessKey(String accessKey);
+
+    /**
+     * Text alignment relative to <code>FIELDSET</code>. See the align 
+     * attribute definition in HTML 4.01. This attribute is deprecated in 
+     * HTML 4.01.
+     */
+    public String getAlign();
+    /**
+     * Text alignment relative to <code>FIELDSET</code>. See the align 
+     * attribute definition in HTML 4.01. This attribute is deprecated in 
+     * HTML 4.01.
+     */
+    public void setAlign(String align);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLLinkElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLLinkElement.java
new file mode 100644 (file)
index 0000000..4ed72ca
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLLinkElement.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * The <code>LINK</code> element specifies a link to an external resource, and 
+ * defines this document's relationship to that resource (or vice versa). 
+ * See the LINK element definition in HTML 4.01 (see also the 
+ * <code>LinkStyle</code> interface in the StyleSheet module [<a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>DOM Level 2 Style Sheets and CSS</a>]).
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLLinkElement extends HTMLElement {
+    /**
+     * Enables/disables the link. This is currently only used for style sheet 
+     * links, and may be used to activate or deactivate style sheets. 
+     */
+    public boolean getDisabled();
+    /**
+     * Enables/disables the link. This is currently only used for style sheet 
+     * links, and may be used to activate or deactivate style sheets. 
+     */
+    public void setDisabled(boolean disabled);
+
+    /**
+     * The character encoding of the resource being linked to. See the charset 
+     * attribute definition in HTML 4.01.
+     */
+    public String getCharset();
+    /**
+     * The character encoding of the resource being linked to. See the charset 
+     * attribute definition in HTML 4.01.
+     */
+    public void setCharset(String charset);
+
+    /**
+     * The URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] of the linked resource. See the href attribute definition in 
+     * HTML 4.01.
+     */
+    public String getHref();
+    /**
+     * The URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] of the linked resource. See the href attribute definition in 
+     * HTML 4.01.
+     */
+    public void setHref(String href);
+
+    /**
+     * Language code of the linked resource. See the hreflang attribute 
+     * definition in HTML 4.01.
+     */
+    public String getHreflang();
+    /**
+     * Language code of the linked resource. See the hreflang attribute 
+     * definition in HTML 4.01.
+     */
+    public void setHreflang(String hreflang);
+
+    /**
+     * Designed for use with one or more target media. See the media attribute 
+     * definition in HTML 4.01.
+     */
+    public String getMedia();
+    /**
+     * Designed for use with one or more target media. See the media attribute 
+     * definition in HTML 4.01.
+     */
+    public void setMedia(String media);
+
+    /**
+     * Forward link type. See the rel attribute definition in HTML 4.01.
+     */
+    public String getRel();
+    /**
+     * Forward link type. See the rel attribute definition in HTML 4.01.
+     */
+    public void setRel(String rel);
+
+    /**
+     * Reverse link type. See the rev attribute definition in HTML 4.01.
+     */
+    public String getRev();
+    /**
+     * Reverse link type. See the rev attribute definition in HTML 4.01.
+     */
+    public void setRev(String rev);
+
+    /**
+     * Frame to render the resource in. See the target attribute definition in 
+     * HTML 4.01.
+     */
+    public String getTarget();
+    /**
+     * Frame to render the resource in. See the target attribute definition in 
+     * HTML 4.01.
+     */
+    public void setTarget(String target);
+
+    /**
+     * Advisory content type. See the type attribute definition in HTML 4.01.
+     */
+    public String getType();
+    /**
+     * Advisory content type. See the type attribute definition in HTML 4.01.
+     */
+    public void setType(String type);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLMapElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLMapElement.java
new file mode 100644 (file)
index 0000000..e413727
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLMapElement.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Client-side image map. See the MAP element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLMapElement extends HTMLElement {
+    /**
+     * The list of areas defined for the image map. 
+     */
+    public HTMLCollection getAreas();
+
+    /**
+     * Names the map (for use with <code>usemap</code>). See the name 
+     * attribute definition in HTML 4.01.
+     */
+    public String getName();
+    /**
+     * Names the map (for use with <code>usemap</code>). See the name 
+     * attribute definition in HTML 4.01.
+     */
+    public void setName(String name);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLMenuElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLMenuElement.java
new file mode 100644 (file)
index 0000000..7c8ec62
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLMenuElement.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Menu list. See the MENU element definition in HTML 4.01. This element is 
+ * deprecated in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLMenuElement extends HTMLElement {
+    /**
+     * Reduce spacing between list items. See the compact attribute definition 
+     * in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public boolean getCompact();
+    /**
+     * Reduce spacing between list items. See the compact attribute definition 
+     * in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setCompact(boolean compact);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLMetaElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLMetaElement.java
new file mode 100644 (file)
index 0000000..b6bf05d
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLMetaElement.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * This contains generic meta-information about the document. See the META 
+ * element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLMetaElement extends HTMLElement {
+    /**
+     * Associated information. See the content attribute definition in HTML 
+     * 4.01.
+     */
+    public String getContent();
+    /**
+     * Associated information. See the content attribute definition in HTML 
+     * 4.01.
+     */
+    public void setContent(String content);
+
+    /**
+     * HTTP response header name [<a href='http://www.ietf.org/rfc/rfc2616.txt'>IETF RFC 2616</a>]. See the http-equiv attribute definition in 
+     * HTML 4.01.
+     */
+    public String getHttpEquiv();
+    /**
+     * HTTP response header name [<a href='http://www.ietf.org/rfc/rfc2616.txt'>IETF RFC 2616</a>]. See the http-equiv attribute definition in 
+     * HTML 4.01.
+     */
+    public void setHttpEquiv(String httpEquiv);
+
+    /**
+     * Meta information name. See the name attribute definition in HTML 4.01.
+     */
+    public String getName();
+    /**
+     * Meta information name. See the name attribute definition in HTML 4.01.
+     */
+    public void setName(String name);
+
+    /**
+     * Select form of content. See the scheme attribute definition in HTML 
+     * 4.01.
+     */
+    public String getScheme();
+    /**
+     * Select form of content. See the scheme attribute definition in HTML 
+     * 4.01.
+     */
+    public void setScheme(String scheme);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLModElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLModElement.java
new file mode 100644 (file)
index 0000000..006ba69
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLModElement.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Notice of modification to part of a document. See the INS and DEL element 
+ * definitions in HTML 4.01. 
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLModElement extends HTMLElement {
+    /**
+     * A URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating a document that describes the reason for the change. 
+     * See the cite attribute definition in HTML 4.01.
+     */
+    public String getCite();
+    /**
+     * A URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating a document that describes the reason for the change. 
+     * See the cite attribute definition in HTML 4.01.
+     */
+    public void setCite(String cite);
+
+    /**
+     * The date and time of the change. See the datetime attribute definition 
+     * in HTML 4.01.
+     */
+    public String getDateTime();
+    /**
+     * The date and time of the change. See the datetime attribute definition 
+     * in HTML 4.01.
+     */
+    public void setDateTime(String dateTime);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLOListElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLOListElement.java
new file mode 100644 (file)
index 0000000..13041c8
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLOListElement.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Ordered list. See the OL element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLOListElement extends HTMLElement {
+    /**
+     * Reduce spacing between list items. See the compact attribute definition 
+     * in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public boolean getCompact();
+    /**
+     * Reduce spacing between list items. See the compact attribute definition 
+     * in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setCompact(boolean compact);
+
+    /**
+     * Starting sequence number. See the start attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public int getStart();
+    /**
+     * Starting sequence number. See the start attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setStart(int start);
+
+    /**
+     * Numbering style. See the type attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public String getType();
+    /**
+     * Numbering style. See the type attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public void setType(String type);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLObjectElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLObjectElement.java
new file mode 100644 (file)
index 0000000..1179546
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLObjectElement.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+import org.w3c.dom.Document;
+
+/**
+ * Generic embedded object.In principle, all properties on the object element 
+ * are read-write but in some environments some properties may be read-only 
+ * once the underlying object is instantiated. See the OBJECT element 
+ * definition in [<a href='http://www.w3.org/TR/1999/REC-html401-19991224'>HTML 4.01</a>].
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLObjectElement extends HTMLElement {
+    /**
+     * Returns the <code>FORM</code> element containing this control. Returns 
+     * <code>null</code> if this control is not within the context of a 
+     * form. 
+     */
+    public HTMLFormElement getForm();
+
+    /**
+     * Applet class file. See the <code>code</code> attribute for 
+     * HTMLAppletElement. 
+     */
+    public String getCode();
+    /**
+     * Applet class file. See the <code>code</code> attribute for 
+     * HTMLAppletElement. 
+     */
+    public void setCode(String code);
+
+    /**
+     * Aligns this object (vertically or horizontally) with respect to its 
+     * surrounding text. See the align attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public String getAlign();
+    /**
+     * Aligns this object (vertically or horizontally) with respect to its 
+     * surrounding text. See the align attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public void setAlign(String align);
+
+    /**
+     * Space-separated list of archives. See the archive attribute definition 
+     * in HTML 4.01.
+     */
+    public String getArchive();
+    /**
+     * Space-separated list of archives. See the archive attribute definition 
+     * in HTML 4.01.
+     */
+    public void setArchive(String archive);
+
+    /**
+     * Width of border around the object. See the border attribute definition 
+     * in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public String getBorder();
+    /**
+     * Width of border around the object. See the border attribute definition 
+     * in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setBorder(String border);
+
+    /**
+     * Base URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] for <code>classid</code>, <code>data</code>, and 
+     * <code>archive</code> attributes. See the codebase attribute definition
+     *  in HTML 4.01.
+     */
+    public String getCodeBase();
+    /**
+     * Base URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] for <code>classid</code>, <code>data</code>, and 
+     * <code>archive</code> attributes. See the codebase attribute definition
+     *  in HTML 4.01.
+     */
+    public void setCodeBase(String codeBase);
+
+    /**
+     * Content type for data downloaded via <code>classid</code> attribute. 
+     * See the codetype attribute definition in HTML 4.01.
+     */
+    public String getCodeType();
+    /**
+     * Content type for data downloaded via <code>classid</code> attribute. 
+     * See the codetype attribute definition in HTML 4.01.
+     */
+    public void setCodeType(String codeType);
+
+    /**
+     * A URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] specifying the location of the object's data. See the data 
+     * attribute definition in HTML 4.01.
+     */
+    public String getData();
+    /**
+     * A URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] specifying the location of the object's data. See the data 
+     * attribute definition in HTML 4.01.
+     */
+    public void setData(String data);
+
+    /**
+     * Declare (for future reference), but do not instantiate, this object. 
+     * See the declare attribute definition in HTML 4.01.
+     */
+    public boolean getDeclare();
+    /**
+     * Declare (for future reference), but do not instantiate, this object. 
+     * See the declare attribute definition in HTML 4.01.
+     */
+    public void setDeclare(boolean declare);
+
+    /**
+     * Override height. See the height attribute definition in HTML 4.01.
+     */
+    public String getHeight();
+    /**
+     * Override height. See the height attribute definition in HTML 4.01.
+     */
+    public void setHeight(String height);
+
+    /**
+     * Horizontal space, in pixels, to the left and right of this image, 
+     * applet, or object. See the hspace attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public int getHspace();
+    /**
+     * Horizontal space, in pixels, to the left and right of this image, 
+     * applet, or object. See the hspace attribute definition in HTML 4.01. 
+     * This attribute is deprecated in HTML 4.01.
+     */
+    public void setHspace(int hspace);
+
+    /**
+     * Form control or object name when submitted with a form. See the name 
+     * attribute definition in HTML 4.01.
+     */
+    public String getName();
+    /**
+     * Form control or object name when submitted with a form. See the name 
+     * attribute definition in HTML 4.01.
+     */
+    public void setName(String name);
+
+    /**
+     * Message to render while loading the object. See the standby attribute 
+     * definition in HTML 4.01.
+     */
+    public String getStandby();
+    /**
+     * Message to render while loading the object. See the standby attribute 
+     * definition in HTML 4.01.
+     */
+    public void setStandby(String standby);
+
+    /**
+     * Index that represents the element's position in the tabbing order. See 
+     * the tabindex attribute definition in HTML 4.01.
+     */
+    public int getTabIndex();
+    /**
+     * Index that represents the element's position in the tabbing order. See 
+     * the tabindex attribute definition in HTML 4.01.
+     */
+    public void setTabIndex(int tabIndex);
+
+    /**
+     * Content type for data downloaded via <code>data</code> attribute. See 
+     * the type attribute definition in HTML 4.01.
+     */
+    public String getType();
+    /**
+     * Content type for data downloaded via <code>data</code> attribute. See 
+     * the type attribute definition in HTML 4.01.
+     */
+    public void setType(String type);
+
+    /**
+     * Use client-side image map. See the usemap attribute definition in HTML 
+     * 4.01.
+     */
+    public String getUseMap();
+    /**
+     * Use client-side image map. See the usemap attribute definition in HTML 
+     * 4.01.
+     */
+    public void setUseMap(String useMap);
+
+    /**
+     * Vertical space, in pixels, above and below this image, applet, or 
+     * object. See the vspace attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public int getVspace();
+    /**
+     * Vertical space, in pixels, above and below this image, applet, or 
+     * object. See the vspace attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public void setVspace(int vspace);
+
+    /**
+     * Override width. See the width attribute definition in HTML 4.01.
+     */
+    public String getWidth();
+    /**
+     * Override width. See the width attribute definition in HTML 4.01.
+     */
+    public void setWidth(String width);
+
+    /**
+     * The document this object contains, if there is any and it is available, 
+     * or <code>null</code> otherwise.
+     * @since DOM Level 2
+     */
+    public Document getContentDocument();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLOptGroupElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLOptGroupElement.java
new file mode 100644 (file)
index 0000000..8bd606a
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLOptGroupElement.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Group options together in logical subdivisions. See the OPTGROUP element 
+ * definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLOptGroupElement extends HTMLElement {
+    /**
+     * The control is unavailable in this context. See the disabled attribute 
+     * definition in HTML 4.01.
+     */
+    public boolean getDisabled();
+    /**
+     * The control is unavailable in this context. See the disabled attribute 
+     * definition in HTML 4.01.
+     */
+    public void setDisabled(boolean disabled);
+
+    /**
+     * Assigns a label to this option group. See the label attribute definition
+     *  in HTML 4.01.
+     */
+    public String getLabel();
+    /**
+     * Assigns a label to this option group. See the label attribute definition
+     *  in HTML 4.01.
+     */
+    public void setLabel(String label);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLOptionElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLOptionElement.java
new file mode 100644 (file)
index 0000000..f3b38a6
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLOptionElement.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * A selectable choice. See the OPTION element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLOptionElement extends HTMLElement {
+    /**
+     * Returns the <code>FORM</code> element containing this control. Returns 
+     * <code>null</code> if this control is not within the context of a 
+     * form. 
+     */
+    public HTMLFormElement getForm();
+
+    /**
+     * Represents the value of the HTML selected attribute. The value of this 
+     * attribute does not change if the state of the corresponding form 
+     * control, in an interactive user agent, changes. See the selected 
+     * attribute definition in HTML 4.01.
+     * @version DOM Level 2
+     */
+    public boolean getDefaultSelected();
+    /**
+     * Represents the value of the HTML selected attribute. The value of this 
+     * attribute does not change if the state of the corresponding form 
+     * control, in an interactive user agent, changes. See the selected 
+     * attribute definition in HTML 4.01.
+     * @version DOM Level 2
+     */
+    public void setDefaultSelected(boolean defaultSelected);
+
+    /**
+     * The text contained within the option element. 
+     */
+    public String getText();
+
+    /**
+     * The index of this <code>OPTION</code> in its parent <code>SELECT</code>
+     * , starting from 0.
+     * @version DOM Level 2
+     */
+    public int getIndex();
+
+    /**
+     * The control is unavailable in this context. See the disabled attribute 
+     * definition in HTML 4.01.
+     */
+    public boolean getDisabled();
+    /**
+     * The control is unavailable in this context. See the disabled attribute 
+     * definition in HTML 4.01.
+     */
+    public void setDisabled(boolean disabled);
+
+    /**
+     * Option label for use in hierarchical menus. See the label attribute 
+     * definition in HTML 4.01.
+     */
+    public String getLabel();
+    /**
+     * Option label for use in hierarchical menus. See the label attribute 
+     * definition in HTML 4.01.
+     */
+    public void setLabel(String label);
+
+    /**
+     * Represents the current state of the corresponding form control, in an 
+     * interactive user agent. Changing this attribute changes the state of 
+     * the form control, but does not change the value of the HTML selected 
+     * attribute of the element.
+     */
+    public boolean getSelected();
+    /**
+     * Represents the current state of the corresponding form control, in an 
+     * interactive user agent. Changing this attribute changes the state of 
+     * the form control, but does not change the value of the HTML selected 
+     * attribute of the element.
+     */
+    public void setSelected(boolean selected);
+
+    /**
+     * The current form control value. See the value attribute definition in 
+     * HTML 4.01.
+     */
+    public String getValue();
+    /**
+     * The current form control value. See the value attribute definition in 
+     * HTML 4.01.
+     */
+    public void setValue(String value);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLOptionsCollection.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLOptionsCollection.java
new file mode 100644 (file)
index 0000000..d70d92d
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLOptionsCollection.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.DOMException;
+
+/**
+ *  An <code>HTMLOptionsCollection</code> is a list of nodes representing HTML 
+ * option element. An individual node may be accessed by either ordinal 
+ * index or the node's <code>name</code> or <code>id</code> attributes.  
+ * Collections in the HTML DOM are assumed to be live meaning that they are 
+ * automatically updated when the underlying document is changed. 
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ * @since DOM Level 2
+ */
+public interface HTMLOptionsCollection {
+    /**
+     *  This attribute specifies the length or size of the list. 
+     */
+    public int getLength();
+    /**
+     *  This attribute specifies the length or size of the list. 
+     * @exception DOMException
+     *    NOT_SUPPORTED_ERR: if setting the length is not allowed by the 
+     *   implementation. 
+     */
+    public void setLength(int length)
+                          throws DOMException;
+
+    /**
+     *  This method retrieves a node specified by ordinal index. Nodes are 
+     * numbered in tree order (depth-first traversal order). 
+     * @param index The index of the node to be fetched. The index origin is 
+     *   0.
+     * @return The <code>Node</code> at the corresponding position upon 
+     *   success. A value of <code>null</code> is returned if the index is 
+     *   out of range. 
+     */
+    public Node item(int index);
+
+    /**
+     * This method retrieves a <code>Node</code> using a name. It first 
+     * searches for a <code>Node</code> with a matching <code>id</code> 
+     * attribute. If it doesn't find one, it then searches for a 
+     * <code>Node</code> with a matching <code>name</code> attribute, but 
+     * only on those elements that are allowed a name attribute. This method 
+     * is case insensitive in HTML documents and case sensitive in XHTML 
+     * documents.
+     * @param name The name of the <code>Node</code> to be fetched.
+     * @return The <code>Node</code> with a <code>name</code> or 
+     *   <code>id</code> attribute whose value corresponds to the specified 
+     *   string. Upon failure (e.g., no node with this name exists), returns 
+     *   <code>null</code>.
+     */
+    public Node namedItem(String name);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLParagraphElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLParagraphElement.java
new file mode 100644 (file)
index 0000000..1cb8e04
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLParagraphElement.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Paragraphs. See the P element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLParagraphElement extends HTMLElement {
+    /**
+     * Horizontal text alignment. See the align attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public String getAlign();
+    /**
+     * Horizontal text alignment. See the align attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setAlign(String align);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLParamElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLParamElement.java
new file mode 100644 (file)
index 0000000..ecf91c2
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLParamElement.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Parameters fed to the <code>OBJECT</code> element. See the PARAM element 
+ * definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLParamElement extends HTMLElement {
+    /**
+     * The name of a run-time parameter. See the name attribute definition in 
+     * HTML 4.01.
+     */
+    public String getName();
+    /**
+     * The name of a run-time parameter. See the name attribute definition in 
+     * HTML 4.01.
+     */
+    public void setName(String name);
+
+    /**
+     * Content type for the <code>value</code> attribute when 
+     * <code>valuetype</code> has the value "ref". See the type attribute 
+     * definition in HTML 4.01.
+     */
+    public String getType();
+    /**
+     * Content type for the <code>value</code> attribute when 
+     * <code>valuetype</code> has the value "ref". See the type attribute 
+     * definition in HTML 4.01.
+     */
+    public void setType(String type);
+
+    /**
+     * The value of a run-time parameter. See the value attribute definition 
+     * in HTML 4.01.
+     */
+    public String getValue();
+    /**
+     * The value of a run-time parameter. See the value attribute definition 
+     * in HTML 4.01.
+     */
+    public void setValue(String value);
+
+    /**
+     * Information about the meaning of the <code>value</code> attribute 
+     * value. See the valuetype attribute definition in HTML 4.01.
+     */
+    public String getValueType();
+    /**
+     * Information about the meaning of the <code>value</code> attribute 
+     * value. See the valuetype attribute definition in HTML 4.01.
+     */
+    public void setValueType(String valueType);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLPreElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLPreElement.java
new file mode 100644 (file)
index 0000000..bab7358
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLPreElement.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Preformatted text. See the PRE element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLPreElement extends HTMLElement {
+    /**
+     * Fixed width for content. See the width attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public int getWidth();
+    /**
+     * Fixed width for content. See the width attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setWidth(int width);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLQuoteElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLQuoteElement.java
new file mode 100644 (file)
index 0000000..c7cc666
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLQuoteElement.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * For the <code>Q</code> and <code>BLOCKQUOTE</code> elements. See the Q 
+ * element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLQuoteElement extends HTMLElement {
+    /**
+     * A URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating a source document or message. See the cite attribute 
+     * definition in HTML 4.01.
+     */
+    public String getCite();
+    /**
+     * A URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating a source document or message. See the cite attribute 
+     * definition in HTML 4.01.
+     */
+    public void setCite(String cite);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLScriptElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLScriptElement.java
new file mode 100644 (file)
index 0000000..a35f7dd
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLScriptElement.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Script statements. See the SCRIPT element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLScriptElement extends HTMLElement {
+    /**
+     * The script content of the element. 
+     */
+    public String getText();
+    /**
+     * The script content of the element. 
+     */
+    public void setText(String text);
+
+    /**
+     * Reserved for future use. 
+     */
+    public String getHtmlFor();
+    /**
+     * Reserved for future use. 
+     */
+    public void setHtmlFor(String htmlFor);
+
+    /**
+     * Reserved for future use. 
+     */
+    public String getEvent();
+    /**
+     * Reserved for future use. 
+     */
+    public void setEvent(String event);
+
+    /**
+     * The character encoding of the linked resource. See the charset 
+     * attribute definition in HTML 4.01.
+     */
+    public String getCharset();
+    /**
+     * The character encoding of the linked resource. See the charset 
+     * attribute definition in HTML 4.01.
+     */
+    public void setCharset(String charset);
+
+    /**
+     * Indicates that the user agent can defer processing of the script. See 
+     * the defer attribute definition in HTML 4.01.
+     */
+    public boolean getDefer();
+    /**
+     * Indicates that the user agent can defer processing of the script. See 
+     * the defer attribute definition in HTML 4.01.
+     */
+    public void setDefer(boolean defer);
+
+    /**
+     * URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating an external script. See the src attribute definition 
+     * in HTML 4.01.
+     */
+    public String getSrc();
+    /**
+     * URI [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>] designating an external script. See the src attribute definition 
+     * in HTML 4.01.
+     */
+    public void setSrc(String src);
+
+    /**
+     * The content type of the script language. See the type attribute 
+     * definition in HTML 4.01.
+     */
+    public String getType();
+    /**
+     * The content type of the script language. See the type attribute 
+     * definition in HTML 4.01.
+     */
+    public void setType(String type);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLSelectElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLSelectElement.java
new file mode 100644 (file)
index 0000000..c5d83b0
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLSelectElement.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+import org.w3c.dom.DOMException;
+
+/**
+ * The select element allows the selection of an option. The contained options 
+ * can be directly accessed through the select element as a collection. See 
+ * the SELECT element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLSelectElement extends HTMLElement {
+    /**
+     * The type of this form control. This is the string "select-multiple" 
+     * when the multiple attribute is <code>true</code> and the string 
+     * "select-one" when <code>false</code>.
+     */
+    public String getType();
+
+    /**
+     * The ordinal index of the selected option, starting from 0. The value -1 
+     * is returned if no element is selected. If multiple options are 
+     * selected, the index of the first selected option is returned. 
+     */
+    public int getSelectedIndex();
+    /**
+     * The ordinal index of the selected option, starting from 0. The value -1 
+     * is returned if no element is selected. If multiple options are 
+     * selected, the index of the first selected option is returned. 
+     */
+    public void setSelectedIndex(int selectedIndex);
+
+    /**
+     *  The current form control value (i.e. the value of the currently 
+     * selected option), if multiple options are selected this is the value 
+     * of the first selected option. 
+     */
+    public String getValue();
+    /**
+     *  The current form control value (i.e. the value of the currently 
+     * selected option), if multiple options are selected this is the value 
+     * of the first selected option. 
+     */
+    public void setValue(String value);
+
+    /**
+     *  The number of options in this <code>SELECT</code>. 
+     * @version DOM Level 2
+     */
+    public int getLength();
+    /**
+     *  The number of options in this <code>SELECT</code>. 
+     * @exception DOMException
+     *    NOT_SUPPORTED_ERR: if setting the length is not allowed by the 
+     *   implementation. 
+     * @version DOM Level 2
+     */
+    public void setLength(int length)
+                      throws DOMException;
+
+    /**
+     * Returns the <code>FORM</code> element containing this control. Returns 
+     * <code>null</code> if this control is not within the context of a 
+     * form. 
+     */
+    public HTMLFormElement getForm();
+
+    /**
+     * The collection of <code>OPTION</code> elements contained by this 
+     * element. 
+     * @version DOM Level 2
+     */
+    public HTMLOptionsCollection getOptions();
+
+    /**
+     * The control is unavailable in this context. See the disabled attribute 
+     * definition in HTML 4.01.
+     */
+    public boolean getDisabled();
+    /**
+     * The control is unavailable in this context. See the disabled attribute 
+     * definition in HTML 4.01.
+     */
+    public void setDisabled(boolean disabled);
+
+    /**
+     * If true, multiple <code>OPTION</code> elements may be selected in this 
+     * <code>SELECT</code>. See the multiple attribute definition in HTML 
+     * 4.01.
+     */
+    public boolean getMultiple();
+    /**
+     * If true, multiple <code>OPTION</code> elements may be selected in this 
+     * <code>SELECT</code>. See the multiple attribute definition in HTML 
+     * 4.01.
+     */
+    public void setMultiple(boolean multiple);
+
+    /**
+     * Form control or object name when submitted with a form. See the name 
+     * attribute definition in HTML 4.01.
+     */
+    public String getName();
+    /**
+     * Form control or object name when submitted with a form. See the name 
+     * attribute definition in HTML 4.01.
+     */
+    public void setName(String name);
+
+    /**
+     * Number of visible rows. See the size attribute definition in HTML 4.01.
+     */
+    public int getSize();
+    /**
+     * Number of visible rows. See the size attribute definition in HTML 4.01.
+     */
+    public void setSize(int size);
+
+    /**
+     * Index that represents the element's position in the tabbing order. See 
+     * the tabindex attribute definition in HTML 4.01.
+     */
+    public int getTabIndex();
+    /**
+     * Index that represents the element's position in the tabbing order. See 
+     * the tabindex attribute definition in HTML 4.01.
+     */
+    public void setTabIndex(int tabIndex);
+
+    /**
+     * Add a new element to the collection of <code>OPTION</code> elements for 
+     * this <code>SELECT</code>. This method is the equivalent of the 
+     * <code>appendChild</code> method of the <code>Node</code> interface if 
+     * the <code>before</code> parameter is <code>null</code>. It is 
+     * equivalent to the <code>insertBefore</code> method on the parent of 
+     * <code>before</code> in all other cases. This method may have no 
+     * effect if the new element is not an <code>OPTION</code> or an 
+     * <code>OPTGROUP</code>.
+     * @param element The element to add.
+     * @param before The element to insert before, or <code>null</code> for 
+     *   the tail of the list.
+     * @exception DOMException
+     *   NOT_FOUND_ERR: Raised if <code>before</code> is not a descendant of 
+     *   the <code>SELECT</code> element. 
+     */
+    public void add(HTMLElement element, 
+                    HTMLElement before)
+                    throws DOMException;
+
+    /**
+     * Remove an element from the collection of <code>OPTION</code> elements 
+     * for this <code>SELECT</code>. Does nothing if no element has the 
+     * given index.
+     * @param index The index of the item to remove, starting from 0.
+     */
+    public void remove(int index);
+
+    /**
+     * Removes keyboard focus from this element.
+     */
+    public void blur();
+
+    /**
+     * Gives keyboard focus to this element.
+     */
+    public void focus();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLStyleElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLStyleElement.java
new file mode 100644 (file)
index 0000000..148bcda
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLStyleElement.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ *  Style information. See the STYLE element definition in HTML 4.01, the CSS 
+ * module [<a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>DOM Level 2 Style Sheets and CSS</a>] and the <code>LinkStyle</code> interface in the StyleSheets 
+ * module [<a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>DOM Level 2 Style Sheets and CSS</a>]. 
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLStyleElement extends HTMLElement {
+    /**
+     * Enables/disables the style sheet. 
+     */
+    public boolean getDisabled();
+    /**
+     * Enables/disables the style sheet. 
+     */
+    public void setDisabled(boolean disabled);
+
+    /**
+     * Designed for use with one or more target media. See the media attribute 
+     * definition in HTML 4.01.
+     */
+    public String getMedia();
+    /**
+     * Designed for use with one or more target media. See the media attribute 
+     * definition in HTML 4.01.
+     */
+    public void setMedia(String media);
+
+    /**
+     * The content type of the style sheet language. See the type attribute 
+     * definition in HTML 4.01.
+     */
+    public String getType();
+    /**
+     * The content type of the style sheet language. See the type attribute 
+     * definition in HTML 4.01.
+     */
+    public void setType(String type);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableCaptionElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableCaptionElement.java
new file mode 100644 (file)
index 0000000..6c0d872
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableCaptionElement.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Table caption See the CAPTION element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLTableCaptionElement extends HTMLElement {
+    /**
+     * Caption alignment with respect to the table. See the align attribute 
+     * definition in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public String getAlign();
+    /**
+     * Caption alignment with respect to the table. See the align attribute 
+     * definition in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setAlign(String align);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableCellElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableCellElement.java
new file mode 100644 (file)
index 0000000..1e8dc3d
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableCellElement.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * The object used to represent the <code>TH</code> and <code>TD</code> 
+ * elements. See the TD element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLTableCellElement extends HTMLElement {
+    /**
+     * The index of this cell in the row, starting from 0. This index is in 
+     * document tree order and not display order.
+     */
+    public int getCellIndex();
+
+    /**
+     * Abbreviation for header cells. See the abbr attribute definition in 
+     * HTML 4.01.
+     */
+    public String getAbbr();
+    /**
+     * Abbreviation for header cells. See the abbr attribute definition in 
+     * HTML 4.01.
+     */
+    public void setAbbr(String abbr);
+
+    /**
+     * Horizontal alignment of data in cell. See the align attribute definition
+     *  in HTML 4.01.
+     */
+    public String getAlign();
+    /**
+     * Horizontal alignment of data in cell. See the align attribute definition
+     *  in HTML 4.01.
+     */
+    public void setAlign(String align);
+
+    /**
+     * Names group of related headers. See the axis attribute definition in 
+     * HTML 4.01.
+     */
+    public String getAxis();
+    /**
+     * Names group of related headers. See the axis attribute definition in 
+     * HTML 4.01.
+     */
+    public void setAxis(String axis);
+
+    /**
+     * Cell background color. See the bgcolor attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public String getBgColor();
+    /**
+     * Cell background color. See the bgcolor attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setBgColor(String bgColor);
+
+    /**
+     * Alignment character for cells in a column. See the char attribute 
+     * definition in HTML 4.01.
+     */
+    public String getCh();
+    /**
+     * Alignment character for cells in a column. See the char attribute 
+     * definition in HTML 4.01.
+     */
+    public void setCh(String ch);
+
+    /**
+     * Offset of alignment character. See the charoff attribute definition in 
+     * HTML 4.01.
+     */
+    public String getChOff();
+    /**
+     * Offset of alignment character. See the charoff attribute definition in 
+     * HTML 4.01.
+     */
+    public void setChOff(String chOff);
+
+    /**
+     * Number of columns spanned by cell. See the colspan attribute definition 
+     * in HTML 4.01.
+     */
+    public int getColSpan();
+    /**
+     * Number of columns spanned by cell. See the colspan attribute definition 
+     * in HTML 4.01.
+     */
+    public void setColSpan(int colSpan);
+
+    /**
+     * List of <code>id</code> attribute values for header cells. See the 
+     * headers attribute definition in HTML 4.01.
+     */
+    public String getHeaders();
+    /**
+     * List of <code>id</code> attribute values for header cells. See the 
+     * headers attribute definition in HTML 4.01.
+     */
+    public void setHeaders(String headers);
+
+    /**
+     * Cell height. See the height attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public String getHeight();
+    /**
+     * Cell height. See the height attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public void setHeight(String height);
+
+    /**
+     * Suppress word wrapping. See the nowrap attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public boolean getNoWrap();
+    /**
+     * Suppress word wrapping. See the nowrap attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setNoWrap(boolean noWrap);
+
+    /**
+     * Number of rows spanned by cell. See the rowspan attribute definition in 
+     * HTML 4.01.
+     */
+    public int getRowSpan();
+    /**
+     * Number of rows spanned by cell. See the rowspan attribute definition in 
+     * HTML 4.01.
+     */
+    public void setRowSpan(int rowSpan);
+
+    /**
+     * Scope covered by header cells. See the scope attribute definition in 
+     * HTML 4.01.
+     */
+    public String getScope();
+    /**
+     * Scope covered by header cells. See the scope attribute definition in 
+     * HTML 4.01.
+     */
+    public void setScope(String scope);
+
+    /**
+     * Vertical alignment of data in cell. See the valign attribute definition 
+     * in HTML 4.01.
+     */
+    public String getVAlign();
+    /**
+     * Vertical alignment of data in cell. See the valign attribute definition 
+     * in HTML 4.01.
+     */
+    public void setVAlign(String vAlign);
+
+    /**
+     * Cell width. See the width attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public String getWidth();
+    /**
+     * Cell width. See the width attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public void setWidth(String width);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableColElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableColElement.java
new file mode 100644 (file)
index 0000000..85a42dd
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableColElement.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Regroups the <code>COL</code> and <code>COLGROUP</code> elements. See the 
+ * COL element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLTableColElement extends HTMLElement {
+    /**
+     * Horizontal alignment of cell data in column. See the align attribute 
+     * definition in HTML 4.01.
+     */
+    public String getAlign();
+    /**
+     * Horizontal alignment of cell data in column. See the align attribute 
+     * definition in HTML 4.01.
+     */
+    public void setAlign(String align);
+
+    /**
+     * Alignment character for cells in a column. See the char attribute 
+     * definition in HTML 4.01.
+     */
+    public String getCh();
+    /**
+     * Alignment character for cells in a column. See the char attribute 
+     * definition in HTML 4.01.
+     */
+    public void setCh(String ch);
+
+    /**
+     * Offset of alignment character. See the charoff attribute definition in 
+     * HTML 4.01.
+     */
+    public String getChOff();
+    /**
+     * Offset of alignment character. See the charoff attribute definition in 
+     * HTML 4.01.
+     */
+    public void setChOff(String chOff);
+
+    /**
+     * Indicates the number of columns in a group or affected by a grouping. 
+     * See the span attribute definition in HTML 4.01.
+     */
+    public int getSpan();
+    /**
+     * Indicates the number of columns in a group or affected by a grouping. 
+     * See the span attribute definition in HTML 4.01.
+     */
+    public void setSpan(int span);
+
+    /**
+     * Vertical alignment of cell data in column. See the valign attribute 
+     * definition in HTML 4.01.
+     */
+    public String getVAlign();
+    /**
+     * Vertical alignment of cell data in column. See the valign attribute 
+     * definition in HTML 4.01.
+     */
+    public void setVAlign(String vAlign);
+
+    /**
+     * Default column width. See the width attribute definition in HTML 4.01.
+     */
+    public String getWidth();
+    /**
+     * Default column width. See the width attribute definition in HTML 4.01.
+     */
+    public void setWidth(String width);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableElement.java
new file mode 100644 (file)
index 0000000..d36b19c
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableElement.java
@@ -0,0 +1,254 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+import org.w3c.dom.DOMException;
+
+/**
+ * The create* and delete* methods on the table allow authors to construct and 
+ * modify tables. [<a href='http://www.w3.org/TR/1999/REC-html401-19991224'>HTML 4.01</a>] specifies that only one of each of the 
+ * <code>CAPTION</code>, <code>THEAD</code>, and <code>TFOOT</code> elements 
+ * may exist in a table. Therefore, if one exists, and the createTHead() or 
+ * createTFoot() method is called, the method returns the existing THead or 
+ * TFoot element. See the TABLE element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLTableElement extends HTMLElement {
+    /**
+     * Returns the table's <code>CAPTION</code>, or void if none exists. 
+     * @version DOM Level 2
+     */
+    public HTMLTableCaptionElement getCaption();
+    /**
+     * Returns the table's <code>CAPTION</code>, or void if none exists. 
+     * @exception DOMException
+     *    HIERARCHY_REQUEST_ERR: if the element is not a <code>CAPTION</code>. 
+     * @version DOM Level 2
+     */
+    public void setCaption(HTMLTableCaptionElement caption)
+                          throws DOMException;
+
+    /**
+     * Returns the table's <code>THEAD</code>, or <code>null</code> if none 
+     * exists. 
+     * @version DOM Level 2
+     */
+    public HTMLTableSectionElement getTHead();
+    /**
+     * Returns the table's <code>THEAD</code>, or <code>null</code> if none 
+     * exists. 
+     * @exception DOMException
+     *    HIERARCHY_REQUEST_ERR: if the element is not a <code>THEAD</code>. 
+     * @version DOM Level 2
+     */
+    public void setTHead(HTMLTableSectionElement tHead)
+                          throws DOMException;
+
+    /**
+     * Returns the table's <code>TFOOT</code>, or <code>null</code> if none 
+     * exists. 
+     * @version DOM Level 2
+     */
+    public HTMLTableSectionElement getTFoot();
+    /**
+     * Returns the table's <code>TFOOT</code>, or <code>null</code> if none 
+     * exists. 
+     * @exception DOMException
+     *    HIERARCHY_REQUEST_ERR: if the element is not a <code>TFOOT</code>. 
+     * @version DOM Level 2
+     */
+    public void setTFoot(HTMLTableSectionElement tFoot)
+                          throws DOMException;
+
+    /**
+     * Returns a collection of all the rows in the table, including all in 
+     * <code>THEAD</code>, <code>TFOOT</code>, all <code>TBODY</code> 
+     * elements. 
+     */
+    public HTMLCollection getRows();
+
+    /**
+     * Returns a collection of the table bodies (including implicit ones).
+     */
+    public HTMLCollection getTBodies();
+
+    /**
+     * Specifies the table's position with respect to the rest of the 
+     * document. See the align attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public String getAlign();
+    /**
+     * Specifies the table's position with respect to the rest of the 
+     * document. See the align attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public void setAlign(String align);
+
+    /**
+     * Cell background color. See the bgcolor attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public String getBgColor();
+    /**
+     * Cell background color. See the bgcolor attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setBgColor(String bgColor);
+
+    /**
+     * The width of the border around the table. See the border attribute 
+     * definition in HTML 4.01.
+     */
+    public String getBorder();
+    /**
+     * The width of the border around the table. See the border attribute 
+     * definition in HTML 4.01.
+     */
+    public void setBorder(String border);
+
+    /**
+     * Specifies the horizontal and vertical space between cell content and 
+     * cell borders. See the cellpadding attribute definition in HTML 4.01.
+     */
+    public String getCellPadding();
+    /**
+     * Specifies the horizontal and vertical space between cell content and 
+     * cell borders. See the cellpadding attribute definition in HTML 4.01.
+     */
+    public void setCellPadding(String cellPadding);
+
+    /**
+     * Specifies the horizontal and vertical separation between cells. See the 
+     * cellspacing attribute definition in HTML 4.01.
+     */
+    public String getCellSpacing();
+    /**
+     * Specifies the horizontal and vertical separation between cells. See the 
+     * cellspacing attribute definition in HTML 4.01.
+     */
+    public void setCellSpacing(String cellSpacing);
+
+    /**
+     * Specifies which external table borders to render. See the frame 
+     * attribute definition in HTML 4.01.
+     */
+    public String getFrame();
+    /**
+     * Specifies which external table borders to render. See the frame 
+     * attribute definition in HTML 4.01.
+     */
+    public void setFrame(String frame);
+
+    /**
+     * Specifies which internal table borders to render. See the rules 
+     * attribute definition in HTML 4.01.
+     */
+    public String getRules();
+    /**
+     * Specifies which internal table borders to render. See the rules 
+     * attribute definition in HTML 4.01.
+     */
+    public void setRules(String rules);
+
+    /**
+     * Description about the purpose or structure of a table. See the summary 
+     * attribute definition in HTML 4.01.
+     */
+    public String getSummary();
+    /**
+     * Description about the purpose or structure of a table. See the summary 
+     * attribute definition in HTML 4.01.
+     */
+    public void setSummary(String summary);
+
+    /**
+     * Specifies the desired table width. See the width attribute definition 
+     * in HTML 4.01.
+     */
+    public String getWidth();
+    /**
+     * Specifies the desired table width. See the width attribute definition 
+     * in HTML 4.01.
+     */
+    public void setWidth(String width);
+
+    /**
+     * Create a table header row or return an existing one.
+     * @return A new table header element (<code>THEAD</code>).
+     */
+    public HTMLElement createTHead();
+
+    /**
+     * Delete the header from the table, if one exists.
+     */
+    public void deleteTHead();
+
+    /**
+     * Create a table footer row or return an existing one.
+     * @return A footer element (<code>TFOOT</code>).
+     */
+    public HTMLElement createTFoot();
+
+    /**
+     * Delete the footer from the table, if one exists.
+     */
+    public void deleteTFoot();
+
+    /**
+     * Create a new table caption object or return an existing one.
+     * @return A <code>CAPTION</code> element.
+     */
+    public HTMLElement createCaption();
+
+    /**
+     * Delete the table caption, if one exists.
+     */
+    public void deleteCaption();
+
+    /**
+     * Insert a new empty row in the table. The new row is inserted 
+     * immediately before and in the same section as the current 
+     * <code>index</code>th row in the table. If <code>index</code> is -1 or 
+     * equal to the number of rows, the new row is appended. In addition, 
+     * when the table is empty the row is inserted into a <code>TBODY</code> 
+     * which is created and inserted into the table.A table row cannot be 
+     * empty according to [<a href='http://www.w3.org/TR/1999/REC-html401-19991224'>HTML 4.01</a>].
+     * @param index The row number where to insert a new row. This index 
+     *   starts from 0 and is relative to the logical order (not document 
+     *   order) of all the rows contained inside the table.
+     * @return The newly created row.
+     * @exception DOMException
+     *   INDEX_SIZE_ERR: Raised if the specified index is greater than the 
+     *   number of rows or if the index is a negative number other than -1.
+     * @version DOM Level 2
+     */
+    public HTMLElement insertRow(int index)
+                                 throws DOMException;
+
+    /**
+     * Delete a table row.
+     * @param index The index of the row to be deleted. This index starts 
+     *   from 0 and is relative to the logical order (not document order) of 
+     *   all the rows contained inside the table. If the index is -1 the 
+     *   last row in the table is deleted.
+     * @exception DOMException
+     *   INDEX_SIZE_ERR: Raised if the specified index is greater than or 
+     *   equal to the number of rows or if the index is a negative number 
+     *   other than -1.
+     * @version DOM Level 2
+     */
+    public void deleteRow(int index)
+                          throws DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableRowElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableRowElement.java
new file mode 100644 (file)
index 0000000..9f4fbf9
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableRowElement.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+import org.w3c.dom.DOMException;
+
+/**
+ * A row in a table. See the TR element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLTableRowElement extends HTMLElement {
+    /**
+     * This is in logical order and not in document order. The 
+     * <code>rowIndex</code> does take into account sections (
+     * <code>THEAD</code>, <code>TFOOT</code>, or <code>TBODY</code>) within 
+     * the table, placing <code>THEAD</code> rows first in the index, 
+     * followed by <code>TBODY</code> rows, followed by <code>TFOOT</code> 
+     * rows.
+     * @version DOM Level 2
+     */
+    public int getRowIndex();
+
+    /**
+     * The index of this row, relative to the current section (
+     * <code>THEAD</code>, <code>TFOOT</code>, or <code>TBODY</code>), 
+     * starting from 0.
+     * @version DOM Level 2
+     */
+    public int getSectionRowIndex();
+
+    /**
+     * The collection of cells in this row. 
+     * @version DOM Level 2
+     */
+    public HTMLCollection getCells();
+
+    /**
+     * Horizontal alignment of data within cells of this row. See the align 
+     * attribute definition in HTML 4.01.
+     */
+    public String getAlign();
+    /**
+     * Horizontal alignment of data within cells of this row. See the align 
+     * attribute definition in HTML 4.01.
+     */
+    public void setAlign(String align);
+
+    /**
+     * Background color for rows. See the bgcolor attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public String getBgColor();
+    /**
+     * Background color for rows. See the bgcolor attribute definition in HTML 
+     * 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setBgColor(String bgColor);
+
+    /**
+     * Alignment character for cells in a column. See the char attribute 
+     * definition in HTML 4.01.
+     */
+    public String getCh();
+    /**
+     * Alignment character for cells in a column. See the char attribute 
+     * definition in HTML 4.01.
+     */
+    public void setCh(String ch);
+
+    /**
+     * Offset of alignment character. See the charoff attribute definition in 
+     * HTML 4.01.
+     */
+    public String getChOff();
+    /**
+     * Offset of alignment character. See the charoff attribute definition in 
+     * HTML 4.01.
+     */
+    public void setChOff(String chOff);
+
+    /**
+     * Vertical alignment of data within cells of this row. See the valign 
+     * attribute definition in HTML 4.01.
+     */
+    public String getVAlign();
+    /**
+     * Vertical alignment of data within cells of this row. See the valign 
+     * attribute definition in HTML 4.01.
+     */
+    public void setVAlign(String vAlign);
+
+    /**
+     * Insert an empty <code>TD</code> cell into this row. If 
+     * <code>index</code> is -1 or equal to the number of cells, the new 
+     * cell is appended.
+     * @param index The place to insert the cell, starting from 0.
+     * @return The newly created cell.
+     * @exception DOMException
+     *   INDEX_SIZE_ERR: Raised if the specified <code>index</code> is greater 
+     *   than the number of cells or if the index is a negative number other 
+     *   than -1.
+     * @version DOM Level 2
+     */
+    public HTMLElement insertCell(int index)
+                                  throws DOMException;
+
+    /**
+     * Delete a cell from the current row.
+     * @param index The index of the cell to delete, starting from 0. If the 
+     *   index is -1 the last cell in the row is deleted.
+     * @exception DOMException
+     *   INDEX_SIZE_ERR: Raised if the specified <code>index</code> is greater 
+     *   than or equal to the number of cells or if the index is a negative 
+     *   number other than -1.
+     * @version DOM Level 2
+     */
+    public void deleteCell(int index)
+                           throws DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableSectionElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableSectionElement.java
new file mode 100644 (file)
index 0000000..5aa6ce4
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTableSectionElement.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+import org.w3c.dom.DOMException;
+
+/**
+ * The <code>THEAD</code>, <code>TFOOT</code>, and <code>TBODY</code> 
+ * elements. 
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLTableSectionElement extends HTMLElement {
+    /**
+     * Horizontal alignment of data in cells. See the <code>align</code> 
+     * attribute for HTMLTheadElement for details. 
+     */
+    public String getAlign();
+    /**
+     * Horizontal alignment of data in cells. See the <code>align</code> 
+     * attribute for HTMLTheadElement for details. 
+     */
+    public void setAlign(String align);
+
+    /**
+     * Alignment character for cells in a column. See the char attribute 
+     * definition in HTML 4.01.
+     */
+    public String getCh();
+    /**
+     * Alignment character for cells in a column. See the char attribute 
+     * definition in HTML 4.01.
+     */
+    public void setCh(String ch);
+
+    /**
+     * Offset of alignment character. See the charoff attribute definition in 
+     * HTML 4.01.
+     */
+    public String getChOff();
+    /**
+     * Offset of alignment character. See the charoff attribute definition in 
+     * HTML 4.01.
+     */
+    public void setChOff(String chOff);
+
+    /**
+     * Vertical alignment of data in cells. See the <code>valign</code> 
+     * attribute for HTMLTheadElement for details. 
+     */
+    public String getVAlign();
+    /**
+     * Vertical alignment of data in cells. See the <code>valign</code> 
+     * attribute for HTMLTheadElement for details. 
+     */
+    public void setVAlign(String vAlign);
+
+    /**
+     * The collection of rows in this table section. 
+     */
+    public HTMLCollection getRows();
+
+    /**
+     * Insert a row into this section. The new row is inserted immediately 
+     * before the current <code>index</code>th row in this section. If 
+     * <code>index</code> is -1 or equal to the number of rows in this 
+     * section, the new row is appended.
+     * @param index The row number where to insert a new row. This index 
+     *   starts from 0 and is relative only to the rows contained inside 
+     *   this section, not all the rows in the table.
+     * @return The newly created row.
+     * @exception DOMException
+     *   INDEX_SIZE_ERR: Raised if the specified index is greater than the 
+     *   number of rows of if the index is a negative number other than -1.
+     * @version DOM Level 2
+     */
+    public HTMLElement insertRow(int index)
+                                 throws DOMException;
+
+    /**
+     * Delete a row from this section.
+     * @param index The index of the row to be deleted, or -1 to delete the 
+     *   last row. This index starts from 0 and is relative only to the rows 
+     *   contained inside this section, not all the rows in the table.
+     * @exception DOMException
+     *   INDEX_SIZE_ERR: Raised if the specified index is greater than or 
+     *   equal to the number of rows or if the index is a negative number 
+     *   other than -1.
+     * @version DOM Level 2
+     */
+    public void deleteRow(int index)
+                          throws DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTextAreaElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTextAreaElement.java
new file mode 100644 (file)
index 0000000..ed5c6c9
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTextAreaElement.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Multi-line text field. See the TEXTAREA element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLTextAreaElement extends HTMLElement {
+    /**
+     * Represents the contents of the element. The value of this attribute 
+     * does not change if the contents of the corresponding form control, in 
+     * an interactive user agent, changes.
+     * @version DOM Level 2
+     */
+    public String getDefaultValue();
+    /**
+     * Represents the contents of the element. The value of this attribute 
+     * does not change if the contents of the corresponding form control, in 
+     * an interactive user agent, changes.
+     * @version DOM Level 2
+     */
+    public void setDefaultValue(String defaultValue);
+
+    /**
+     * Returns the <code>FORM</code> element containing this control. Returns 
+     * <code>null</code> if this control is not within the context of a 
+     * form. 
+     */
+    public HTMLFormElement getForm();
+
+    /**
+     * A single character access key to give access to the form control. See 
+     * the accesskey attribute definition in HTML 4.01.
+     */
+    public String getAccessKey();
+    /**
+     * A single character access key to give access to the form control. See 
+     * the accesskey attribute definition in HTML 4.01.
+     */
+    public void setAccessKey(String accessKey);
+
+    /**
+     * Width of control (in characters). See the cols attribute definition in 
+     * HTML 4.01.
+     */
+    public int getCols();
+    /**
+     * Width of control (in characters). See the cols attribute definition in 
+     * HTML 4.01.
+     */
+    public void setCols(int cols);
+
+    /**
+     * The control is unavailable in this context. See the disabled attribute 
+     * definition in HTML 4.01.
+     */
+    public boolean getDisabled();
+    /**
+     * The control is unavailable in this context. See the disabled attribute 
+     * definition in HTML 4.01.
+     */
+    public void setDisabled(boolean disabled);
+
+    /**
+     * Form control or object name when submitted with a form. See the name 
+     * attribute definition in HTML 4.01.
+     */
+    public String getName();
+    /**
+     * Form control or object name when submitted with a form. See the name 
+     * attribute definition in HTML 4.01.
+     */
+    public void setName(String name);
+
+    /**
+     * This control is read-only. See the readonly attribute definition in 
+     * HTML 4.01.
+     */
+    public boolean getReadOnly();
+    /**
+     * This control is read-only. See the readonly attribute definition in 
+     * HTML 4.01.
+     */
+    public void setReadOnly(boolean readOnly);
+
+    /**
+     * Number of text rows. See the rows attribute definition in HTML 4.01.
+     */
+    public int getRows();
+    /**
+     * Number of text rows. See the rows attribute definition in HTML 4.01.
+     */
+    public void setRows(int rows);
+
+    /**
+     * Index that represents the element's position in the tabbing order. See 
+     * the tabindex attribute definition in HTML 4.01.
+     */
+    public int getTabIndex();
+    /**
+     * Index that represents the element's position in the tabbing order. See 
+     * the tabindex attribute definition in HTML 4.01.
+     */
+    public void setTabIndex(int tabIndex);
+
+    /**
+     * The type of this form control. This the string "textarea".
+     */
+    public String getType();
+
+    /**
+     * Represents the current contents of the corresponding form control, in 
+     * an interactive user agent. Changing this attribute changes the 
+     * contents of the form control, but does not change the contents of the 
+     * element. If the entirety of the data can not fit into a single 
+     * <code>DOMString</code>, the implementation may truncate the data.
+     */
+    public String getValue();
+    /**
+     * Represents the current contents of the corresponding form control, in 
+     * an interactive user agent. Changing this attribute changes the 
+     * contents of the form control, but does not change the contents of the 
+     * element. If the entirety of the data can not fit into a single 
+     * <code>DOMString</code>, the implementation may truncate the data.
+     */
+    public void setValue(String value);
+
+    /**
+     * Removes keyboard focus from this element.
+     */
+    public void blur();
+
+    /**
+     * Gives keyboard focus to this element.
+     */
+    public void focus();
+
+    /**
+     * Select the contents of the <code>TEXTAREA</code>.
+     */
+    public void select();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTitleElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTitleElement.java
new file mode 100644 (file)
index 0000000..67122bb
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLTitleElement.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * The document title. See the TITLE element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLTitleElement extends HTMLElement {
+    /**
+     * The specified title as a string. 
+     */
+    public String getText();
+    /**
+     * The specified title as a string. 
+     */
+    public void setText(String text);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLUListElement.java b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLUListElement.java
new file mode 100644 (file)
index 0000000..61ccb32
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/html2/HTMLUListElement.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2003 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.html2;
+
+/**
+ * Unordered list. See the UL element definition in HTML 4.01.
+ * <p>See also the <a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>Document Object Model (DOM) Level 2 HTML Specification</a>.
+ */
+public interface HTMLUListElement extends HTMLElement {
+    /**
+     * Reduce spacing between list items. See the compact attribute definition 
+     * in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public boolean getCompact();
+    /**
+     * Reduce spacing between list items. See the compact attribute definition 
+     * in HTML 4.01. This attribute is deprecated in HTML 4.01.
+     */
+    public void setCompact(boolean compact);
+
+    /**
+     * Bullet style. See the type attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public String getType();
+    /**
+     * Bullet style. See the type attribute definition in HTML 4.01. This 
+     * attribute is deprecated in HTML 4.01.
+     */
+    public void setType(String type);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/ls/DOMImplementationLS.java b/libjava/external/w3c_dom/org/w3c/dom/ls/DOMImplementationLS.java
new file mode 100644 (file)
index 0000000..c94fc8e
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/ls/DOMImplementationLS.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.ls;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  <code>DOMImplementationLS</code> contains the factory methods for creating 
+ * Load and Save objects. 
+ * <p> The expectation is that an instance of the 
+ * <code>DOMImplementationLS</code> interface can be obtained by using 
+ * binding-specific casting methods on an instance of the 
+ * <code>DOMImplementation</code> interface or, if the <code>Document</code> 
+ * supports the feature <code>"Core"</code> version <code>"3.0"</code> 
+ * defined in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
+ * , by using the method <code>DOMImplementation.getFeature</code> with 
+ * parameter values <code>"LS"</code> (or <code>"LS-Async"</code>) and 
+ * <code>"3.0"</code> (respectively). 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
+and Save Specification</a>.
+ */
+public interface DOMImplementationLS {
+    // DOMImplementationLSMode
+    /**
+     * Create a synchronous <code>LSParser</code>.
+     */
+    public static final short MODE_SYNCHRONOUS          = 1;
+    /**
+     * Create an asynchronous <code>LSParser</code>.
+     */
+    public static final short MODE_ASYNCHRONOUS         = 2;
+
+    /**
+     * Create a new <code>LSParser</code>. The newly constructed parser may 
+     * then be configured by means of its <code>DOMConfiguration</code> 
+     * object, and used to parse documents by means of its <code>parse</code>
+     *  method. 
+     * @param mode  The <code>mode</code> argument is either 
+     *   <code>MODE_SYNCHRONOUS</code> or <code>MODE_ASYNCHRONOUS</code>, if 
+     *   <code>mode</code> is <code>MODE_SYNCHRONOUS</code> then the 
+     *   <code>LSParser</code> that is created will operate in synchronous 
+     *   mode, if it's <code>MODE_ASYNCHRONOUS</code> then the 
+     *   <code>LSParser</code> that is created will operate in asynchronous 
+     *   mode. 
+     * @param schemaType  An absolute URI representing the type of the schema 
+     *   language used during the load of a <code>Document</code> using the 
+     *   newly created <code>LSParser</code>. Note that no lexical checking 
+     *   is done on the absolute URI. In order to create a 
+     *   <code>LSParser</code> for any kind of schema types (i.e. the 
+     *   LSParser will be free to use any schema found), use the value 
+     *   <code>null</code>. 
+     * <p ><b>Note:</b>    For W3C XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
+     *   , applications must use the value 
+     *   <code>"http://www.w3.org/2001/XMLSchema"</code>. For XML DTD [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>], 
+     *   applications must use the value 
+     *   <code>"http://www.w3.org/TR/REC-xml"</code>. Other Schema languages 
+     *   are outside the scope of the W3C and therefore should recommend an 
+     *   absolute URI in order to use this method. 
+     * @return  The newly created <code>LSParser</code> object. This 
+     *   <code>LSParser</code> is either synchronous or asynchronous 
+     *   depending on the value of the <code>mode</code> argument. 
+     * <p ><b>Note:</b>    By default, the newly created <code>LSParser</code> 
+     *   does not contain a <code>DOMErrorHandler</code>, i.e. the value of 
+     *   the "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
+     *   error-handler</a>" configuration parameter is <code>null</code>. However, implementations 
+     *   may provide a default error handler at creation time. In that case, 
+     *   the initial value of the <code>"error-handler"</code> configuration 
+     *   parameter on the new <code>LSParser</code> object contains a 
+     *   reference to the default error handler. 
+     * @exception DOMException
+     *    NOT_SUPPORTED_ERR: Raised if the requested mode or schema type is 
+     *   not supported. 
+     */
+    public LSParser createLSParser(short mode, 
+                                   String schemaType)
+                                   throws DOMException;
+
+    /**
+     *  Create a new <code>LSSerializer</code> object. 
+     * @return The newly created <code>LSSerializer</code> object.
+     * <p ><b>Note:</b>    By default, the newly created 
+     *   <code>LSSerializer</code> has no <code>DOMErrorHandler</code>, i.e. 
+     *   the value of the <code>"error-handler"</code> configuration 
+     *   parameter is <code>null</code>. However, implementations may 
+     *   provide a default error handler at creation time. In that case, the 
+     *   initial value of the <code>"error-handler"</code> configuration 
+     *   parameter on the new <code>LSSerializer</code> object contains a 
+     *   reference to the default error handler. 
+     */
+    public LSSerializer createLSSerializer();
+
+    /**
+     *  Create a new empty input source object where 
+     * <code>LSInput.characterStream</code>, <code>LSInput.byteStream</code>
+     * , <code>LSInput.stringData</code> <code>LSInput.systemId</code>, 
+     * <code>LSInput.publicId</code>, <code>LSInput.baseURI</code>, and 
+     * <code>LSInput.encoding</code> are null, and 
+     * <code>LSInput.certifiedText</code> is false. 
+     * @return  The newly created input object. 
+     */
+    public LSInput createLSInput();
+
+    /**
+     *  Create a new empty output destination object where 
+     * <code>LSOutput.characterStream</code>, 
+     * <code>LSOutput.byteStream</code>, <code>LSOutput.systemId</code>, 
+     * <code>LSOutput.encoding</code> are null. 
+     * @return  The newly created output object. 
+     */
+    public LSOutput createLSOutput();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/ls/LSException.java b/libjava/external/w3c_dom/org/w3c/dom/ls/LSException.java
new file mode 100644 (file)
index 0000000..65a83f0
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/ls/LSException.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.ls;
+
+/**
+ *  Parser or write operations may throw an <code>LSException</code> if the 
+ * processing is stopped. The processing can be stopped due to a 
+ * <code>DOMError</code> with a severity of 
+ * <code>DOMError.SEVERITY_FATAL_ERROR</code> or a non recovered 
+ * <code>DOMError.SEVERITY_ERROR</code>, or if 
+ * <code>DOMErrorHandler.handleError()</code> returned <code>false</code>. 
+ * <p ><b>Note:</b>  As suggested in the definition of the constants in the 
+ * <code>DOMError</code> interface, a DOM implementation may choose to 
+ * continue after a fatal error, but the resulting DOM tree is then 
+ * implementation dependent. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
+and Save Specification</a>.
+ */
+public class LSException extends RuntimeException {
+    public LSException(short code, String message) {
+       super(message);
+       this.code = code;
+    }
+    public short   code;
+    // LSExceptionCode
+    /**
+     *  If an attempt was made to load a document, or an XML Fragment, using 
+     * <code>LSParser</code> and the processing has been stopped. 
+     */
+    public static final short PARSE_ERR                 = 81;
+    /**
+     *  If an attempt was made to serialize a <code>Node</code> using 
+     * <code>LSSerializer</code> and the processing has been stopped. 
+     */
+    public static final short SERIALIZE_ERR             = 82;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/ls/LSInput.java b/libjava/external/w3c_dom/org/w3c/dom/ls/LSInput.java
new file mode 100644 (file)
index 0000000..862bf77
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/ls/LSInput.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.ls;
+
+/**
+ *  This interface represents an input source for data. 
+ * <p> This interface allows an application to encapsulate information about 
+ * an input source in a single object, which may include a public 
+ * identifier, a system identifier, a byte stream (possibly with a specified 
+ * encoding), a base URI, and/or a character stream. 
+ * <p> The exact definitions of a byte stream and a character stream are 
+ * binding dependent. 
+ * <p> The application is expected to provide objects that implement this 
+ * interface whenever such objects are needed. The application can either 
+ * provide its own objects that implement this interface, or it can use the 
+ * generic factory method <code>DOMImplementationLS.createLSInput()</code> 
+ * to create objects that implement this interface. 
+ * <p> The <code>LSParser</code> will use the <code>LSInput</code> object to 
+ * determine how to read data. The <code>LSParser</code> will look at the 
+ * different inputs specified in the <code>LSInput</code> in the following 
+ * order to know which one to read from, the first one that is not null and 
+ * not an empty string will be used: 
+ * <ol>
+ * <li> <code>LSInput.characterStream</code> 
+ * </li>
+ * <li> 
+ * <code>LSInput.byteStream</code> 
+ * </li>
+ * <li> <code>LSInput.stringData</code> 
+ * </li>
+ * <li> 
+ * <code>LSInput.systemId</code> 
+ * </li>
+ * <li> <code>LSInput.publicId</code> 
+ * </li>
+ * </ol> 
+ * <p> If all inputs are null, the <code>LSParser</code> will report a 
+ * <code>DOMError</code> with its <code>DOMError.type</code> set to 
+ * <code>"no-input-specified"</code> and its <code>DOMError.severity</code> 
+ * set to <code>DOMError.SEVERITY_FATAL_ERROR</code>. 
+ * <p> <code>LSInput</code> objects belong to the application. The DOM 
+ * implementation will never modify them (though it may make copies and 
+ * modify the copies, if necessary). 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
+and Save Specification</a>.
+ */
+public interface LSInput {
+    /**
+     *  An attribute of a language and binding dependent type that represents 
+     * a stream of 16-bit units. The application must encode the stream 
+     * using UTF-16 (defined in [Unicode] and in [ISO/IEC 10646]). It is not a requirement to have an XML declaration when 
+     * using character streams. If an XML declaration is present, the value 
+     * of the encoding attribute will be ignored. 
+     */
+    public java.io.Reader getCharacterStream();
+    /**
+     *  An attribute of a language and binding dependent type that represents 
+     * a stream of 16-bit units. The application must encode the stream 
+     * using UTF-16 (defined in [Unicode] and in [ISO/IEC 10646]). It is not a requirement to have an XML declaration when 
+     * using character streams. If an XML declaration is present, the value 
+     * of the encoding attribute will be ignored. 
+     */
+    public void setCharacterStream(java.io.Reader characterStream);
+
+    /**
+     *  An attribute of a language and binding dependent type that represents 
+     * a stream of bytes. 
+     * <br> If the application knows the character encoding of the byte 
+     * stream, it should set the encoding attribute. Setting the encoding in 
+     * this way will override any encoding specified in an XML declaration 
+     * in the data. 
+     */
+    public java.io.InputStream getByteStream();
+    /**
+     *  An attribute of a language and binding dependent type that represents 
+     * a stream of bytes. 
+     * <br> If the application knows the character encoding of the byte 
+     * stream, it should set the encoding attribute. Setting the encoding in 
+     * this way will override any encoding specified in an XML declaration 
+     * in the data. 
+     */
+    public void setByteStream(java.io.InputStream byteStream);
+
+    /**
+     *  String data to parse. If provided, this will always be treated as a 
+     * sequence of 16-bit units (UTF-16 encoded characters). It is not a 
+     * requirement to have an XML declaration when using 
+     * <code>stringData</code>. If an XML declaration is present, the value 
+     * of the encoding attribute will be ignored. 
+     */
+    public String getStringData();
+    /**
+     *  String data to parse. If provided, this will always be treated as a 
+     * sequence of 16-bit units (UTF-16 encoded characters). It is not a 
+     * requirement to have an XML declaration when using 
+     * <code>stringData</code>. If an XML declaration is present, the value 
+     * of the encoding attribute will be ignored. 
+     */
+    public void setStringData(String stringData);
+
+    /**
+     *  The system identifier, a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>], for this 
+     * input source. The system identifier is optional if there is a byte 
+     * stream, a character stream, or string data. It is still useful to 
+     * provide one, since the application will use it to resolve any 
+     * relative URIs and can include it in error messages and warnings. (The 
+     * LSParser will only attempt to fetch the resource identified by the 
+     * URI reference if there is no other input available in the input 
+     * source.) 
+     * <br> If the application knows the character encoding of the object 
+     * pointed to by the system identifier, it can set the encoding using 
+     * the <code>encoding</code> attribute. 
+     * <br> If the specified system ID is a relative URI reference (see 
+     * section 5 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]), the DOM 
+     * implementation will attempt to resolve the relative URI with the 
+     * <code>baseURI</code> as the base, if that fails, the behavior is 
+     * implementation dependent. 
+     */
+    public String getSystemId();
+    /**
+     *  The system identifier, a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>], for this 
+     * input source. The system identifier is optional if there is a byte 
+     * stream, a character stream, or string data. It is still useful to 
+     * provide one, since the application will use it to resolve any 
+     * relative URIs and can include it in error messages and warnings. (The 
+     * LSParser will only attempt to fetch the resource identified by the 
+     * URI reference if there is no other input available in the input 
+     * source.) 
+     * <br> If the application knows the character encoding of the object 
+     * pointed to by the system identifier, it can set the encoding using 
+     * the <code>encoding</code> attribute. 
+     * <br> If the specified system ID is a relative URI reference (see 
+     * section 5 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]), the DOM 
+     * implementation will attempt to resolve the relative URI with the 
+     * <code>baseURI</code> as the base, if that fails, the behavior is 
+     * implementation dependent. 
+     */
+    public void setSystemId(String systemId);
+
+    /**
+     *  The public identifier for this input source. This may be mapped to an 
+     * input source using an implementation dependent mechanism (such as 
+     * catalogues or other mappings). The public identifier, if specified, 
+     * may also be reported as part of the location information when errors 
+     * are reported. 
+     */
+    public String getPublicId();
+    /**
+     *  The public identifier for this input source. This may be mapped to an 
+     * input source using an implementation dependent mechanism (such as 
+     * catalogues or other mappings). The public identifier, if specified, 
+     * may also be reported as part of the location information when errors 
+     * are reported. 
+     */
+    public void setPublicId(String publicId);
+
+    /**
+     *  The base URI to be used (see section 5.1.4 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]) for 
+     * resolving a relative <code>systemId</code> to an absolute URI. 
+     * <br> If, when used, the base URI is itself a relative URI, an empty 
+     * string, or null, the behavior is implementation dependent. 
+     */
+    public String getBaseURI();
+    /**
+     *  The base URI to be used (see section 5.1.4 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]) for 
+     * resolving a relative <code>systemId</code> to an absolute URI. 
+     * <br> If, when used, the base URI is itself a relative URI, an empty 
+     * string, or null, the behavior is implementation dependent. 
+     */
+    public void setBaseURI(String baseURI);
+
+    /**
+     *  The character encoding, if known. The encoding must be a string 
+     * acceptable for an XML encoding declaration ([<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] section 
+     * 4.3.3 "Character Encoding in Entities"). 
+     * <br> This attribute has no effect when the application provides a 
+     * character stream or string data. For other sources of input, an 
+     * encoding specified by means of this attribute will override any 
+     * encoding specified in the XML declaration or the Text declaration, or 
+     * an encoding obtained from a higher level protocol, such as HTTP [<a href='http://www.ietf.org/rfc/rfc2616.txt'>IETF RFC 2616</a>]. 
+     */
+    public String getEncoding();
+    /**
+     *  The character encoding, if known. The encoding must be a string 
+     * acceptable for an XML encoding declaration ([<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] section 
+     * 4.3.3 "Character Encoding in Entities"). 
+     * <br> This attribute has no effect when the application provides a 
+     * character stream or string data. For other sources of input, an 
+     * encoding specified by means of this attribute will override any 
+     * encoding specified in the XML declaration or the Text declaration, or 
+     * an encoding obtained from a higher level protocol, such as HTTP [<a href='http://www.ietf.org/rfc/rfc2616.txt'>IETF RFC 2616</a>]. 
+     */
+    public void setEncoding(String encoding);
+
+    /**
+     *  If set to true, assume that the input is certified (see section 2.13 
+     * in [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]) when 
+     * parsing [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]. 
+     */
+    public boolean getCertifiedText();
+    /**
+     *  If set to true, assume that the input is certified (see section 2.13 
+     * in [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]) when 
+     * parsing [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]. 
+     */
+    public void setCertifiedText(boolean certifiedText);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/ls/LSLoadEvent.java b/libjava/external/w3c_dom/org/w3c/dom/ls/LSLoadEvent.java
new file mode 100644 (file)
index 0000000..601a5be
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/ls/LSLoadEvent.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.ls;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.events.Event;
+
+/**
+ *  This interface represents a load event object that signals the completion 
+ * of a document load. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
+and Save Specification</a>.
+ */
+public interface LSLoadEvent extends Event {
+    /**
+     * The document that finished loading.
+     */
+    public Document getNewDocument();
+
+    /**
+     * The input source that was parsed.
+     */
+    public LSInput getInput();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/ls/LSOutput.java b/libjava/external/w3c_dom/org/w3c/dom/ls/LSOutput.java
new file mode 100644 (file)
index 0000000..2f8675c
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/ls/LSOutput.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.ls;
+
+/**
+ *  This interface represents an output destination for data. 
+ * <p> This interface allows an application to encapsulate information about 
+ * an output destination in a single object, which may include a URI, a byte 
+ * stream (possibly with a specified encoding), a base URI, and/or a 
+ * character stream. 
+ * <p> The exact definitions of a byte stream and a character stream are 
+ * binding dependent. 
+ * <p> The application is expected to provide objects that implement this 
+ * interface whenever such objects are needed. The application can either 
+ * provide its own objects that implement this interface, or it can use the 
+ * generic factory method <code>DOMImplementationLS.createLSOutput()</code> 
+ * to create objects that implement this interface. 
+ * <p> The <code>LSSerializer</code> will use the <code>LSOutput</code> object 
+ * to determine where to serialize the output to. The 
+ * <code>LSSerializer</code> will look at the different outputs specified in 
+ * the <code>LSOutput</code> in the following order to know which one to 
+ * output to, the first one that is not null and not an empty string will be 
+ * used: 
+ * <ol>
+ * <li> <code>LSOutput.characterStream</code> 
+ * </li>
+ * <li> 
+ * <code>LSOutput.byteStream</code> 
+ * </li>
+ * <li> <code>LSOutput.systemId</code> 
+ * </li>
+ * </ol> 
+ * <p> <code>LSOutput</code> objects belong to the application. The DOM 
+ * implementation will never modify them (though it may make copies and 
+ * modify the copies, if necessary). 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
+and Save Specification</a>.
+ */
+public interface LSOutput {
+    /**
+     *  An attribute of a language and binding dependent type that represents 
+     * a writable stream to which 16-bit units can be output. 
+     */
+    public java.io.Writer getCharacterStream();
+    /**
+     *  An attribute of a language and binding dependent type that represents 
+     * a writable stream to which 16-bit units can be output. 
+     */
+    public void setCharacterStream(java.io.Writer characterStream);
+
+    /**
+     *  An attribute of a language and binding dependent type that represents 
+     * a writable stream of bytes. 
+     */
+    public java.io.OutputStream getByteStream();
+    /**
+     *  An attribute of a language and binding dependent type that represents 
+     * a writable stream of bytes. 
+     */
+    public void setByteStream(java.io.OutputStream byteStream);
+
+    /**
+     *  The system identifier, a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>], for this 
+     * output destination. 
+     * <br> If the system ID is a relative URI reference (see section 5 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]), the 
+     * behavior is implementation dependent. 
+     */
+    public String getSystemId();
+    /**
+     *  The system identifier, a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>], for this 
+     * output destination. 
+     * <br> If the system ID is a relative URI reference (see section 5 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]), the 
+     * behavior is implementation dependent. 
+     */
+    public void setSystemId(String systemId);
+
+    /**
+     *  The character encoding to use for the output. The encoding must be a 
+     * string acceptable for an XML encoding declaration ([<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] section 
+     * 4.3.3 "Character Encoding in Entities"), it is recommended that 
+     * character encodings registered (as charsets) with the Internet 
+     * Assigned Numbers Authority [<a href='ftp://ftp.isi.edu/in-notes/iana/assignments/character-sets'>IANA-CHARSETS</a>]
+     *  should be referred to using their registered names. 
+     */
+    public String getEncoding();
+    /**
+     *  The character encoding to use for the output. The encoding must be a 
+     * string acceptable for an XML encoding declaration ([<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] section 
+     * 4.3.3 "Character Encoding in Entities"), it is recommended that 
+     * character encodings registered (as charsets) with the Internet 
+     * Assigned Numbers Authority [<a href='ftp://ftp.isi.edu/in-notes/iana/assignments/character-sets'>IANA-CHARSETS</a>]
+     *  should be referred to using their registered names. 
+     */
+    public void setEncoding(String encoding);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/ls/LSParser.java b/libjava/external/w3c_dom/org/w3c/dom/ls/LSParser.java
new file mode 100644 (file)
index 0000000..ee918e0
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/ls/LSParser.java
@@ -0,0 +1,466 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.ls;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.Node;
+import org.w3c.dom.DOMException;
+
+/**
+ *  An interface to an object that is able to build, or augment, a DOM tree 
+ * from various input sources. 
+ * <p> <code>LSParser</code> provides an API for parsing XML and building the 
+ * corresponding DOM document structure. A <code>LSParser</code> instance 
+ * can be obtained by invoking the 
+ * <code>DOMImplementationLS.createLSParser()</code> method. 
+ * <p> As specified in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
+ * , when a document is first made available via the LSParser: 
+ * <ul>
+ * <li> there will 
+ * never be two adjacent nodes of type NODE_TEXT, and there will never be 
+ * empty text nodes. 
+ * </li>
+ * <li> it is expected that the <code>value</code> and 
+ * <code>nodeValue</code> attributes of an <code>Attr</code> node initially 
+ * return the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#AVNormalize'>XML 1.0 
+ * normalized value</a>. However, if the parameters "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-validate-if-schema'>
+ * validate-if-schema</a>" and "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-datatype-normalization'>
+ * datatype-normalization</a>" are set to <code>true</code>, depending on the attribute normalization 
+ * used, the attribute values may differ from the ones obtained by the XML 
+ * 1.0 attribute normalization. If the parameters "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-datatype-normalization'>
+ * datatype-normalization</a>" is set to <code>false</code>, the XML 1.0 attribute normalization is 
+ * guaranteed to occur, and if the attributes list does not contain 
+ * namespace declarations, the <code>attributes</code> attribute on 
+ * <code>Element</code> node represents the property <b>[attributes]</b> defined in [<a href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204/'>XML Information Set</a>]
+ * . 
+ * </li>
+ * </ul>
+ * <p> Asynchronous <code>LSParser</code> objects are expected to also 
+ * implement the <code>events::EventTarget</code> interface so that event 
+ * listeners can be registered on asynchronous <code>LSParser</code> 
+ * objects. 
+ * <p> Events supported by asynchronous <code>LSParser</code> objects are: 
+ * <dl>
+ * <dt>load</dt>
+ * <dd>
+ *  The <code>LSParser</code> finishes to load the document. See also the 
+ * definition of the <code>LSLoadEvent</code> interface. </dd>
+ * <dt>progress</dt>
+ * <dd> The 
+ * <code>LSParser</code> signals progress as data is parsed.  This 
+ * specification does not attempt to define exactly when progress events 
+ * should be dispatched. That is intentionally left as 
+ * implementation-dependent. Here is one example of how an application might 
+ * dispatch progress events: Once the parser starts receiving data, a 
+ * progress event is dispatched to indicate that the parsing starts. From 
+ * there on, a progress event is dispatched for every 4096 bytes of data 
+ * that is received and processed. This is only one example, though, and 
+ * implementations can choose to dispatch progress events at any time while 
+ * parsing, or not dispatch them at all.  See also the definition of the 
+ * <code>LSProgressEvent</code> interface. </dd>
+ * </dl>
+ * <p ><b>Note:</b>  All events defined in this specification use the 
+ * namespace URI <code>"http://www.w3.org/2002/DOMLS"</code>. 
+ * <p> While parsing an input source, errors are reported to the application 
+ * through the error handler (<code>LSParser.domConfig</code>'s "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
+ * error-handler</a>" parameter). This specification does in no way try to define all possible 
+ * errors that can occur while parsing XML, or any other markup, but some 
+ * common error cases are defined. The types (<code>DOMError.type</code>) of 
+ * errors and warnings defined by this specification are: 
+ * <dl>
+ * <dt> 
+ * <code>"check-character-normalization-failure" [error]</code> </dt>
+ * <dd> Raised if 
+ * the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-check-character-normalization'>
+ * check-character-normalization</a>" is set to true and a string is encountered that fails normalization 
+ * checking. </dd>
+ * <dt><code>"doctype-not-allowed" [fatal]</code></dt>
+ * <dd> Raised if the 
+ * configuration parameter "disallow-doctype" is set to <code>true</code> 
+ * and a doctype is encountered. </dd>
+ * <dt><code>"no-input-specified" [fatal]</code></dt>
+ * <dd> 
+ * Raised when loading a document and no input is specified in the 
+ * <code>LSInput</code> object. </dd>
+ * <dt>
+ * <code>"pi-base-uri-not-preserved" [warning]</code></dt>
+ * <dd> Raised if a processing 
+ * instruction is encountered in a location where the base URI of the 
+ * processing instruction can not be preserved.  One example of a case where 
+ * this warning will be raised is if the configuration parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-entities'>
+ * entities</a>" is set to <code>false</code> and the following XML file is parsed: 
+ * <pre>
+ * &lt;!DOCTYPE root [ &lt;!ENTITY e SYSTEM 'subdir/myentity.ent' ]&gt; 
+ * &lt;root&gt; &amp;e; &lt;/root&gt;</pre>
+ *  And <code>subdir/myentity.ent</code> 
+ * contains: 
+ * <pre>&lt;one&gt; &lt;two/&gt; &lt;/one&gt; &lt;?pi 3.14159?&gt; 
+ * &lt;more/&gt;</pre>
+ * </dd>
+ * <dt><code>"unbound-prefix-in-entity" [warning]</code></dt>
+ * <dd> An 
+ * implementation dependent warning that may be raised if the configuration 
+ * parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-namespaces'>
+ * namespaces</a>" is set to <code>true</code> and an unbound namespace prefix is 
+ * encountered in an entity's replacement text. Raising this warning is not 
+ * enforced since some existing parsers may not recognize unbound namespace 
+ * prefixes in the replacement text of entities. </dd>
+ * <dt>
+ * <code>"unknown-character-denormalization" [fatal]</code></dt>
+ * <dd> Raised if the 
+ * configuration parameter "ignore-unknown-character-denormalizations" is 
+ * set to <code>false</code> and a character is encountered for which the 
+ * processor cannot determine the normalization properties. </dd>
+ * <dt>
+ * <code>"unsupported-encoding" [fatal]</code></dt>
+ * <dd> Raised if an unsupported 
+ * encoding is encountered. </dd>
+ * <dt><code>"unsupported-media-type" [fatal]</code></dt>
+ * <dd> 
+ * Raised if the configuration parameter "supported-media-types-only" is set 
+ * to <code>true</code> and an unsupported media type is encountered. </dd>
+ * </dl> 
+ * <p> In addition to raising the defined errors and warnings, implementations 
+ * are expected to raise implementation specific errors and warnings for any 
+ * other error and warning cases such as IO errors (file not found, 
+ * permission denied,...), XML well-formedness errors, and so on. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
+and Save Specification</a>.
+ */
+public interface LSParser {
+    /**
+     *  The <code>DOMConfiguration</code> object used when parsing an input 
+     * source. This <code>DOMConfiguration</code> is specific to the parse 
+     * operation. No parameter values from this <code>DOMConfiguration</code>
+     *  object are passed automatically to the <code>DOMConfiguration</code> 
+     * object on the <code>Document</code> that is created, or used, by the 
+     * parse operation. The DOM application is responsible for passing any 
+     * needed parameter values from this <code>DOMConfiguration</code> 
+     * object to the <code>DOMConfiguration</code> object referenced by the 
+     * <code>Document</code> object. 
+     * <br> In addition to the parameters recognized in on the <a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#DOMConfiguration'>
+     * DOMConfiguration</a> interface defined in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
+     * , the <code>DOMConfiguration</code> objects for <code>LSParser</code> 
+     * add or modify the following parameters: 
+     * <dl>
+     * <dt>
+     * <code>"charset-overrides-xml-encoding"</code></dt>
+     * <dd>
+     * <dl>
+     * <dt><code>true</code></dt>
+     * <dd>[<em>optional</em>] (<em>default</em>) If a higher level protocol such as HTTP [<a href='http://www.ietf.org/rfc/rfc2616.txt'>IETF RFC 2616</a>] provides an 
+     * indication of the character encoding of the input stream being 
+     * processed, that will override any encoding specified in the XML 
+     * declaration or the Text declaration (see also section 4.3.3, 
+     * "Character Encoding in Entities", in [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]). 
+     * Explicitly setting an encoding in the <code>LSInput</code> overrides 
+     * any encoding from the protocol. </dd>
+     * <dt><code>false</code></dt>
+     * <dd>[<em>required</em>] The parser ignores any character set encoding information from 
+     * higher-level protocols. </dd>
+     * </dl></dd>
+     * <dt><code>"disallow-doctype"</code></dt>
+     * <dd>
+     * <dl>
+     * <dt>
+     * <code>true</code></dt>
+     * <dd>[<em>optional</em>] Throw a fatal <b>"doctype-not-allowed"</b> error if a doctype node is found while parsing the document. This is 
+     * useful when dealing with things like SOAP envelopes where doctype 
+     * nodes are not allowed. </dd>
+     * <dt><code>false</code></dt>
+     * <dd>[<em>required</em>] (<em>default</em>) Allow doctype nodes in the document. </dd>
+     * </dl></dd>
+     * <dt>
+     * <code>"ignore-unknown-character-denormalizations"</code></dt>
+     * <dd>
+     * <dl>
+     * <dt>
+     * <code>true</code></dt>
+     * <dd>[<em>required</em>] (<em>default</em>) If, while verifying full normalization when [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>] is 
+     * supported, a processor encounters characters for which it cannot 
+     * determine the normalization properties, then the processor will 
+     * ignore any possible denormalizations caused by these characters.  
+     * This parameter is ignored for [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. </dd>
+     * <dt>
+     * <code>false</code></dt>
+     * <dd>[<em>optional</em>] Report an fatal <b>"unknown-character-denormalization"</b> error if a character is encountered for which the processor cannot 
+     * determine the normalization properties. </dd>
+     * </dl></dd>
+     * <dt><code>"infoset"</code></dt>
+     * <dd> See 
+     * the definition of <code>DOMConfiguration</code> for a description of 
+     * this parameter. Unlike in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
+     * , this parameter will default to <code>true</code> for 
+     * <code>LSParser</code>. </dd>
+     * <dt><code>"namespaces"</code></dt>
+     * <dd>
+     * <dl>
+     * <dt><code>true</code></dt>
+     * <dd>[<em>required</em>] (<em>default</em>) Perform the namespace processing as defined in [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
+     *  and [<a href='http://www.w3.org/TR/2004/REC-xml-names11-20040204/'>XML Namespaces 1.1</a>]
+     * . </dd>
+     * <dt><code>false</code></dt>
+     * <dd>[<em>optional</em>] Do not perform the namespace processing. </dd>
+     * </dl></dd>
+     * <dt>
+     * <code>"resource-resolver"</code></dt>
+     * <dd>[<em>required</em>] A reference to a <code>LSResourceResolver</code> object, or null. If 
+     * the value of this parameter is not null when an external resource 
+     * (such as an external XML entity or an XML schema location) is 
+     * encountered, the implementation will request that the 
+     * <code>LSResourceResolver</code> referenced in this parameter resolves 
+     * the resource. </dd>
+     * <dt><code>"supported-media-types-only"</code></dt>
+     * <dd>
+     * <dl>
+     * <dt>
+     * <code>true</code></dt>
+     * <dd>[<em>optional</em>] Check that the media type of the parsed resource is a supported media 
+     * type. If an unsupported media type is encountered, a fatal error of 
+     * type <b>"unsupported-media-type"</b> will be raised. The media types defined in [<a href='http://www.ietf.org/rfc/rfc3023.txt'>IETF RFC 3023</a>] must always 
+     * be accepted. </dd>
+     * <dt><code>false</code></dt>
+     * <dd>[<em>required</em>] (<em>default</em>) Accept any media type. </dd>
+     * </dl></dd>
+     * <dt><code>"validate"</code></dt>
+     * <dd> See the definition of 
+     * <code>DOMConfiguration</code> for a description of this parameter. 
+     * Unlike in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
+     * , the processing of the internal subset is always accomplished, even 
+     * if this parameter is set to <code>false</code>. </dd>
+     * <dt>
+     * <code>"validate-if-schema"</code></dt>
+     * <dd> See the definition of 
+     * <code>DOMConfiguration</code> for a description of this parameter. 
+     * Unlike in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
+     * , the processing of the internal subset is always accomplished, even 
+     * if this parameter is set to <code>false</code>. </dd>
+     * <dt>
+     * <code>"well-formed"</code></dt>
+     * <dd> See the definition of 
+     * <code>DOMConfiguration</code> for a description of this parameter. 
+     * Unlike in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
+     * , this parameter cannot be set to <code>false</code>. </dd>
+     * </dl>
+     */
+    public DOMConfiguration getDomConfig();
+
+    /**
+     *  When a filter is provided, the implementation will call out to the 
+     * filter as it is constructing the DOM tree structure. The filter can 
+     * choose to remove elements from the document being constructed, or to 
+     * terminate the parsing early. 
+     * <br> The filter is invoked after the operations requested by the 
+     * <code>DOMConfiguration</code> parameters have been applied. For 
+     * example, if "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-validate'>
+     * validate</a>" is set to <code>true</code>, the validation is done before invoking the 
+     * filter. 
+     */
+    public LSParserFilter getFilter();
+    /**
+     *  When a filter is provided, the implementation will call out to the 
+     * filter as it is constructing the DOM tree structure. The filter can 
+     * choose to remove elements from the document being constructed, or to 
+     * terminate the parsing early. 
+     * <br> The filter is invoked after the operations requested by the 
+     * <code>DOMConfiguration</code> parameters have been applied. For 
+     * example, if "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-validate'>
+     * validate</a>" is set to <code>true</code>, the validation is done before invoking the 
+     * filter. 
+     */
+    public void setFilter(LSParserFilter filter);
+
+    /**
+     *  <code>true</code> if the <code>LSParser</code> is asynchronous, 
+     * <code>false</code> if it is synchronous. 
+     */
+    public boolean getAsync();
+
+    /**
+     *  <code>true</code> if the <code>LSParser</code> is currently busy 
+     * loading a document, otherwise <code>false</code>. 
+     */
+    public boolean getBusy();
+
+    /**
+     * Parse an XML document from a resource identified by a 
+     * <code>LSInput</code>.
+     * @param input  The <code>LSInput</code> from which the source of the 
+     *   document is to be read. 
+     * @return  If the <code>LSParser</code> is a synchronous 
+     *   <code>LSParser</code>, the newly created and populated 
+     *   <code>Document</code> is returned. If the <code>LSParser</code> is 
+     *   asynchronous, <code>null</code> is returned since the document 
+     *   object may not yet be constructed when this method returns. 
+     * @exception DOMException
+     *    INVALID_STATE_ERR: Raised if the <code>LSParser</code>'s 
+     *   <code>LSParser.busy</code> attribute is <code>true</code>. 
+     * @exception LSException
+     *    PARSE_ERR: Raised if the <code>LSParser</code> was unable to load 
+     *   the XML document. DOM applications should attach a 
+     *   <code>DOMErrorHandler</code> using the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
+     *   error-handler</a>" if they wish to get details on the error. 
+     */
+    public Document parse(LSInput input)
+                          throws DOMException, LSException;
+
+    /**
+     *  Parse an XML document from a location identified by a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]. If the URI 
+     * contains a fragment identifier (see section 4.1 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]), the 
+     * behavior is not defined by this specification, future versions of 
+     * this specification may define the behavior. 
+     * @param uri The location of the XML document to be read.
+     * @return  If the <code>LSParser</code> is a synchronous 
+     *   <code>LSParser</code>, the newly created and populated 
+     *   <code>Document</code> is returned, or <code>null</code> if an error 
+     *   occured. If the <code>LSParser</code> is asynchronous, 
+     *   <code>null</code> is returned since the document object may not yet 
+     *   be constructed when this method returns. 
+     * @exception DOMException
+     *    INVALID_STATE_ERR: Raised if the <code>LSParser.busy</code> 
+     *   attribute is <code>true</code>. 
+     * @exception LSException
+     *    PARSE_ERR: Raised if the <code>LSParser</code> was unable to load 
+     *   the XML document. DOM applications should attach a 
+     *   <code>DOMErrorHandler</code> using the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
+     *   error-handler</a>" if they wish to get details on the error. 
+     */
+    public Document parseURI(String uri)
+                             throws DOMException, LSException;
+
+    // ACTION_TYPES
+    /**
+     *  Append the result of the parse operation as children of the context 
+     * node. For this action to work, the context node must be an 
+     * <code>Element</code> or a <code>DocumentFragment</code>. 
+     */
+    public static final short ACTION_APPEND_AS_CHILDREN = 1;
+    /**
+     *  Replace all the children of the context node with the result of the 
+     * parse operation. For this action to work, the context node must be an 
+     * <code>Element</code>, a <code>Document</code>, or a 
+     * <code>DocumentFragment</code>. 
+     */
+    public static final short ACTION_REPLACE_CHILDREN   = 2;
+    /**
+     *  Insert the result of the parse operation as the immediately preceding 
+     * sibling of the context node. For this action to work the context 
+     * node's parent must be an <code>Element</code> or a 
+     * <code>DocumentFragment</code>. 
+     */
+    public static final short ACTION_INSERT_BEFORE      = 3;
+    /**
+     *  Insert the result of the parse operation as the immediately following 
+     * sibling of the context node. For this action to work the context 
+     * node's parent must be an <code>Element</code> or a 
+     * <code>DocumentFragment</code>. 
+     */
+    public static final short ACTION_INSERT_AFTER       = 4;
+    /**
+     *  Replace the context node with the result of the parse operation. For 
+     * this action to work, the context node must have a parent, and the 
+     * parent must be an <code>Element</code> or a 
+     * <code>DocumentFragment</code>. 
+     */
+    public static final short ACTION_REPLACE            = 5;
+
+    /**
+     *  Parse an XML fragment from a resource identified by a 
+     * <code>LSInput</code> and insert the content into an existing document 
+     * at the position specified with the <code>context</code> and 
+     * <code>action</code> arguments. When parsing the input stream, the 
+     * context node (or its parent, depending on where the result will be 
+     * inserted) is used for resolving unbound namespace prefixes. The 
+     * context node's <code>ownerDocument</code> node (or the node itself if 
+     * the node of type <code>DOCUMENT_NODE</code>) is used to resolve 
+     * default attributes and entity references. 
+     * <br> As the new data is inserted into the document, at least one 
+     * mutation event is fired per new immediate child or sibling of the 
+     * context node. 
+     * <br> If the context node is a <code>Document</code> node and the action 
+     * is <code>ACTION_REPLACE_CHILDREN</code>, then the document that is 
+     * passed as the context node will be changed such that its 
+     * <code>xmlEncoding</code>, <code>documentURI</code>, 
+     * <code>xmlVersion</code>, <code>inputEncoding</code>, 
+     * <code>xmlStandalone</code>, and all other such attributes are set to 
+     * what they would be set to if the input source was parsed using 
+     * <code>LSParser.parse()</code>. 
+     * <br> This method is always synchronous, even if the 
+     * <code>LSParser</code> is asynchronous (<code>LSParser.async</code> is 
+     * <code>true</code>). 
+     * <br> If an error occurs while parsing, the caller is notified through 
+     * the <code>ErrorHandler</code> instance associated with the "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
+     * error-handler</a>" parameter of the <code>DOMConfiguration</code>. 
+     * <br> When calling <code>parseWithContext</code>, the values of the 
+     * following configuration parameters will be ignored and their default 
+     * values will always be used instead: "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-validate'>
+     * validate</a>", "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-validate-if-schema'>
+     * validate-if-schema</a>", and "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-element-content-whitespace'>
+     * element-content-whitespace</a>". Other parameters will be treated normally, and the parser is expected 
+     * to call the <code>LSParserFilter</code> just as if a whole document 
+     * was parsed. 
+     * @param input  The <code>LSInput</code> from which the source document 
+     *   is to be read. The source document must be an XML fragment, i.e. 
+     *   anything except a complete XML document (except in the case where 
+     *   the context node of type <code>DOCUMENT_NODE</code>, and the action 
+     *   is <code>ACTION_REPLACE_CHILDREN</code>), a DOCTYPE (internal 
+     *   subset), entity declaration(s), notation declaration(s), or XML or 
+     *   text declaration(s). 
+     * @param contextArg  The node that is used as the context for the data 
+     *   that is being parsed. This node must be a <code>Document</code> 
+     *   node, a <code>DocumentFragment</code> node, or a node of a type 
+     *   that is allowed as a child of an <code>Element</code> node, e.g. it 
+     *   cannot be an <code>Attribute</code> node. 
+     * @param action  This parameter describes which action should be taken 
+     *   between the new set of nodes being inserted and the existing 
+     *   children of the context node. The set of possible actions is 
+     *   defined in <code>ACTION_TYPES</code> above. 
+     * @return  Return the node that is the result of the parse operation. If 
+     *   the result is more than one top-level node, the first one is 
+     *   returned. 
+     * @exception DOMException
+     *   HIERARCHY_REQUEST_ERR: Raised if the content cannot replace, be 
+     *   inserted before, after, or as a child of the context node (see also 
+     *   <code>Node.insertBefore</code> or <code>Node.replaceChild</code> in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
+     *   ).
+     *   <br> NOT_SUPPORTED_ERR: Raised if the <code>LSParser</code> doesn't 
+     *   support this method, or if the context node is of type 
+     *   <code>Document</code> and the DOM implementation doesn't support 
+     *   the replacement of the <code>DocumentType</code> child or 
+     *   <code>Element</code> child. 
+     *   <br> NO_MODIFICATION_ALLOWED_ERR: Raised if the context node is a 
+     *   read only node and the content is being appended to its child list, 
+     *   or if the parent node of the context node is read only node and the 
+     *   content is being inserted in its child list.
+     *   <br> INVALID_STATE_ERR: Raised if the <code>LSParser.busy</code> 
+     *   attribute is <code>true</code>. 
+     * @exception LSException
+     *    PARSE_ERR: Raised if the <code>LSParser</code> was unable to load 
+     *   the XML fragment. DOM applications should attach a 
+     *   <code>DOMErrorHandler</code> using the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
+     *   error-handler</a>" if they wish to get details on the error. 
+     */
+    public Node parseWithContext(LSInput input, 
+                                 Node contextArg, 
+                                 short action)
+                                 throws DOMException, LSException;
+
+    /**
+     *  Abort the loading of the document that is currently being loaded by 
+     * the <code>LSParser</code>. If the <code>LSParser</code> is currently 
+     * not busy, a call to this method does nothing. 
+     */
+    public void abort();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/ls/LSParserFilter.java b/libjava/external/w3c_dom/org/w3c/dom/ls/LSParserFilter.java
new file mode 100644 (file)
index 0000000..4e61294
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/ls/LSParserFilter.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.ls;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.Element;
+
+/**
+ *  <code>LSParserFilter</code>s provide applications the ability to examine 
+ * nodes as they are being constructed while parsing. As each node is 
+ * examined, it may be modified or removed, or the entire parse may be 
+ * terminated early. 
+ * <p> At the time any of the filter methods are called by the parser, the 
+ * owner Document and DOMImplementation objects exist and are accessible. 
+ * The document element is never passed to the <code>LSParserFilter</code> 
+ * methods, i.e. it is not possible to filter out the document element. 
+ * <code>Document</code>, <code>DocumentType</code>, <code>Notation</code>, 
+ * <code>Entity</code>, and <code>Attr</code> nodes are never passed to the 
+ * <code>acceptNode</code> method on the filter. The child nodes of an 
+ * <code>EntityReference</code> node are passed to the filter if the 
+ * parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-entities'>
+ * entities</a>" is set to <code>false</code>. Note that, as described by the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-entities'>
+ * entities</a>", unexpanded entity reference nodes are never discarded and are always 
+ * passed to the filter. 
+ * <p> All validity checking while parsing a document occurs on the source 
+ * document as it appears on the input stream, not on the DOM document as it 
+ * is built in memory. With filters, the document in memory may be a subset 
+ * of the document on the stream, and its validity may have been affected by 
+ * the filtering. 
+ * <p> All default attributes must be present on elements when the elements 
+ * are passed to the filter methods. All other default content must be 
+ * passed to the filter methods. 
+ * <p> DOM applications must not raise exceptions in a filter. The effect of 
+ * throwing exceptions from a filter is DOM implementation dependent. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
+and Save Specification</a>.
+ */
+public interface LSParserFilter {
+    // Constants returned by startElement and acceptNode
+    /**
+     * Accept the node.
+     */
+    public static final short FILTER_ACCEPT             = 1;
+    /**
+     * Reject the node and its children.
+     */
+    public static final short FILTER_REJECT             = 2;
+    /**
+     * Skip this single node. The children of this node will still be 
+     * considered. 
+     */
+    public static final short FILTER_SKIP               = 3;
+    /**
+     *  Interrupt the normal processing of the document. 
+     */
+    public static final short FILTER_INTERRUPT          = 4;
+
+    /**
+     *  The parser will call this method after each <code>Element</code> start 
+     * tag has been scanned, but before the remainder of the 
+     * <code>Element</code> is processed. The intent is to allow the 
+     * element, including any children, to be efficiently skipped. Note that 
+     * only element nodes are passed to the <code>startElement</code> 
+     * function. 
+     * <br>The element node passed to <code>startElement</code> for filtering 
+     * will include all of the Element's attributes, but none of the 
+     * children nodes. The Element may not yet be in place in the document 
+     * being constructed (it may not have a parent node.) 
+     * <br>A <code>startElement</code> filter function may access or change 
+     * the attributes for the Element. Changing Namespace declarations will 
+     * have no effect on namespace resolution by the parser.
+     * <br>For efficiency, the Element node passed to the filter may not be 
+     * the same one as is actually placed in the tree if the node is 
+     * accepted. And the actual node (node object identity) may be reused 
+     * during the process of reading in and filtering a document.
+     * @param elementArg The newly encountered element. At the time this 
+     *   method is called, the element is incomplete - it will have its 
+     *   attributes, but no children. 
+     * @return 
+     * <ul>
+     * <li> <code>FILTER_ACCEPT</code> if the <code>Element</code> should 
+     *   be included in the DOM document being built. 
+     * </li>
+     * <li> 
+     *   <code>FILTER_REJECT</code> if the <code>Element</code> and all of 
+     *   its children should be rejected. 
+     * </li>
+     * <li> <code>FILTER_SKIP</code> if the 
+     *   <code>Element</code> should be skipped. All of its children are 
+     *   inserted in place of the skipped <code>Element</code> node. 
+     * </li>
+     * <li> 
+     *   <code>FILTER_INTERRUPT</code> if the filter wants to stop the 
+     *   processing of the document. Interrupting the processing of the 
+     *   document does no longer guarantee that the resulting DOM tree is 
+     *   XML well-formed. The <code>Element</code> is rejected. 
+     * </li>
+     * </ul> Returning 
+     *   any other values will result in unspecified behavior. 
+     */
+    public short startElement(Element elementArg);
+
+    /**
+     * This method will be called by the parser at the completion of the 
+     * parsing of each node. The node and all of its descendants will exist 
+     * and be complete. The parent node will also exist, although it may be 
+     * incomplete, i.e. it may have additional children that have not yet 
+     * been parsed. Attribute nodes are never passed to this function.
+     * <br>From within this method, the new node may be freely modified - 
+     * children may be added or removed, text nodes modified, etc. The state 
+     * of the rest of the document outside this node is not defined, and the 
+     * affect of any attempt to navigate to, or to modify any other part of 
+     * the document is undefined. 
+     * <br>For validating parsers, the checks are made on the original 
+     * document, before any modification by the filter. No validity checks 
+     * are made on any document modifications made by the filter.
+     * <br>If this new node is rejected, the parser might reuse the new node 
+     * and any of its descendants.
+     * @param nodeArg The newly constructed element. At the time this method 
+     *   is called, the element is complete - it has all of its children 
+     *   (and their children, recursively) and attributes, and is attached 
+     *   as a child to its parent. 
+     * @return 
+     * <ul>
+     * <li> <code>FILTER_ACCEPT</code> if this <code>Node</code> should 
+     *   be included in the DOM document being built. 
+     * </li>
+     * <li> 
+     *   <code>FILTER_REJECT</code> if the <code>Node</code> and all of its 
+     *   children should be rejected. 
+     * </li>
+     * <li> <code>FILTER_SKIP</code> if the 
+     *   <code>Node</code> should be skipped and the <code>Node</code> 
+     *   should be replaced by all the children of the <code>Node</code>. 
+     * </li>
+     * <li> 
+     *   <code>FILTER_INTERRUPT</code> if the filter wants to stop the 
+     *   processing of the document. Interrupting the processing of the 
+     *   document does no longer guarantee that the resulting DOM tree is 
+     *   XML well-formed. The <code>Node</code> is accepted and will be the 
+     *   last completely parsed node. 
+     * </li>
+     * </ul>
+     */
+    public short acceptNode(Node nodeArg);
+
+    /**
+     *  Tells the <code>LSParser</code> what types of nodes to show to the 
+     * method <code>LSParserFilter.acceptNode</code>. If a node is not shown 
+     * to the filter using this attribute, it is automatically included in 
+     * the DOM document being built. See <code>NodeFilter</code> for 
+     * definition of the constants. The constants <code>SHOW_ATTRIBUTE</code>
+     * , <code>SHOW_DOCUMENT</code>, <code>SHOW_DOCUMENT_TYPE</code>, 
+     * <code>SHOW_NOTATION</code>, <code>SHOW_ENTITY</code>, and 
+     * <code>SHOW_DOCUMENT_FRAGMENT</code> are meaningless here. Those nodes 
+     * will never be passed to <code>LSParserFilter.acceptNode</code>. 
+     * <br> The constants used here are defined in [<a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>DOM Level 2 Traversal and      Range</a>]
+     * . 
+     */
+    public int getWhatToShow();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/ls/LSProgressEvent.java b/libjava/external/w3c_dom/org/w3c/dom/ls/LSProgressEvent.java
new file mode 100644 (file)
index 0000000..da98e14
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/ls/LSProgressEvent.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.ls;
+
+import org.w3c.dom.events.Event;
+
+/**
+ *  This interface represents a progress event object that notifies the 
+ * application about progress as a document is parsed. It extends the 
+ * <code>Event</code> interface defined in [<a href='http://www.w3.org/TR/2003/NOTE-DOM-Level-3-Events-20031107'>DOM Level 3 Events</a>]
+ * . 
+ * <p> The units used for the attributes <code>position</code> and 
+ * <code>totalSize</code> are not specified and can be implementation and 
+ * input dependent. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
+and Save Specification</a>.
+ */
+public interface LSProgressEvent extends Event {
+    /**
+     * The input source that is being parsed.
+     */
+    public LSInput getInput();
+
+    /**
+     * The current position in the input source, including all external 
+     * entities and other resources that have been read.
+     */
+    public int getPosition();
+
+    /**
+     * The total size of the document including all external resources, this 
+     * number might change as a document is being parsed if references to 
+     * more external resources are seen. A value of <code>0</code> is 
+     * returned if the total size cannot be determined or estimated.
+     */
+    public int getTotalSize();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/ls/LSResourceResolver.java b/libjava/external/w3c_dom/org/w3c/dom/ls/LSResourceResolver.java
new file mode 100644 (file)
index 0000000..c0c523c
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/ls/LSResourceResolver.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.ls;
+
+/**
+ *  <code>LSResourceResolver</code> provides a way for applications to 
+ * redirect references to external resources. 
+ * <p> Applications needing to implement custom handling for external 
+ * resources can implement this interface and register their implementation 
+ * by setting the "resource-resolver" parameter of 
+ * <code>DOMConfiguration</code> objects attached to <code>LSParser</code> 
+ * and <code>LSSerializer</code>. It can also be register on 
+ * <code>DOMConfiguration</code> objects attached to <code>Document</code> 
+ * if the "LS" feature is supported. 
+ * <p> The <code>LSParser</code> will then allow the application to intercept 
+ * any external entities, including the external DTD subset and external 
+ * parameter entities, before including them. The top-level document entity 
+ * is never passed to the <code>resolveResource</code> method. 
+ * <p> Many DOM applications will not need to implement this interface, but it 
+ * will be especially useful for applications that build XML documents from 
+ * databases or other specialized input sources, or for applications that 
+ * use URNs. 
+ * <p ><b>Note:</b>  <code>LSResourceResolver</code> is based on the SAX2 [<a href='http://www.saxproject.org/'>SAX</a>] <code>EntityResolver</code> 
+ * interface. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
+and Save Specification</a>.
+ */
+public interface LSResourceResolver {
+    /**
+     *  Allow the application to resolve external resources. 
+     * <br> The <code>LSParser</code> will call this method before opening any 
+     * external resource, including the external DTD subset, external 
+     * entities referenced within the DTD, and external entities referenced 
+     * within the document element (however, the top-level document entity 
+     * is not passed to this method). The application may then request that 
+     * the <code>LSParser</code> resolve the external resource itself, that 
+     * it use an alternative URI, or that it use an entirely different input 
+     * source. 
+     * <br> Application writers can use this method to redirect external 
+     * system identifiers to secure and/or local URI, to look up public 
+     * identifiers in a catalogue, or to read an entity from a database or 
+     * other input source (including, for example, a dialog box). 
+     * @param type  The type of the resource being resolved. For XML [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] resources 
+     *   (i.e. entities), applications must use the value 
+     *   <code>"http://www.w3.org/TR/REC-xml"</code>. For XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
+     *   , applications must use the value 
+     *   <code>"http://www.w3.org/2001/XMLSchema"</code>. Other types of 
+     *   resources are outside the scope of this specification and therefore 
+     *   should recommend an absolute URI in order to use this method. 
+     * @param namespaceURI  The namespace of the resource being resolved, 
+     *   e.g. the target namespace of the XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
+     *    when resolving XML Schema resources. 
+     * @param publicId  The public identifier of the external entity being 
+     *   referenced, or <code>null</code> if no public identifier was 
+     *   supplied or if the resource is not an entity. 
+     * @param systemId  The system identifier, a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>], of the 
+     *   external resource being referenced, or <code>null</code> if no 
+     *   system identifier was supplied. 
+     * @param baseURI  The absolute base URI of the resource being parsed, or 
+     *   <code>null</code> if there is no base URI. 
+     * @return  A <code>LSInput</code> object describing the new input 
+     *   source, or <code>null</code> to request that the parser open a 
+     *   regular URI connection to the resource. 
+     */
+    public LSInput resolveResource(String type, 
+                                   String namespaceURI, 
+                                   String publicId, 
+                                   String systemId, 
+                                   String baseURI);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/ls/LSSerializer.java b/libjava/external/w3c_dom/org/w3c/dom/ls/LSSerializer.java
new file mode 100644 (file)
index 0000000..e7b6350
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/ls/LSSerializer.java
@@ -0,0 +1,436 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.ls;
+
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.Node;
+import org.w3c.dom.DOMException;
+
+/**
+ *  A <code>LSSerializer</code> provides an API for serializing (writing) a 
+ * DOM document out into XML. The XML data is written to a string or an 
+ * output stream. Any changes or fixups made during the serialization affect 
+ * only the serialized data. The <code>Document</code> object and its 
+ * children are never altered by the serialization operation. 
+ * <p> During serialization of XML data, namespace fixup is done as defined in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
+ * , Appendix B. [<a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>DOM Level 2 Core</a>]
+ *  allows empty strings as a real namespace URI. If the 
+ * <code>namespaceURI</code> of a <code>Node</code> is empty string, the 
+ * serialization will treat them as <code>null</code>, ignoring the prefix 
+ * if any. 
+ * <p> <code>LSSerializer</code> accepts any node type for serialization. For 
+ * nodes of type <code>Document</code> or <code>Entity</code>, well-formed 
+ * XML will be created when possible (well-formedness is guaranteed if the 
+ * document or entity comes from a parse operation and is unchanged since it 
+ * was created). The serialized output for these node types is either as a 
+ * XML document or an External XML Entity, respectively, and is acceptable 
+ * input for an XML parser. For all other types of nodes the serialized form 
+ * is implementation dependent. 
+ * <p>Within a <code>Document</code>, <code>DocumentFragment</code>, or 
+ * <code>Entity</code> being serialized, <code>Nodes</code> are processed as 
+ * follows
+ * <ul>
+ * <li> <code>Document</code> nodes are written, including the XML 
+ * declaration (unless the parameter "xml-declaration" is set to 
+ * <code>false</code>) and a DTD subset, if one exists in the DOM. Writing a 
+ * <code>Document</code> node serializes the entire document. 
+ * </li>
+ * <li> 
+ * <code>Entity</code> nodes, when written directly by 
+ * <code>LSSerializer.write</code>, outputs the entity expansion but no 
+ * namespace fixup is done. The resulting output will be valid as an 
+ * external entity. 
+ * </li>
+ * <li> If the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-entities'>
+ * entities</a>" is set to <code>true</code>, <code>EntityReference</code> nodes are 
+ * serialized as an entity reference of the form "
+ * <code>&amp;entityName;</code>" in the output. Child nodes (the expansion) 
+ * of the entity reference are ignored. If the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-entities'>
+ * entities</a>" is set to <code>false</code>, only the children of the entity reference 
+ * are serialized. <code>EntityReference</code> nodes with no children (no 
+ * corresponding <code>Entity</code> node or the corresponding 
+ * <code>Entity</code> nodes have no children) are always serialized. 
+ * </li>
+ * <li> 
+ * <code>CDATAsections</code> containing content characters that cannot be 
+ * represented in the specified output encoding are handled according to the 
+ * "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-split-cdata-sections'>
+ * split-cdata-sections</a>" parameter.  If the parameter is set to <code>true</code>, 
+ * <code>CDATAsections</code> are split, and the unrepresentable characters 
+ * are serialized as numeric character references in ordinary content. The 
+ * exact position and number of splits is not specified.  If the parameter 
+ * is set to <code>false</code>, unrepresentable characters in a 
+ * <code>CDATAsection</code> are reported as 
+ * <code>"wf-invalid-character"</code> errors if the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-well-formed'>
+ * well-formed</a>" is set to <code>true</code>. The error is not recoverable - there is no 
+ * mechanism for supplying alternative characters and continuing with the 
+ * serialization. 
+ * </li>
+ * <li> <code>DocumentFragment</code> nodes are serialized by 
+ * serializing the children of the document fragment in the order they 
+ * appear in the document fragment. 
+ * </li>
+ * <li> All other node types (Element, Text, 
+ * etc.) are serialized to their corresponding XML source form. 
+ * </li>
+ * </ul>
+ * <p ><b>Note:</b>  The serialization of a <code>Node</code> does not always 
+ * generate a well-formed XML document, i.e. a <code>LSParser</code> might 
+ * throw fatal errors when parsing the resulting serialization. 
+ * <p> Within the character data of a document (outside of markup), any 
+ * characters that cannot be represented directly are replaced with 
+ * character references. Occurrences of '&lt;' and '&amp;' are replaced by 
+ * the predefined entities &amp;lt; and &amp;amp;. The other predefined 
+ * entities (&amp;gt;, &amp;apos;, and &amp;quot;) might not be used, except 
+ * where needed (e.g. using &amp;gt; in cases such as ']]&gt;'). Any 
+ * characters that cannot be represented directly in the output character 
+ * encoding are serialized as numeric character references (and since 
+ * character encoding standards commonly use hexadecimal representations of 
+ * characters, using the hexadecimal representation when serializing 
+ * character references is encouraged). 
+ * <p> To allow attribute values to contain both single and double quotes, the 
+ * apostrophe or single-quote character (') may be represented as 
+ * "&amp;apos;", and the double-quote character (")  as "&amp;quot;". New 
+ * line characters and other characters that cannot be represented directly 
+ * in attribute values in the output character encoding are serialized as a 
+ * numeric character reference. 
+ * <p> Within markup, but outside of attributes, any occurrence of a character 
+ * that cannot be represented in the output character encoding is reported 
+ * as a <code>DOMError</code> fatal error. An example would be serializing 
+ * the element &lt;LaCa\u00f1ada/&gt; with <code>encoding="us-ascii"</code>. 
+ * This will result with a generation of a <code>DOMError</code> 
+ * "wf-invalid-character-in-node-name" (as proposed in "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-well-formed'>
+ * well-formed</a>"). 
+ * <p> When requested by setting the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-normalize-characters'>
+ * normalize-characters</a>" on <code>LSSerializer</code> to true, character normalization is 
+ * performed according to the definition of <a href='http://www.w3.org/TR/2004/REC-xml11-20040204/#dt-fullnorm'>fully 
+ * normalized</a> characters included in appendix E of [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>] on all 
+ * data to be serialized, both markup and character data. The character 
+ * normalization process affects only the data as it is being written; it 
+ * does not alter the DOM's view of the document after serialization has 
+ * completed. 
+ * <p> Implementations are required to support the encodings "UTF-8", 
+ * "UTF-16", "UTF-16BE", and "UTF-16LE" to guarantee that data is 
+ * serializable in all encodings that are required to be supported by all 
+ * XML parsers. When the encoding is UTF-8, whether or not a byte order mark 
+ * is serialized, or if the output is big-endian or little-endian, is 
+ * implementation dependent. When the encoding is UTF-16, whether or not the 
+ * output is big-endian or little-endian is implementation dependent, but a 
+ * Byte Order Mark must be generated for non-character outputs, such as 
+ * <code>LSOutput.byteStream</code> or <code>LSOutput.systemId</code>. If 
+ * the Byte Order Mark is not generated, a "byte-order-mark-needed" warning 
+ * is reported. When the encoding is UTF-16LE or UTF-16BE, the output is 
+ * big-endian (UTF-16BE) or little-endian (UTF-16LE) and the Byte Order Mark 
+ * is not be generated. In all cases, the encoding declaration, if 
+ * generated, will correspond to the encoding used during the serialization 
+ * (e.g. <code>encoding="UTF-16"</code> will appear if UTF-16 was 
+ * requested). 
+ * <p> Namespaces are fixed up during serialization, the serialization process 
+ * will verify that namespace declarations, namespace prefixes and the 
+ * namespace URI associated with elements and attributes are consistent. If 
+ * inconsistencies are found, the serialized form of the document will be 
+ * altered to remove them. The method used for doing the namespace fixup 
+ * while serializing a document is the algorithm defined in Appendix B.1, 
+ * "Namespace normalization", of [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
+ * . 
+ * <p> While serializing a document, the parameter "discard-default-content" 
+ * controls whether or not non-specified data is serialized. 
+ * <p> While serializing, errors and warnings are reported to the application 
+ * through the error handler (<code>LSSerializer.domConfig</code>'s "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
+ * error-handler</a>" parameter). This specification does in no way try to define all possible 
+ * errors and warnings that can occur while serializing a DOM node, but some 
+ * common error and warning cases are defined. The types (
+ * <code>DOMError.type</code>) of errors and warnings defined by this 
+ * specification are: 
+ * <dl>
+ * <dt><code>"no-output-specified" [fatal]</code></dt>
+ * <dd> Raised when 
+ * writing to a <code>LSOutput</code> if no output is specified in the 
+ * <code>LSOutput</code>. </dd>
+ * <dt> 
+ * <code>"unbound-prefix-in-entity-reference" [fatal]</code> </dt>
+ * <dd> Raised if the 
+ * configuration parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-namespaces'>
+ * namespaces</a>" is set to <code>true</code> and an entity whose replacement text 
+ * contains unbound namespace prefixes is referenced in a location where 
+ * there are no bindings for the namespace prefixes. </dd>
+ * <dt>
+ * <code>"unsupported-encoding" [fatal]</code></dt>
+ * <dd> Raised if an unsupported 
+ * encoding is encountered. </dd>
+ * </dl> 
+ * <p> In addition to raising the defined errors and warnings, implementations 
+ * are expected to raise implementation specific errors and warnings for any 
+ * other error and warning cases such as IO errors (file not found, 
+ * permission denied,...) and so on. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
+and Save Specification</a>.
+ */
+public interface LSSerializer {
+    /**
+     *  The <code>DOMConfiguration</code> object used by the 
+     * <code>LSSerializer</code> when serializing a DOM node. 
+     * <br> In addition to the parameters recognized by the <a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#DOMConfiguration'>
+     * DOMConfiguration</a> interface defined in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
+     * , the <code>DOMConfiguration</code> objects for 
+     * <code>LSSerializer</code> adds, or modifies, the following 
+     * parameters: 
+     * <dl>
+     * <dt><code>"canonical-form"</code></dt>
+     * <dd>
+     * <dl>
+     * <dt><code>true</code></dt>
+     * <dd>[<em>optional</em>] Writes the document according to the rules specified in [<a href='http://www.w3.org/TR/2001/REC-xml-c14n-20010315'>Canonical XML</a>]. 
+     * In addition to the behavior described in "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-canonical-form'>
+     * canonical-form</a>" [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
+     * , setting this parameter to <code>true</code> will set the parameters 
+     * "format-pretty-print", "discard-default-content", and "xml-declaration
+     * ", to <code>false</code>. Setting one of those parameters to 
+     * <code>true</code> will set this parameter to <code>false</code>. 
+     * Serializing an XML 1.1 document when "canonical-form" is 
+     * <code>true</code> will generate a fatal error. </dd>
+     * <dt><code>false</code></dt>
+     * <dd>[<em>required</em>] (<em>default</em>) Do not canonicalize the output. </dd>
+     * </dl></dd>
+     * <dt><code>"discard-default-content"</code></dt>
+     * <dd>
+     * <dl>
+     * <dt>
+     * <code>true</code></dt>
+     * <dd>[<em>required</em>] (<em>default</em>) Use the <code>Attr.specified</code> attribute to decide what attributes 
+     * should be discarded. Note that some implementations might use 
+     * whatever information available to the implementation (i.e. XML 
+     * schema, DTD, the <code>Attr.specified</code> attribute, and so on) to 
+     * determine what attributes and content to discard if this parameter is 
+     * set to <code>true</code>. </dd>
+     * <dt><code>false</code></dt>
+     * <dd>[<em>required</em>]Keep all attributes and all content.</dd>
+     * </dl></dd>
+     * <dt><code>"format-pretty-print"</code></dt>
+     * <dd>
+     * <dl>
+     * <dt>
+     * <code>true</code></dt>
+     * <dd>[<em>optional</em>] Formatting the output by adding whitespace to produce a pretty-printed, 
+     * indented, human-readable form. The exact form of the transformations 
+     * is not specified by this specification. Pretty-printing changes the 
+     * content of the document and may affect the validity of the document, 
+     * validating implementations should preserve validity. </dd>
+     * <dt>
+     * <code>false</code></dt>
+     * <dd>[<em>required</em>] (<em>default</em>) Don't pretty-print the result. </dd>
+     * </dl></dd>
+     * <dt> 
+     * <code>"ignore-unknown-character-denormalizations"</code> </dt>
+     * <dd>
+     * <dl>
+     * <dt>
+     * <code>true</code></dt>
+     * <dd>[<em>required</em>] (<em>default</em>) If, while verifying full normalization when [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>] is 
+     * supported, a character is encountered for which the normalization 
+     * properties cannot be determined, then raise a 
+     * <code>"unknown-character-denormalization"</code> warning (instead of 
+     * raising an error, if this parameter is not set) and ignore any 
+     * possible denormalizations caused by these characters. </dd>
+     * <dt>
+     * <code>false</code></dt>
+     * <dd>[<em>optional</em>] Report a fatal error if a character is encountered for which the 
+     * processor cannot determine the normalization properties. </dd>
+     * </dl></dd>
+     * <dt>
+     * <code>"normalize-characters"</code></dt>
+     * <dd> This parameter is equivalent to 
+     * the one defined by <code>DOMConfiguration</code> in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
+     * . Unlike in the Core, the default value for this parameter is 
+     * <code>true</code>. While DOM implementations are not required to 
+     * support <a href='http://www.w3.org/TR/2004/REC-xml11-20040204/#dt-fullnorm'>fully 
+     * normalizing</a> the characters in the document according to appendix E of [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>], this 
+     * parameter must be activated by default if supported. </dd>
+     * <dt>
+     * <code>"xml-declaration"</code></dt>
+     * <dd>
+     * <dl>
+     * <dt><code>true</code></dt>
+     * <dd>[<em>required</em>] (<em>default</em>) If a <code>Document</code>, <code>Element</code>, or <code>Entity</code>
+     *  node is serialized, the XML declaration, or text declaration, should 
+     * be included. The version (<code>Document.xmlVersion</code> if the 
+     * document is a Level 3 document and the version is non-null, otherwise 
+     * use the value "1.0"), and the output encoding (see 
+     * <code>LSSerializer.write</code> for details on how to find the output 
+     * encoding) are specified in the serialized XML declaration. </dd>
+     * <dt>
+     * <code>false</code></dt>
+     * <dd>[<em>required</em>] Do not serialize the XML and text declarations. Report a 
+     * <code>"xml-declaration-needed"</code> warning if this will cause 
+     * problems (i.e. the serialized data is of an XML version other than [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>], or an 
+     * encoding would be needed to be able to re-parse the serialized data). </dd>
+     * </dl></dd>
+     * </dl>
+     */
+    public DOMConfiguration getDomConfig();
+
+    /**
+     *  The end-of-line sequence of characters to be used in the XML being 
+     * written out. Any string is supported, but XML treats only a certain 
+     * set of characters sequence as end-of-line (See section 2.11, 
+     * "End-of-Line Handling" in [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>], if the 
+     * serialized content is XML 1.0 or section 2.11, "End-of-Line Handling" 
+     * in [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>], if the 
+     * serialized content is XML 1.1). Using other character sequences than 
+     * the recommended ones can result in a document that is either not 
+     * serializable or not well-formed). 
+     * <br> On retrieval, the default value of this attribute is the 
+     * implementation specific default end-of-line sequence. DOM 
+     * implementations should choose the default to match the usual 
+     * convention for text files in the environment being used. 
+     * Implementations must choose a default sequence that matches one of 
+     * those allowed by XML 1.0 or XML 1.1, depending on the serialized 
+     * content. Setting this attribute to <code>null</code> will reset its 
+     * value to the default value. 
+     * <br> 
+     */
+    public String getNewLine();
+    /**
+     *  The end-of-line sequence of characters to be used in the XML being 
+     * written out. Any string is supported, but XML treats only a certain 
+     * set of characters sequence as end-of-line (See section 2.11, 
+     * "End-of-Line Handling" in [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>], if the 
+     * serialized content is XML 1.0 or section 2.11, "End-of-Line Handling" 
+     * in [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>], if the 
+     * serialized content is XML 1.1). Using other character sequences than 
+     * the recommended ones can result in a document that is either not 
+     * serializable or not well-formed). 
+     * <br> On retrieval, the default value of this attribute is the 
+     * implementation specific default end-of-line sequence. DOM 
+     * implementations should choose the default to match the usual 
+     * convention for text files in the environment being used. 
+     * Implementations must choose a default sequence that matches one of 
+     * those allowed by XML 1.0 or XML 1.1, depending on the serialized 
+     * content. Setting this attribute to <code>null</code> will reset its 
+     * value to the default value. 
+     * <br> 
+     */
+    public void setNewLine(String newLine);
+
+    /**
+     *  When the application provides a filter, the serializer will call out 
+     * to the filter before serializing each Node. The filter implementation 
+     * can choose to remove the node from the stream or to terminate the 
+     * serialization early. 
+     * <br> The filter is invoked after the operations requested by the 
+     * <code>DOMConfiguration</code> parameters have been applied. For 
+     * example, CDATA sections won't be passed to the filter if "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-cdata-sections'>
+     * cdata-sections</a>" is set to <code>false</code>. 
+     */
+    public LSSerializerFilter getFilter();
+    /**
+     *  When the application provides a filter, the serializer will call out 
+     * to the filter before serializing each Node. The filter implementation 
+     * can choose to remove the node from the stream or to terminate the 
+     * serialization early. 
+     * <br> The filter is invoked after the operations requested by the 
+     * <code>DOMConfiguration</code> parameters have been applied. For 
+     * example, CDATA sections won't be passed to the filter if "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-cdata-sections'>
+     * cdata-sections</a>" is set to <code>false</code>. 
+     */
+    public void setFilter(LSSerializerFilter filter);
+
+    /**
+     *  Serialize the specified node as described above in the general 
+     * description of the <code>LSSerializer</code> interface. The output is 
+     * written to the supplied <code>LSOutput</code>. 
+     * <br> When writing to a <code>LSOutput</code>, the encoding is found by 
+     * looking at the encoding information that is reachable through the 
+     * <code>LSOutput</code> and the item to be written (or its owner 
+     * document) in this order: 
+     * <ol>
+     * <li> <code>LSOutput.encoding</code>, 
+     * </li>
+     * <li> 
+     * <code>Document.inputEncoding</code>, 
+     * </li>
+     * <li> 
+     * <code>Document.xmlEncoding</code>. 
+     * </li>
+     * </ol>
+     * <br> If no encoding is reachable through the above properties, a 
+     * default encoding of "UTF-8" will be used. If the specified encoding 
+     * is not supported an "unsupported-encoding" fatal error is raised. 
+     * <br> If no output is specified in the <code>LSOutput</code>, a 
+     * "no-output-specified" fatal error is raised. 
+     * <br> The implementation is responsible of associating the appropriate 
+     * media type with the serialized data. 
+     * <br> When writing to a HTTP URI, a HTTP PUT is performed. When writing 
+     * to other types of URIs, the mechanism for writing the data to the URI 
+     * is implementation dependent. 
+     * @param nodeArg  The node to serialize. 
+     * @param destination The destination for the serialized DOM.
+     * @return  Returns <code>true</code> if <code>node</code> was 
+     *   successfully serialized. Return <code>false</code> in case the 
+     *   normal processing stopped but the implementation kept serializing 
+     *   the document; the result of the serialization being implementation 
+     *   dependent then. 
+     * @exception LSException
+     *    SERIALIZE_ERR: Raised if the <code>LSSerializer</code> was unable to 
+     *   serialize the node. DOM applications should attach a 
+     *   <code>DOMErrorHandler</code> using the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
+     *   error-handler</a>" if they wish to get details on the error. 
+     */
+    public boolean write(Node nodeArg, 
+                         LSOutput destination)
+                         throws LSException;
+
+    /**
+     *  A convenience method that acts as if <code>LSSerializer.write</code> 
+     * was called with a <code>LSOutput</code> with no encoding specified 
+     * and <code>LSOutput.systemId</code> set to the <code>uri</code> 
+     * argument. 
+     * @param nodeArg  The node to serialize. 
+     * @param uri The URI to write to.
+     * @return  Returns <code>true</code> if <code>node</code> was 
+     *   successfully serialized. Return <code>false</code> in case the 
+     *   normal processing stopped but the implementation kept serializing 
+     *   the document; the result of the serialization being implementation 
+     *   dependent then. 
+     * @exception LSException
+     *    SERIALIZE_ERR: Raised if the <code>LSSerializer</code> was unable to 
+     *   serialize the node. DOM applications should attach a 
+     *   <code>DOMErrorHandler</code> using the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
+     *   error-handler</a>" if they wish to get details on the error. 
+     */
+    public boolean writeToURI(Node nodeArg, 
+                              String uri)
+                              throws LSException;
+
+    /**
+     *  Serialize the specified node as described above in the general 
+     * description of the <code>LSSerializer</code> interface. The output is 
+     * written to a <code>DOMString</code> that is returned to the caller. 
+     * The encoding used is the encoding of the <code>DOMString</code> type, 
+     * i.e. UTF-16. Note that no Byte Order Mark is generated in a 
+     * <code>DOMString</code> object. 
+     * @param nodeArg  The node to serialize. 
+     * @return  Returns the serialized data. 
+     * @exception DOMException
+     *    DOMSTRING_SIZE_ERR: Raised if the resulting string is too long to 
+     *   fit in a <code>DOMString</code>. 
+     * @exception LSException
+     *    SERIALIZE_ERR: Raised if the <code>LSSerializer</code> was unable to 
+     *   serialize the node. DOM applications should attach a 
+     *   <code>DOMErrorHandler</code> using the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
+     *   error-handler</a>" if they wish to get details on the error. 
+     */
+    public String writeToString(Node nodeArg)
+                                throws DOMException, LSException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/ls/LSSerializerFilter.java b/libjava/external/w3c_dom/org/w3c/dom/ls/LSSerializerFilter.java
new file mode 100644 (file)
index 0000000..049459c
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/ls/LSSerializerFilter.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.ls;
+
+import org.w3c.dom.traversal.NodeFilter;
+
+/**
+ *  <code>LSSerializerFilter</code>s provide applications the ability to 
+ * examine nodes as they are being serialized and decide what nodes should 
+ * be serialized or not. The <code>LSSerializerFilter</code> interface is 
+ * based on the <code>NodeFilter</code> interface defined in [<a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>DOM Level 2 Traversal and      Range</a>]
+ * . 
+ * <p> <code>Document</code>, <code>DocumentType</code>, 
+ * <code>DocumentFragment</code>, <code>Notation</code>, <code>Entity</code>
+ * , and children of <code>Attr</code> nodes are not passed to the filter. 
+ * The child nodes of an <code>EntityReference</code> node are only passed 
+ * to the filter if the <code>EntityReference</code> node is skipped by the 
+ * method <code>LSParserFilter.acceptNode()</code>. 
+ * <p> When serializing an <code>Element</code>, the element is passed to the 
+ * filter before any of its attributes are passed to the filter. Namespace 
+ * declaration attributes, and default attributes (except in the case when "
+ * discard-default-content" is set to <code>false</code>), are never passed 
+ * to the filter. 
+ * <p> The result of any attempt to modify a node passed to a 
+ * <code>LSSerializerFilter</code> is implementation dependent. 
+ * <p> DOM applications must not raise exceptions in a filter. The effect of 
+ * throwing exceptions from a filter is DOM implementation dependent. 
+ * <p> For efficiency, a node passed to the filter may not be the same as the 
+ * one that is actually in the tree. And the actual node (node object 
+ * identity) may be reused during the process of filtering and serializing a 
+ * document. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
+and Save Specification</a>.
+ */
+public interface LSSerializerFilter extends NodeFilter {
+    /**
+     *  Tells the <code>LSSerializer</code> what types of nodes to show to the 
+     * filter. If a node is not shown to the filter using this attribute, it 
+     * is automatically serialized. See <code>NodeFilter</code> for 
+     * definition of the constants. The constants <code>SHOW_DOCUMENT</code>
+     * , <code>SHOW_DOCUMENT_TYPE</code>, <code>SHOW_DOCUMENT_FRAGMENT</code>
+     * , <code>SHOW_NOTATION</code>, and <code>SHOW_ENTITY</code> are 
+     * meaningless here, such nodes will never be passed to a 
+     * <code>LSSerializerFilter</code>. 
+     * <br> Unlike [<a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>DOM Level 2 Traversal and      Range</a>]
+     * , the <code>SHOW_ATTRIBUTE</code> constant indicates that the 
+     * <code>Attr</code> nodes are shown and passed to the filter. 
+     * <br> The constants used here are defined in [<a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>DOM Level 2 Traversal and      Range</a>]
+     * . 
+     */
+    public int getWhatToShow();
+
+}
diff --git a/libjava/org/w3c/dom/ranges/DocumentRange.java b/libjava/external/w3c_dom/org/w3c/dom/ranges/DocumentRange.java
similarity index 97%
rename from libjava/org/w3c/dom/ranges/DocumentRange.java
rename to libjava/external/w3c_dom/org/w3c/dom/ranges/DocumentRange.java
index f9b764f..6b52267 100644 (file)
--- a/libjava/org/w3c/dom/ranges/DocumentRange.java
+++ b/libjava/external/w3c_dom/org/w3c/dom/ranges/DocumentRange.java
@@ -1,33 +1,33 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom.ranges;\r
-\r
-/**\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document Object Model (DOM) Level 2 Traversal and Range Specification</a>.\r
- * @since DOM Level 2\r
- */\r
-public interface DocumentRange {\r
-    /**\r
-     * This interface can be obtained from the object implementing the \r
-     * <code>Document</code> interface using binding-specific casting \r
-     * methods.\r
-     * @return The initial state of the Range returned from this method is \r
-     *   such that both of its boundary-points are positioned at the \r
-     *   beginning of the corresponding Document, before any content. The \r
-     *   Range returned can only be used to select content associated with \r
-     *   this Document, or with DocumentFragments and Attrs for which this \r
-     *   Document is the <code>ownerDocument</code>.\r
-     */\r
-    public Range createRange();\r
-\r
-}\r
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.ranges;
+
+/**
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document Object Model (DOM) Level 2 Traversal and Range Specification</a>.
+ * @since DOM Level 2
+ */
+public interface DocumentRange {
+    /**
+     * This interface can be obtained from the object implementing the 
+     * <code>Document</code> interface using binding-specific casting 
+     * methods.
+     * @return The initial state of the Range returned from this method is 
+     *   such that both of its boundary-points are positioned at the 
+     *   beginning of the corresponding Document, before any content. The 
+     *   Range returned can only be used to select content associated with 
+     *   this Document, or with DocumentFragments and Attrs for which this 
+     *   Document is the <code>ownerDocument</code>.
+     */
+    public Range createRange();
+
+}
diff --git a/libjava/org/w3c/dom/ranges/Range.java b/libjava/external/w3c_dom/org/w3c/dom/ranges/Range.java
similarity index 88%
rename from libjava/org/w3c/dom/ranges/Range.java
rename to libjava/external/w3c_dom/org/w3c/dom/ranges/Range.java
index f4c3608..a576b4d 100644 (file)
--- a/libjava/org/w3c/dom/ranges/Range.java
+++ b/libjava/external/w3c_dom/org/w3c/dom/ranges/Range.java
@@ -1,399 +1,416 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom.ranges;\r
-\r
-import org.w3c.dom.Node;\r
-import org.w3c.dom.DocumentFragment;\r
-import org.w3c.dom.DOMException;\r
-\r
-/**\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document Object Model (DOM) Level 2 Traversal and Range Specification</a>.\r
- * @since DOM Level 2\r
- */\r
-public interface Range {\r
-    /**\r
-     * Node within which the Range begins \r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been \r
-     *   invoked on this object.\r
-     */\r
-    public Node getStartContainer()\r
-                       throws DOMException;\r
-\r
-    /**\r
-     * Offset within the starting node of the Range. \r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been \r
-     *   invoked on this object.\r
-     */\r
-    public int getStartOffset()\r
-                       throws DOMException;\r
-\r
-    /**\r
-     * Node within which the Range ends \r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been \r
-     *   invoked on this object.\r
-     */\r
-    public Node getEndContainer()\r
-                       throws DOMException;\r
-\r
-    /**\r
-     * Offset within the ending node of the Range. \r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been \r
-     *   invoked on this object.\r
-     */\r
-    public int getEndOffset()\r
-                       throws DOMException;\r
-\r
-    /**\r
-     * TRUE if the Range is collapsed \r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been \r
-     *   invoked on this object.\r
-     */\r
-    public boolean getCollapsed()\r
-                       throws DOMException;\r
-\r
-    /**\r
-     * The deepest common ancestor container of the Range's two \r
-     * boundary-points.\r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been \r
-     *   invoked on this object.\r
-     */\r
-    public Node getCommonAncestorContainer()\r
-                       throws DOMException;\r
-\r
-    /**\r
-     * Sets the attributes describing the start of the Range. \r
-     * @param refNodeThe <code>refNode</code> value. This parameter must be \r
-     *   different from <code>null</code>.\r
-     * @param offsetThe <code>startOffset</code> value. \r
-     * @exception RangeException\r
-     *   INVALID_NODE_TYPE_ERR: Raised if <code>refNode</code> or an ancestor \r
-     *   of <code>refNode</code> is an Entity, Notation, or DocumentType \r
-     *   node.\r
-     * @exception DOMException\r
-     *   INDEX_SIZE_ERR: Raised if <code>offset</code> is negative or greater \r
-     *   than the number of child units in <code>refNode</code>. Child units \r
-     *   are 16-bit units if <code>refNode</code> is a type of CharacterData \r
-     *   node (e.g., a Text or Comment node) or a ProcessingInstruction \r
-     *   node. Child units are Nodes in all other cases.\r
-     *   <br>INVALID_STATE_ERR: Raised if <code>detach()</code> has already \r
-     *   been invoked on this object.\r
-     */\r
-    public void setStart(Node refNode, \r
-                         int offset)\r
-                         throws RangeException, DOMException;\r
-\r
-    /**\r
-     * Sets the attributes describing the end of a Range.\r
-     * @param refNodeThe <code>refNode</code> value. This parameter must be \r
-     *   different from <code>null</code>.\r
-     * @param offsetThe <code>endOffset</code> value. \r
-     * @exception RangeException\r
-     *   INVALID_NODE_TYPE_ERR: Raised if <code>refNode</code> or an ancestor \r
-     *   of <code>refNode</code> is an Entity, Notation, or DocumentType \r
-     *   node.\r
-     * @exception DOMException\r
-     *   INDEX_SIZE_ERR: Raised if <code>offset</code> is negative or greater \r
-     *   than the number of child units in <code>refNode</code>. Child units \r
-     *   are 16-bit units if <code>refNode</code> is a type of CharacterData \r
-     *   node (e.g., a Text or Comment node) or a ProcessingInstruction \r
-     *   node. Child units are Nodes in all other cases.\r
-     *   <br>INVALID_STATE_ERR: Raised if <code>detach()</code> has already \r
-     *   been invoked on this object.\r
-     */\r
-    public void setEnd(Node refNode, \r
-                       int offset)\r
-                       throws RangeException, DOMException;\r
-\r
-    /**\r
-     * Sets the start position to be before a node\r
-     * @param refNodeRange starts before <code>refNode</code> \r
-     * @exception RangeException\r
-     *   INVALID_NODE_TYPE_ERR: Raised if the root container of \r
-     *   <code>refNode</code> is not an Attr, Document, or DocumentFragment \r
-     *   node or if <code>refNode</code> is a Document, DocumentFragment, \r
-     *   Attr, Entity, or Notation node.\r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been \r
-     *   invoked on this object.\r
-     */\r
-    public void setStartBefore(Node refNode)\r
-                               throws RangeException, DOMException;\r
-\r
-    /**\r
-     * Sets the start position to be after a node\r
-     * @param refNodeRange starts after <code>refNode</code> \r
-     * @exception RangeException\r
-     *   INVALID_NODE_TYPE_ERR: Raised if the root container of \r
-     *   <code>refNode</code> is not an Attr, Document, or DocumentFragment \r
-     *   node or if <code>refNode</code> is a Document, DocumentFragment, \r
-     *   Attr, Entity, or Notation node.\r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been \r
-     *   invoked on this object.\r
-     */\r
-    public void setStartAfter(Node refNode)\r
-                              throws RangeException, DOMException;\r
-\r
-    /**\r
-     * Sets the end position to be before a node. \r
-     * @param refNodeRange ends before <code>refNode</code> \r
-     * @exception RangeException\r
-     *   INVALID_NODE_TYPE_ERR: Raised if the root container of \r
-     *   <code>refNode</code> is not an Attr, Document, or DocumentFragment \r
-     *   node or if <code>refNode</code> is a Document, DocumentFragment, \r
-     *   Attr, Entity, or Notation node.\r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been \r
-     *   invoked on this object.\r
-     */\r
-    public void setEndBefore(Node refNode)\r
-                             throws RangeException, DOMException;\r
-\r
-    /**\r
-     * Sets the end of a Range to be after a node \r
-     * @param refNodeRange ends after <code>refNode</code>. \r
-     * @exception RangeException\r
-     *   INVALID_NODE_TYPE_ERR: Raised if the root container of \r
-     *   <code>refNode</code> is not an Attr, Document or DocumentFragment \r
-     *   node or if <code>refNode</code> is a Document, DocumentFragment, \r
-     *   Attr, Entity, or Notation node.\r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been \r
-     *   invoked on this object.\r
-     */\r
-    public void setEndAfter(Node refNode)\r
-                            throws RangeException, DOMException;\r
-\r
-    /**\r
-     * Collapse a Range onto one of its boundary-points \r
-     * @param toStartIf TRUE, collapses the Range onto its start; if FALSE, \r
-     *   collapses it onto its end. \r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been \r
-     *   invoked on this object.\r
-     */\r
-    public void collapse(boolean toStart)\r
-                         throws DOMException;\r
-\r
-    /**\r
-     * Select a node and its contents \r
-     * @param refNodeThe node to select. \r
-     * @exception RangeException\r
-     *   INVALID_NODE_TYPE_ERR: Raised if an ancestor of <code>refNode</code> \r
-     *   is an Entity, Notation or DocumentType node or if \r
-     *   <code>refNode</code> is a Document, DocumentFragment, Attr, Entity, \r
-     *   or Notation node.\r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been \r
-     *   invoked on this object.\r
-     */\r
-    public void selectNode(Node refNode)\r
-                           throws RangeException, DOMException;\r
-\r
-    /**\r
-     * Select the contents within a node \r
-     * @param refNodeNode to select from \r
-     * @exception RangeException\r
-     *   INVALID_NODE_TYPE_ERR: Raised if <code>refNode</code> or an ancestor \r
-     *   of <code>refNode</code> is an Entity, Notation or DocumentType node.\r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been \r
-     *   invoked on this object.\r
-     */\r
-    public void selectNodeContents(Node refNode)\r
-                                   throws RangeException, DOMException;\r
-\r
-    // CompareHow\r
-    /**\r
-     * Compare start boundary-point of <code>sourceRange</code> to start \r
-     * boundary-point of Range on which <code>compareBoundaryPoints</code> \r
-     * is invoked.\r
-     */\r
-    public static final short START_TO_START            = 0;\r
-    /**\r
-     * Compare start boundary-point of <code>sourceRange</code> to end \r
-     * boundary-point of Range on which <code>compareBoundaryPoints</code> \r
-     * is invoked.\r
-     */\r
-    public static final short START_TO_END              = 1;\r
-    /**\r
-     * Compare end boundary-point of <code>sourceRange</code> to end \r
-     * boundary-point of Range on which <code>compareBoundaryPoints</code> \r
-     * is invoked.\r
-     */\r
-    public static final short END_TO_END                = 2;\r
-    /**\r
-     * Compare end boundary-point of <code>sourceRange</code> to start \r
-     * boundary-point of Range on which <code>compareBoundaryPoints</code> \r
-     * is invoked.\r
-     */\r
-    public static final short END_TO_START              = 3;\r
-\r
-    /**\r
-     * Compare the boundary-points of two Ranges in a document.\r
-     * @param howA code representing the type of comparison, as defined above.\r
-     * @param sourceRangeThe <code>Range</code> on which this current \r
-     *   <code>Range</code> is compared to.\r
-     * @return  -1, 0 or 1 depending on whether the corresponding \r
-     *   boundary-point of the Range is respectively before, equal to, or \r
-     *   after the corresponding boundary-point of <code>sourceRange</code>. \r
-     * @exception DOMException\r
-     *   WRONG_DOCUMENT_ERR: Raised if the two Ranges are not in the same \r
-     *   Document or DocumentFragment.\r
-     *   <br>INVALID_STATE_ERR: Raised if <code>detach()</code> has already \r
-     *   been invoked on this object.\r
-     */\r
-    public short compareBoundaryPoints(short how, \r
-                                       Range sourceRange)\r
-                                       throws DOMException;\r
-\r
-    /**\r
-     * Removes the contents of a Range from the containing document or \r
-     * document fragment without returning a reference to the removed \r
-     * content.  \r
-     * @exception DOMException\r
-     *   NO_MODIFICATION_ALLOWED_ERR: Raised if any portion of the content of \r
-     *   the Range is read-only or any of the nodes that contain any of the \r
-     *   content of the Range are read-only.\r
-     *   <br>INVALID_STATE_ERR: Raised if <code>detach()</code> has already \r
-     *   been invoked on this object.\r
-     */\r
-    public void deleteContents()\r
-                               throws DOMException;\r
-\r
-    /**\r
-     * Moves the contents of a Range from the containing document or document \r
-     * fragment to a new DocumentFragment. \r
-     * @return A DocumentFragment containing the extracted contents. \r
-     * @exception DOMException\r
-     *   NO_MODIFICATION_ALLOWED_ERR: Raised if any portion of the content of \r
-     *   the Range is read-only or any of the nodes which contain any of the \r
-     *   content of the Range are read-only.\r
-     *   <br>HIERARCHY_REQUEST_ERR: Raised if a DocumentType node would be \r
-     *   extracted into the new DocumentFragment.\r
-     *   <br>INVALID_STATE_ERR: Raised if <code>detach()</code> has already \r
-     *   been invoked on this object.\r
-     */\r
-    public DocumentFragment extractContents()\r
-                                            throws DOMException;\r
-\r
-    /**\r
-     * Duplicates the contents of a Range \r
-     * @return A DocumentFragment that contains content equivalent to this \r
-     *   Range.\r
-     * @exception DOMException\r
-     *   HIERARCHY_REQUEST_ERR: Raised if a DocumentType node would be \r
-     *   extracted into the new DocumentFragment.\r
-     *   <br>INVALID_STATE_ERR: Raised if <code>detach()</code> has already \r
-     *   been invoked on this object.\r
-     */\r
-    public DocumentFragment cloneContents()\r
-                                          throws DOMException;\r
-\r
-    /**\r
-     * Inserts a node into the Document or DocumentFragment at the start of \r
-     * the Range. If the container is a Text node, this will be split at the \r
-     * start of the Range (as if the Text node's splitText method was \r
-     * performed at the insertion point) and the insertion will occur \r
-     * between the two resulting Text nodes. Adjacent Text nodes will not be \r
-     * automatically merged. If the node to be inserted is a \r
-     * DocumentFragment node, the children will be inserted rather than the \r
-     * DocumentFragment node itself.\r
-     * @param newNodeThe node to insert at the start of the Range \r
-     * @exception DOMException\r
-     *   NO_MODIFICATION_ALLOWED_ERR: Raised if an ancestor container of the \r
-     *   start of the Range is read-only.\r
-     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>newNode</code> and the \r
-     *   container of the start of the Range were not created from the same \r
-     *   document.\r
-     *   <br>HIERARCHY_REQUEST_ERR: Raised if the container of the start of \r
-     *   the Range is of a type that does not allow children of the type of \r
-     *   <code>newNode</code> or if <code>newNode</code> is an ancestor of \r
-     *   the container.\r
-     *   <br>INVALID_STATE_ERR: Raised if <code>detach()</code> has already \r
-     *   been invoked on this object.\r
-     * @exception RangeException\r
-     *   INVALID_NODE_TYPE_ERR: Raised if <code>newNode</code> is an Attr, \r
-     *   Entity, Notation, or Document node.\r
-     */\r
-    public void insertNode(Node newNode)\r
-                           throws DOMException, RangeException;\r
-\r
-    /**\r
-     * Reparents the contents of the Range to the given node and inserts the \r
-     * node at the position of the start of the Range. \r
-     * @param newParentThe node to surround the contents with. \r
-     * @exception DOMException\r
-     *   NO_MODIFICATION_ALLOWED_ERR: Raised if an ancestor container of \r
-     *   either boundary-point of the Range is read-only.\r
-     *   <br>WRONG_DOCUMENT_ERR: Raised if <code> newParent</code> and the \r
-     *   container of the start of the Range were not created from the same \r
-     *   document.\r
-     *   <br>HIERARCHY_REQUEST_ERR: Raised if the container of the start of \r
-     *   the Range is of a type that does not allow children of the type of \r
-     *   <code>newParent</code> or if <code>newParent</code> is an ancestor \r
-     *   of the container or if <code>node</code> would end up with a child \r
-     *   node of a type not allowed by the type of <code>node</code>.\r
-     *   <br>INVALID_STATE_ERR: Raised if <code>detach()</code> has already \r
-     *   been invoked on this object.\r
-     * @exception RangeException\r
-     *   BAD_BOUNDARYPOINTS_ERR: Raised if the Range partially selects a \r
-     *   non-text node.\r
-     *   <br>INVALID_NODE_TYPE_ERR: Raised if <code> node</code> is an Attr, \r
-     *   Entity, DocumentType, Notation, Document, or DocumentFragment node.\r
-     */\r
-    public void surroundContents(Node newParent)\r
-                                 throws DOMException, RangeException;\r
-\r
-    /**\r
-     * Produces a new Range whose boundary-points are equal to the \r
-     * boundary-points of the Range. \r
-     * @return The duplicated Range. \r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been \r
-     *   invoked on this object.\r
-     */\r
-    public Range cloneRange()\r
-                            throws DOMException;\r
-\r
-    /**\r
-     * Returns the contents of a Range as a string. This string contains only \r
-     * the data characters, not any markup. \r
-     * @return The contents of the Range.\r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been \r
-     *   invoked on this object.\r
-     */\r
-    public String toString()\r
-                           throws DOMException;\r
-\r
-    /**\r
-     * Called to indicate that the Range is no longer in use and that the \r
-     * implementation may relinquish any resources associated with this \r
-     * Range. Subsequent calls to any methods or attribute getters on this \r
-     * Range will result in a <code>DOMException</code> being thrown with an \r
-     * error code of <code>INVALID_STATE_ERR</code>.\r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been \r
-     *   invoked on this object.\r
-     */\r
-    public void detach()\r
-                       throws DOMException;\r
-\r
-}\r
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.ranges;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.DocumentFragment;
+
+/**
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document Object Model (DOM) Level 2 Traversal and Range Specification</a>.
+ * @since DOM Level 2
+ */
+public interface Range {
+    /**
+     * Node within which the Range begins 
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been 
+     *   invoked on this object.
+     */
+    public Node getStartContainer()
+                       throws DOMException;
+
+    /**
+     * Offset within the starting node of the Range. 
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been 
+     *   invoked on this object.
+     */
+    public int getStartOffset()
+                       throws DOMException;
+
+    /**
+     * Node within which the Range ends 
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been 
+     *   invoked on this object.
+     */
+    public Node getEndContainer()
+                       throws DOMException;
+
+    /**
+     * Offset within the ending node of the Range. 
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been 
+     *   invoked on this object.
+     */
+    public int getEndOffset()
+                       throws DOMException;
+
+    /**
+     * TRUE if the Range is collapsed 
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been 
+     *   invoked on this object.
+     */
+    public boolean getCollapsed()
+                       throws DOMException;
+
+    /**
+     * The deepest common ancestor container of the Range's two 
+     * boundary-points.
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been 
+     *   invoked on this object.
+     */
+    public Node getCommonAncestorContainer()
+                       throws DOMException;
+
+    /**
+     * Sets the attributes describing the start of the Range. 
+     * @param refNode The <code>refNode</code> value. This parameter must be 
+     *   different from <code>null</code>.
+     * @param offset The <code>startOffset</code> value. 
+     * @exception RangeException
+     *   INVALID_NODE_TYPE_ERR: Raised if <code>refNode</code> or an ancestor 
+     *   of <code>refNode</code> is an Entity, Notation, or DocumentType 
+     *   node.
+     * @exception DOMException
+     *   INDEX_SIZE_ERR: Raised if <code>offset</code> is negative or greater 
+     *   than the number of child units in <code>refNode</code>. Child units 
+     *   are 16-bit units if <code>refNode</code> is a type of CharacterData 
+     *   node (e.g., a Text or Comment node) or a ProcessingInstruction 
+     *   node. Child units are Nodes in all other cases.
+     *   <br>INVALID_STATE_ERR: Raised if <code>detach()</code> has already 
+     *   been invoked on this object.
+     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>refNode</code> was created 
+     *   from a different document than the one that created this range.
+     */
+    public void setStart(Node refNode, 
+                         int offset)
+                         throws RangeException, DOMException;
+
+    /**
+     * Sets the attributes describing the end of a Range.
+     * @param refNode The <code>refNode</code> value. This parameter must be 
+     *   different from <code>null</code>.
+     * @param offset The <code>endOffset</code> value. 
+     * @exception RangeException
+     *   INVALID_NODE_TYPE_ERR: Raised if <code>refNode</code> or an ancestor 
+     *   of <code>refNode</code> is an Entity, Notation, or DocumentType 
+     *   node.
+     * @exception DOMException
+     *   INDEX_SIZE_ERR: Raised if <code>offset</code> is negative or greater 
+     *   than the number of child units in <code>refNode</code>. Child units 
+     *   are 16-bit units if <code>refNode</code> is a type of CharacterData 
+     *   node (e.g., a Text or Comment node) or a ProcessingInstruction 
+     *   node. Child units are Nodes in all other cases.
+     *   <br>INVALID_STATE_ERR: Raised if <code>detach()</code> has already 
+     *   been invoked on this object.
+     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>refNode</code> was created 
+     *   from a different document than the one that created this range.
+     */
+    public void setEnd(Node refNode, 
+                       int offset)
+                       throws RangeException, DOMException;
+
+    /**
+     * Sets the start position to be before a node
+     * @param refNode Range starts before <code>refNode</code> 
+     * @exception RangeException
+     *   INVALID_NODE_TYPE_ERR: Raised if the root container of 
+     *   <code>refNode</code> is not an Attr, Document, or DocumentFragment 
+     *   node or if <code>refNode</code> is a Document, DocumentFragment, 
+     *   Attr, Entity, or Notation node.
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been 
+     *   invoked on this object.
+     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>refNode</code> was created 
+     *   from a different document than the one that created this range.
+     */
+    public void setStartBefore(Node refNode)
+                               throws RangeException, DOMException;
+
+    /**
+     * Sets the start position to be after a node
+     * @param refNode Range starts after <code>refNode</code> 
+     * @exception RangeException
+     *   INVALID_NODE_TYPE_ERR: Raised if the root container of 
+     *   <code>refNode</code> is not an Attr, Document, or DocumentFragment 
+     *   node or if <code>refNode</code> is a Document, DocumentFragment, 
+     *   Attr, Entity, or Notation node.
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been 
+     *   invoked on this object.
+     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>refNode</code> was created 
+     *   from a different document than the one that created this range.
+     */
+    public void setStartAfter(Node refNode)
+                              throws RangeException, DOMException;
+
+    /**
+     * Sets the end position to be before a node. 
+     * @param refNode Range ends before <code>refNode</code> 
+     * @exception RangeException
+     *   INVALID_NODE_TYPE_ERR: Raised if the root container of 
+     *   <code>refNode</code> is not an Attr, Document, or DocumentFragment 
+     *   node or if <code>refNode</code> is a Document, DocumentFragment, 
+     *   Attr, Entity, or Notation node.
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been 
+     *   invoked on this object.
+     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>refNode</code> was created 
+     *   from a different document than the one that created this range.
+     */
+    public void setEndBefore(Node refNode)
+                             throws RangeException, DOMException;
+
+    /**
+     * Sets the end of a Range to be after a node 
+     * @param refNode Range ends after <code>refNode</code>. 
+     * @exception RangeException
+     *   INVALID_NODE_TYPE_ERR: Raised if the root container of 
+     *   <code>refNode</code> is not an Attr, Document or DocumentFragment 
+     *   node or if <code>refNode</code> is a Document, DocumentFragment, 
+     *   Attr, Entity, or Notation node.
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been 
+     *   invoked on this object.
+     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>refNode</code> was created 
+     *   from a different document than the one that created this range.
+     */
+    public void setEndAfter(Node refNode)
+                            throws RangeException, DOMException;
+
+    /**
+     * Collapse a Range onto one of its boundary-points 
+     * @param toStart If TRUE, collapses the Range onto its start; if FALSE, 
+     *   collapses it onto its end. 
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been 
+     *   invoked on this object.
+     */
+    public void collapse(boolean toStart)
+                         throws DOMException;
+
+    /**
+     * Select a node and its contents 
+     * @param refNode The node to select. 
+     * @exception RangeException
+     *   INVALID_NODE_TYPE_ERR: Raised if an ancestor of <code>refNode</code> 
+     *   is an Entity, Notation or DocumentType node or if 
+     *   <code>refNode</code> is a Document, DocumentFragment, Attr, Entity, 
+     *   or Notation node.
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been 
+     *   invoked on this object.
+     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>refNode</code> was created 
+     *   from a different document than the one that created this range.
+     */
+    public void selectNode(Node refNode)
+                           throws RangeException, DOMException;
+
+    /**
+     * Select the contents within a node 
+     * @param refNode Node to select from 
+     * @exception RangeException
+     *   INVALID_NODE_TYPE_ERR: Raised if <code>refNode</code> or an ancestor 
+     *   of <code>refNode</code> is an Entity, Notation or DocumentType node.
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been 
+     *   invoked on this object.
+     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>refNode</code> was created 
+     *   from a different document than the one that created this range.
+     */
+    public void selectNodeContents(Node refNode)
+                                   throws RangeException, DOMException;
+
+    // CompareHow
+    /**
+     * Compare start boundary-point of <code>sourceRange</code> to start 
+     * boundary-point of Range on which <code>compareBoundaryPoints</code> 
+     * is invoked.
+     */
+    public static final short START_TO_START            = 0;
+    /**
+     * Compare start boundary-point of <code>sourceRange</code> to end 
+     * boundary-point of Range on which <code>compareBoundaryPoints</code> 
+     * is invoked.
+     */
+    public static final short START_TO_END              = 1;
+    /**
+     * Compare end boundary-point of <code>sourceRange</code> to end 
+     * boundary-point of Range on which <code>compareBoundaryPoints</code> 
+     * is invoked.
+     */
+    public static final short END_TO_END                = 2;
+    /**
+     * Compare end boundary-point of <code>sourceRange</code> to start 
+     * boundary-point of Range on which <code>compareBoundaryPoints</code> 
+     * is invoked.
+     */
+    public static final short END_TO_START              = 3;
+
+    /**
+     * Compare the boundary-points of two Ranges in a document.
+     * @param how A code representing the type of comparison, as defined 
+     *   above.
+     * @param sourceRange The <code>Range</code> on which this current 
+     *   <code>Range</code> is compared to.
+     * @return  -1, 0 or 1 depending on whether the corresponding 
+     *   boundary-point of the Range is respectively before, equal to, or 
+     *   after the corresponding boundary-point of <code>sourceRange</code>. 
+     * @exception DOMException
+     *   WRONG_DOCUMENT_ERR: Raised if the two Ranges are not in the same 
+     *   Document or DocumentFragment.
+     *   <br>INVALID_STATE_ERR: Raised if <code>detach()</code> has already 
+     *   been invoked on this object.
+     */
+    public short compareBoundaryPoints(short how, 
+                                       Range sourceRange)
+                                       throws DOMException;
+
+    /**
+     * Removes the contents of a Range from the containing document or 
+     * document fragment without returning a reference to the removed 
+     * content.  
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised if any portion of the content of 
+     *   the Range is read-only or any of the nodes that contain any of the 
+     *   content of the Range are read-only.
+     *   <br>INVALID_STATE_ERR: Raised if <code>detach()</code> has already 
+     *   been invoked on this object.
+     */
+    public void deleteContents()
+                               throws DOMException;
+
+    /**
+     * Moves the contents of a Range from the containing document or document 
+     * fragment to a new DocumentFragment. 
+     * @return A DocumentFragment containing the extracted contents. 
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised if any portion of the content of 
+     *   the Range is read-only or any of the nodes which contain any of the 
+     *   content of the Range are read-only.
+     *   <br>HIERARCHY_REQUEST_ERR: Raised if a DocumentType node would be 
+     *   extracted into the new DocumentFragment.
+     *   <br>INVALID_STATE_ERR: Raised if <code>detach()</code> has already 
+     *   been invoked on this object.
+     */
+    public DocumentFragment extractContents()
+                                            throws DOMException;
+
+    /**
+     * Duplicates the contents of a Range 
+     * @return A DocumentFragment that contains content equivalent to this 
+     *   Range.
+     * @exception DOMException
+     *   HIERARCHY_REQUEST_ERR: Raised if a DocumentType node would be 
+     *   extracted into the new DocumentFragment.
+     *   <br>INVALID_STATE_ERR: Raised if <code>detach()</code> has already 
+     *   been invoked on this object.
+     */
+    public DocumentFragment cloneContents()
+                                          throws DOMException;
+
+    /**
+     * Inserts a node into the Document or DocumentFragment at the start of 
+     * the Range. If the container is a Text node, this will be split at the 
+     * start of the Range (as if the Text node's splitText method was 
+     * performed at the insertion point) and the insertion will occur 
+     * between the two resulting Text nodes. Adjacent Text nodes will not be 
+     * automatically merged. If the node to be inserted is a 
+     * DocumentFragment node, the children will be inserted rather than the 
+     * DocumentFragment node itself.
+     * @param newNode The node to insert at the start of the Range 
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised if an ancestor container of the 
+     *   start of the Range is read-only.
+     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>newNode</code> and the 
+     *   container of the start of the Range were not created from the same 
+     *   document.
+     *   <br>HIERARCHY_REQUEST_ERR: Raised if the container of the start of 
+     *   the Range is of a type that does not allow children of the type of 
+     *   <code>newNode</code> or if <code>newNode</code> is an ancestor of 
+     *   the container.
+     *   <br>INVALID_STATE_ERR: Raised if <code>detach()</code> has already 
+     *   been invoked on this object.
+     * @exception RangeException
+     *   INVALID_NODE_TYPE_ERR: Raised if <code>newNode</code> is an Attr, 
+     *   Entity, Notation, or Document node.
+     */
+    public void insertNode(Node newNode)
+                           throws DOMException, RangeException;
+
+    /**
+     * Reparents the contents of the Range to the given node and inserts the 
+     * node at the position of the start of the Range. 
+     * @param newParent The node to surround the contents with. 
+     * @exception DOMException
+     *   NO_MODIFICATION_ALLOWED_ERR: Raised if an ancestor container of 
+     *   either boundary-point of the Range is read-only.
+     *   <br>WRONG_DOCUMENT_ERR: Raised if <code> newParent</code> and the 
+     *   container of the start of the Range were not created from the same 
+     *   document.
+     *   <br>HIERARCHY_REQUEST_ERR: Raised if the container of the start of 
+     *   the Range is of a type that does not allow children of the type of 
+     *   <code>newParent</code> or if <code>newParent</code> is an ancestor 
+     *   of the container or if <code>node</code> would end up with a child 
+     *   node of a type not allowed by the type of <code>node</code>.
+     *   <br>INVALID_STATE_ERR: Raised if <code>detach()</code> has already 
+     *   been invoked on this object.
+     * @exception RangeException
+     *   BAD_BOUNDARYPOINTS_ERR: Raised if the Range partially selects a 
+     *   non-text node.
+     *   <br>INVALID_NODE_TYPE_ERR: Raised if <code> node</code> is an Attr, 
+     *   Entity, DocumentType, Notation, Document, or DocumentFragment node.
+     */
+    public void surroundContents(Node newParent)
+                                 throws DOMException, RangeException;
+
+    /**
+     * Produces a new Range whose boundary-points are equal to the 
+     * boundary-points of the Range. 
+     * @return The duplicated Range. 
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been 
+     *   invoked on this object.
+     */
+    public Range cloneRange()
+                            throws DOMException;
+
+    /**
+     * Returns the contents of a Range as a string. This string contains only 
+     * the data characters, not any markup. 
+     * @return The contents of the Range.
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been 
+     *   invoked on this object.
+     */
+    public String toString()
+                           throws DOMException;
+
+    /**
+     * Called to indicate that the Range is no longer in use and that the 
+     * implementation may relinquish any resources associated with this 
+     * Range. Subsequent calls to any methods or attribute getters on this 
+     * Range will result in a <code>DOMException</code> being thrown with an 
+     * error code of <code>INVALID_STATE_ERR</code>.
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if <code>detach()</code> has already been 
+     *   invoked on this object.
+     */
+    public void detach()
+                       throws DOMException;
+
+}
diff --git a/libjava/org/w3c/dom/ranges/RangeException.java b/libjava/external/w3c_dom/org/w3c/dom/ranges/RangeException.java
similarity index 97%
rename from libjava/org/w3c/dom/ranges/RangeException.java
rename to libjava/external/w3c_dom/org/w3c/dom/ranges/RangeException.java
index abf9a9f..551008e 100644 (file)
--- a/libjava/org/w3c/dom/ranges/RangeException.java
+++ b/libjava/external/w3c_dom/org/w3c/dom/ranges/RangeException.java
@@ -1,39 +1,39 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom.ranges;\r
-\r
-/**\r
- * Range operations may throw a <code>RangeException</code> as specified in \r
- * their method descriptions.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document Object Model (DOM) Level 2 Traversal and Range Specification</a>.\r
- * @since DOM Level 2\r
- */\r
-public class RangeException extends RuntimeException {\r
-    public RangeException(short code, String message) {\r
-       super(message);\r
-       this.code = code;\r
-    }\r
-    public short   code;\r
-    // RangeExceptionCode\r
-    /**\r
-     * If the boundary-points of a Range do not meet specific requirements.\r
-     */\r
-    public static final short BAD_BOUNDARYPOINTS_ERR    = 1;\r
-    /**\r
-     * If the container of an boundary-point of a Range is being set to either \r
-     * a node of an invalid type or a node with an ancestor of an invalid \r
-     * type.\r
-     */\r
-    public static final short INVALID_NODE_TYPE_ERR     = 2;\r
-\r
-}\r
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.ranges;
+
+/**
+ * Range operations may throw a <code>RangeException</code> as specified in 
+ * their method descriptions.
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document Object Model (DOM) Level 2 Traversal and Range Specification</a>.
+ * @since DOM Level 2
+ */
+public class RangeException extends RuntimeException {
+    public RangeException(short code, String message) {
+       super(message);
+       this.code = code;
+    }
+    public short   code;
+    // RangeExceptionCode
+    /**
+     * If the boundary-points of a Range do not meet specific requirements.
+     */
+    public static final short BAD_BOUNDARYPOINTS_ERR    = 1;
+    /**
+     * If the container of an boundary-point of a Range is being set to either 
+     * a node of an invalid type or a node with an ancestor of an invalid 
+     * type.
+     */
+    public static final short INVALID_NODE_TYPE_ERR     = 2;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/stylesheets/DocumentStyle.java b/libjava/external/w3c_dom/org/w3c/dom/stylesheets/DocumentStyle.java
new file mode 100644 (file)
index 0000000..612a561
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/stylesheets/DocumentStyle.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.stylesheets;
+
+/**
+ *  The <code>DocumentStyle</code> interface provides a mechanism by which the 
+ * style sheets embedded in a document can be retrieved. The expectation is 
+ * that an instance of the <code>DocumentStyle</code> interface can be 
+ * obtained by using binding-specific casting methods on an instance of the 
+ * <code>Document</code> interface. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface DocumentStyle {
+    /**
+     *  A list containing all the style sheets explicitly linked into or 
+     * embedded in a document. For HTML documents, this includes external 
+     * style sheets, included via the HTML  LINK element, and inline  STYLE 
+     * elements. In XML, this includes external style sheets, included via 
+     * style sheet processing instructions (see [XML StyleSheet]). 
+     */
+    public StyleSheetList getStyleSheets();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/stylesheets/LinkStyle.java b/libjava/external/w3c_dom/org/w3c/dom/stylesheets/LinkStyle.java
new file mode 100644 (file)
index 0000000..481bd19
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/stylesheets/LinkStyle.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.stylesheets;
+
+/**
+ *  The <code>LinkStyle</code> interface provides a mechanism by which a style 
+ * sheet can be retrieved from the node responsible for linking it into a 
+ * document. An instance of the <code>LinkStyle</code> interface can be 
+ * obtained using binding-specific casting methods on an instance of a 
+ * linking node (<code>HTMLLinkElement</code>, <code>HTMLStyleElement</code> 
+ * or <code>ProcessingInstruction</code> in DOM Level 2). 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface LinkStyle {
+    /**
+     *  The style sheet. 
+     */
+    public StyleSheet getSheet();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/stylesheets/MediaList.java b/libjava/external/w3c_dom/org/w3c/dom/stylesheets/MediaList.java
new file mode 100644 (file)
index 0000000..f83d5f1
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/stylesheets/MediaList.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.stylesheets;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  The <code>MediaList</code> interface provides the abstraction of an 
+ * ordered collection of media, without defining or constraining how this 
+ * collection is implemented. An empty list is the same as a list that 
+ * contains the medium <code>"all"</code>. 
+ * <p> The items in the <code>MediaList</code> are accessible via an integral 
+ * index, starting from 0. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface MediaList {
+    /**
+     *  The parsable textual representation of the media list. This is a 
+     * comma-separated list of media. 
+     */
+    public String getMediaText();
+    /**
+     *  The parsable textual representation of the media list. This is a 
+     * comma-separated list of media. 
+     * @exception DOMException
+     *   SYNTAX_ERR: Raised if the specified string value has a syntax error 
+     *   and is unparsable.
+     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this media list is 
+     *   readonly.
+     */
+    public void setMediaText(String mediaText)
+                             throws DOMException;
+
+    /**
+     *  The number of media in the list. The range of valid media is 
+     * <code>0</code> to <code>length-1</code> inclusive. 
+     */
+    public int getLength();
+
+    /**
+     *  Returns the <code>index</code>th in the list. If <code>index</code> is 
+     * greater than or equal to the number of media in the list, this 
+     * returns <code>null</code>. 
+     * @param index  Index into the collection. 
+     * @return  The medium at the <code>index</code>th position in the 
+     *   <code>MediaList</code>, or <code>null</code> if that is not a valid 
+     *   index. 
+     */
+    public String item(int index);
+
+    /**
+     *  Deletes the medium indicated by <code>oldMedium</code> from the list. 
+     * @param oldMedium The medium to delete in the media list.
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this list is readonly. 
+     *   <br> NOT_FOUND_ERR: Raised if <code>oldMedium</code> is not in the 
+     *   list. 
+     */
+    public void deleteMedium(String oldMedium)
+                             throws DOMException;
+
+    /**
+     *  Adds the medium <code>newMedium</code> to the end of the list. If the 
+     * <code>newMedium</code> is already used, it is first removed. 
+     * @param newMedium The new medium to add.
+     * @exception DOMException
+     *    INVALID_CHARACTER_ERR: If the medium contains characters that are 
+     *   invalid in the underlying style language. 
+     *   <br> NO_MODIFICATION_ALLOWED_ERR: Raised if this list is readonly. 
+     */
+    public void appendMedium(String newMedium)
+                             throws DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/stylesheets/StyleSheet.java b/libjava/external/w3c_dom/org/w3c/dom/stylesheets/StyleSheet.java
new file mode 100644 (file)
index 0000000..3da4307
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/stylesheets/StyleSheet.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.stylesheets;
+
+import org.w3c.dom.Node;
+
+/**
+ *  The <code>StyleSheet</code> interface is the abstract base interface for 
+ * any type of style sheet. It represents a single style sheet associated 
+ * with a structured document. In HTML, the StyleSheet interface represents 
+ * either an external style sheet, included via the HTML  LINK element, or 
+ * an inline  STYLE element. In XML, this interface represents an external 
+ * style sheet, included via a style sheet processing instruction. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface StyleSheet {
+    /**
+     *  This specifies the style sheet language for this style sheet. The 
+     * style sheet language is specified as a content type (e.g. 
+     * "text/css"). The content type is often specified in the 
+     * <code>ownerNode</code>. Also see the type attribute definition for 
+     * the <code>LINK</code> element in HTML 4.0, and the type 
+     * pseudo-attribute for the XML style sheet processing instruction. 
+     */
+    public String getType();
+
+    /**
+     *  <code>false</code> if the style sheet is applied to the document. 
+     * <code>true</code> if it is not. Modifying this attribute may cause a 
+     * new resolution of style for the document. A stylesheet only applies 
+     * if both an appropriate medium definition is present and the disabled 
+     * attribute is false. So, if the media doesn't apply to the current 
+     * user agent, the <code>disabled</code> attribute is ignored. 
+     */
+    public boolean getDisabled();
+    /**
+     *  <code>false</code> if the style sheet is applied to the document. 
+     * <code>true</code> if it is not. Modifying this attribute may cause a 
+     * new resolution of style for the document. A stylesheet only applies 
+     * if both an appropriate medium definition is present and the disabled 
+     * attribute is false. So, if the media doesn't apply to the current 
+     * user agent, the <code>disabled</code> attribute is ignored. 
+     */
+    public void setDisabled(boolean disabled);
+
+    /**
+     *  The node that associates this style sheet with the document. For HTML, 
+     * this may be the corresponding <code>LINK</code> or <code>STYLE</code> 
+     * element. For XML, it may be the linking processing instruction. For 
+     * style sheets that are included by other style sheets, the value of 
+     * this attribute is <code>null</code>. 
+     */
+    public Node getOwnerNode();
+
+    /**
+     *  For style sheet languages that support the concept of style sheet 
+     * inclusion, this attribute represents the including style sheet, if 
+     * one exists. If the style sheet is a top-level style sheet, or the 
+     * style sheet language does not support inclusion, the value of this 
+     * attribute is <code>null</code>. 
+     */
+    public StyleSheet getParentStyleSheet();
+
+    /**
+     *  If the style sheet is a linked style sheet, the value of its attribute 
+     * is its location. For inline style sheets, the value of this attribute 
+     * is <code>null</code>. See the href attribute definition for the 
+     * <code>LINK</code> element in HTML 4.0, and the href pseudo-attribute 
+     * for the XML style sheet processing instruction. 
+     */
+    public String getHref();
+
+    /**
+     *  The advisory title. The title is often specified in the 
+     * <code>ownerNode</code>. See the title attribute definition for the 
+     * <code>LINK</code> element in HTML 4.0, and the title pseudo-attribute 
+     * for the XML style sheet processing instruction. 
+     */
+    public String getTitle();
+
+    /**
+     *  The intended destination media for style information. The media is 
+     * often specified in the <code>ownerNode</code>. If no media has been 
+     * specified, the <code>MediaList</code> will be empty. See the media 
+     * attribute definition for the <code>LINK</code> element in HTML 4.0, 
+     * and the media pseudo-attribute for the XML style sheet processing 
+     * instruction . Modifying the media list may cause a change to the 
+     * attribute <code>disabled</code>. 
+     */
+    public MediaList getMedia();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/stylesheets/StyleSheetList.java b/libjava/external/w3c_dom/org/w3c/dom/stylesheets/StyleSheetList.java
new file mode 100644 (file)
index 0000000..b8f9a44
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/stylesheets/StyleSheetList.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.stylesheets;
+
+/**
+ * The <code>StyleSheetList</code> interface provides the abstraction of an 
+ * ordered collection of style sheets. 
+ * <p> The items in the <code>StyleSheetList</code> are accessible via an 
+ * integral index, starting from 0. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
+ * @since DOM Level 2
+ */
+public interface StyleSheetList {
+    /**
+     *  The number of <code>StyleSheets</code> in the list. The range of valid 
+     * child stylesheet indices is <code>0</code> to <code>length-1</code> 
+     * inclusive. 
+     */
+    public int getLength();
+
+    /**
+     *  Used to retrieve a style sheet by ordinal index. If index is greater 
+     * than or equal to the number of style sheets in the list, this returns 
+     * <code>null</code>. 
+     * @param index Index into the collection
+     * @return The style sheet at the <code>index</code> position in the 
+     *   <code>StyleSheetList</code>, or <code>null</code> if that is not a 
+     *   valid index. 
+     */
+    public StyleSheet item(int index);
+
+}
diff --git a/libjava/org/w3c/dom/traversal/DocumentTraversal.java b/libjava/external/w3c_dom/org/w3c/dom/traversal/DocumentTraversal.java
similarity index 60%
rename from libjava/org/w3c/dom/traversal/DocumentTraversal.java
rename to libjava/external/w3c_dom/org/w3c/dom/traversal/DocumentTraversal.java
index 88e7a92..bc45ad9 100644 (file)
--- a/libjava/org/w3c/dom/traversal/DocumentTraversal.java
+++ b/libjava/external/w3c_dom/org/w3c/dom/traversal/DocumentTraversal.java
@@ -1,90 +1,93 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom.traversal;\r
-\r
-import org.w3c.dom.Node;\r
-import org.w3c.dom.DOMException;\r
-\r
-/**\r
- * <code>DocumentTraversal</code> contains methods that create iterators and \r
- * tree-walkers to traverse a node and its children in document order (depth \r
- * first, pre-order traversal, which is equivalent to the order in which the \r
- * start tags occur in the text representation of the document). In DOMs \r
- * which support the Traversal feature, <code>DocumentTraversal</code> will \r
- * be implemented by the same objects that implement the Document interface.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document Object Model (DOM) Level 2 Traversal and Range Specification</a>.\r
- * @since DOM Level 2\r
- */\r
-public interface DocumentTraversal {\r
-    /**\r
-     * Create a new <code>NodeIterator</code> over the subtree rooted at the \r
-     * specified node.\r
-     * @param rootThe node which will be iterated together with its children. \r
-     *   The iterator is initially positioned just before this node. The \r
-     *   <code>whatToShow</code> flags and the filter, if any, are not \r
-     *   considered when setting this position. The root must not be \r
-     *   <code>null</code>.\r
-     * @param whatToShowThis flag specifies which node types may appear in \r
-     *   the logical view of the tree presented by the iterator. See the \r
-     *   description of <code>NodeFilter</code> for the set of possible \r
-     *   <code>SHOW_</code> values.These flags can be combined using \r
-     *   <code>OR</code>.\r
-     * @param filterThe <code>NodeFilter</code> to be used with this \r
-     *   <code>TreeWalker</code>, or <code>null</code> to indicate no filter.\r
-     * @param entityReferenceExpansionThe value of this flag determines \r
-     *   whether entity reference nodes are expanded.\r
-     * @return The newly created <code>NodeIterator</code>.\r
-     * @exception DOMException\r
-     *   NOT_SUPPORTED_ERR: Raised if the specified <code>root</code> is \r
-     *   <code>null</code>.\r
-     */\r
-    public NodeIterator createNodeIterator(Node root, \r
-                                           int whatToShow, \r
-                                           NodeFilter filter, \r
-                                           boolean entityReferenceExpansion)\r
-                                           throws DOMException;\r
-\r
-    /**\r
-     * Create a new <code>TreeWalker</code> over the subtree rooted at the \r
-     * specified node.\r
-     * @param rootThe node which will serve as the <code>root</code> for the \r
-     *   <code>TreeWalker</code>. The <code>whatToShow</code> flags and the \r
-     *   <code>NodeFilter</code> are not considered when setting this value; \r
-     *   any node type will be accepted as the <code>root</code>. The \r
-     *   <code>currentNode</code> of the <code>TreeWalker</code> is \r
-     *   initialized to this node, whether or not it is visible. The \r
-     *   <code>root</code> functions as a stopping point for traversal \r
-     *   methods that look upward in the document structure, such as \r
-     *   <code>parentNode</code> and nextNode. The <code>root</code> must \r
-     *   not be <code>null</code>.\r
-     * @param whatToShowThis flag specifies which node types may appear in \r
-     *   the logical view of the tree presented by the tree-walker. See the \r
-     *   description of <code>NodeFilter</code> for the set of possible \r
-     *   SHOW_ values.These flags can be combined using <code>OR</code>.\r
-     * @param filterThe <code>NodeFilter</code> to be used with this \r
-     *   <code>TreeWalker</code>, or <code>null</code> to indicate no filter.\r
-     * @param entityReferenceExpansionIf this flag is false, the contents of \r
-     *   <code>EntityReference</code> nodes are not presented in the logical \r
-     *   view.\r
-     * @return The newly created <code>TreeWalker</code>.\r
-     * @exception DOMException\r
-     *    NOT_SUPPORTED_ERR: Raised if the specified <code>root</code> is \r
-     *   <code>null</code>.\r
-     */\r
-    public TreeWalker createTreeWalker(Node root, \r
-                                       int whatToShow, \r
-                                       NodeFilter filter, \r
-                                       boolean entityReferenceExpansion)\r
-                                       throws DOMException;\r
-\r
-}\r
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.traversal;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.DOMException;
+
+/**
+ * <code>DocumentTraversal</code> contains methods that create 
+ * <code>NodeIterators</code> and <code>TreeWalkers</code> to traverse a 
+ * node and its children in document order (depth first, pre-order 
+ * traversal, which is equivalent to the order in which the start tags occur 
+ * in the text representation of the document). In DOMs which support the 
+ * Traversal feature, <code>DocumentTraversal</code> will be implemented by 
+ * the same objects that implement the Document interface.
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document Object Model (DOM) Level 2 Traversal and Range Specification</a>.
+ * @since DOM Level 2
+ */
+public interface DocumentTraversal {
+    /**
+     * Create a new <code>NodeIterator</code> over the subtree rooted at the 
+     * specified node.
+     * @param root The node which will be iterated together with its 
+     *   children. The <code>NodeIterator</code> is initially positioned 
+     *   just before this node. The <code>whatToShow</code> flags and the 
+     *   filter, if any, are not considered when setting this position. The 
+     *   root must not be <code>null</code>.
+     * @param whatToShow This flag specifies which node types may appear in 
+     *   the logical view of the tree presented by the 
+     *   <code>NodeIterator</code>. See the description of 
+     *   <code>NodeFilter</code> for the set of possible <code>SHOW_</code> 
+     *   values.These flags can be combined using <code>OR</code>.
+     * @param filter The <code>NodeFilter</code> to be used with this 
+     *   <code>NodeIterator</code>, or <code>null</code> to indicate no 
+     *   filter.
+     * @param entityReferenceExpansion The value of this flag determines 
+     *   whether entity reference nodes are expanded.
+     * @return The newly created <code>NodeIterator</code>.
+     * @exception DOMException
+     *   NOT_SUPPORTED_ERR: Raised if the specified <code>root</code> is 
+     *   <code>null</code>.
+     */
+    public NodeIterator createNodeIterator(Node root, 
+                                           int whatToShow, 
+                                           NodeFilter filter, 
+                                           boolean entityReferenceExpansion)
+                                           throws DOMException;
+
+    /**
+     * Create a new <code>TreeWalker</code> over the subtree rooted at the 
+     * specified node.
+     * @param root The node which will serve as the <code>root</code> for the 
+     *   <code>TreeWalker</code>. The <code>whatToShow</code> flags and the 
+     *   <code>NodeFilter</code> are not considered when setting this value; 
+     *   any node type will be accepted as the <code>root</code>. The 
+     *   <code>currentNode</code> of the <code>TreeWalker</code> is 
+     *   initialized to this node, whether or not it is visible. The 
+     *   <code>root</code> functions as a stopping point for traversal 
+     *   methods that look upward in the document structure, such as 
+     *   <code>parentNode</code> and nextNode. The <code>root</code> must 
+     *   not be <code>null</code>.
+     * @param whatToShow This flag specifies which node types may appear in 
+     *   the logical view of the tree presented by the 
+     *   <code>TreeWalker</code>. See the description of 
+     *   <code>NodeFilter</code> for the set of possible <code>SHOW_</code> 
+     *   values.These flags can be combined using <code>OR</code>.
+     * @param filter The <code>NodeFilter</code> to be used with this 
+     *   <code>TreeWalker</code>, or <code>null</code> to indicate no filter.
+     * @param entityReferenceExpansion If this flag is false, the contents of 
+     *   <code>EntityReference</code> nodes are not presented in the logical 
+     *   view.
+     * @return The newly created <code>TreeWalker</code>.
+     * @exception DOMException
+     *    NOT_SUPPORTED_ERR: Raised if the specified <code>root</code> is 
+     *   <code>null</code>.
+     */
+    public TreeWalker createTreeWalker(Node root, 
+                                       int whatToShow, 
+                                       NodeFilter filter, 
+                                       boolean entityReferenceExpansion)
+                                       throws DOMException;
+
+}
diff --git a/libjava/org/w3c/dom/traversal/NodeFilter.java b/libjava/external/w3c_dom/org/w3c/dom/traversal/NodeFilter.java
similarity index 79%
rename from libjava/org/w3c/dom/traversal/NodeFilter.java
rename to libjava/external/w3c_dom/org/w3c/dom/traversal/NodeFilter.java
index 8901059..b9beac4 100644 (file)
--- a/libjava/org/w3c/dom/traversal/NodeFilter.java
+++ b/libjava/external/w3c_dom/org/w3c/dom/traversal/NodeFilter.java
@@ -1,142 +1,144 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom.traversal;\r
-\r
-import org.w3c.dom.Node;\r
-\r
-/**\r
- * Filters are objects that know how to "filter out" nodes. If a \r
- * <code>NodeIterator</code> or <code>TreeWalker</code> is given a \r
- * <code>NodeFilter</code>, it applies the filter before it returns the next \r
- * node. If the filter says to accept the node, the traversal logic returns \r
- * it; otherwise, traversal looks for the next node and pretends that the \r
- * node that was rejected was not there.\r
- * <p>The DOM does not provide any filters. <code>NodeFilter</code> is just an \r
- * interface that users can implement to provide their own filters. \r
- * <p><code>NodeFilters</code> do not need to know how to traverse from node \r
- * to node, nor do they need to know anything about the data structure that \r
- * is being traversed. This makes it very easy to write filters, since the \r
- * only thing they have to know how to do is evaluate a single node. One \r
- * filter may be used with a number of different kinds of traversals, \r
- * encouraging code reuse.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document Object Model (DOM) Level 2 Traversal and Range Specification</a>.\r
- * @since DOM Level 2\r
- */\r
-public interface NodeFilter {\r
-    // Constants returned by acceptNode\r
-    /**\r
-     * Accept the node. Navigation methods defined for \r
-     * <code>NodeIterator</code> or <code>TreeWalker</code> will return this \r
-     * node.\r
-     */\r
-    public static final short FILTER_ACCEPT             = 1;\r
-    /**\r
-     * Reject the node. Navigation methods defined for \r
-     * <code>NodeIterator</code> or <code>TreeWalker</code> will not return \r
-     * this node. For <code>TreeWalker</code>, the children of this node \r
-     * will also be rejected. <code>NodeIterators</code> treat this as a \r
-     * synonym for <code>FILTER_SKIP</code>.\r
-     */\r
-    public static final short FILTER_REJECT             = 2;\r
-    /**\r
-     * Skip this single node. Navigation methods defined for \r
-     * <code>NodeIterator</code> or <code>TreeWalker</code> will not return \r
-     * this node. For both <code>NodeIterator</code> and \r
-     * <code>TreeWalker</code>, the children of this node will still be \r
-     * considered. \r
-     */\r
-    public static final short FILTER_SKIP               = 3;\r
-\r
-    // Constants for whatToShow\r
-    /**\r
-     * Show all <code>Nodes</code>.\r
-     */\r
-    public static final int SHOW_ALL                  = 0xFFFFFFFF;\r
-    /**\r
-     * Show <code>Element</code> nodes.\r
-     */\r
-    public static final int SHOW_ELEMENT              = 0x00000001;\r
-    /**\r
-     * Show <code>Attr</code> nodes. This is meaningful only when creating an \r
-     * iterator or tree-walker with an attribute node as its \r
-     * <code>root</code>; in this case, it means that the attribute node \r
-     * will appear in the first position of the iteration or traversal. \r
-     * Since attributes are never children of other nodes, they do not \r
-     * appear when traversing over the document tree.\r
-     */\r
-    public static final int SHOW_ATTRIBUTE            = 0x00000002;\r
-    /**\r
-     * Show <code>Text</code> nodes.\r
-     */\r
-    public static final int SHOW_TEXT                 = 0x00000004;\r
-    /**\r
-     * Show <code>CDATASection</code> nodes.\r
-     */\r
-    public static final int SHOW_CDATA_SECTION        = 0x00000008;\r
-    /**\r
-     * Show <code>EntityReference</code> nodes.\r
-     */\r
-    public static final int SHOW_ENTITY_REFERENCE     = 0x00000010;\r
-    /**\r
-     * Show <code>Entity</code> nodes. This is meaningful only when creating \r
-     * an iterator or tree-walker with an<code> Entity</code> node as its \r
-     * <code>root</code>; in this case, it means that the <code>Entity</code>\r
-     *  node will appear in the first position of the traversal. Since \r
-     * entities are not part of the document tree, they do not appear when \r
-     * traversing over the document tree.\r
-     */\r
-    public static final int SHOW_ENTITY               = 0x00000020;\r
-    /**\r
-     * Show <code>ProcessingInstruction</code> nodes.\r
-     */\r
-    public static final int SHOW_PROCESSING_INSTRUCTION = 0x00000040;\r
-    /**\r
-     * Show <code>Comment</code> nodes.\r
-     */\r
-    public static final int SHOW_COMMENT              = 0x00000080;\r
-    /**\r
-     * Show <code>Document</code> nodes.\r
-     */\r
-    public static final int SHOW_DOCUMENT             = 0x00000100;\r
-    /**\r
-     * Show <code>DocumentType</code> nodes.\r
-     */\r
-    public static final int SHOW_DOCUMENT_TYPE        = 0x00000200;\r
-    /**\r
-     * Show <code>DocumentFragment</code> nodes.\r
-     */\r
-    public static final int SHOW_DOCUMENT_FRAGMENT    = 0x00000400;\r
-    /**\r
-     * Show <code>Notation</code> nodes. This is meaningful only when creating \r
-     * an iterator or tree-walker with a <code>Notation</code> node as its \r
-     * <code>root</code>; in this case, it means that the \r
-     * <code>Notation</code> node will appear in the first position of the \r
-     * traversal. Since notations are not part of the document tree, they do \r
-     * not appear when traversing over the document tree.\r
-     */\r
-    public static final int SHOW_NOTATION             = 0x00000800;\r
-\r
-    /**\r
-     * Test whether a specified node is visible in the logical view of a \r
-     * <code>TreeWalker</code> or <code>NodeIterator</code>. This function \r
-     * will be called by the implementation of <code>TreeWalker</code> and \r
-     * <code>NodeIterator</code>; it is not normally called directly from \r
-     * user code. (Though you could do so if you wanted to use the same \r
-     * filter to guide your own application logic.)\r
-     * @param nThe node to check to see if it passes the filter or not.\r
-     * @return a constant to determine whether the node is accepted, \r
-     *   rejected, or skipped, as defined above.\r
-     */\r
-    public short acceptNode(Node n);\r
-\r
-}\r
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.traversal;
+
+import org.w3c.dom.Node;
+
+/**
+ * Filters are objects that know how to "filter out" nodes. If a 
+ * <code>NodeIterator</code> or <code>TreeWalker</code> is given a 
+ * <code>NodeFilter</code>, it applies the filter before it returns the next 
+ * node. If the filter says to accept the node, the traversal logic returns 
+ * it; otherwise, traversal looks for the next node and pretends that the 
+ * node that was rejected was not there.
+ * <p>The DOM does not provide any filters. <code>NodeFilter</code> is just an 
+ * interface that users can implement to provide their own filters. 
+ * <p><code>NodeFilters</code> do not need to know how to traverse from node 
+ * to node, nor do they need to know anything about the data structure that 
+ * is being traversed. This makes it very easy to write filters, since the 
+ * only thing they have to know how to do is evaluate a single node. One 
+ * filter may be used with a number of different kinds of traversals, 
+ * encouraging code reuse.
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document Object Model (DOM) Level 2 Traversal and Range Specification</a>.
+ * @since DOM Level 2
+ */
+public interface NodeFilter {
+    // Constants returned by acceptNode
+    /**
+     * Accept the node. Navigation methods defined for 
+     * <code>NodeIterator</code> or <code>TreeWalker</code> will return this 
+     * node.
+     */
+    public static final short FILTER_ACCEPT             = 1;
+    /**
+     * Reject the node. Navigation methods defined for 
+     * <code>NodeIterator</code> or <code>TreeWalker</code> will not return 
+     * this node. For <code>TreeWalker</code>, the children of this node 
+     * will also be rejected. <code>NodeIterators</code> treat this as a 
+     * synonym for <code>FILTER_SKIP</code>.
+     */
+    public static final short FILTER_REJECT             = 2;
+    /**
+     * Skip this single node. Navigation methods defined for 
+     * <code>NodeIterator</code> or <code>TreeWalker</code> will not return 
+     * this node. For both <code>NodeIterator</code> and 
+     * <code>TreeWalker</code>, the children of this node will still be 
+     * considered. 
+     */
+    public static final short FILTER_SKIP               = 3;
+
+    // Constants for whatToShow
+    /**
+     * Show all <code>Nodes</code>.
+     */
+    public static final int SHOW_ALL                  = 0xFFFFFFFF;
+    /**
+     * Show <code>Element</code> nodes.
+     */
+    public static final int SHOW_ELEMENT              = 0x00000001;
+    /**
+     * Show <code>Attr</code> nodes. This is meaningful only when creating an 
+     * <code>NodeIterator</code> or <code>TreeWalker</code> with an 
+     * attribute node as its <code>root</code>; in this case, it means that 
+     * the attribute node will appear in the first position of the iteration 
+     * or traversal. Since attributes are never children of other nodes, 
+     * they do not appear when traversing over the document tree.
+     */
+    public static final int SHOW_ATTRIBUTE            = 0x00000002;
+    /**
+     * Show <code>Text</code> nodes.
+     */
+    public static final int SHOW_TEXT                 = 0x00000004;
+    /**
+     * Show <code>CDATASection</code> nodes.
+     */
+    public static final int SHOW_CDATA_SECTION        = 0x00000008;
+    /**
+     * Show <code>EntityReference</code> nodes.
+     */
+    public static final int SHOW_ENTITY_REFERENCE     = 0x00000010;
+    /**
+     * Show <code>Entity</code> nodes. This is meaningful only when creating 
+     * an <code>NodeIterator</code> or <code>TreeWalker</code> with an 
+     * <code>Entity</code> node as its <code>root</code>; in this case, it 
+     * means that the <code>Entity</code> node will appear in the first 
+     * position of the traversal. Since entities are not part of the 
+     * document tree, they do not appear when traversing over the document 
+     * tree.
+     */
+    public static final int SHOW_ENTITY               = 0x00000020;
+    /**
+     * Show <code>ProcessingInstruction</code> nodes.
+     */
+    public static final int SHOW_PROCESSING_INSTRUCTION = 0x00000040;
+    /**
+     * Show <code>Comment</code> nodes.
+     */
+    public static final int SHOW_COMMENT              = 0x00000080;
+    /**
+     * Show <code>Document</code> nodes.
+     */
+    public static final int SHOW_DOCUMENT             = 0x00000100;
+    /**
+     * Show <code>DocumentType</code> nodes.
+     */
+    public static final int SHOW_DOCUMENT_TYPE        = 0x00000200;
+    /**
+     * Show <code>DocumentFragment</code> nodes.
+     */
+    public static final int SHOW_DOCUMENT_FRAGMENT    = 0x00000400;
+    /**
+     * Show <code>Notation</code> nodes. This is meaningful only when creating 
+     * an <code>NodeIterator</code> or <code>TreeWalker</code> with a 
+     * <code>Notation</code> node as its <code>root</code>; in this case, it 
+     * means that the <code>Notation</code> node will appear in the first 
+     * position of the traversal. Since notations are not part of the 
+     * document tree, they do not appear when traversing over the document 
+     * tree.
+     */
+    public static final int SHOW_NOTATION             = 0x00000800;
+
+    /**
+     * Test whether a specified node is visible in the logical view of a 
+     * <code>TreeWalker</code> or <code>NodeIterator</code>. This function 
+     * will be called by the implementation of <code>TreeWalker</code> and 
+     * <code>NodeIterator</code>; it is not normally called directly from 
+     * user code. (Though you could do so if you wanted to use the same 
+     * filter to guide your own application logic.)
+     * @param n The node to check to see if it passes the filter or not.
+     * @return A constant to determine whether the node is accepted, 
+     *   rejected, or skipped, as defined above.
+     */
+    public short acceptNode(Node n);
+
+}
diff --git a/libjava/org/w3c/dom/traversal/NodeIterator.java b/libjava/external/w3c_dom/org/w3c/dom/traversal/NodeIterator.java
similarity index 64%
rename from libjava/org/w3c/dom/traversal/NodeIterator.java
rename to libjava/external/w3c_dom/org/w3c/dom/traversal/NodeIterator.java
index 3563e80..d1f0d08 100644 (file)
--- a/libjava/org/w3c/dom/traversal/NodeIterator.java
+++ b/libjava/external/w3c_dom/org/w3c/dom/traversal/NodeIterator.java
@@ -1,108 +1,109 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom.traversal;\r
-\r
-import org.w3c.dom.Node;\r
-import org.w3c.dom.DOMException;\r
-\r
-/**\r
- * <code>Iterators</code> are used to step through a set of nodes, e.g. the \r
- * set of nodes in a <code>NodeList</code>, the document subtree governed by \r
- * a particular <code>Node</code>, the results of a query, or any other set \r
- * of nodes. The set of nodes to be iterated is determined by the \r
- * implementation of the <code>NodeIterator</code>. DOM Level 2 specifies a \r
- * single <code>NodeIterator</code> implementation for document-order \r
- * traversal of a document subtree. Instances of these iterators are created \r
- * by calling <code>DocumentTraversal</code>\r
- * <code>.createNodeIterator()</code>.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document Object Model (DOM) Level 2 Traversal and Range Specification</a>.\r
- * @since DOM Level 2\r
- */\r
-public interface NodeIterator {\r
-    /**\r
-     * The root node of the <code>NodeIterator</code>, as specified when it \r
-     * was created.\r
-     */\r
-    public Node getRoot();\r
-\r
-    /**\r
-     * This attribute determines which node types are presented via the \r
-     * iterator. The available set of constants is defined in the \r
-     * <code>NodeFilter</code> interface.  Nodes not accepted by \r
-     * <code>whatToShow</code> will be skipped, but their children may still \r
-     * be considered. Note that this skip takes precedence over the filter, \r
-     * if any. \r
-     */\r
-    public int getWhatToShow();\r
-\r
-    /**\r
-     * The <code>NodeFilter</code> used to screen nodes.\r
-     */\r
-    public NodeFilter getFilter();\r
-\r
-    /**\r
-     *  The value of this flag determines whether the children of entity \r
-     * reference nodes are visible to the iterator. If false, they  and \r
-     * their descendants will be rejected. Note that this rejection takes \r
-     * precedence over <code>whatToShow</code> and the filter. Also note \r
-     * that this is currently the only situation where \r
-     * <code>NodeIterators</code> may reject a complete subtree rather than \r
-     * skipping individual nodes. \r
-     * <br>\r
-     * <br> To produce a view of the document that has entity references \r
-     * expanded and does not expose the entity reference node itself, use \r
-     * the <code>whatToShow</code> flags to hide the entity reference node \r
-     * and set <code>expandEntityReferences</code> to true when creating the \r
-     * iterator. To produce a view of the document that has entity reference \r
-     * nodes but no entity expansion, use the <code>whatToShow</code> flags \r
-     * to show the entity reference node and set \r
-     * <code>expandEntityReferences</code> to false.\r
-     */\r
-    public boolean getExpandEntityReferences();\r
-\r
-    /**\r
-     * Returns the next node in the set and advances the position of the \r
-     * iterator in the set. After a <code>NodeIterator</code> is created, \r
-     * the first call to <code>nextNode()</code> returns the first node in \r
-     * the set.\r
-     * @return The next <code>Node</code> in the set being iterated over, or \r
-     *   <code>null</code> if there are no more members in that set.\r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if this method is called after the \r
-     *   <code>detach</code> method was invoked.\r
-     */\r
-    public Node nextNode()\r
-                         throws DOMException;\r
-\r
-    /**\r
-     * Returns the previous node in the set and moves the position of the \r
-     * <code>NodeIterator</code> backwards in the set.\r
-     * @return The previous <code>Node</code> in the set being iterated over, \r
-     *   or <code>null</code> if there are no more members in that set. \r
-     * @exception DOMException\r
-     *   INVALID_STATE_ERR: Raised if this method is called after the \r
-     *   <code>detach</code> method was invoked.\r
-     */\r
-    public Node previousNode()\r
-                             throws DOMException;\r
-\r
-    /**\r
-     * Detaches the <code>NodeIterator</code> from the set which it iterated \r
-     * over, releasing any computational resources and placing the iterator \r
-     * in the INVALID state. After <code>detach</code> has been invoked, \r
-     * calls to <code>nextNode</code> or <code>previousNode</code> will \r
-     * raise the exception INVALID_STATE_ERR.\r
-     */\r
-    public void detach();\r
-\r
-}\r
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.traversal;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.DOMException;
+
+/**
+ * <code>NodeIterators</code> are used to step through a set of nodes, e.g. 
+ * the set of nodes in a <code>NodeList</code>, the document subtree 
+ * governed by a particular <code>Node</code>, the results of a query, or 
+ * any other set of nodes. The set of nodes to be iterated is determined by 
+ * the implementation of the <code>NodeIterator</code>. DOM Level 2 
+ * specifies a single <code>NodeIterator</code> implementation for 
+ * document-order traversal of a document subtree. Instances of these 
+ * <code>NodeIterators</code> are created by calling 
+ * <code>DocumentTraversal</code><code>.createNodeIterator()</code>.
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document Object Model (DOM) Level 2 Traversal and Range Specification</a>.
+ * @since DOM Level 2
+ */
+public interface NodeIterator {
+    /**
+     * The root node of the <code>NodeIterator</code>, as specified when it 
+     * was created.
+     */
+    public Node getRoot();
+
+    /**
+     * This attribute determines which node types are presented via the 
+     * <code>NodeIterator</code>. The available set of constants is defined 
+     * in the <code>NodeFilter</code> interface.  Nodes not accepted by 
+     * <code>whatToShow</code> will be skipped, but their children may still 
+     * be considered. Note that this skip takes precedence over the filter, 
+     * if any. 
+     */
+    public int getWhatToShow();
+
+    /**
+     * The <code>NodeFilter</code> used to screen nodes.
+     */
+    public NodeFilter getFilter();
+
+    /**
+     *  The value of this flag determines whether the children of entity 
+     * reference nodes are visible to the <code>NodeIterator</code>. If 
+     * false, these children  and their descendants will be rejected. Note 
+     * that this rejection takes precedence over <code>whatToShow</code> and 
+     * the filter. Also note that this is currently the only situation where 
+     * <code>NodeIterators</code> may reject a complete subtree rather than 
+     * skipping individual nodes. 
+     * <br>
+     * <br> To produce a view of the document that has entity references 
+     * expanded and does not expose the entity reference node itself, use 
+     * the <code>whatToShow</code> flags to hide the entity reference node 
+     * and set <code>expandEntityReferences</code> to true when creating the 
+     * <code>NodeIterator</code>. To produce a view of the document that has 
+     * entity reference nodes but no entity expansion, use the 
+     * <code>whatToShow</code> flags to show the entity reference node and 
+     * set <code>expandEntityReferences</code> to false.
+     */
+    public boolean getExpandEntityReferences();
+
+    /**
+     * Returns the next node in the set and advances the position of the 
+     * <code>NodeIterator</code> in the set. After a 
+     * <code>NodeIterator</code> is created, the first call to 
+     * <code>nextNode()</code> returns the first node in the set.
+     * @return The next <code>Node</code> in the set being iterated over, or 
+     *   <code>null</code> if there are no more members in that set.
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if this method is called after the 
+     *   <code>detach</code> method was invoked.
+     */
+    public Node nextNode()
+                         throws DOMException;
+
+    /**
+     * Returns the previous node in the set and moves the position of the 
+     * <code>NodeIterator</code> backwards in the set.
+     * @return The previous <code>Node</code> in the set being iterated over, 
+     *   or <code>null</code> if there are no more members in that set. 
+     * @exception DOMException
+     *   INVALID_STATE_ERR: Raised if this method is called after the 
+     *   <code>detach</code> method was invoked.
+     */
+    public Node previousNode()
+                             throws DOMException;
+
+    /**
+     * Detaches the <code>NodeIterator</code> from the set which it iterated 
+     * over, releasing any computational resources and placing the 
+     * <code>NodeIterator</code> in the INVALID state. After 
+     * <code>detach</code> has been invoked, calls to <code>nextNode</code> 
+     * or <code>previousNode</code> will raise the exception 
+     * INVALID_STATE_ERR.
+     */
+    public void detach();
+
+}
diff --git a/libjava/org/w3c/dom/traversal/TreeWalker.java b/libjava/external/w3c_dom/org/w3c/dom/traversal/TreeWalker.java
similarity index 89%
rename from libjava/org/w3c/dom/traversal/TreeWalker.java
rename to libjava/external/w3c_dom/org/w3c/dom/traversal/TreeWalker.java
index ed02929..f5fff86 100644 (file)
--- a/libjava/org/w3c/dom/traversal/TreeWalker.java
+++ b/libjava/external/w3c_dom/org/w3c/dom/traversal/TreeWalker.java
@@ -1,167 +1,179 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom.traversal;\r
-\r
-import org.w3c.dom.Node;\r
-import org.w3c.dom.DOMException;\r
-\r
-/**\r
- * <code>TreeWalker</code> objects are used to navigate a document tree or \r
- * subtree using the view of the document defined by their \r
- * <code>whatToShow</code> flags and filter (if any). Any function which \r
- * performs navigation using a <code>TreeWalker</code> will automatically \r
- * support any view defined by a <code>TreeWalker</code>.\r
- * <p>Omitting nodes from the logical view of a subtree can result in a \r
- * structure that is substantially different from the same subtree in the \r
- * complete, unfiltered document. Nodes that are siblings in the \r
- * <code>TreeWalker</code> view may be children of different, widely \r
- * separated nodes in the original view. For instance, consider a \r
- * <code>NodeFilter</code> that skips all nodes except for Text nodes and \r
- * the root node of a document. In the logical view that results, all text \r
- * nodes will be siblings and appear as direct children of the root node, no \r
- * matter how deeply nested the structure of the original document.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document Object Model (DOM) Level 2 Traversal and Range Specification</a>.\r
- * @since DOM Level 2\r
- */\r
-public interface TreeWalker {\r
-    /**\r
-     * The <code>root</code> node of the <code>TreeWalker</code>, as specified \r
-     * when it was created.\r
-     */\r
-    public Node getRoot();\r
-\r
-    /**\r
-     * This attribute determines which node types are presented via the \r
-     * <code>TreeWalker</code>. The available set of constants is defined in \r
-     * the <code>NodeFilter</code> interface.  Nodes not accepted by \r
-     * <code>whatToShow</code> will be skipped, but their children may still \r
-     * be considered. Note that this skip takes precedence over the filter, \r
-     * if any. \r
-     */\r
-    public int getWhatToShow();\r
-\r
-    /**\r
-     * The filter used to screen nodes.\r
-     */\r
-    public NodeFilter getFilter();\r
-\r
-    /**\r
-     * The value of this flag determines whether the children of entity \r
-     * reference nodes are visible to the <code>TreeWalker</code>. If false, \r
-     * they  and their descendants will be rejected. Note that this \r
-     * rejection takes precedence over <code>whatToShow</code> and the \r
-     * filter, if any. \r
-     * <br> To produce a view of the document that has entity references \r
-     * expanded and does not expose the entity reference node itself, use \r
-     * the <code>whatToShow</code> flags to hide the entity reference node \r
-     * and set <code>expandEntityReferences</code> to true when creating the \r
-     * <code>TreeWalker</code>. To produce a view of the document that has \r
-     * entity reference nodes but no entity expansion, use the \r
-     * <code>whatToShow</code> flags to show the entity reference node and \r
-     * set <code>expandEntityReferences</code> to false.\r
-     */\r
-    public boolean getExpandEntityReferences();\r
-\r
-    /**\r
-     * The node at which the <code>TreeWalker</code> is currently positioned.\r
-     * <br>Alterations to the DOM tree may cause the current node to no longer \r
-     * be accepted by the <code>TreeWalker</code>'s associated filter. \r
-     * <code>currentNode</code> may also be explicitly set to any node, \r
-     * whether or not it is within the subtree specified by the \r
-     * <code>root</code> node or would be accepted by the filter and \r
-     * <code>whatToShow</code> flags. Further traversal occurs relative to \r
-     * <code>currentNode</code> even if it is not part of the current view, \r
-     * by applying the filters in the requested direction; if no traversal \r
-     * is possible, <code>currentNode</code> is not changed. \r
-     * @exception DOMException\r
-     *   NOT_SUPPORTED_ERR: Raised if an attempt is made to set \r
-     *   <code>currentNode</code> to <code>null</code>.\r
-     */\r
-    public Node getCurrentNode();\r
-    public void setCurrentNode(Node currentNode)\r
-                         throws DOMException;\r
-\r
-    /**\r
-     * Moves to and returns the closest visible ancestor node of the current \r
-     * node. If the search for <code>parentNode</code> attempts to step \r
-     * upward from the <code>TreeWalker</code>'s <code>root</code> node, or \r
-     * if it fails to find a visible ancestor node, this method retains the \r
-     * current position and returns <code>null</code>.\r
-     * @return The new parent node, or <code>null</code> if the current node \r
-     *   has no parent  in the <code>TreeWalker</code>'s logical view.  \r
-     */\r
-    public Node parentNode();\r
-\r
-    /**\r
-     * Moves the <code>TreeWalker</code> to the first visible child of the \r
-     * current node, and returns the new node. If the current node has no \r
-     * visible children, returns <code>null</code>, and retains the current \r
-     * node.\r
-     * @return The new node, or <code>null</code> if the current node has no \r
-     *   visible children  in the <code>TreeWalker</code>'s logical view.  \r
-     */\r
-    public Node firstChild();\r
-\r
-    /**\r
-     * Moves the <code>TreeWalker</code> to the last visible child of the \r
-     * current node, and returns the new node. If the current node has no \r
-     * visible children, returns <code>null</code>, and retains the current \r
-     * node.\r
-     * @return The new node, or <code>null</code> if the current node has no \r
-     *   children  in the <code>TreeWalker</code>'s logical view.  \r
-     */\r
-    public Node lastChild();\r
-\r
-    /**\r
-     * Moves the <code>TreeWalker</code> to the previous sibling of the \r
-     * current node, and returns the new node. If the current node has no \r
-     * visible previous sibling, returns <code>null</code>, and retains the \r
-     * current node.\r
-     * @return The new node, or <code>null</code> if the current node has no \r
-     *   previous sibling.  in the <code>TreeWalker</code>'s logical view.  \r
-     */\r
-    public Node previousSibling();\r
-\r
-    /**\r
-     * Moves the <code>TreeWalker</code> to the next sibling of the current \r
-     * node, and returns the new node. If the current node has no visible \r
-     * next sibling, returns <code>null</code>, and retains the current node.\r
-     * @return The new node, or <code>null</code> if the current node has no \r
-     *   next sibling.  in the <code>TreeWalker</code>'s logical view.  \r
-     */\r
-    public Node nextSibling();\r
-\r
-    /**\r
-     * Moves the <code>TreeWalker</code> to the previous visible node in \r
-     * document order relative to the current node, and returns the new \r
-     * node. If the current node has no previous node,  or if the search for \r
-     * <code>previousNode</code> attempts to step upward from the \r
-     * <code>TreeWalker</code>'s <code>root</code> node,  returns \r
-     * <code>null</code>, and retains the current node. \r
-     * @return The new node, or <code>null</code> if the current node has no \r
-     *   previous node  in the <code>TreeWalker</code>'s logical view.  \r
-     */\r
-    public Node previousNode();\r
-\r
-    /**\r
-     * Moves the <code>TreeWalker</code> to the next visible node in document \r
-     * order relative to the current node, and returns the new node. If the \r
-     * current node has no next node, or if the search for nextNode attempts \r
-     * to step upward from the <code>TreeWalker</code>'s <code>root</code> \r
-     * node, returns <code>null</code>, and retains the current node.\r
-     * @return The new node, or <code>null</code> if the current node has no \r
-     *   next node  in the <code>TreeWalker</code>'s logical view.  \r
-     */\r
-    public Node nextNode();\r
-\r
-}\r
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.traversal;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.DOMException;
+
+/**
+ * <code>TreeWalker</code> objects are used to navigate a document tree or 
+ * subtree using the view of the document defined by their 
+ * <code>whatToShow</code> flags and filter (if any). Any function which 
+ * performs navigation using a <code>TreeWalker</code> will automatically 
+ * support any view defined by a <code>TreeWalker</code>.
+ * <p>Omitting nodes from the logical view of a subtree can result in a 
+ * structure that is substantially different from the same subtree in the 
+ * complete, unfiltered document. Nodes that are siblings in the 
+ * <code>TreeWalker</code> view may be children of different, widely 
+ * separated nodes in the original view. For instance, consider a 
+ * <code>NodeFilter</code> that skips all nodes except for Text nodes and 
+ * the root node of a document. In the logical view that results, all text 
+ * nodes will be siblings and appear as direct children of the root node, no 
+ * matter how deeply nested the structure of the original document.
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document Object Model (DOM) Level 2 Traversal and Range Specification</a>.
+ * @since DOM Level 2
+ */
+public interface TreeWalker {
+    /**
+     * The <code>root</code> node of the <code>TreeWalker</code>, as specified 
+     * when it was created.
+     */
+    public Node getRoot();
+
+    /**
+     * This attribute determines which node types are presented via the 
+     * <code>TreeWalker</code>. The available set of constants is defined in 
+     * the <code>NodeFilter</code> interface.  Nodes not accepted by 
+     * <code>whatToShow</code> will be skipped, but their children may still 
+     * be considered. Note that this skip takes precedence over the filter, 
+     * if any. 
+     */
+    public int getWhatToShow();
+
+    /**
+     * The filter used to screen nodes.
+     */
+    public NodeFilter getFilter();
+
+    /**
+     * The value of this flag determines whether the children of entity 
+     * reference nodes are visible to the <code>TreeWalker</code>. If false, 
+     * these children  and their descendants will be rejected. Note that 
+     * this rejection takes precedence over <code>whatToShow</code> and the 
+     * filter, if any. 
+     * <br> To produce a view of the document that has entity references 
+     * expanded and does not expose the entity reference node itself, use 
+     * the <code>whatToShow</code> flags to hide the entity reference node 
+     * and set <code>expandEntityReferences</code> to true when creating the 
+     * <code>TreeWalker</code>. To produce a view of the document that has 
+     * entity reference nodes but no entity expansion, use the 
+     * <code>whatToShow</code> flags to show the entity reference node and 
+     * set <code>expandEntityReferences</code> to false.
+     */
+    public boolean getExpandEntityReferences();
+
+    /**
+     * The node at which the <code>TreeWalker</code> is currently positioned.
+     * <br>Alterations to the DOM tree may cause the current node to no longer 
+     * be accepted by the <code>TreeWalker</code>'s associated filter. 
+     * <code>currentNode</code> may also be explicitly set to any node, 
+     * whether or not it is within the subtree specified by the 
+     * <code>root</code> node or would be accepted by the filter and 
+     * <code>whatToShow</code> flags. Further traversal occurs relative to 
+     * <code>currentNode</code> even if it is not part of the current view, 
+     * by applying the filters in the requested direction; if no traversal 
+     * is possible, <code>currentNode</code> is not changed. 
+     */
+    public Node getCurrentNode();
+    /**
+     * The node at which the <code>TreeWalker</code> is currently positioned.
+     * <br>Alterations to the DOM tree may cause the current node to no longer 
+     * be accepted by the <code>TreeWalker</code>'s associated filter. 
+     * <code>currentNode</code> may also be explicitly set to any node, 
+     * whether or not it is within the subtree specified by the 
+     * <code>root</code> node or would be accepted by the filter and 
+     * <code>whatToShow</code> flags. Further traversal occurs relative to 
+     * <code>currentNode</code> even if it is not part of the current view, 
+     * by applying the filters in the requested direction; if no traversal 
+     * is possible, <code>currentNode</code> is not changed. 
+     * @exception DOMException
+     *   NOT_SUPPORTED_ERR: Raised if an attempt is made to set 
+     *   <code>currentNode</code> to <code>null</code>.
+     */
+    public void setCurrentNode(Node currentNode)
+                         throws DOMException;
+
+    /**
+     * Moves to and returns the closest visible ancestor node of the current 
+     * node. If the search for <code>parentNode</code> attempts to step 
+     * upward from the <code>TreeWalker</code>'s <code>root</code> node, or 
+     * if it fails to find a visible ancestor node, this method retains the 
+     * current position and returns <code>null</code>.
+     * @return The new parent node, or <code>null</code> if the current node 
+     *   has no parent  in the <code>TreeWalker</code>'s logical view.  
+     */
+    public Node parentNode();
+
+    /**
+     * Moves the <code>TreeWalker</code> to the first visible child of the 
+     * current node, and returns the new node. If the current node has no 
+     * visible children, returns <code>null</code>, and retains the current 
+     * node.
+     * @return The new node, or <code>null</code> if the current node has no 
+     *   visible children  in the <code>TreeWalker</code>'s logical view.  
+     */
+    public Node firstChild();
+
+    /**
+     * Moves the <code>TreeWalker</code> to the last visible child of the 
+     * current node, and returns the new node. If the current node has no 
+     * visible children, returns <code>null</code>, and retains the current 
+     * node.
+     * @return The new node, or <code>null</code> if the current node has no 
+     *   children  in the <code>TreeWalker</code>'s logical view.  
+     */
+    public Node lastChild();
+
+    /**
+     * Moves the <code>TreeWalker</code> to the previous sibling of the 
+     * current node, and returns the new node. If the current node has no 
+     * visible previous sibling, returns <code>null</code>, and retains the 
+     * current node.
+     * @return The new node, or <code>null</code> if the current node has no 
+     *   previous sibling.  in the <code>TreeWalker</code>'s logical view.  
+     */
+    public Node previousSibling();
+
+    /**
+     * Moves the <code>TreeWalker</code> to the next sibling of the current 
+     * node, and returns the new node. If the current node has no visible 
+     * next sibling, returns <code>null</code>, and retains the current node.
+     * @return The new node, or <code>null</code> if the current node has no 
+     *   next sibling.  in the <code>TreeWalker</code>'s logical view.  
+     */
+    public Node nextSibling();
+
+    /**
+     * Moves the <code>TreeWalker</code> to the previous visible node in 
+     * document order relative to the current node, and returns the new 
+     * node. If the current node has no previous node,  or if the search for 
+     * <code>previousNode</code> attempts to step upward from the 
+     * <code>TreeWalker</code>'s <code>root</code> node,  returns 
+     * <code>null</code>, and retains the current node. 
+     * @return The new node, or <code>null</code> if the current node has no 
+     *   previous node  in the <code>TreeWalker</code>'s logical view.  
+     */
+    public Node previousNode();
+
+    /**
+     * Moves the <code>TreeWalker</code> to the next visible node in document 
+     * order relative to the current node, and returns the new node. If the 
+     * current node has no next node, or if the search for nextNode attempts 
+     * to step upward from the <code>TreeWalker</code>'s <code>root</code> 
+     * node, returns <code>null</code>, and retains the current node.
+     * @return The new node, or <code>null</code> if the current node has no 
+     *   next node  in the <code>TreeWalker</code>'s logical view.  
+     */
+    public Node nextNode();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/views/AbstractView.java b/libjava/external/w3c_dom/org/w3c/dom/views/AbstractView.java
new file mode 100644 (file)
index 0000000..97e8f0e
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/views/AbstractView.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.views;
+
+/**
+ * A base interface that all views shall derive from.
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Views-20001113'>Document Object Model (DOM) Level 2 Views Specification</a>.
+ * @since DOM Level 2
+ */
+public interface AbstractView {
+    /**
+     * The source <code>DocumentView</code> of which this is an 
+     * <code>AbstractView</code>.
+     */
+    public DocumentView getDocument();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/views/DocumentView.java b/libjava/external/w3c_dom/org/w3c/dom/views/DocumentView.java
new file mode 100644 (file)
index 0000000..2cb9eeb
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/views/DocumentView.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.views;
+
+/**
+ * The <code>DocumentView</code> interface is implemented by 
+ * <code>Document</code> objects in DOM implementations supporting DOM 
+ * Views. It provides an attribute to retrieve the default view of a 
+ * document.
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Views-20001113'>Document Object Model (DOM) Level 2 Views Specification</a>.
+ * @since DOM Level 2
+ */
+public interface DocumentView {
+    /**
+     * The default <code>AbstractView</code> for this <code>Document</code>, 
+     * or <code>null</code> if none available.
+     */
+    public AbstractView getDefaultView();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathEvaluator.java b/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathEvaluator.java
new file mode 100644 (file)
index 0000000..a85c0e8
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathEvaluator.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.xpath;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.DOMException;
+
+/**
+ *  The evaluation of XPath expressions is provided by 
+ * <code>XPathEvaluator</code>. In a DOM implementation which supports the 
+ * XPath 3.0 feature, as described above, the <code>XPathEvaluator</code> 
+ * interface will be implemented on the same object which implements the 
+ * <code>Document</code> interface permitting it to be obtained by the usual 
+ * binding-specific method such as casting or by using the DOM Level 3 
+ * getInterface method. In this case the implementation obtained from the 
+ * Document supports the XPath DOM module and is compatible with the XPath 
+ * 1.0 specification. 
+ * <p>Evaluation of expressions with specialized extension functions or 
+ * variables may not work in all implementations and is, therefore, not 
+ * portable. <code>XPathEvaluator</code> implementations may be available 
+ * from other sources that could provide specific support for specialized 
+ * extension functions or variables as would be defined by other 
+ * specifications. 
+ * <p>See also the <a href='http://www.w3.org/TR/2004/NOTE-DOM-Level-3-XPath-20040226'>Document Object Model (DOM) Level 3 XPath Specification</a>.
+ */
+public interface XPathEvaluator {
+    /**
+     * Creates a parsed XPath expression with resolved namespaces. This is 
+     * useful when an expression will be reused in an application since it 
+     * makes it possible to compile the expression string into a more 
+     * efficient internal form and preresolve all namespace prefixes which 
+     * occur within the expression.
+     * @param expression The XPath expression string to be parsed.
+     * @param resolver The <code>resolver</code> permits translation of all 
+     *   prefixes, including the <code>xml</code> namespace prefix, within 
+     *   the XPath expression into appropriate namespace URIs. If this is 
+     *   specified as <code>null</code>, any namespace prefix within the 
+     *   expression will result in <code>DOMException</code> being thrown 
+     *   with the code <code>NAMESPACE_ERR</code>.
+     * @return The compiled form of the XPath expression.
+     * @exception XPathException
+     *   INVALID_EXPRESSION_ERR: Raised if the expression is not legal 
+     *   according to the rules of the <code>XPathEvaluator</code>.
+     * @exception DOMException
+     *   NAMESPACE_ERR: Raised if the expression contains namespace prefixes 
+     *   which cannot be resolved by the specified 
+     *   <code>XPathNSResolver</code>.
+     */
+    public XPathExpression createExpression(String expression, 
+                                            XPathNSResolver resolver)
+                                            throws XPathException, DOMException;
+
+    /**
+     * Adapts any DOM node to resolve namespaces so that an XPath expression 
+     * can be easily evaluated relative to the context of the node where it 
+     * appeared within the document. This adapter works like the DOM Level 3 
+     * method <code>lookupNamespaceURI</code> on nodes in resolving the 
+     * namespaceURI from a given prefix using the current information 
+     * available in the node's hierarchy at the time lookupNamespaceURI is 
+     * called. also correctly resolving the implicit xml prefix.
+     * @param nodeResolver The node to be used as a context for namespace 
+     *   resolution.
+     * @return <code>XPathNSResolver</code> which resolves namespaces with 
+     *   respect to the definitions in scope for a specified node.
+     */
+    public XPathNSResolver createNSResolver(Node nodeResolver);
+
+    /**
+     * Evaluates an XPath expression string and returns a result of the 
+     * specified type if possible.
+     * @param expression The XPath expression string to be parsed and 
+     *   evaluated.
+     * @param contextNode The <code>context</code> is context node for the 
+     *   evaluation of this XPath expression. If the XPathEvaluator was 
+     *   obtained by casting the <code>Document</code> then this must be 
+     *   owned by the same document and must be a <code>Document</code>, 
+     *   <code>Element</code>, <code>Attribute</code>, <code>Text</code>, 
+     *   <code>CDATASection</code>, <code>Comment</code>, 
+     *   <code>ProcessingInstruction</code>, or <code>XPathNamespace</code> 
+     *   node. If the context node is a <code>Text</code> or a 
+     *   <code>CDATASection</code>, then the context is interpreted as the 
+     *   whole logical text node as seen by XPath, unless the node is empty 
+     *   in which case it may not serve as the XPath context.
+     * @param resolver The <code>resolver</code> permits translation of all 
+     *   prefixes, including the <code>xml</code> namespace prefix, within 
+     *   the XPath expression into appropriate namespace URIs. If this is 
+     *   specified as <code>null</code>, any namespace prefix within the 
+     *   expression will result in <code>DOMException</code> being thrown 
+     *   with the code <code>NAMESPACE_ERR</code>.
+     * @param type If a specific <code>type</code> is specified, then the 
+     *   result will be returned as the corresponding type.For XPath 1.0 
+     *   results, this must be one of the codes of the 
+     *   <code>XPathResult</code> interface.
+     * @param result The <code>result</code> specifies a specific result 
+     *   object which may be reused and returned by this method. If this is 
+     *   specified as <code>null</code>or the implementation does not reuse 
+     *   the specified result, a new result object will be constructed and 
+     *   returned.For XPath 1.0 results, this object will be of type 
+     *   <code>XPathResult</code>.
+     * @return The result of the evaluation of the XPath expression.For XPath 
+     *   1.0 results, this object will be of type <code>XPathResult</code>.
+     * @exception XPathException
+     *   INVALID_EXPRESSION_ERR: Raised if the expression is not legal 
+     *   according to the rules of the <code>XPathEvaluator</code>i
+     *   <br>TYPE_ERR: Raised if the result cannot be converted to return the 
+     *   specified type.
+     * @exception DOMException
+     *   NAMESPACE_ERR: Raised if the expression contains namespace prefixes 
+     *   which cannot be resolved by the specified 
+     *   <code>XPathNSResolver</code>.
+     *   <br>WRONG_DOCUMENT_ERR: The Node is from a document that is not 
+     *   supported by this <code>XPathEvaluator</code>.
+     *   <br>NOT_SUPPORTED_ERR: The Node is not a type permitted as an XPath 
+     *   context node or the request type is not permitted by this 
+     *   <code>XPathEvaluator</code>.
+     */
+    public Object evaluate(String expression, 
+                           Node contextNode, 
+                           XPathNSResolver resolver, 
+                           short type, 
+                           Object result)
+                           throws XPathException, DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathException.java b/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathException.java
new file mode 100644 (file)
index 0000000..deb1bd7
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathException.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.xpath;
+
+/**
+ * A new exception has been created for exceptions specific to these XPath 
+ * interfaces.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/NOTE-DOM-Level-3-XPath-20040226'>Document Object Model (DOM) Level 3 XPath Specification</a>.
+ */
+public class XPathException extends RuntimeException {
+    public XPathException(short code, String message) {
+       super(message);
+       this.code = code;
+    }
+    public short   code;
+    // XPathExceptionCode
+    /**
+     * If the expression has a syntax error or otherwise is not a legal 
+     * expression according to the rules of the specific 
+     * <code>XPathEvaluator</code> or contains specialized extension 
+     * functions or variables not supported by this implementation.
+     */
+    public static final short INVALID_EXPRESSION_ERR    = 51;
+    /**
+     * If the expression cannot be converted to return the specified type.
+     */
+    public static final short TYPE_ERR                  = 52;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathExpression.java b/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathExpression.java
new file mode 100644 (file)
index 0000000..e972532
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathExpression.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.xpath;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.DOMException;
+
+/**
+ * The <code>XPathExpression</code> interface represents a parsed and resolved 
+ * XPath expression.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/NOTE-DOM-Level-3-XPath-20040226'>Document Object Model (DOM) Level 3 XPath Specification</a>.
+ */
+public interface XPathExpression {
+    /**
+     * Evaluates this XPath expression and returns a result.
+     * @param contextNode The <code>context</code> is context node for the 
+     *   evaluation of this XPath expression.If the XPathEvaluator was 
+     *   obtained by casting the <code>Document</code> then this must be 
+     *   owned by the same document and must be a <code>Document</code>, 
+     *   <code>Element</code>, <code>Attribute</code>, <code>Text</code>, 
+     *   <code>CDATASection</code>, <code>Comment</code>, 
+     *   <code>ProcessingInstruction</code>, or <code>XPathNamespace</code> 
+     *   node.If the context node is a <code>Text</code> or a 
+     *   <code>CDATASection</code>, then the context is interpreted as the 
+     *   whole logical text node as seen by XPath, unless the node is empty 
+     *   in which case it may not serve as the XPath context.
+     * @param type If a specific <code>type</code> is specified, then the 
+     *   result will be coerced to return the specified type relying on 
+     *   XPath conversions and fail if the desired coercion is not possible. 
+     *   This must be one of the type codes of <code>XPathResult</code>.
+     * @param result The <code>result</code> specifies a specific result 
+     *   object which may be reused and returned by this method. If this is 
+     *   specified as <code>null</code>or the implementation does not reuse 
+     *   the specified result, a new result object will be constructed and 
+     *   returned.For XPath 1.0 results, this object will be of type 
+     *   <code>XPathResult</code>.
+     * @return The result of the evaluation of the XPath expression.For XPath 
+     *   1.0 results, this object will be of type <code>XPathResult</code>.
+     * @exception XPathException
+     *   TYPE_ERR: Raised if the result cannot be converted to return the 
+     *   specified type.
+     * @exception DOMException
+     *   WRONG_DOCUMENT_ERR: The Node is from a document that is not supported 
+     *   by the XPathEvaluator that created this <code>XPathExpression</code>
+     *   .
+     *   <br>NOT_SUPPORTED_ERR: The Node is not a type permitted as an XPath 
+     *   context node or the request type is not permitted by this 
+     *   <code>XPathExpression</code>.
+     */
+    public Object evaluate(Node contextNode, 
+                           short type, 
+                           Object result)
+                           throws XPathException, DOMException;
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathNSResolver.java b/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathNSResolver.java
new file mode 100644 (file)
index 0000000..b8f0521
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathNSResolver.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.xpath;
+
+/**
+ * The <code>XPathNSResolver</code> interface permit <code>prefix</code> 
+ * strings in the expression to be properly bound to 
+ * <code>namespaceURI</code> strings. <code>XPathEvaluator</code> can 
+ * construct an implementation of <code>XPathNSResolver</code> from a node, 
+ * or the interface may be implemented by any application.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/NOTE-DOM-Level-3-XPath-20040226'>Document Object Model (DOM) Level 3 XPath Specification</a>.
+ */
+public interface XPathNSResolver {
+    /**
+     * Look up the namespace URI associated to the given namespace prefix. The 
+     * XPath evaluator must never call this with a <code>null</code> or 
+     * empty argument, because the result of doing this is undefined.
+     * @param prefix The prefix to look for.
+     * @return Returns the associated namespace URI or <code>null</code> if 
+     *   none is found.
+     */
+    public String lookupNamespaceURI(String prefix);
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathNamespace.java b/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathNamespace.java
new file mode 100644 (file)
index 0000000..9f15481
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathNamespace.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.xpath;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>XPathNamespace</code> interface is returned by 
+ * <code>XPathResult</code> interfaces to represent the XPath namespace node 
+ * type that DOM lacks. There is no public constructor for this node type. 
+ * Attempts to place it into a hierarchy or a NamedNodeMap result in a 
+ * <code>DOMException</code> with the code <code>HIERARCHY_REQUEST_ERR</code>
+ * . This node is read only, so methods or setting of attributes that would 
+ * mutate the node result in a DOMException with the code 
+ * <code>NO_MODIFICATION_ALLOWED_ERR</code>.
+ * <p>The core specification describes attributes of the <code>Node</code> 
+ * interface that are different for different node types but does not 
+ * describe <code>XPATH_NAMESPACE_NODE</code>, so here is a description of 
+ * those attributes for this node type. All attributes of <code>Node</code> 
+ * not described in this section have a <code>null</code> or 
+ * <code>false</code> value.
+ * <p><code>ownerDocument</code> matches the <code>ownerDocument</code> of the 
+ * <code>ownerElement</code> even if the element is later adopted.
+ * <p><code>nodeName</code> is always the string "<code>#namespace</code>".
+ * <p><code>prefix</code> is the prefix of the namespace represented by the 
+ * node.
+ * <p><code>localName</code> is the same as <code>prefix</code>.
+ * <p><code>nodeType</code> is equal to <code>XPATH_NAMESPACE_NODE</code>.
+ * <p><code>namespaceURI</code> is the namespace URI of the namespace 
+ * represented by the node.
+ * <p><code>nodeValue</code> is the same as <code>namespaceURI</code>.
+ * <p><code>adoptNode</code>, <code>cloneNode</code>, and 
+ * <code>importNode</code> fail on this node type by raising a 
+ * <code>DOMException</code> with the code <code>NOT_SUPPORTED_ERR</code>.
+ * <p ><b>Note:</b> In future versions of the XPath specification, the 
+ * definition of a namespace node may be changed incomatibly, in which case 
+ * incompatible changes to field values may be required to implement 
+ * versions beyond XPath 1.0.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/NOTE-DOM-Level-3-XPath-20040226'>Document Object Model (DOM) Level 3 XPath Specification</a>.
+ */
+public interface XPathNamespace extends Node {
+    // XPathNodeType
+    /**
+     * The node is a <code>Namespace</code>.
+     */
+    public static final short XPATH_NAMESPACE_NODE      = 13;
+
+    /**
+     * The <code>Element</code> on which the namespace was in scope when it 
+     * was requested. This does not change on a returned namespace node even 
+     * if the document changes such that the namespace goes out of scope on 
+     * that element and this node is no longer found there by XPath.
+     */
+    public Element getOwnerElement();
+
+}
diff --git a/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathResult.java b/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathResult.java
new file mode 100644 (file)
index 0000000..56064b9
--- /dev/null
+++ b/libjava/external/w3c_dom/org/w3c/dom/xpath/XPathResult.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ */
+
+package org.w3c.dom.xpath;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.DOMException;
+
+/**
+ * The <code>XPathResult</code> interface represents the result of the 
+ * evaluation of an XPath 1.0 expression within the context of a particular 
+ * node. Since evaluation of an XPath expression can result in various 
+ * result types, this object makes it possible to discover and manipulate 
+ * the type and value of the result.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/NOTE-DOM-Level-3-XPath-20040226'>Document Object Model (DOM) Level 3 XPath Specification</a>.
+ */
+public interface XPathResult {
+    // XPathResultType
+    /**
+     * This code does not represent a specific type. An evaluation of an XPath 
+     * expression will never produce this type. If this type is requested, 
+     * then the evaluation returns whatever type naturally results from 
+     * evaluation of the expression. 
+     * <br>If the natural result is a node set when <code>ANY_TYPE</code> was 
+     * requested, then <code>UNORDERED_NODE_ITERATOR_TYPE</code> is always 
+     * the resulting type. Any other representation of a node set must be 
+     * explicitly requested.
+     */
+    public static final short ANY_TYPE                  = 0;
+    /**
+     * The result is a <a href='http://www.w3.org/TR/1999/REC-xpath-19991116#numbers'>number</a> as defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath 1.0</a>]. 
+     * Document modification does not invalidate the number, but may mean 
+     * that reevaluation would not yield the same number.
+     */
+    public static final short NUMBER_TYPE               = 1;
+    /**
+     * The result is a <a href='http://www.w3.org/TR/1999/REC-xpath-19991116#strings'>string</a> as defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath 1.0</a>]. 
+     * Document modification does not invalidate the string, but may mean 
+     * that the string no longer corresponds to the current document.
+     */
+    public static final short STRING_TYPE               = 2;
+    /**
+     * The result is a <a href='http://www.w3.org/TR/1999/REC-xpath-19991116#booleans'>boolean</a> as defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath 1.0</a>]. 
+     * Document modification does not invalidate the boolean, but may mean 
+     * that reevaluation would not yield the same boolean.
+     */
+    public static final short BOOLEAN_TYPE              = 3;
+    /**
+     * The result is a <a href='http://www.w3.org/TR/1999/REC-xpath-19991116#node-sets'>node set</a> as defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath 1.0</a>] that 
+     * will be accessed iteratively, which may not produce nodes in a 
+     * particular order. Document modification invalidates the iteration.
+     * <br>This is the default type returned if the result is a node set and 
+     * <code>ANY_TYPE</code> is requested.
+     */
+    public static final short UNORDERED_NODE_ITERATOR_TYPE = 4;
+    /**
+     * The result is a node set as defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath 1.0</a>] that 
+     * will be accessed iteratively, which will produce document-ordered 
+     * nodes. Document modification invalidates the iteration.
+     */
+    public static final short ORDERED_NODE_ITERATOR_TYPE = 5;
+    /**
+     * The result is a <a href='http://www.w3.org/TR/1999/REC-xpath-19991116#node-sets'>node set</a> as defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath 1.0</a>] that 
+     * will be accessed as a snapshot list of nodes that may not be in a 
+     * particular order. Document modification does not invalidate the 
+     * snapshot but may mean that reevaluation would not yield the same 
+     * snapshot and nodes in the snapshot may have been altered, moved, or 
+     * removed from the document.
+     */
+    public static final short UNORDERED_NODE_SNAPSHOT_TYPE = 6;
+    /**
+     * The result is a <a href='http://www.w3.org/TR/1999/REC-xpath-19991116#node-sets'>node set</a> as defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath 1.0</a>] that 
+     * will be accessed as a snapshot list of nodes that will be in original 
+     * document order. Document modification does not invalidate the 
+     * snapshot but may mean that reevaluation would not yield the same 
+     * snapshot and nodes in the snapshot may have been altered, moved, or 
+     * removed from the document.
+     */
+    public static final short ORDERED_NODE_SNAPSHOT_TYPE = 7;
+    /**
+     * The result is a <a href='http://www.w3.org/TR/1999/REC-xpath-19991116#node-sets'>node set</a> as defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath 1.0</a>] and 
+     * will be accessed as a single node, which may be <code>null</code>if 
+     * the node set is empty. Document modification does not invalidate the 
+     * node, but may mean that the result node no longer corresponds to the 
+     * current document. This is a convenience that permits optimization 
+     * since the implementation can stop once any node in the resulting set 
+     * has been found.
+     * <br>If there is more than one node in the actual result, the single 
+     * node returned might not be the first in document order.
+     */
+    public static final short ANY_UNORDERED_NODE_TYPE   = 8;
+    /**
+     * The result is a <a href='http://www.w3.org/TR/1999/REC-xpath-19991116#node-sets'>node set</a> as defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath 1.0</a>] and 
+     * will be accessed as a single node, which may be <code>null</code> if 
+     * the node set is empty. Document modification does not invalidate the 
+     * node, but may mean that the result node no longer corresponds to the 
+     * current document. This is a convenience that permits optimization 
+     * since the implementation can stop once the first node in document 
+     * order of the resulting set has been found.
+     * <br>If there are more than one node in the actual result, the single 
+     * node returned will be the first in document order.
+     */
+    public static final short FIRST_ORDERED_NODE_TYPE   = 9;
+
+    /**
+     * A code representing the type of this result, as defined by the type 
+     * constants.
+     */
+    public short getResultType();
+
+    /**
+     * The value of this number result. If the native double type of the DOM 
+     * binding does not directly support the exact IEEE 754 result of the 
+     * XPath expression, then it is up to the definition of the binding to 
+     * specify how the XPath number is converted to the native binding 
+     * number.
+     * @exception XPathException
+     *   TYPE_ERR: raised if <code>resultType</code> is not 
+     *   <code>NUMBER_TYPE</code>.
+     */
+    public double getNumberValue()
+                             throws XPathException;
+
+    /**
+     * The value of this string result.
+     * @exception XPathException
+     *   TYPE_ERR: raised if <code>resultType</code> is not 
+     *   <code>STRING_TYPE</code>.
+     */
+    public String getStringValue()
+                             throws XPathException;
+
+    /**
+     * The value of this boolean result.
+     * @exception XPathException
+     *   TYPE_ERR: raised if <code>resultType</code> is not 
+     *   <code>BOOLEAN_TYPE</code>.
+     */
+    public boolean getBooleanValue()
+                             throws XPathException;
+
+    /**
+     * The value of this single node result, which may be <code>null</code>.
+     * @exception XPathException
+     *   TYPE_ERR: raised if <code>resultType</code> is not 
+     *   <code>ANY_UNORDERED_NODE_TYPE</code> or 
+     *   <code>FIRST_ORDERED_NODE_TYPE</code>.
+     */
+    public Node getSingleNodeValue()
+                             throws XPathException;
+
+    /**
+     * Signifies that the iterator has become invalid. True if 
+     * <code>resultType</code> is <code>UNORDERED_NODE_ITERATOR_TYPE</code> 
+     * or <code>ORDERED_NODE_ITERATOR_TYPE</code> and the document has been 
+     * modified since this result was returned.
+     */
+    public boolean getInvalidIteratorState();
+
+    /**
+     * The number of nodes in the result snapshot. Valid values for 
+     * snapshotItem indices are <code>0</code> to 
+     * <code>snapshotLength-1</code> inclusive.
+     * @exception XPathException
+     *   TYPE_ERR: raised if <code>resultType</code> is not 
+     *   <code>UNORDERED_NODE_SNAPSHOT_TYPE</code> or 
+     *   <code>ORDERED_NODE_SNAPSHOT_TYPE</code>.
+     */
+    public int getSnapshotLength()
+                             throws XPathException;
+
+    /**
+     * Iterates and returns the next node from the node set or 
+     * <code>null</code>if there are no more nodes.
+     * @return Returns the next node.
+     * @exception XPathException
+     *   TYPE_ERR: raised if <code>resultType</code> is not 
+     *   <code>UNORDERED_NODE_ITERATOR_TYPE</code> or 
+     *   <code>ORDERED_NODE_ITERATOR_TYPE</code>.
+     * @exception DOMException
+     *   INVALID_STATE_ERR: The document has been mutated since the result was 
+     *   returned.
+     */
+    public Node iterateNext()
+                            throws XPathException, DOMException;
+
+    /**
+     * Returns the <code>index</code>th item in the snapshot collection. If 
+     * <code>index</code> is greater than or equal to the number of nodes in 
+     * the list, this method returns <code>null</code>. Unlike the iterator 
+     * result, the snapshot does not become invalid, but may not correspond 
+     * to the current document if it is mutated.
+     * @param index Index into the snapshot collection.
+     * @return The node at the <code>index</code>th position in the 
+     *   <code>NodeList</code>, or <code>null</code> if that is not a valid 
+     *   index.
+     * @exception XPathException
+     *   TYPE_ERR: raised if <code>resultType</code> is not 
+     *   <code>UNORDERED_NODE_SNAPSHOT_TYPE</code> or 
+     *   <code>ORDERED_NODE_SNAPSHOT_TYPE</code>.
+     */
+    public Node snapshotItem(int index)
+                             throws XPathException;
+
+}
diff --git a/libjava/gnu/xml/aelfred2/ContentHandler2.java b/libjava/gnu/xml/aelfred2/ContentHandler2.java
new file mode 100644 (file)
index 0000000..7bb1e7d
--- /dev/null
+++ b/libjava/gnu/xml/aelfred2/ContentHandler2.java
@@ -0,0 +1,65 @@
+/* ContentHandler2.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.aelfred2;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+
+/**
+ * Extension to the SAX ContentHandler interface to report parsing events
+ * and parameters required by DOM Level 3 but not supported by SAX.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public interface ContentHandler2
+  extends ContentHandler
+{
+
+  /**
+   * Reports the XML declaration.
+   * @param version the value of the version attribute in the XML
+   * declaration
+   * @param encoding the encoding specified in the XML declaration, if any
+   * @param standalone the standalone attribute from the XML declaration
+   * @param inputEncoding the encoding of the XML input
+   */
+  void xmlDecl(String version, String encoding, boolean standalone,
+               String inputEncoding)
+    throws SAXException;
+  
+}
diff --git a/libjava/gnu/xml/aelfred2/JAXPFactory.java b/libjava/gnu/xml/aelfred2/JAXPFactory.java
new file mode 100644 (file)
index 0000000..006dc13
--- /dev/null
+++ b/libjava/gnu/xml/aelfred2/JAXPFactory.java
@@ -0,0 +1,196 @@
+/* JAXPFactory.java -- 
+   Copyright (C) 2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.aelfred2;
+
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import org.xml.sax.Parser;
+import org.xml.sax.XMLReader;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.helpers.XMLReaderAdapter;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+
+/**
+ * Configurable factory to create an &AElig;lfred2 JAXP parser; required
+ * to bootstrap using JAXP.  You should use SAX2 directly where possible,
+ * rather than through JAXP, since that gives you better control.
+ * This class would normally be configured as a platform default factory.
+ *
+ * @author David Brownell
+ */
+public final class JAXPFactory extends SAXParserFactory
+{
+    private Hashtable  flags = new Hashtable ();
+
+    /**
+     * Constructs a factory which normally returns a non-validating
+     * parser.
+     */
+    public JAXPFactory () { }
+
+    public SAXParser newSAXParser ()
+    throws ParserConfigurationException, SAXException
+    {
+       JaxpParser      jaxp = new JaxpParser ();
+       Enumeration     e = flags.keys ();
+       XMLReader       parser = jaxp.getXMLReader ();
+
+       parser.setFeature (
+               SAXDriver.FEATURE + "namespaces",
+               isNamespaceAware ());
+       parser.setFeature (
+               SAXDriver.FEATURE + "validation",
+               isValidating ());
+       // that makes SAX2 feature flags trump JAXP
+
+       while (e.hasMoreElements ()) {
+           String      uri = (String) e.nextElement ();
+           Boolean     value = (Boolean) flags.get (uri);
+           parser.setFeature (uri, value.booleanValue ());
+       }
+
+       return jaxp;
+    }
+
+    // yes, this "feature transfer" mechanism doesn't play well
+
+    public void setFeature (String name, boolean value) 
+    throws
+       ParserConfigurationException,
+       SAXNotRecognizedException,
+       SAXNotSupportedException
+    {
+       try {
+           // force "early" detection of errors where possible
+           // (flags can't necessarily be set before parsing)
+           new JaxpParser ().getXMLReader ().setFeature (name, value);
+
+           flags.put (name, new Boolean (value));
+       } catch (SAXNotRecognizedException e) {
+           throw new SAXNotRecognizedException (name);
+       } catch (SAXNotSupportedException e) {
+           throw new SAXNotSupportedException (name);
+       } catch (Exception e) {
+           throw new ParserConfigurationException (
+                 e.getClass ().getName ()
+               + ": "
+               + e.getMessage ());
+       }
+    }
+
+    public boolean getFeature (String name) 
+    throws
+       ParserConfigurationException,
+       SAXNotRecognizedException,
+       SAXNotSupportedException
+    {
+       Boolean value = (Boolean) flags.get (name);
+       
+       if (value != null)
+           return value.booleanValue ();
+       else
+           try {
+               return new JaxpParser ().getXMLReader ().getFeature (name);
+           } catch (SAXNotRecognizedException e) {
+               throw new SAXNotRecognizedException (name);
+           } catch (SAXNotSupportedException e) {
+               throw new SAXNotSupportedException (name);
+           } catch (SAXException e) {
+               throw new ParserConfigurationException (
+                     e.getClass ().getName ()
+                   + ": "
+                   + e.getMessage ());
+           }
+    }
+
+    private static class JaxpParser extends SAXParser
+    {
+       private XmlReader       ae2 = new XmlReader ();
+       private XMLReaderAdapter parser = null;
+
+       JaxpParser () { }
+
+       public void setProperty (String id, Object value) 
+       throws SAXNotRecognizedException, SAXNotSupportedException
+           { ae2.setProperty (id, value); }
+
+       public Object getProperty (String id) 
+       throws SAXNotRecognizedException, SAXNotSupportedException
+           { return ae2.getProperty (id); }
+
+       public Parser getParser ()
+       throws SAXException
+       { 
+           if (parser == null)
+               parser = new XMLReaderAdapter (ae2);
+           return parser;
+       }
+
+       public XMLReader getXMLReader ()
+       throws SAXException
+           { return ae2; }
+
+       public boolean isNamespaceAware ()
+       {
+           try {
+               return ae2.getFeature (SAXDriver.FEATURE + "namespaces");
+           } catch (Exception e) {
+               throw new Error ();
+           }
+       }
+
+       public boolean isValidating ()
+       {
+           try {
+               return ae2.getFeature (SAXDriver.FEATURE + "validation");
+           } catch (Exception e) {
+               throw new Error ();
+           }
+       }
+
+        // TODO isXIncludeAware()
+        
+    }
+}
diff --git a/libjava/gnu/xml/aelfred2/SAXDriver.java b/libjava/gnu/xml/aelfred2/SAXDriver.java
new file mode 100644 (file)
index 0000000..4912f27
--- /dev/null
+++ b/libjava/gnu/xml/aelfred2/SAXDriver.java
@@ -0,0 +1,1385 @@
+/* SAXDriver.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+
+Portions derived from code which carried the following notice:
+
+  Copyright (c) 1997, 1998 by Microstar Software Ltd.
+
+  AElfred is free for both commercial and non-commercial use and
+  redistribution, provided that Microstar's copyright and disclaimer are
+  retained intact.  You are free to modify AElfred for your own use and
+  to redistribute AElfred with your modifications, provided that the
+  modifications are clearly documented.
+
+  This program 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.  Please use it AT
+  YOUR OWN RISK.
+*/
+
+package gnu.xml.aelfred2;
+
+import java.io.*;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Locale;
+import java.util.Stack;
+
+// maintaining 1.1 compatibility for now ... more portable, PJava, etc
+// Iterator, Hashmap and ArrayList ought to be faster
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+import org.xml.sax.*;
+import org.xml.sax.ext.*;
+import org.xml.sax.helpers.NamespaceSupport;
+
+
+/**
+ * An enhanced SAX2 version of Microstar's &AElig;lfred XML parser.
+ * The enhancements primarily relate to significant improvements in
+ * conformance to the XML specification, and SAX2 support.  Performance
+ * has been improved.  See the package level documentation for more
+ * information.
+ *
+ * <table border="1" width='100%' cellpadding='3' cellspacing='0'>
+ * <tr bgcolor='#ccccff'>
+ *     <th><font size='+1'>Name</font></th>
+ *     <th><font size='+1'>Notes</font></th></tr>
+ *
+ * <tr><td colspan=2><center><em>Features ... URL prefix is
+ * <b>http://xml.org/sax/features/</b></em></center></td></tr>
+ *
+ * <tr><td>(URL)/external-general-entities</td>
+ *     <td>Value defaults to <em>true</em></td></tr>
+ * <tr><td>(URL)/external-parameter-entities</td>
+ *     <td>Value defaults to <em>true</em></td></tr>
+ * <tr><td>(URL)/is-standalone</td>
+ *     <td>(PRELIMINARY) Returns true iff the document's parsing
+ *     has started (some non-error event after <em>startDocument()</em>
+ *     was reported) and the document's standalone flag is set.</td></tr>
+ * <tr><td>(URL)/namespace-prefixes</td>
+ *     <td>Value defaults to <em>false</em> (but XML 1.0 names are
+ *             always reported)</td></tr>
+ * <tr><td>(URL)/lexical-handler/parameter-entities</td>
+ *     <td>Value is fixed at <em>true</em></td></tr>
+ * <tr><td>(URL)/namespaces</td>
+ *     <td>Value defaults to <em>true</em></td></tr>
+ * <tr><td>(URL)/resolve-dtd-uris</td>
+ *     <td>(PRELIMINARY) Value defaults to <em>true</em></td></tr>
+ * <tr><td>(URL)/string-interning</td>
+ *     <td>Value is fixed at <em>true</em></td></tr>
+ * <tr><td>(URL)/use-attributes2</td>
+ *     <td>(PRELIMINARY) Value is fixed at <em>true</em></td></tr>
+ * <tr><td>(URL)/use-entity-resolver2</td>
+ *     <td>(PRELIMINARY) Value defaults to <em>true</em></td></tr>
+ * <tr><td>(URL)/validation</td>
+ *     <td>Value is fixed at <em>false</em></td></tr>
+ *
+ * <tr><td colspan=2><center><em>Handler Properties ... URL prefix is
+ * <b>http://xml.org/sax/properties/</b></em></center></td></tr>
+ *
+ * <tr><td>(URL)/declaration-handler</td>
+ *     <td>A declaration handler may be provided.  </td></tr>
+ * <tr><td>(URL)/lexical-handler</td>
+ *     <td>A lexical handler may be provided.  </td></tr>
+ * </table>
+ *
+ * <p>This parser currently implements the SAX1 Parser API, but
+ * it may not continue to do so in the future.
+ *
+ * @author Written by David Megginson (version 1.2a from Microstar)
+ * @author Updated by David Brownell &lt;dbrownell@users.sourceforge.net&gt;
+ * @see org.xml.sax.Parser
+ */
+final public class SAXDriver
+    implements Locator, Attributes2, XMLReader, Parser, AttributeList
+{
+    private final DefaultHandler2      base = new DefaultHandler2 ();
+    private XmlParser                  parser;
+
+    private EntityResolver             entityResolver = base;
+    private EntityResolver2            resolver2 = null;
+    private ContentHandler             contentHandler = base;
+    private DTDHandler                 dtdHandler = base;
+    private ErrorHandler               errorHandler = base;
+    private DeclHandler                        declHandler = base;
+    private LexicalHandler             lexicalHandler = base;
+
+    private String                     elementName;
+    private Stack                      entityStack;
+
+    // one vector (of object/struct): faster, smaller
+    private List                       attributesList = Collections.synchronizedList(new ArrayList());
+  
+    private boolean                    attributeSpecified [] = new boolean[10];
+    private boolean                    attributeDeclared [] = new boolean[10];
+
+    private boolean                    namespaces = true;
+    private boolean                    xmlNames = false;
+    private boolean                    extGE = true;
+    private boolean                    extPE = true;
+    private boolean                    resolveAll = true;
+    private boolean                    useResolver2 = true;
+    private boolean                     stringInterning = true;
+
+    private int                                attributeCount;
+    private boolean                    attributes;
+    private String                     nsTemp [];
+    private NamespaceSupport           prefixStack;
+
+    //
+    // Constructor.
+    //
+
+    /** Constructs a SAX Parser.  */
+    public SAXDriver ()
+    {
+      reset ();
+    }
+
+    private void reset ()
+    {
+      elementName = null;
+      entityStack = new Stack ();
+      attributesList = Collections.synchronizedList(new ArrayList());
+      attributeSpecified = new boolean[10];
+      attributeDeclared = new boolean[10];
+      attributeCount = 0;
+      attributes = false;
+      nsTemp = new String[3];
+      prefixStack = null;
+    }
+
+
+    //
+    // Implementation of org.xml.sax.Parser.
+    //
+
+    /**
+     * <b>SAX1</b>: Sets the locale used for diagnostics; currently,
+     * only locales using the English language are supported.
+     * @param locale The locale for which diagnostics will be generated
+     */
+    public void setLocale (Locale locale)
+    throws SAXException
+    {
+       if ("en".equals (locale.getLanguage ()))
+           return ;
+
+       throw new SAXException ("AElfred2 only supports English locales.");
+    }
+
+
+    /**
+     * <b>SAX2</b>: Returns the object used when resolving external
+     * entities during parsing (both general and parameter entities).
+     */
+    public EntityResolver getEntityResolver ()
+    {
+       return (entityResolver == base) ? null : entityResolver;
+    }
+
+    /**
+     * <b>SAX1, SAX2</b>: Set the entity resolver for this parser.
+     * @param handler The object to receive entity events.
+     */
+    public void setEntityResolver (EntityResolver resolver)
+    {
+       if (resolver instanceof EntityResolver2)
+           resolver2 = (EntityResolver2) resolver;
+       else
+           resolver2 = null;
+       if (resolver == null)
+           resolver = base;
+       entityResolver = resolver;
+    }
+
+
+    /**
+     * <b>SAX2</b>: Returns the object used to process declarations related
+     * to notations and unparsed entities.
+     */
+    public DTDHandler getDTDHandler ()
+    {
+       return (dtdHandler == base) ? null : dtdHandler;
+    }
+
+    /**
+     * <b>SAX1, SAX2</b>: Set the DTD handler for this parser.
+     * @param handler The object to receive DTD events.
+     */
+    public void setDTDHandler (DTDHandler handler)
+    {
+       if (handler == null)
+           handler = base;
+       this.dtdHandler = handler;
+    }
+
+
+    /**
+     * <b>SAX1</b>: Set the document handler for this parser.  If a
+     * content handler was set, this document handler will supplant it.
+     * The parser is set to report all XML 1.0 names rather than to
+     * filter out "xmlns" attributes (the "namespace-prefixes" feature
+     * is set to true).
+     *
+     * @deprecated SAX2 programs should use the XMLReader interface
+     * and a ContentHandler.
+     *
+     * @param handler The object to receive document events.
+     */
+    public void setDocumentHandler (DocumentHandler handler)
+    {
+       contentHandler = new Adapter (handler);
+       xmlNames = true;
+    }
+
+    /**
+     * <b>SAX2</b>: Returns the object used to report the logical
+     * content of an XML document.
+     */
+    public ContentHandler getContentHandler ()
+    {
+       return contentHandler == base ? null : contentHandler;
+    }
+
+    /**
+     * <b>SAX2</b>: Assigns the object used to report the logical
+     * content of an XML document.  If a document handler was set,
+     * this content handler will supplant it (but XML 1.0 style name
+     * reporting may remain enabled).
+     */
+    public void setContentHandler (ContentHandler handler)
+    {
+       if (handler == null)
+           handler = base;
+       contentHandler = handler;
+    }
+
+    /**
+     * <b>SAX1, SAX2</b>: Set the error handler for this parser.
+     * @param handler The object to receive error events.
+     */
+    public void setErrorHandler (ErrorHandler handler)
+    {
+       if (handler == null)
+           handler = base;
+       this.errorHandler = handler;
+    }
+
+    /**
+     * <b>SAX2</b>: Returns the object used to receive callbacks for XML
+     * errors of all levels (fatal, nonfatal, warning); this is never null;
+     */
+    public ErrorHandler getErrorHandler ()
+       { return errorHandler == base ? null : errorHandler; }
+
+
+    /**
+     * <b>SAX1, SAX2</b>: Auxiliary API to parse an XML document, used mostly
+     * when no URI is available.
+     * If you want anything useful to happen, you should set
+     * at least one type of handler.
+     * @param source The XML input source.  Don't set 'encoding' unless
+     * you know for a fact that it's correct.
+     * @see #setEntityResolver
+     * @see #setDTDHandler
+     * @see #setContentHandler
+     * @see #setErrorHandler
+     * @exception SAXException The handlers may throw any SAXException,
+     * and the parser normally throws SAXParseException objects.
+     * @exception IOException IOExceptions are normally through through
+     * the parser if there are problems reading the source document.
+     */
+    public void parse (InputSource source)
+    throws SAXException, IOException
+    {
+       synchronized (base) {
+           parser = new XmlParser ();
+           if (namespaces)
+               prefixStack = new NamespaceSupport ();
+           else if (!xmlNames)
+               throw new IllegalStateException ();
+           parser.setHandler (this);
+
+           try {
+
+             Reader r = source.getCharacterStream();
+             InputStream in = source.getByteStream();
+
+             
+               parser.doParse (source.getSystemId (),
+                             source.getPublicId (),
+                             r,
+                             in,
+                             source.getEncoding ());
+           } catch (SAXException e) {
+               throw e;
+           } catch (IOException e) {
+               throw e;
+           } catch (RuntimeException e) {
+               throw e;
+           } catch (Exception e) {
+               throw new SAXParseException (e.getMessage (), this, e);
+           } finally {
+               contentHandler.endDocument ();
+                reset();
+           }
+       }
+    }
+
+
+    /**
+     * <b>SAX1, SAX2</b>: Preferred API to parse an XML document, using a
+     * system identifier (URI).
+     */
+    public void parse (String systemId)
+    throws SAXException, IOException
+    {
+       parse (new InputSource (systemId));
+    }
+
+    //
+    // Implementation of SAX2 "XMLReader" interface
+    //
+    static final String        FEATURE = "http://xml.org/sax/features/";
+    static final String        PROPERTY = "http://xml.org/sax/properties/";
+
+    /**
+     * <b>SAX2</b>: Tells the value of the specified feature flag.
+     *
+     * @exception SAXNotRecognizedException thrown if the feature flag
+     * is neither built in, nor yet assigned.
+     */
+    public boolean getFeature (String featureId)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+    {
+       if ((FEATURE + "validation").equals (featureId))
+           return false;
+
+       // external entities (both types) are optionally included
+       if ((FEATURE + "external-general-entities").equals (featureId))
+           return extGE;
+       if ((FEATURE + "external-parameter-entities") .equals (featureId))
+           return extPE;
+
+       // element/attribute names are as written in document; no mangling
+       if ((FEATURE + "namespace-prefixes").equals (featureId))
+           return xmlNames;
+
+       // report element/attribute namespaces?
+       if ((FEATURE + "namespaces").equals (featureId))
+           return namespaces;
+
+       // all PEs and GEs are reported
+       if ((FEATURE + "lexical-handler/parameter-entities").equals (featureId))
+           return true;
+
+       // default is true
+       if ((FEATURE + "string-interning").equals (featureId))
+           return stringInterning;
+       
+       // EXTENSIONS 1.1
+
+       // always returns isSpecified info
+       if ((FEATURE + "use-attributes2").equals (featureId))
+           return true;
+       
+       // meaningful between startDocument/endDocument
+       if ((FEATURE + "is-standalone").equals (featureId)) {
+           if (parser == null)
+               throw new SAXNotSupportedException (featureId);
+           return parser.isStandalone ();
+       }
+
+       // optionally don't absolutize URIs in declarations
+       if ((FEATURE + "resolve-dtd-uris").equals (featureId))
+           return resolveAll;
+
+       // optionally use resolver2 interface methods, if possible
+       if ((FEATURE + "use-entity-resolver2").equals (featureId))
+           return useResolver2;
+       
+       throw new SAXNotRecognizedException (featureId);
+    }
+
+    // package private
+    DeclHandler getDeclHandler () { return declHandler; }
+
+    // package private
+    boolean resolveURIs () { return resolveAll; }
+
+    /**
+     * <b>SAX2</b>:  Returns the specified property.
+     *
+     * @exception SAXNotRecognizedException thrown if the property value
+     * is neither built in, nor yet stored.
+     */
+    public Object getProperty (String propertyId)
+    throws SAXNotRecognizedException
+    {
+       if ((PROPERTY + "declaration-handler").equals (propertyId))
+           return declHandler == base ? null : declHandler;
+
+       if ((PROPERTY + "lexical-handler").equals (propertyId))
+           return lexicalHandler == base ? null : lexicalHandler;
+       
+       // unknown properties
+       throw new SAXNotRecognizedException (propertyId);
+    }
+
+    /**
+     * <b>SAX2</b>:  Sets the state of feature flags in this parser.  Some
+     * built-in feature flags are mutable.
+     */
+    public void setFeature (String featureId, boolean value)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+    {
+       boolean state;
+       
+       // Features with a defined value, we just change it if we can.
+       state = getFeature (featureId);
+
+       if (state == value)
+           return;
+       if (parser != null)
+           throw new SAXNotSupportedException ("not while parsing");
+
+       if ((FEATURE + "namespace-prefixes").equals (featureId)) {
+           // in this implementation, this only affects xmlns reporting
+           xmlNames = value;
+           // forcibly prevent illegal parser state
+           if (!xmlNames)
+               namespaces = true;
+           return;
+       }
+
+       if ((FEATURE + "namespaces").equals (featureId)) {
+           namespaces = value;
+           // forcibly prevent illegal parser state
+           if (!namespaces)
+               xmlNames = true;
+           return;
+       }
+
+       if ((FEATURE + "external-general-entities").equals (featureId)) {
+           extGE = value;
+           return;
+       }
+       if ((FEATURE + "external-parameter-entities") .equals (featureId)) {
+           extPE = value;
+           return;
+       }
+       if ((FEATURE + "resolve-dtd-uris").equals (featureId)) {
+           resolveAll = value;
+           return;
+       }
+
+       if ((FEATURE + "use-entity-resolver2").equals (featureId)) {
+           useResolver2 = value;
+           return;
+       }
+
+       throw new SAXNotRecognizedException (featureId);
+    }
+
+    /**
+     * <b>SAX2</b>:  Assigns the specified property.  Like SAX1 handlers,
+     * these may be changed at any time.
+     */
+    public void setProperty (String propertyId, Object value)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+    {
+       // see if the property is recognized
+       getProperty (propertyId);
+
+       // Properties with a defined value, we just change it if we can.
+
+       if ((PROPERTY + "declaration-handler").equals (propertyId)) {
+           if (value == null)
+               declHandler = base;
+           else if (! (value instanceof DeclHandler))
+               throw new SAXNotSupportedException (propertyId);
+           else
+               declHandler = (DeclHandler) value;
+           return ;
+       }
+
+       if ((PROPERTY + "lexical-handler").equals (propertyId)) {
+           if (value == null)
+               lexicalHandler = base;
+           else if (! (value instanceof LexicalHandler))
+               throw new SAXNotSupportedException (propertyId);
+           else
+               lexicalHandler = (LexicalHandler) value;
+           return ;
+       }
+
+       throw new SAXNotSupportedException (propertyId);
+    }
+
+
+    //
+    // This is where the driver receives XmlParser callbacks and translates
+    // them into SAX callbacks.  Some more callbacks have been added for
+    // SAX2 support.
+    //
+
+    void startDocument ()
+    throws SAXException
+    {
+       contentHandler.setDocumentLocator (this);
+       contentHandler.startDocument ();
+       attributesList.clear ();
+    }
+
+    void xmlDecl(String version,
+                 String encoding,
+                 boolean standalone,
+                 String inputEncoding)
+      throws SAXException
+    {
+      if (contentHandler instanceof ContentHandler2)
+        {
+          ((ContentHandler2) contentHandler).xmlDecl(version,
+                                                     encoding,
+                                                     standalone,
+                                                     inputEncoding);
+        }
+    }
+
+    void skippedEntity (String name)
+    throws SAXException
+       { contentHandler.skippedEntity (name); }
+
+    InputSource getExternalSubset (String name, String baseURI)
+    throws SAXException, IOException
+    {
+       if (resolver2 == null || !useResolver2 || !extPE)
+           return null;
+       return resolver2.getExternalSubset (name, baseURI);
+    }
+
+    InputSource resolveEntity (boolean isPE, String name,
+       InputSource in, String baseURI)
+    throws SAXException, IOException
+    {
+       InputSource     source;
+
+       // external entities might be skipped
+       if (isPE && !extPE)
+           return null;
+       if (!isPE && !extGE)
+           return null;
+
+       // ... or not
+       lexicalHandler.startEntity (name);
+       if (resolver2 != null && useResolver2) {
+           source = resolver2.resolveEntity (name, in.getPublicId (),
+                       baseURI, in.getSystemId ());
+           if (source == null) {
+               in.setSystemId (absolutize (baseURI,
+                               in.getSystemId (), false));
+               source = in;
+           }
+       } else {
+           in.setSystemId (absolutize (baseURI, in.getSystemId (), false));
+           source = entityResolver.resolveEntity (in.getPublicId (),
+                       in.getSystemId ());
+           if (source == null)
+               source = in;
+       }
+       startExternalEntity (name, source.getSystemId (), true);
+       return source;
+    }
+
+    // absolutize a system ID relative to the specified base URI
+    // (temporarily) package-visible for external entity decls
+    String absolutize (String baseURI, String systemId, boolean nice)
+    throws MalformedURLException, SAXException
+    {
+       // FIXME normalize system IDs -- when?
+       // - Convert to UTF-8
+       // - Map reserved and non-ASCII characters to %HH
+
+       try {
+           if (baseURI == null) {
+               warn ("No base URI; hope this SYSTEM id is absolute: "
+                       + systemId);
+               return new URL (systemId).toString ();
+           } else
+               return new URL (new URL (baseURI), systemId).toString ();
+
+       } catch (MalformedURLException e) {
+
+           // Let unknown URI schemes pass through unless we need
+           // the JVM to map them to i/o streams for us...
+           if (!nice)
+               throw e;
+
+           // sometimes sysids for notations or unparsed entities
+           // aren't really URIs...
+           warn ("Can't absolutize SYSTEM id: " + e.getMessage ());
+           return systemId;
+       }
+    }
+
+    void startExternalEntity (String name, String systemId,
+       boolean stackOnly)
+    throws SAXException
+    {
+       // The following warning was deleted because the application has the
+       // option of not setting systemId. Sun's JAXP or Xerces seems to
+       // ignore this case.
+       /*
+       if (systemId == null)
+           warn ("URI was not reported to parser for entity " + name);
+       */
+       if (!stackOnly)         // spliced [dtd] needs startEntity
+           lexicalHandler.startEntity (name);
+       entityStack.push (systemId);
+    }
+
+    void endExternalEntity (String name)
+    throws SAXException
+    {
+       if (!"[document]".equals (name))
+           lexicalHandler.endEntity (name);
+       entityStack.pop ();
+    }
+
+    void startInternalEntity (String name)
+    throws SAXException
+    {
+       lexicalHandler.startEntity (name);
+    }
+
+    void endInternalEntity (String name)
+    throws SAXException
+    {
+       lexicalHandler.endEntity (name);
+    }
+
+    void doctypeDecl (String name, String publicId, String systemId)
+    throws SAXException
+    {
+       lexicalHandler.startDTD (name, publicId, systemId);
+       
+       // ... the "name" is a declaration and should be given
+       // to the DeclHandler (but sax2 doesn't).
+
+       // the IDs for the external subset are lexical details,
+       // as are the contents of the internal subset; but sax2
+       // doesn't provide the internal subset "pre-parse"
+    }
+
+    void notationDecl (String name, String ids [])
+    throws SAXException
+    {
+       try {
+           dtdHandler.notationDecl (name, ids [0],
+               (resolveAll && ids [1] != null)
+                       ? absolutize (ids [2], ids [1], true)
+                       : ids [1]);
+       } catch (IOException e) {
+           // "can't happen"
+           throw new SAXParseException (e.getMessage (), this, e);
+       }
+    }
+
+    void unparsedEntityDecl (String name, String ids [], String notation)
+    throws SAXException
+    {
+       try {
+           dtdHandler.unparsedEntityDecl (name, ids [0],
+                   resolveAll
+                       ? absolutize (ids [2], ids [1], true)
+                       : ids [1],
+                   notation);
+       } catch (IOException e) {
+           // "can't happen"
+           throw new SAXParseException (e.getMessage (), this, e);
+       }
+    }
+
+    void endDoctype ()
+    throws SAXException
+    {
+       lexicalHandler.endDTD ();
+    }
+
+    private void declarePrefix (String prefix, String uri)
+    throws SAXException
+    {
+       int index = uri.indexOf (':');
+
+       // many versions of nwalsh docbook stylesheets 
+       // have bogus URLs; so this can't be an error...
+       if (index < 1 && uri.length () != 0)
+           warn ("relative URI for namespace: " + uri);
+
+       // FIXME:  char [0] must be ascii alpha; chars [1..index]
+       // must be ascii alphanumeric or in "+-." [RFC 2396]
+       
+       //Namespace Constraints
+       //name for xml prefix must be http://www.w3.org/XML/1998/namespace
+       boolean prefixEquality = prefix.equals("xml");
+       boolean uriEquality = uri.equals("http://www.w3.org/XML/1998/namespace");
+       if ((prefixEquality || uriEquality) && !(prefixEquality && uriEquality))
+          fatal ("xml is by definition bound to the namespace name " +
+                       "http://www.w3.org/XML/1998/namespace");
+       
+        //xmlns prefix declaration is illegal but xml prefix declaration is llegal...
+       if (prefixEquality && uriEquality)
+          return;
+       
+        //name for xmlns prefix must be http://www.w3.org/2000/xmlns/
+       prefixEquality = prefix.equals("xmlns");
+       uriEquality = uri.equals("http://www.w3.org/2000/xmlns/");
+       if ((prefixEquality || uriEquality) && !(prefixEquality && uriEquality))
+          fatal("http://www.w3.org/2000/xmlns/ is by definition bound" +
+                       " to prefix xmlns");
+       
+       //even if the uri is http://www.w3.org/2000/xmlns/ it is illegal to declare it
+       if (prefixEquality && uriEquality)
+          fatal ("declaring the xmlns prefix is illegal");
+               
+       uri = uri.intern ();
+       prefixStack.declarePrefix (prefix, uri);
+       contentHandler.startPrefixMapping (prefix, uri);
+    }
+
+    void attribute (String qname, String value, boolean isSpecified)
+    throws SAXException
+    {
+       if (!attributes) {
+           attributes = true;
+           if (namespaces)
+               prefixStack.pushContext ();
+       }
+
+       // process namespace decls immediately;
+       // then maybe forget this as an attribute
+       if (namespaces) {
+           int index;
+
+      // default NS declaration?
+      if (getFeature (FEATURE + "string-interning")) {
+        if ("xmlns" == qname) {
+          declarePrefix ("", value);
+          if (!xmlNames)
+            return;
+        }
+        // NS prefix declaration?
+        else if ((index = qname.indexOf (':')) == 5
+                 && qname.startsWith ("xmlns")) {
+          String               prefix = qname.substring (6);
+          
+          if (prefix.equals(""))
+               fatal ("missing prefix in namespace declaration attribute");    
+          if (value.length () == 0) {
+            verror ("missing URI in namespace declaration attribute: "
+                    + qname);
+          } else
+            declarePrefix (prefix, value);
+          if (!xmlNames)
+            return;
+        }
+      } else {
+        if ("xmlns".equals(qname)) {
+          declarePrefix ("", value);
+          if (!xmlNames)
+            return;
+        }
+        // NS prefix declaration?
+        else if ((index = qname.indexOf (':')) == 5
+                 && qname.startsWith ("xmlns")) {
+          String               prefix = qname.substring (6);
+          
+          if (value.length () == 0) {
+            verror ("missing URI in namespace decl attribute: "
+                    + qname);
+          } else
+            declarePrefix (prefix, value);
+          if (!xmlNames)
+            return;
+        }
+      }
+  }
+       // remember this attribute ...
+
+       if (attributeCount == attributeSpecified.length) {      // grow array?
+           boolean temp [] = new boolean [attributeSpecified.length + 5];
+           System.arraycopy (attributeSpecified, 0, temp, 0, attributeCount);
+           attributeSpecified = temp;
+       }
+       attributeSpecified [attributeCount] = isSpecified;
+
+       attributeCount++;
+       
+       // attribute type comes from querying parser's DTD records
+       attributesList.add(new Attribute(qname, value));
+
+    }
+
+    void startElement (String elname)
+    throws SAXException
+    {
+       ContentHandler handler = contentHandler;
+
+       //
+       // NOTE:  this implementation of namespace support adds something
+       // like six percent to parsing CPU time, in a large (~50 MB)
+       // document that doesn't use namespaces at all.  (Measured by PC
+       // sampling, with a bug where endElement processing was omitted.)
+       // [Measurement referred to older implementation, older JVM ...]
+       //
+       // It ought to become notably faster in such cases.  Most
+       // costs are the prefix stack calling Hashtable.get() (2%),
+       // String.hashCode() (1.5%) and about 1.3% each for pushing
+       // the context, and two chunks of name processing.
+       //
+
+       if (!attributes) {
+           if (namespaces)
+               prefixStack.pushContext ();
+       } else if (namespaces) {
+
+           // now we can patch up namespace refs; we saw all the
+           // declarations, so now we'll do the Right Thing
+           Iterator itt = attributesList.iterator ();
+           while(itt.hasNext())
+           {
+               Attribute attribute = (Attribute) itt.next();
+               String  qname = attribute.name;
+               int     index;
+
+    // default NS declaration?
+    if (getFeature (FEATURE + "string-interning")) {
+      if ("xmlns" == qname)
+                   continue;
+    } else {
+      if ("xmlns".equals(qname))
+                   continue;
+    }
+               //Illegal in the new Namespaces Draft
+               //should it be only in 1.1 docs??
+               if (qname.equals (":"))
+                   fatal ("namespace names consisting of a single colon " +
+                               "character are invalid");
+               index = qname.indexOf (':');
+
+               // NS prefix declaration?
+               if (index == 5 && qname.startsWith ("xmlns"))
+                   continue;
+
+               // it's not a NS decl; patch namespace info items
+               if (prefixStack.processName (qname, nsTemp, true) == null)
+                   fatal ("undeclared attribute prefix in: " + qname);
+               else {
+                   attribute.nameSpace = nsTemp[0];
+                   attribute.localName = nsTemp[1];
+               }
+           }
+       }
+
+       // save element name so attribute callbacks work
+       elementName = elname;
+       if (namespaces) {
+           if (prefixStack.processName (elname, nsTemp, false) == null) {
+               fatal ("undeclared element prefix in: " + elname);
+               nsTemp [0] = nsTemp [1] = "";
+           }
+           handler.startElement (nsTemp [0], nsTemp [1], elname, this);
+       } else
+           handler.startElement ("", "", elname, this);
+       // elementName = null;
+
+       // elements with no attributes are pretty common!
+       if (attributes) {
+           attributesList.clear();
+           attributeCount = 0;
+           attributes = false;
+       }
+    }
+
+    void endElement (String elname)
+    throws SAXException
+    {
+       ContentHandler  handler = contentHandler;
+
+       if (!namespaces) {
+           handler.endElement ("", "", elname);
+           return;
+       }
+       prefixStack.processName (elname, nsTemp, false);
+       handler.endElement (nsTemp [0], nsTemp [1], elname);
+
+       Enumeration     prefixes = prefixStack.getDeclaredPrefixes ();
+
+       while (prefixes.hasMoreElements ())
+           handler.endPrefixMapping ((String) prefixes.nextElement ());
+       prefixStack.popContext ();
+    }
+
+    void startCDATA ()
+    throws SAXException
+    {
+       lexicalHandler.startCDATA ();
+    }
+
+    void charData (char ch[], int start, int length)
+    throws SAXException
+    {
+       contentHandler.characters (ch, start, length);
+    }
+
+    void endCDATA ()
+    throws SAXException
+    {
+       lexicalHandler.endCDATA ();
+    }
+
+    void ignorableWhitespace (char ch[], int start, int length)
+    throws SAXException
+    {
+       contentHandler.ignorableWhitespace (ch, start, length);
+    }
+
+    void processingInstruction (String target, String data)
+    throws SAXException
+    {
+       contentHandler.processingInstruction (target, data);
+    }
+
+    void comment (char ch[], int start, int length)
+    throws SAXException
+    {
+       if (lexicalHandler != base)
+           lexicalHandler.comment (ch, start, length);
+    }
+
+    void fatal (String message)
+    throws SAXException
+    {
+       SAXParseException fatal;
+       
+       fatal = new SAXParseException (message, this);
+       errorHandler.fatalError (fatal);
+
+       // Even if the application can continue ... we can't!
+       throw fatal;
+    }
+
+    // We can safely report a few validity errors that
+    // make layered SAX2 DTD validation more conformant
+    void verror (String message)
+    throws SAXException
+    {
+       SAXParseException err;
+       
+       err = new SAXParseException (message, this);
+       errorHandler.error (err);
+    }
+
+    void warn (String message)
+    throws SAXException
+    {
+       SAXParseException err;
+       
+       err = new SAXParseException (message, this);
+       errorHandler.warning (err);
+    }
+
+
+    //
+    // Implementation of org.xml.sax.Attributes.
+    //
+
+    /**
+     * <b>SAX1 AttributeList, SAX2 Attributes</b> method
+     * (don't invoke on parser);
+     */
+    public int getLength ()
+    {
+       return attributesList.size ();
+    }
+
+    /**
+     * <b>SAX2 Attributes</b> method (don't invoke on parser);
+     */
+    public String getURI (int index)
+    {
+       return ((Attribute) attributesList.get (index)).nameSpace;
+    }
+
+    /**
+     * <b>SAX2 Attributes</b> method (don't invoke on parser);
+     */
+    public String getLocalName (int index)
+    {
+        Attribute attr = (Attribute) attributesList.get (index);
+        // FIXME attr.localName is sometimes null, why?
+        if (namespaces && attr.localName == null)
+          {
+            // XXX fix this here for now
+            int ci = attr.name.indexOf(':');
+            attr.localName = (ci == -1) ? attr.name :
+              attr.name.substring(ci + 1);
+          }
+        return attr.localName;
+    }
+
+    /**
+     * <b>SAX2 Attributes</b> method (don't invoke on parser);
+     */
+    public String getQName (int i)
+    {
+       return ((Attribute) attributesList.get (i)).name;
+    }
+
+    /**
+     * <b>SAX1 AttributeList</b> method (don't invoke on parser);
+     */
+    public String getName (int i)
+    {
+       return ((Attribute) attributesList.get (i)).name;
+    }
+
+    /**
+     * <b>SAX1 AttributeList, SAX2 Attributes</b> method
+     * (don't invoke on parser);
+     */
+    public String getType (int i)
+    {
+       String  type = parser.getAttributeType (elementName, getQName (i));
+       if (type == null)
+           return "CDATA";
+       // ... use DeclHandler.attributeDecl to see enumerations
+      if (type == "ENUMERATION")
+        return "NMTOKEN";
+       return type;
+    }
+
+
+    /**
+     * <b>SAX1 AttributeList, SAX2 Attributes</b> method
+     * (don't invoke on parser);
+     */
+    public String getValue (int i)
+    {
+       return ((Attribute) attributesList.get (i)).value;
+    }
+
+
+    /**
+     * <b>SAX2 Attributes</b> method (don't invoke on parser);
+     */
+    public int getIndex (String uri, String local)
+    {
+       int length = getLength ();
+
+       for (int i = 0; i < length; i++) {
+           if (!getURI (i).equals (uri))
+               continue;
+           if (getLocalName (i).equals (local))
+               return i;
+       }
+       return -1;
+    }
+
+
+    /**
+     * <b>SAX2 Attributes</b> method (don't invoke on parser);
+     */
+    public int getIndex (String xmlName)
+    {
+       int length = getLength ();
+
+       for (int i = 0; i < length; i++) {
+           if (getQName (i).equals (xmlName))
+               return i;
+       }
+       return -1;
+    }
+
+
+    /**
+     * <b>SAX2 Attributes</b> method (don't invoke on parser);
+     */
+    public String getType (String uri, String local)
+    {
+       int index = getIndex (uri, local);
+
+       if (index < 0)
+           return null;
+       return getType (index);
+    }
+
+
+    /**
+     * <b>SAX1 AttributeList, SAX2 Attributes</b> method
+     * (don't invoke on parser);
+     */
+    public String getType (String xmlName)
+    {
+       int index = getIndex (xmlName);
+
+       if (index < 0)
+           return null;
+       return getType (index);
+    }
+
+
+    /**
+     * <b>SAX Attributes</b> method (don't invoke on parser);
+     */
+    public String getValue (String uri, String local)
+    {
+       int index = getIndex (uri, local);
+
+       if (index < 0)
+           return null;
+       return getValue (index);
+    }
+
+
+    /**
+     * <b>SAX1 AttributeList, SAX2 Attributes</b> method
+     * (don't invoke on parser);
+     */
+    public String getValue (String xmlName)
+    {
+       int index = getIndex (xmlName);
+
+       if (index < 0)
+           return null;
+       return getValue (index);
+    }
+
+
+    //
+    // Implementation of org.xml.sax.ext.Attributes2
+    //
+
+
+    /** @return false unless the attribute was declared in the DTD.
+     * @throws java.lang.ArrayIndexOutOfBoundsException
+     *   When the supplied index does not identify an attribute.
+     */    
+    public boolean isDeclared (int index)
+    {
+       if (index < 0 || index >= attributeCount) 
+           throw new ArrayIndexOutOfBoundsException ();
+       return attributeDeclared [index];
+    }
+
+    /** @return false unless the attribute was declared in the DTD.
+     * @throws java.lang.IllegalArgumentException
+     *   When the supplied names do not identify an attribute.
+     */
+    public boolean isDeclared (java.lang.String qName)
+    {
+       int index = getIndex (qName);
+       if (index < 0)
+           throw new IllegalArgumentException ();
+       return attributeDeclared [index];
+    }
+
+    /** @return false unless the attribute was declared in the DTD.
+     * @throws java.lang.IllegalArgumentException
+     *   When the supplied names do not identify an attribute.
+     */
+    public boolean isDeclared (java.lang.String uri, java.lang.String localName)
+    {
+       int index = getIndex (uri, localName);
+       if (index < 0)
+           throw new IllegalArgumentException ();
+       return attributeDeclared [index];
+    }
+
+
+    /**
+     * <b>SAX-ext Attributes2</b> method (don't invoke on parser);
+     */
+    public boolean isSpecified (int index)
+    {
+       if (index < 0 || index >= attributeCount) 
+           throw new ArrayIndexOutOfBoundsException ();
+       return attributeSpecified [index];
+    }
+
+    /**
+     * <b>SAX-ext Attributes2</b> method (don't invoke on parser);
+     */
+    public boolean isSpecified (String uri, String local)
+    {
+       int index = getIndex (uri, local);
+
+       if (index < 0)
+           throw new IllegalArgumentException ();
+       return attributeSpecified [index];
+    }
+
+    /**
+     * <b>SAX-ext Attributes2</b> method (don't invoke on parser);
+     */
+    public boolean isSpecified (String xmlName)
+    {
+       int index = getIndex (xmlName);
+
+       if (index < 0)
+           throw new IllegalArgumentException ();
+       return attributeSpecified [index];
+    }
+
+
+    //
+    // Implementation of org.xml.sax.Locator.
+    //
+
+    /**
+     * <b>SAX Locator</b> method (don't invoke on parser);
+     */
+    public String getPublicId ()
+    {
+       return null;            // FIXME track public IDs too
+    }
+
+    /**
+     * <b>SAX Locator</b> method (don't invoke on parser);
+     */
+    public String getSystemId ()
+    {
+       if (entityStack.empty ())
+           return null;
+       else
+           return (String) entityStack.peek ();
+    }
+
+    /**
+     * <b>SAX Locator</b> method (don't invoke on parser);
+     */
+    public int getLineNumber ()
+    {
+       return parser.getLineNumber ();
+    }
+
+    /**
+     * <b>SAX Locator</b> method (don't invoke on parser);
+     */
+    public int getColumnNumber ()
+    {
+       return parser.getColumnNumber ();
+    }
+
+    // adapter between SAX2 content handler and SAX1 document handler callbacks
+    private static class Adapter implements ContentHandler
+    {
+       private DocumentHandler         docHandler;
+
+       Adapter (DocumentHandler dh)
+           { docHandler = dh; }
+
+
+       public void setDocumentLocator (Locator l)
+           { docHandler.setDocumentLocator (l); }
+       
+       public void startDocument () throws SAXException
+           { docHandler.startDocument (); }
+       
+       public void processingInstruction (String target, String data)
+       throws SAXException
+           { docHandler.processingInstruction (target, data); }
+       
+       public void startPrefixMapping (String prefix, String uri)
+           { /* ignored */ }
+
+       public void startElement (
+           String      namespace,
+           String      local,
+           String      name,
+           Attributes  attrs
+       ) throws SAXException
+           { docHandler.startElement (name, (AttributeList) attrs); }
+
+       public void characters (char buf [], int offset, int len)
+       throws SAXException
+           { docHandler.characters (buf, offset, len); }
+
+       public void ignorableWhitespace (char buf [], int offset, int len)
+       throws SAXException
+           { docHandler.ignorableWhitespace (buf, offset, len); }
+
+       public void skippedEntity (String name)
+           { /* ignored */ }
+
+       public void endElement (String u, String l, String name)
+       throws SAXException
+           { docHandler.endElement (name); }
+
+       public void endPrefixMapping (String prefix)
+           { /* ignored */ }
+
+       public void endDocument () throws SAXException
+           { docHandler.endDocument (); }
+    }
+}
+
+class Attribute
+{
+
+    String name;
+    String value;
+    String nameSpace;
+    String localName;
+
+    Attribute(String name, String value)
+    {
+        this.name = name;
+        this.value = value;
+        this.nameSpace = "";
+    }
+}
+
diff --git a/libjava/gnu/xml/aelfred2/XmlParser.java b/libjava/gnu/xml/aelfred2/XmlParser.java
new file mode 100644 (file)
index 0000000..f4abf22
--- /dev/null
+++ b/libjava/gnu/xml/aelfred2/XmlParser.java
@@ -0,0 +1,5113 @@
+/* XmlParser.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+
+Partly derived from code which carried the following notice:
+
+  Copyright (c) 1997, 1998 by Microstar Software Ltd.
+
+  AElfred is free for both commercial and non-commercial use and
+  redistribution, provided that Microstar's copyright and disclaimer are
+  retained intact.  You are free to modify AElfred for your own use and
+  to redistribute AElfred with your modifications, provided that the
+  modifications are clearly documented.
+
+  This program 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.  Please use it AT
+  YOUR OWN RISK.
+*/
+
+package gnu.xml.aelfred2;
+
+import java.io.BufferedInputStream;
+import java.io.CharConversionException;
+import java.io.EOFException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.net.URLConnection;
+
+// maintaining 1.1 compatibility for now ...
+// Iterator and Hashmap ought to be faster
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Stack;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+
+/**
+ * Parse XML documents and return parse events through call-backs.
+ * Use the <code>SAXDriver</code> class as your entry point, as all
+ * internal parser interfaces are subject to change.
+ *
+ * @author Written by David Megginson &lt;dmeggins@microstar.com&gt;
+ *     (version 1.2a with bugfixes)
+ * @author Updated by David Brownell &lt;dbrownell@users.sourceforge.net&gt;
+ * @see SAXDriver
+ */
+final class XmlParser
+{
+    // avoid slow per-character readCh()
+    private final static boolean USE_CHEATS = true;
+
+
+    //////////////////////////////////////////////////////////////////////
+    // Constructors.
+    ////////////////////////////////////////////////////////////////////////
+
+
+    /**
+     * Construct a new parser with no associated handler.
+     * @see #setHandler
+     * @see #parse
+     */
+    // package private
+    XmlParser ()
+    {
+    }
+
+
+    /**
+     * Set the handler that will receive parsing events.
+     * @param handler The handler to receive callback events.
+     * @see #parse
+     */
+    // package private
+    void setHandler (SAXDriver handler)
+    {
+       this.handler = handler;
+    }
+
+
+    /**
+     * Parse an XML document from the character stream, byte stream, or URI
+     * that you provide (in that order of preference).  Any URI that you
+     * supply will become the base URI for resolving relative URI, and may
+     * be used to acquire a reader or byte stream.
+     *
+     * <p> Only one thread at a time may use this parser; since it is
+     * private to this package, post-parse cleanup is done by the caller,
+     * which MUST NOT REUSE the parser (just null it).
+     *
+     * @param systemId Absolute URI of the document; should never be null,
+     * but may be so iff a reader <em>or</em> a stream is provided.
+     * @param publicId The public identifier of the document, or null.
+     * @param reader A character stream; must be null if stream isn't.
+     * @param stream A byte input stream; must be null if reader isn't.
+     * @param encoding The suggested encoding, or null if unknown.
+     * @exception java.lang.Exception Basically SAXException or IOException
+     */
+    // package private 
+    void doParse (
+       String          systemId,
+       String          publicId,
+       Reader          reader,
+       InputStream     stream,
+       String          encoding
+    ) throws Exception
+    {
+       if (handler == null)
+           throw new IllegalStateException ("no callback handler");
+
+       initializeVariables ();
+
+       // predeclare the built-in entities here (replacement texts)
+       // we don't need to intern(), since we're guaranteed literals
+       // are always (globally) interned.
+       setInternalEntity ("amp", "&#38;");
+       setInternalEntity ("lt", "&#60;");
+       setInternalEntity ("gt", "&#62;");
+       setInternalEntity ("apos", "&#39;");
+       setInternalEntity ("quot", "&#34;");
+
+       try {
+           // pushURL first to ensure locator is correct in startDocument
+           // ... it might report an IO or encoding exception.
+           handler.startDocument ();
+           pushURL (false, "[document]",
+                       // default baseURI: null
+                   new String [] { publicId, systemId, null},
+                   reader, stream, encoding, false);
+
+           parseDocument ();
+       } catch (EOFException e){
+           //empty input
+           error("empty document, with no root element.");
+       }finally {
+           if (reader != null)
+               try { reader.close ();
+               } catch (IOException e) { /* ignore */ }
+           if (stream != null)
+               try { stream.close ();
+               } catch (IOException e) { /* ignore */ }
+           if (is != null)
+               try { is.close ();
+               } catch (IOException e) { /* ignore */ }
+           if (reader != null)
+               try {
+                   reader.close ();
+               } catch (IOException e) { /* ignore */
+               }
+           scratch = null;
+       }
+    }
+
+
+    ////////////////////////////////////////////////////////////////////////
+    // Constants.
+    ////////////////////////////////////////////////////////////////////////
+
+    //
+    // Constants for element content type.
+    //
+
+    /**
+     * Constant: an element has not been declared.
+     * @see #getElementContentType
+     */
+    public final static int CONTENT_UNDECLARED = 0;
+
+    /**
+     * Constant: the element has a content model of ANY.
+     * @see #getElementContentType
+     */
+    public final static int CONTENT_ANY = 1;
+
+    /**
+     * Constant: the element has declared content of EMPTY.
+     * @see #getElementContentType
+     */
+    public final static int CONTENT_EMPTY = 2;
+
+    /**
+     * Constant: the element has mixed content.
+     * @see #getElementContentType
+     */
+    public final static int CONTENT_MIXED = 3;
+
+    /**
+     * Constant: the element has element content.
+     * @see #getElementContentType
+     */
+    public final static int CONTENT_ELEMENTS = 4;
+
+
+    //
+    // Constants for the entity type.
+    //
+
+    /**
+     * Constant: the entity has not been declared.
+     * @see #getEntityType
+     */
+    public final static int ENTITY_UNDECLARED = 0;
+
+    /**
+     * Constant: the entity is internal.
+     * @see #getEntityType
+     */
+    public final static int ENTITY_INTERNAL = 1;
+
+    /**
+     * Constant: the entity is external, non-parsable data.
+     * @see #getEntityType
+     */
+    public final static int ENTITY_NDATA = 2;
+
+    /**
+     * Constant: the entity is external XML data.
+     * @see #getEntityType
+     */
+    public final static int ENTITY_TEXT = 3;
+
+
+    //
+    // Attribute type constants are interned literal strings.
+    //
+
+    //
+    // Constants for supported encodings.  "external" is just a flag.
+    //
+    private final static int ENCODING_EXTERNAL = 0;
+    private final static int ENCODING_UTF_8 = 1;
+    private final static int ENCODING_ISO_8859_1 = 2;
+    private final static int ENCODING_UCS_2_12 = 3;
+    private final static int ENCODING_UCS_2_21 = 4;
+    private final static int ENCODING_UCS_4_1234 = 5;
+    private final static int ENCODING_UCS_4_4321 = 6;
+    private final static int ENCODING_UCS_4_2143 = 7;
+    private final static int ENCODING_UCS_4_3412 = 8;
+    private final static int ENCODING_ASCII = 9;
+
+
+    //
+    // Constants for attribute default value.
+    //
+
+    /**
+     * Constant: the attribute is not declared.
+     * @see #getAttributeDefaultValueType
+     */
+    public final static int ATTRIBUTE_DEFAULT_UNDECLARED = 30;
+
+    /**
+     * Constant: the attribute has a literal default value specified.
+     * @see #getAttributeDefaultValueType
+     * @see #getAttributeDefaultValue
+     */
+    public final static int ATTRIBUTE_DEFAULT_SPECIFIED = 31;
+
+    /**
+     * Constant: the attribute was declared #IMPLIED.
+     * @see #getAttributeDefaultValueType
+     */
+    public final static int ATTRIBUTE_DEFAULT_IMPLIED = 32;
+
+    /**
+     * Constant: the attribute was declared #REQUIRED.
+     * @see #getAttributeDefaultValueType
+     */
+    public final static int ATTRIBUTE_DEFAULT_REQUIRED = 33;
+
+    /**
+     * Constant: the attribute was declared #FIXED.
+     * @see #getAttributeDefaultValueType
+     * @see #getAttributeDefaultValue
+     */
+    public final static int ATTRIBUTE_DEFAULT_FIXED = 34;
+
+
+    //
+    // Constants for input.
+    //
+    private final static int INPUT_NONE = 0;
+    private final static int INPUT_INTERNAL = 1;
+    private final static int INPUT_STREAM = 3;
+    private final static int INPUT_READER = 5;
+
+
+    //
+    // Flags for reading literals.
+    //
+       // expand general entity refs (attribute values in dtd and content)
+    private final static int LIT_ENTITY_REF = 2;
+       // normalize this value (space chars) (attributes, public ids)
+    private final static int LIT_NORMALIZE = 4;
+       // literal is an attribute value 
+    private final static int LIT_ATTRIBUTE = 8;
+       // don't expand parameter entities
+    private final static int LIT_DISABLE_PE = 16;
+       // don't expand [or parse] character refs
+    private final static int LIT_DISABLE_CREF = 32;
+       // don't parse general entity refs
+    private final static int LIT_DISABLE_EREF = 64;
+       // literal is a public ID value 
+    private final static int LIT_PUBID = 256;
+
+
+    //
+    // Flags affecting PE handling in DTDs (if expandPE is true).
+    // PEs expand with space padding, except inside literals.
+    //
+    private final static int CONTEXT_NORMAL = 0;
+    private final static int CONTEXT_LITERAL = 1;
+
+
+    //////////////////////////////////////////////////////////////////////
+    // Error reporting.
+    //////////////////////////////////////////////////////////////////////
+
+
+    /**
+     * Report an error.
+     * @param message The error message.
+     * @param textFound The text that caused the error (or null).
+     * @see SAXDriver#error
+     * @see #line
+     */
+    private void error (String message, String textFound, String textExpected)
+    throws SAXException
+    {
+       if (textFound != null) {
+           message = message + " (found \"" + textFound + "\")";
+       }
+       if (textExpected != null) {
+           message = message + " (expected \"" + textExpected + "\")";
+       }
+       handler.fatal (message);
+
+       // "can't happen"
+       throw new SAXException (message);
+    }
+
+
+    /**
+     * Report a serious error.
+     * @param message The error message.
+     * @param textFound The text that caused the error (or null).
+     */
+    private void error (String message, char textFound, String textExpected)
+    throws SAXException
+    {
+       error (message, new Character (textFound).toString (), textExpected);
+    }
+
+    /** Report typical case fatal errors. */
+    private void error (String message)
+    throws SAXException
+    {
+       handler.fatal (message);
+    }
+
+
+    //////////////////////////////////////////////////////////////////////
+    // Major syntactic productions.
+    //////////////////////////////////////////////////////////////////////
+
+
+    /**
+     * Parse an XML document.
+     * <pre>
+     * [1] document ::= prolog element Misc*
+     * </pre>
+     * <p>This is the top-level parsing function for a single XML
+     * document.  As a minimum, a well-formed document must have
+     * a document element, and a valid document must have a prolog
+     * (one with doctype) as well.
+     */
+    private void parseDocument ()
+    throws Exception
+    {
+        try {                                       // added by MHK
+           boolean sawDTD = parseProlog ();
+           require ('<');
+           parseElement (!sawDTD);
+        } catch (EOFException ee) {                 // added by MHK
+            error("premature end of file", "[EOF]", null);
+        }
+        
+       try {
+           parseMisc ();   //skip all white, PIs, and comments
+           char c = readCh ();    //if this doesn't throw an exception...
+           error ("unexpected characters after document end", c, null);
+       } catch (EOFException e) {
+           return;
+       }
+    }
+
+    static final char  startDelimComment [] = { '<', '!', '-', '-' };
+    static final char  endDelimComment [] = { '-', '-' };
+
+    /**
+     * Skip a comment.
+     * <pre>
+     * [15] Comment ::= '&lt;!--' ((Char - '-') | ('-' (Char - '-')))* "-->"
+     * </pre>
+     * <p> (The <code>&lt;!--</code> has already been read.)
+     */
+    private void parseComment ()
+    throws Exception
+    {
+       char c;
+       boolean saved = expandPE;
+
+       expandPE = false;
+       parseUntil (endDelimComment);
+       require ('>');
+       expandPE = saved;
+       handler.comment (dataBuffer, 0, dataBufferPos);
+       dataBufferPos = 0;
+    }
+
+    static final char  startDelimPI [] = { '<', '?' };
+    static final char  endDelimPI [] = { '?', '>' };
+
+    /**
+     * Parse a processing instruction and do a call-back.
+     * <pre>
+     * [16] PI ::= '&lt;?' PITarget
+     *         (S (Char* - (Char* '?&gt;' Char*)))?
+     *         '?&gt;'
+     * [17] PITarget ::= Name - ( ('X'|'x') ('M'|m') ('L'|l') )
+     * </pre>
+     * <p> (The <code>&lt;?</code> has already been read.)
+     */
+    private void parsePI ()
+    throws SAXException, IOException
+    {
+       String name;
+       boolean saved = expandPE;
+
+       expandPE = false;
+       name = readNmtoken (true);
+       //NE08
+       if (name.indexOf(':') >= 0)
+           error ("Illegal character(':') in processing instruction name ", name, null);
+       if ("xml".equalsIgnoreCase (name))
+           error ("Illegal processing instruction target", name, null);
+       if (!tryRead (endDelimPI)) {
+           requireWhitespace ();
+           parseUntil (endDelimPI);
+       }
+       expandPE = saved;
+       handler.processingInstruction (name, dataBufferToString ());
+    }
+
+
+    static final char  endDelimCDATA [] = { ']', ']', '>' };
+
+       private boolean isDirtyCurrentElement;
+
+    /**
+     * Parse a CDATA section.
+     * <pre>
+     * [18] CDSect ::= CDStart CData CDEnd
+     * [19] CDStart ::= '&lt;![CDATA['
+     * [20] CData ::= (Char* - (Char* ']]&gt;' Char*))
+     * [21] CDEnd ::= ']]&gt;'
+     * </pre>
+     * <p> (The '&lt;![CDATA[' has already been read.)
+     */
+    private void parseCDSect ()
+    throws Exception
+    {
+       parseUntil (endDelimCDATA);
+       dataBufferFlush ();
+    }
+
+
+    /**
+     * Parse the prolog of an XML document.
+     * <pre>
+     * [22] prolog ::= XMLDecl? Misc* (Doctypedecl Misc*)?
+     * </pre>
+     * <p>We do not look for the XML declaration here, because it was
+     * handled by pushURL ().
+     * @see pushURL
+     * @return true if a DTD was read.
+     */
+    private boolean parseProlog ()
+    throws Exception
+    {
+       parseMisc ();
+
+       if (tryRead ("<!DOCTYPE")) {
+           parseDoctypedecl ();
+           parseMisc ();
+           return true;
+       }
+       return false;
+    }
+
+    private void checkLegalVersion (String version)
+    throws SAXException
+    {
+       int len = version.length ();
+       for (int i = 0; i < len; i++) {
+           char c = version.charAt (i);
+           if ('0' <= c && c <= '9')
+               continue;
+           if (c == '_' || c == '.' || c == ':' || c == '-')
+               continue;
+           if ('a' <= c && c <= 'z')
+               continue;
+           if ('A' <= c && c <= 'Z')
+               continue;
+           error ("illegal character in version", version, "1.0");
+       }
+    }
+
+
+    /**
+     * Parse the XML declaration.
+     * <pre>
+     * [23] XMLDecl ::= '&lt;?xml' VersionInfo EncodingDecl? SDDecl? S? '?&gt;'
+     * [24] VersionInfo ::= S 'version' Eq
+     *         ("'" VersionNum "'" | '"' VersionNum '"' )
+     * [26] VersionNum ::= ([a-zA-Z0-9_.:] | '-')*
+     * [32] SDDecl ::= S 'standalone' Eq
+     *         ( "'"" ('yes' | 'no') "'"" | '"' ("yes" | "no") '"' )
+     * [80] EncodingDecl ::= S 'encoding' Eq
+     *         ( "'" EncName "'" | "'" EncName "'" )
+     * [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')*
+     * </pre>
+     * <p> (The <code>&lt;?xml</code> and whitespace have already been read.)
+     * @return the encoding in the declaration, uppercased; or null
+     * @see #parseTextDecl
+     * @see #setupDecoding
+     */
+    private String parseXMLDecl (boolean ignoreEncoding)
+    throws SAXException, IOException
+    {
+       String  version;
+       String  encodingName = null;
+       String  standalone = null;
+       int     flags = LIT_DISABLE_CREF | LIT_DISABLE_PE | LIT_DISABLE_EREF;
+        String inputEncoding = null;
+        
+        switch (this.encoding)
+          {
+          case ENCODING_EXTERNAL:
+          case ENCODING_UTF_8:
+            inputEncoding = "UTF-8";
+            break;
+          case ENCODING_ISO_8859_1:
+            inputEncoding = "ISO-8859-1";
+            break;
+          case ENCODING_UCS_2_12:
+            inputEncoding = "UTF-16BE";
+            break;
+          case ENCODING_UCS_2_21:
+            inputEncoding = "UTF-16LE";
+            break;
+          }
+
+       // Read the version.
+       require ("version");
+       parseEq ();
+       checkLegalVersion (version = readLiteral (flags));
+       if (!version.equals ("1.0")){
+           if(version.equals ("1.1")){
+               handler.warn ("expected XML version 1.0, not: " + version);
+               xmlVersion = XML_11;
+           }else {
+               error("illegal XML version", version, "1.0 or 1.1");
+           }
+       }
+       else
+           xmlVersion = XML_10;
+       // Try reading an encoding declaration.
+       boolean white = tryWhitespace ();
+
+       if (tryRead ("encoding")) {
+           if (!white)
+               error ("whitespace required before 'encoding='");
+           parseEq ();
+           encodingName = readLiteral (flags);
+           if (!ignoreEncoding)
+               setupDecoding (encodingName);
+       }
+
+       // Try reading a standalone declaration
+       if (encodingName != null)
+           white = tryWhitespace ();
+       if (tryRead ("standalone")) {
+           if (!white)
+               error ("whitespace required before 'standalone='");
+           parseEq ();
+           standalone = readLiteral (flags);
+           if ("yes".equals (standalone))
+               docIsStandalone = true;
+           else if (!"no".equals (standalone))
+               error ("standalone flag must be 'yes' or 'no'");
+       }
+
+       skipWhitespace ();
+       require ("?>");
+
+        if (inputEncoding == null)
+          {
+            inputEncoding = encodingName;
+          }
+        handler.xmlDecl(version, encodingName, "yes".equals(standalone),
+                        inputEncoding);
+
+       return encodingName;
+    }
+
+
+    /**
+     * Parse a text declaration.
+     * <pre>
+     * [79] TextDecl ::= '&lt;?xml' VersionInfo? EncodingDecl S? '?&gt;'
+     * [80] EncodingDecl ::= S 'encoding' Eq
+     *         ( '"' EncName '"' | "'" EncName "'" )
+     * [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')*
+     * </pre>
+     * <p> (The <code>&lt;?xml</code>' and whitespace have already been read.)
+     * @return the encoding in the declaration, uppercased; or null
+     * @see #parseXMLDecl
+     * @see #setupDecoding
+     */
+    private String parseTextDecl (boolean ignoreEncoding)
+    throws SAXException, IOException
+    {
+       String  encodingName = null;
+       int     flags = LIT_DISABLE_CREF | LIT_DISABLE_PE | LIT_DISABLE_EREF;
+
+       // Read an optional version.
+       if (tryRead ("version")) {
+           String version;
+           parseEq ();
+           checkLegalVersion (version = readLiteral (flags));
+           
+           if (version.equals ("1.1")){
+               if (xmlVersion == XML_10){
+                  error ("external subset has later version number.", "1.0", version);    
+               }
+               handler.warn ("expected XML version 1.0, not: " + version);
+               xmlVersion = XML_11;
+             }else if(!version.equals ("1.0")) {
+                error("illegal XML version", version, "1.0 or 1.1");
+            }
+           requireWhitespace ();
+       }
+
+
+       // Read the encoding.
+       require ("encoding");
+       parseEq ();
+       encodingName = readLiteral (flags);
+       if (!ignoreEncoding)
+           setupDecoding (encodingName);
+
+       skipWhitespace ();
+       require ("?>");
+
+       return encodingName;
+    }
+
+
+    /**
+     * Sets up internal state so that we can decode an entity using the
+     * specified encoding.  This is used when we start to read an entity
+     * and we have been given knowledge of its encoding before we start to
+     * read any data (e.g. from a SAX input source or from a MIME type).
+     *
+     * <p> It is also used after autodetection, at which point only very
+     * limited adjustments to the encoding may be used (switching between
+     * related builtin decoders).
+     *
+     * @param encodingName The name of the encoding specified by the user.
+     * @exception IOException if the encoding isn't supported either
+     * internally to this parser, or by the hosting JVM.
+     * @see #parseXMLDecl
+     * @see #parseTextDecl
+     */
+    private void setupDecoding (String encodingName)
+    throws SAXException, IOException
+    {
+       encodingName = encodingName.toUpperCase ();
+
+       // ENCODING_EXTERNAL indicates an encoding that wasn't
+       // autodetected ... we can use builtin decoders, or
+       // ones from the JVM (InputStreamReader).
+
+       // Otherwise we can only tweak what was autodetected, and
+       // only for single byte (ASCII derived) builtin encodings.
+
+       // ASCII-derived encodings
+       if (encoding == ENCODING_UTF_8 || encoding == ENCODING_EXTERNAL) {
+           if (encodingName.equals ("ISO-8859-1")
+                   || encodingName.equals ("8859_1")
+                   || encodingName.equals ("ISO8859_1")
+             ) {
+               encoding = ENCODING_ISO_8859_1;
+               return;
+           } else if (encodingName.equals ("US-ASCII")
+                       || encodingName.equals ("ASCII")) {
+               encoding = ENCODING_ASCII;
+               return;
+           } else if (encodingName.equals ("UTF-8")
+                       || encodingName.equals ("UTF8")) {
+               encoding = ENCODING_UTF_8;
+               return;
+           } else if (encoding != ENCODING_EXTERNAL) {
+               // used to start with a new reader ...
+               throw new UnsupportedEncodingException (encodingName);
+           }
+           // else fallthrough ...
+           // it's ASCII-ish and something other than a builtin
+       }
+
+       // Unicode and such
+       if (encoding == ENCODING_UCS_2_12 || encoding == ENCODING_UCS_2_21) {
+           if (!(encodingName.equals ("ISO-10646-UCS-2")
+                   || encodingName.equals ("UTF-16")
+                   || encodingName.equals ("UTF-16BE")
+                   || encodingName.equals ("UTF-16LE")))
+               error ("unsupported Unicode encoding",
+                      encodingName,
+                      "UTF-16");
+           return;
+       }
+
+       // four byte encodings
+       if (encoding == ENCODING_UCS_4_1234
+               || encoding == ENCODING_UCS_4_4321
+               || encoding == ENCODING_UCS_4_2143
+               || encoding == ENCODING_UCS_4_3412) {
+           // Strictly:  "UCS-4" == "UTF-32BE"; also, "UTF-32LE" exists
+           if (!encodingName.equals ("ISO-10646-UCS-4"))
+               error ("unsupported 32-bit encoding",
+                      encodingName,
+                      "ISO-10646-UCS-4");
+           return;
+       }
+
+       // assert encoding == ENCODING_EXTERNAL
+       // if (encoding != ENCODING_EXTERNAL)
+       //     throw new RuntimeException ("encoding = " + encoding);
+
+       if (encodingName.equals ("UTF-16BE")) {
+           encoding = ENCODING_UCS_2_12;
+           return;
+       }
+       if (encodingName.equals ("UTF-16LE")) {
+           encoding = ENCODING_UCS_2_21;
+           return;
+       }
+
+       // We couldn't use the builtin decoders at all.  But we can try to
+       // create a reader, since we haven't messed up buffering.  Tweak
+       // the encoding name if necessary.
+
+       if (encodingName.equals ("UTF-16")
+               || encodingName.equals ("ISO-10646-UCS-2"))
+           encodingName = "Unicode";
+       // Ignoring all the EBCDIC aliases here
+
+       reader = new InputStreamReader (is, encodingName);
+       sourceType = INPUT_READER;
+    }
+
+
+    /**
+     * Parse miscellaneous markup outside the document element and DOCTYPE
+     * declaration.
+     * <pre>
+     * [27] Misc ::= Comment | PI | S
+     * </pre>
+     */
+    private void parseMisc ()
+    throws Exception
+    {
+       while (true) {
+           skipWhitespace ();
+           if (tryRead (startDelimPI)) {
+               parsePI ();
+           } else if (tryRead (startDelimComment)) {
+               parseComment ();
+           } else {
+               return;
+           }
+       }
+    }
+
+
+    /**
+     * Parse a document type declaration.
+     * <pre>
+     * [28] doctypedecl ::= '&lt;!DOCTYPE' S Name (S ExternalID)? S?
+     *         ('[' (markupdecl | PEReference | S)* ']' S?)? '&gt;'
+     * </pre>
+     * <p> (The <code>&lt;!DOCTYPE</code> has already been read.)
+     */
+    private void parseDoctypedecl ()
+    throws Exception
+    {
+       String rootName, ids[];
+
+       // Read the document type name.
+       requireWhitespace ();
+       rootName = readNmtoken (true);
+
+       // Read the External subset's IDs
+       skipWhitespace ();
+       ids = readExternalIds (false, true);
+
+       // report (a) declaration of name, (b) lexical info (ids)
+       handler.doctypeDecl (rootName, ids [0], ids [1]);
+
+       // Internal subset is parsed first, if present
+       skipWhitespace ();
+       if (tryRead ('[')) {
+
+           // loop until the subset ends
+           while (true) {
+               doReport = expandPE = true;
+               skipWhitespace ();
+               doReport = expandPE = false;
+               if (tryRead (']')) {
+                   break;              // end of subset
+               } else {
+                   // WFC, PEs in internal subset (only between decls)
+                   peIsError = expandPE = true;
+                   parseMarkupdecl ();
+                   peIsError = expandPE = false;
+               }
+           }
+       }
+       skipWhitespace ();
+       require ('>');
+
+       // Read the external subset, if any
+       InputSource     subset;
+
+       if (ids [1] == null)
+           subset = handler.getExternalSubset (rootName,
+                       handler.getSystemId ());
+       else
+           subset = null;
+       if (ids [1] != null || subset != null) {
+           pushString (null, ">");
+
+           // NOTE:  [dtd] is so we say what SAX2 expects,
+           // though it's misleading (subset, not entire dtd)
+           if (ids [1] != null)
+               pushURL (true, "[dtd]", ids, null, null, null, true);
+           else {
+               handler.warn ("modifying document by adding external subset");
+               pushURL (true, "[dtd]",
+                   new String [] { subset.getPublicId (),
+                           subset.getSystemId (), null },
+                   subset.getCharacterStream (),
+                   subset.getByteStream (),
+                   subset.getEncoding (),
+                   false);
+           }
+
+           // Loop until we end up back at '>'
+           while (true) {
+               doReport = expandPE = true;
+               skipWhitespace ();
+               doReport = expandPE = false;
+               if (tryRead ('>')) {
+                   break;
+               } else {
+                   expandPE = true;
+                   parseMarkupdecl ();
+                   expandPE = false;
+               }
+           }
+
+           // the ">" string isn't popped yet
+           if (inputStack.size () != 1)
+               error ("external subset has unmatched '>'");
+       }
+
+       // done dtd
+       handler.endDoctype ();
+       expandPE = false;
+       doReport = true;
+    }
+
+
+    /**
+     * Parse a markup declaration in the internal or external DTD subset.
+     * <pre>
+     * [29] markupdecl ::= elementdecl | Attlistdecl | EntityDecl
+     *         | NotationDecl | PI | Comment
+     * [30] extSubsetDecl ::= (markupdecl | conditionalSect
+     *         | PEReference | S) *
+     * </pre>
+     * <p> Reading toplevel PE references is handled as a lexical issue
+     * by the caller, as is whitespace.
+     */
+    private void parseMarkupdecl ()
+    throws Exception
+    {
+       char    saved [] = null;
+       boolean savedPE = expandPE;
+
+       // prevent "<%foo;" and ensures saved entity is right
+       require ('<');
+       unread ('<');
+       expandPE = false;
+
+       if (tryRead ("<!ELEMENT")) {
+           saved = readBuffer;
+           expandPE = savedPE;
+           parseElementDecl ();
+       } else if (tryRead ("<!ATTLIST")) {
+           saved = readBuffer;
+           expandPE = savedPE;
+           parseAttlistDecl ();
+       } else if (tryRead ("<!ENTITY")) {
+           saved = readBuffer;
+           expandPE = savedPE;
+           parseEntityDecl ();
+       } else if (tryRead ("<!NOTATION")) {
+           saved = readBuffer;
+           expandPE = savedPE;
+           parseNotationDecl ();
+       } else if (tryRead (startDelimPI)) {
+           saved = readBuffer;
+           expandPE = savedPE;
+           parsePI ();
+       } else if (tryRead (startDelimComment)) {
+           saved = readBuffer;
+           expandPE = savedPE;
+           parseComment ();
+       } else if (tryRead ("<![")) {
+           saved = readBuffer;
+           expandPE = savedPE;
+           if (inputStack.size () > 0)
+               parseConditionalSect (saved);
+           else
+               error ("conditional sections illegal in internal subset");
+       } else {
+           error ("expected markup declaration");
+       }
+
+       // VC: Proper Decl/PE Nesting
+       if (readBuffer != saved)
+           handler.verror ("Illegal Declaration/PE nesting");
+    }
+
+
+    /**
+     * Parse an element, with its tags.
+     * <pre>
+     * [39] element ::= EmptyElementTag | STag content ETag
+     * [40] STag ::= '&lt;' Name (S Attribute)* S? '&gt;'
+     * [44] EmptyElementTag ::= '&lt;' Name (S Attribute)* S? '/&gt;'
+     * </pre>
+     * <p> (The '&lt;' has already been read.)
+     * <p>NOTE: this method actually chains onto parseContent (), if necessary,
+     * and parseContent () will take care of calling parseETag ().
+     */
+    private void parseElement (boolean maybeGetSubset)
+    throws Exception
+    {
+       String  gi;
+       char    c;
+       int     oldElementContent = currentElementContent;
+       String  oldElement = currentElement;
+       Object  element [];
+
+       // This is the (global) counter for the
+       // array of specified attributes.
+       tagAttributePos = 0;
+
+       // Read the element type name.
+       gi = readNmtoken (true);
+
+       // If we saw no DTD, and this is the document root element,
+       // let the application modify the input stream by providing one.
+       if (maybeGetSubset) {
+           InputSource subset = handler.getExternalSubset (gi,
+                       handler.getSystemId ());
+           if (subset != null) {
+               String  publicId = subset.getPublicId ();
+               String  systemId = subset.getSystemId ();
+
+               handler.warn ("modifying document by adding DTD");
+               handler.doctypeDecl (gi, publicId, systemId);
+               pushString (null, ">");
+
+               // NOTE:  [dtd] is so we say what SAX2 expects,
+               // though it's misleading (subset, not entire dtd)
+               pushURL (true, "[dtd]",
+                   new String [] { publicId, systemId, null },
+                   subset.getCharacterStream (),
+                   subset.getByteStream (),
+                   subset.getEncoding (),
+                   false);
+
+               // Loop until we end up back at '>'
+               while (true) {
+                   doReport = expandPE = true;
+                   skipWhitespace ();
+                   doReport = expandPE = false;
+                   if (tryRead ('>')) {
+                       break;
+                   } else {
+                       expandPE = true;
+                       parseMarkupdecl ();
+                       expandPE = false;
+                   }
+               }
+
+               // the ">" string isn't popped yet
+               if (inputStack.size () != 1)
+                   error ("external subset has unmatched '>'");
+
+               handler.endDoctype ();
+           }
+       }
+
+       // Determine the current content type.
+       currentElement = gi;
+       element = (Object []) elementInfo.get (gi);
+       currentElementContent = getContentType (element, CONTENT_ANY);
+
+       // Read the attributes, if any.
+       // After this loop, "c" is the closing delimiter.
+       boolean white = tryWhitespace ();
+       c = readCh ();
+       while (c != '/' && c != '>') {
+           unread (c);
+           if (!white)
+               error ("need whitespace between attributes");
+           parseAttribute (gi);
+           white = tryWhitespace ();
+           c = readCh ();
+       }
+
+       // Supply any defaulted attributes.
+       Enumeration atts = declaredAttributes (element);
+       if (atts != null) {
+           String aname;
+loop:
+           while (atts.hasMoreElements ()) {
+               aname = (String) atts.nextElement ();
+               // See if it was specified.
+               for (int i = 0; i < tagAttributePos; i++) {
+                   if (tagAttributes [i] == aname) {
+                       continue loop;
+                   }
+               }
+               // ... or has a default
+               String value = getAttributeDefaultValue (gi, aname);
+
+               if (value == null)
+                   continue;
+               handler.attribute (aname, value, false);
+           }
+       }
+
+       // Figure out if this is a start tag
+       // or an empty element, and dispatch an
+       // event accordingly.
+       switch (c) {
+       case '>':
+           handler.startElement (gi);
+           parseContent ();
+           break;
+       case '/':
+           require ('>');
+           handler.startElement (gi);
+           handler.endElement (gi);
+           break;
+       }
+
+       // Restore the previous state.
+       currentElement = oldElement;
+       currentElementContent = oldElementContent;
+    }
+
+
+    /**
+     * Parse an attribute assignment.
+     * <pre>
+     * [41] Attribute ::= Name Eq AttValue
+     * </pre>
+     * @param name The name of the attribute's element.
+     * @see SAXDriver#attribute
+     */
+    private void parseAttribute (String name)
+    throws Exception
+    {
+       String aname;
+       String type;
+       String value;
+       int flags = LIT_ATTRIBUTE |  LIT_ENTITY_REF;
+
+       // Read the attribute name.
+       aname = readNmtoken (true);
+       type = getAttributeType (name, aname);
+
+       // Parse '='
+       parseEq ();
+
+       // Read the value, normalizing whitespace
+       // unless it is CDATA.
+  if (handler.getFeature (SAXDriver.FEATURE + "string-interning")) {
+    if (type == "CDATA" || type == null) {
+           value = readLiteral (flags);
+    } else {
+           value = readLiteral (flags | LIT_NORMALIZE);
+    }
+  } else {
+    if (type.equals("CDATA") || type == null) {
+           value = readLiteral (flags);
+    } else {
+           value = readLiteral (flags | LIT_NORMALIZE);
+    }
+  }
+
+       // WFC: no duplicate attributes
+       for (int i = 0; i < tagAttributePos; i++)
+           if (aname.equals (tagAttributes [i]))
+               error ("duplicate attribute", aname, null);
+
+       // Inform the handler about the
+       // attribute.
+       handler.attribute (aname, value, true);
+       dataBufferPos = 0;
+
+       // Note that the attribute has been
+       // specified.
+       if (tagAttributePos == tagAttributes.length) {
+           String newAttrib[] = new String [tagAttributes.length * 2];
+           System.arraycopy (tagAttributes, 0, newAttrib, 0, tagAttributePos);
+           tagAttributes = newAttrib;
+       }
+       tagAttributes [tagAttributePos++] = aname;
+    }
+
+
+    /**
+     * Parse an equals sign surrounded by optional whitespace.
+     * <pre>
+     * [25] Eq ::= S? '=' S?
+     * </pre>
+     */
+    private void parseEq ()
+    throws SAXException, IOException
+    {
+       skipWhitespace ();
+       require ('=');
+       skipWhitespace ();
+    }
+
+
+    /**
+     * Parse an end tag.
+     * <pre>
+     * [42] ETag ::= '</' Name S? '>'
+     * </pre>
+     * <p>NOTE: parseContent () chains to here, we already read the
+     * "&lt;/".
+     */
+    private void parseETag ()
+    throws Exception
+    {
+       require (currentElement);
+       skipWhitespace ();
+       require ('>');
+       handler.endElement (currentElement);
+       // not re-reporting any SAXException re bogus end tags,
+       // even though that diagnostic might be clearer ...
+    }
+
+
+    /**
+     * Parse the content of an element.
+     * <pre>
+     * [43] content ::= (element | CharData | Reference
+     *         | CDSect | PI | Comment)*
+     * [67] Reference ::= EntityRef | CharRef
+     * </pre>
+     * <p> NOTE: consumes ETtag.
+     */
+    private void parseContent ()
+    throws Exception
+    {
+       char c;
+
+       while (true) {
+           // consume characters (or ignorable whitspace) until delimiter
+           parseCharData ();
+
+           // Handle delimiters
+           c = readCh ();
+           switch (c) {
+
+           case '&':                   // Found "&"
+               c = readCh ();
+               if (c == '#') {
+                   parseCharRef ();
+               } else {
+                   unread (c);
+                   parseEntityRef (true);
+               }
+               isDirtyCurrentElement = true;
+               break;
+
+             case '<':                         // Found "<"
+               dataBufferFlush ();
+               c = readCh ();
+               switch (c) {
+                 case '!':                     // Found "<!"
+                   c = readCh ();
+                   switch (c) {
+                     case '-':                 // Found "<!-"
+                       require ('-');
+                       isDirtyCurrentElement = false;
+                       parseComment ();
+                       break;
+                     case '[':                 // Found "<!["
+                       isDirtyCurrentElement = false;
+                       require ("CDATA[");
+                       handler.startCDATA ();
+                       inCDATA = true;
+                       parseCDSect ();
+                       inCDATA = false;
+                       handler.endCDATA ();
+                       break;
+                     default:
+                       error ("expected comment or CDATA section", c, null);
+                       break;
+                   }
+                   break;
+
+                 case '?':             // Found "<?"
+                   isDirtyCurrentElement = false;
+                   parsePI ();
+                   break;
+
+                 case '/':             // Found "</"
+                   isDirtyCurrentElement = false;
+                   parseETag ();
+                   return;
+
+                 default:              // Found "<" followed by something else
+                   isDirtyCurrentElement = false;
+                   unread (c);
+                   parseElement (false);
+                   break;
+               }
+           }
+       }
+       
+    }
+
+
+    /**
+     * Parse an element type declaration.
+     * <pre>
+     * [45] elementdecl ::= '&lt;!ELEMENT' S Name S contentspec S? '&gt;'
+     * </pre>
+     * <p> NOTE: the '&lt;!ELEMENT' has already been read.
+     */
+    private void parseElementDecl ()
+    throws Exception
+    {
+       String name;
+
+       requireWhitespace ();
+       // Read the element type name.
+       name = readNmtoken (true);
+
+       requireWhitespace ();
+       // Read the content model.
+       parseContentspec (name);
+
+       skipWhitespace ();
+       require ('>');
+    }
+
+
+    /**
+     * Content specification.
+     * <pre>
+     * [46] contentspec ::= 'EMPTY' | 'ANY' | Mixed | elements
+     * </pre>
+     */
+    private void parseContentspec (String name)
+    throws Exception
+    {
+// FIXME: move elementDecl() into setElement(), pass EMTPY/ANY ...
+       if (tryRead ("EMPTY")) {
+           setElement (name, CONTENT_EMPTY, null, null);
+           if (!skippedPE)
+               handler.getDeclHandler ().elementDecl (name, "EMPTY");
+           return;
+       } else if (tryRead ("ANY")) {
+           setElement (name, CONTENT_ANY, null, null);
+           if (!skippedPE)
+               handler.getDeclHandler ().elementDecl (name, "ANY");
+           return;
+       } else {
+           String      model;
+           char        saved []; 
+
+           require ('(');
+           saved = readBuffer;
+           dataBufferAppend ('(');
+           skipWhitespace ();
+           if (tryRead ("#PCDATA")) {
+               dataBufferAppend ("#PCDATA");
+               parseMixed (saved);
+               model = dataBufferToString ();
+               setElement (name, CONTENT_MIXED, model, null);
+           } else {
+               parseElements (saved);
+               model = dataBufferToString ();
+               setElement (name, CONTENT_ELEMENTS, model, null);
+           }
+           if (!skippedPE)
+               handler.getDeclHandler ().elementDecl (name, model);
+       }
+    }
+
+    /**
+     * Parse an element-content model.
+     * <pre>
+     * [47] elements ::= (choice | seq) ('?' | '*' | '+')?
+     * [49] choice ::= '(' S? cp (S? '|' S? cp)+ S? ')'
+     * [50] seq ::= '(' S? cp (S? ',' S? cp)* S? ')'
+     * </pre>
+     *
+     * <p> NOTE: the opening '(' and S have already been read.
+     *
+     * @param saved Buffer for entity that should have the terminal ')'
+     */
+    private void parseElements (char saved [])
+    throws Exception
+    {
+       char c;
+       char sep;
+
+       // Parse the first content particle
+       skipWhitespace ();
+       parseCp ();
+
+       // Check for end or for a separator.
+       skipWhitespace ();
+       c = readCh ();
+       switch (c) {
+       case ')':
+           // VC: Proper Group/PE Nesting
+           if (readBuffer != saved)
+               handler.verror ("Illegal Group/PE nesting");
+
+           dataBufferAppend (')');
+           c = readCh ();
+           switch (c) {
+           case '*':
+           case '+':
+           case '?':
+               dataBufferAppend (c);
+               break;
+           default:
+               unread (c);
+           }
+           return;
+       case ',':                       // Register the separator.
+       case '|':
+           sep = c;
+           dataBufferAppend (c);
+           break;
+       default:
+           error ("bad separator in content model", c, null);
+           return;
+       }
+
+       // Parse the rest of the content model.
+       while (true) {
+           skipWhitespace ();
+           parseCp ();
+           skipWhitespace ();
+           c = readCh ();
+           if (c == ')') {
+               // VC: Proper Group/PE Nesting
+               if (readBuffer != saved)
+                   handler.verror ("Illegal Group/PE nesting");
+
+               dataBufferAppend (')');
+               break;
+           } else if (c != sep) {
+               error ("bad separator in content model", c, null);
+               return;
+           } else {
+               dataBufferAppend (c);
+           }
+       }
+
+       // Check for the occurrence indicator.
+       c = readCh ();
+       switch (c) {
+       case '?':
+       case '*':
+       case '+':
+           dataBufferAppend (c);
+           return;
+       default:
+           unread (c);
+           return;
+       }
+    }
+
+
+    /**
+     * Parse a content particle.
+     * <pre>
+     * [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?
+     * </pre>
+     */
+    private void parseCp ()
+    throws Exception
+    {
+       if (tryRead ('(')) {
+           dataBufferAppend ('(');
+           parseElements (readBuffer);
+       } else {
+           dataBufferAppend (readNmtoken (true));
+           char c = readCh ();
+           switch (c) {
+           case '?':
+           case '*':
+           case '+':
+               dataBufferAppend (c);
+               break;
+           default:
+               unread (c);
+               break;
+           }
+       }
+    }
+
+
+    /**
+     * Parse mixed content.
+     * <pre>
+     * [51] Mixed ::= '(' S? ( '#PCDATA' (S? '|' S? Name)*) S? ')*'
+     *       | '(' S? ('#PCDATA') S? ')'
+     * </pre>
+     *
+     * @param saved Buffer for entity that should have the terminal ')'
+     */
+    private void parseMixed (char saved [])
+    throws Exception
+    {
+       // Check for PCDATA alone.
+       skipWhitespace ();
+       if (tryRead (')')) {
+           // VC: Proper Group/PE Nesting
+           if (readBuffer != saved)
+               handler.verror ("Illegal Group/PE nesting");
+
+           dataBufferAppend (")*");
+           tryRead ('*');
+           return;
+       }
+
+       // Parse mixed content.
+       skipWhitespace ();
+       while (!tryRead (")")) {
+           require ('|');
+           dataBufferAppend ('|');
+           skipWhitespace ();
+           dataBufferAppend (readNmtoken (true));
+           skipWhitespace ();
+       }
+
+       // VC: Proper Group/PE Nesting
+       if (readBuffer != saved)
+           handler.verror ("Illegal Group/PE nesting");
+
+       require ('*');
+       dataBufferAppend (")*");
+    }
+
+
+    /**
+     * Parse an attribute list declaration.
+     * <pre>
+     * [52] AttlistDecl ::= '&lt;!ATTLIST' S Name AttDef* S? '&gt;'
+     * </pre>
+     * <p>NOTE: the '&lt;!ATTLIST' has already been read.
+     */
+    private void parseAttlistDecl ()
+    throws Exception
+    {
+       String elementName;
+
+       requireWhitespace ();
+       elementName = readNmtoken (true);
+       boolean white = tryWhitespace ();
+       while (!tryRead ('>')) {
+           if (!white)
+               error ("whitespace required before attribute definition");
+           parseAttDef (elementName);
+           white = tryWhitespace ();
+       }
+    }
+
+
+    /**
+     * Parse a single attribute definition.
+     * <pre>
+     * [53] AttDef ::= S Name S AttType S DefaultDecl
+     * </pre>
+     */
+    private void parseAttDef (String elementName)
+    throws Exception
+    {
+       String name;
+       String type;
+       String enumer = null;
+
+       // Read the attribute name.
+       name = readNmtoken (true);
+
+       // Read the attribute type.
+       requireWhitespace ();
+       type = readAttType ();
+
+       // Get the string of enumerated values if necessary.
+  if (handler.getFeature (SAXDriver.FEATURE + "string-interning")) {
+    if ("ENUMERATION" == type || "NOTATION" == type)
+           enumer = dataBufferToString ();
+  } else {
+    if ("ENUMERATION".equals(type) || "NOTATION".equals(type))
+           enumer = dataBufferToString ();
+  }
+
+       // Read the default value.
+       requireWhitespace ();
+       parseDefault (elementName, name, type, enumer);
+    }
+
+
+  /**
+   * Parse the attribute type.
+   * <pre>
+   * [54] AttType ::= StringType | TokenizedType | EnumeratedType
+   * [55] StringType ::= 'CDATA'
+   * [56] TokenizedType ::= 'ID' | 'IDREF' | 'IDREFS' | 'ENTITY'
+   *           | 'ENTITIES' | 'NMTOKEN' | 'NMTOKENS'
+   * [57] EnumeratedType ::= NotationType | Enumeration
+   * </pre>
+   */
+  private String readAttType ()
+    throws Exception
+  {
+    if (tryRead ('(')) {
+           parseEnumeration (false);
+           return "ENUMERATION";
+    } else {
+           String typeString = readNmtoken (true);
+      if (handler.getFeature (SAXDriver.FEATURE + "string-interning")) {
+        if ("NOTATION" == typeString) {
+          parseNotationType ();
+          return typeString;
+        } else if ("CDATA" == typeString
+                   || "ID" == typeString
+                   || "IDREF" == typeString
+                   || "IDREFS" == typeString
+                   || "ENTITY" == typeString
+                   || "ENTITIES" == typeString
+                   || "NMTOKEN" == typeString
+                   || "NMTOKENS" == typeString)
+          return typeString;
+      } else {
+        if ("NOTATION".equals(typeString)) {
+          parseNotationType ();
+          return typeString;
+        } else if ("CDATA".equals(typeString)
+                   || "ID".equals(typeString)
+                   || "IDREF".equals(typeString)
+                   || "IDREFS".equals(typeString)
+                   || "ENTITY".equals(typeString)
+                   || "ENTITIES".equals(typeString)
+                   || "NMTOKEN".equals(typeString)
+                   || "NMTOKENS".equals(typeString))
+          return typeString;
+      }
+           error ("illegal attribute type", typeString, null);
+           return null;
+    }
+  }
+  
+
+    /**
+     * Parse an enumeration.
+     * <pre>
+     * [59] Enumeration ::= '(' S? Nmtoken (S? '|' S? Nmtoken)* S? ')'
+     * </pre>
+     * <p>NOTE: the '(' has already been read.
+     */
+    private void parseEnumeration (boolean isNames)
+    throws Exception
+    {
+       dataBufferAppend ('(');
+
+       // Read the first token.
+       skipWhitespace ();
+       dataBufferAppend (readNmtoken (isNames));
+       // Read the remaining tokens.
+       skipWhitespace ();
+       while (!tryRead (')')) {
+           require ('|');
+           dataBufferAppend ('|');
+           skipWhitespace ();
+           dataBufferAppend (readNmtoken (isNames));
+           skipWhitespace ();
+       }
+       dataBufferAppend (')');
+    }
+
+
+    /**
+     * Parse a notation type for an attribute.
+     * <pre>
+     * [58] NotationType ::= 'NOTATION' S '(' S? NameNtoks
+     *         (S? '|' S? name)* S? ')'
+     * </pre>
+     * <p>NOTE: the 'NOTATION' has already been read
+     */
+    private void parseNotationType ()
+    throws Exception
+    {
+       requireWhitespace ();
+       require ('(');
+
+       parseEnumeration (true);
+    }
+
+
+    /**
+     * Parse the default value for an attribute.
+     * <pre>
+     * [60] DefaultDecl ::= '#REQUIRED' | '#IMPLIED'
+     *         | (('#FIXED' S)? AttValue)
+     * </pre>
+     */
+    private void parseDefault (
+       String elementName,
+       String name,
+       String type,
+       String enumer
+    ) throws Exception
+    {
+       int     valueType = ATTRIBUTE_DEFAULT_SPECIFIED;
+       String  value = null;
+       int     flags = LIT_ATTRIBUTE;
+       boolean saved = expandPE;
+       String  defaultType = null;
+
+       // LIT_ATTRIBUTE forces '<' checks now (ASAP) and turns whitespace
+       // chars to spaces (doesn't matter when that's done if it doesn't
+       // interfere with char refs expanding to whitespace).
+
+       if (!skippedPE) {
+    flags |= LIT_ENTITY_REF;
+    if (handler.getFeature (SAXDriver.FEATURE + "string-interning")) {
+           if ("CDATA" != type)
+        flags |= LIT_NORMALIZE;
+    } else {
+           if (!"CDATA".equals(type))
+        flags |= LIT_NORMALIZE;
+    }
+       }
+
+       expandPE = false;
+       if (tryRead ('#')) {
+           if (tryRead ("FIXED")) {
+               defaultType = "#FIXED";
+               valueType = ATTRIBUTE_DEFAULT_FIXED;
+               requireWhitespace ();
+               value = readLiteral (flags);
+           } else if (tryRead ("REQUIRED")) {
+               defaultType = "#REQUIRED";
+               valueType = ATTRIBUTE_DEFAULT_REQUIRED;
+           } else if (tryRead ("IMPLIED")) {
+               defaultType = "#IMPLIED";
+               valueType = ATTRIBUTE_DEFAULT_IMPLIED;
+           } else {
+               error ("illegal keyword for attribute default value");
+           }
+       } else
+           value = readLiteral (flags);
+       expandPE = saved;
+       setAttribute (elementName, name, type, enumer, value, valueType);
+  if (handler.getFeature (SAXDriver.FEATURE + "string-interning")) {
+    if ("ENUMERATION" == type)
+           type = enumer;
+    else if ("NOTATION" == type)
+           type = "NOTATION " + enumer;
+  } else {
+    if ("ENUMERATION".equals(type))
+           type = enumer;
+    else if ("NOTATION".equals(type))
+           type = "NOTATION " + enumer;
+  }
+       if (!skippedPE) handler.getDeclHandler ()
+           .attributeDecl (elementName, name, type, defaultType, value);
+    }
+
+
+    /**
+     * Parse a conditional section.
+     * <pre>
+     * [61] conditionalSect ::= includeSect || ignoreSect
+     * [62] includeSect ::= '&lt;![' S? 'INCLUDE' S? '['
+     *         extSubsetDecl ']]&gt;'
+     * [63] ignoreSect ::= '&lt;![' S? 'IGNORE' S? '['
+     *         ignoreSectContents* ']]&gt;'
+     * [64] ignoreSectContents ::= Ignore
+     *         ('&lt;![' ignoreSectContents* ']]&gt;' Ignore )*
+     * [65] Ignore ::= Char* - (Char* ( '&lt;![' | ']]&gt;') Char* )
+     * </pre>
+     * <p> NOTE: the '&gt;![' has already been read.
+     */
+    private void parseConditionalSect (char saved [])
+    throws Exception
+    {
+       skipWhitespace ();
+       if (tryRead ("INCLUDE")) {
+           skipWhitespace ();
+           require ('[');
+           // VC: Proper Conditional Section/PE Nesting
+           if (readBuffer != saved)
+               handler.verror ("Illegal Conditional Section/PE nesting");
+           skipWhitespace ();
+           while (!tryRead ("]]>")) {
+               parseMarkupdecl ();
+               skipWhitespace ();
+           }
+       } else if (tryRead ("IGNORE")) {
+           skipWhitespace ();
+           require ('[');
+           // VC: Proper Conditional Section/PE Nesting
+           if (readBuffer != saved)
+               handler.verror ("Illegal Conditional Section/PE nesting");
+           int nesting = 1;
+           char c;
+           expandPE = false;
+           for (int nest = 1; nest > 0;) {
+               c = readCh ();
+               switch (c) {
+               case '<':
+                   if (tryRead ("![")) {
+                       nest++;
+                   }
+               case ']':
+                   if (tryRead ("]>")) {
+                       nest--;
+                   }
+               }
+           }
+           expandPE = true;
+       } else {
+           error ("conditional section must begin with INCLUDE or IGNORE");
+       }
+    }
+
+  private void parseCharRef ()
+    throws SAXException, IOException
+  {
+    parseCharRef (true /* do flushDataBuffer by default */);
+  }
+
+  /**
+   * Try to read a character reference without consuming data from buffer.
+   * <pre>
+   * [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';'
+   * </pre>
+   * <p>NOTE: the '&#' has already been read.
+   */
+  private void tryReadCharRef ()
+  throws SAXException, IOException
+  {
+       int value = 0;
+       char c;
+
+       if (tryRead ('x')) {
+loop1:
+           while (true) {
+               c = readCh ();
+               int n;
+               switch (c) {
+               case '0': case '1': case '2': case '3': case '4':
+               case '5': case '6': case '7': case '8': case '9':
+                   n = c - '0';
+                   break;
+               case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+                   n = (c - 'a') + 10;
+                   break;
+               case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
+                   n = (c - 'A') + 10;
+                   break;
+               case ';':
+                   break loop1;
+               default:
+                   error ("illegal character in character reference", c, null);
+                   break loop1;
+               }
+               value *= 16;
+               value += n;
+           }
+       } else {
+loop2:
+           while (true) {
+               c = readCh ();
+               switch (c) {
+               case '0': case '1': case '2': case '3': case '4':
+               case '5': case '6': case '7': case '8': case '9':
+                   value *= 10;
+                   value += c - '0';
+                   break;
+               case ';':
+                   break loop2;
+               default:
+                   error ("illegal character in character reference", c, null);
+                   break loop2;
+               }
+           }
+       }
+
+       // check for character refs being legal XML
+       if ((value < 0x0020
+               && ! (value == '\n' || value == '\t' || value == '\r'))
+               || (value >= 0xD800 && value <= 0xDFFF)
+               || value == 0xFFFE || value == 0xFFFF
+               || value > 0x0010ffff)
+           error ("illegal XML character reference U+"
+                   + Integer.toHexString (value));
+
+       // Check for surrogates: 00000000 0000xxxx yyyyyyyy zzzzzzzz
+       //  (1101|10xx|xxyy|yyyy + 1101|11yy|zzzz|zzzz:
+       if (value > 0x0010ffff) {
+           // too big for surrogate
+           error ("character reference " + value + " is too large for UTF-16",
+                  new Integer (value).toString (), null);
+       }
+
+  }
+  
+    /**
+     * Read and interpret a character reference.
+     * <pre>
+     * [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';'
+     * </pre>
+     * <p>NOTE: the '&#' has already been read.
+     */
+    private void parseCharRef (boolean doFlush)
+    throws SAXException, IOException
+    {
+       int value = 0;
+       char c;
+
+       if (tryRead ('x')) {
+loop1:
+           while (true) {
+               c = readCh ();
+               int n;
+               switch (c) {
+               case '0': case '1': case '2': case '3': case '4':
+               case '5': case '6': case '7': case '8': case '9':
+                   n = c - '0';
+                   break;
+               case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+                   n = (c - 'a') + 10;
+                   break;
+               case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
+                   n = (c - 'A') + 10;
+                   break;
+               case ';':
+                   break loop1;
+               default:
+                   error ("illegal character in character reference", c, null);
+                   break loop1;
+               }
+               value *= 16;
+               value += n;
+           }
+       } else {
+loop2:
+           while (true) {
+               c = readCh ();
+               switch (c) {
+               case '0': case '1': case '2': case '3': case '4':
+               case '5': case '6': case '7': case '8': case '9':
+                   value *= 10;
+                   value += c - '0';
+                   break;
+               case ';':
+                   break loop2;
+               default:
+                   error ("illegal character in character reference", c, null);
+                   break loop2;
+               }
+           }
+       }
+
+       // check for character refs being legal XML
+       if ((value < 0x0020
+               && ! (value == '\n' || value == '\t' || value == '\r'))
+               || (value >= 0xD800 && value <= 0xDFFF)
+               || value == 0xFFFE || value == 0xFFFF
+               || value > 0x0010ffff)
+           error ("illegal XML character reference U+"
+                   + Integer.toHexString (value));
+
+       // Check for surrogates: 00000000 0000xxxx yyyyyyyy zzzzzzzz
+       //  (1101|10xx|xxyy|yyyy + 1101|11yy|zzzz|zzzz:
+       if (value <= 0x0000ffff) {
+           // no surrogates needed
+           dataBufferAppend ((char) value);
+       } else if (value <= 0x0010ffff) {
+           value -= 0x10000;
+           // > 16 bits, surrogate needed
+           dataBufferAppend ((char) (0xd800 | (value >> 10)));
+           dataBufferAppend ((char) (0xdc00 | (value & 0x0003ff)));
+       } else {
+           // too big for surrogate
+           error ("character reference " + value + " is too large for UTF-16",
+                  new Integer (value).toString (), null);
+       }
+  if (doFlush) dataBufferFlush ();
+    }
+
+
+    /**
+     * Parse and expand an entity reference.
+     * <pre>
+     * [68] EntityRef ::= '&' Name ';'
+     * </pre>
+     * <p>NOTE: the '&amp;' has already been read.
+     * @param externalAllowed External entities are allowed here.
+     */
+    private void parseEntityRef (boolean externalAllowed)
+    throws SAXException, IOException
+    {
+       String name;
+
+       name = readNmtoken (true);
+       require (';');
+       switch (getEntityType (name)) {
+       case ENTITY_UNDECLARED:
+           // NOTE:  XML REC describes amazingly convoluted handling for
+           // this case.  Nothing as meaningful as being a WFness error
+           // unless the processor might _legitimately_ not have seen a
+           // declaration ... which is what this implements.
+           String      message;
+           
+           message = "reference to undeclared general entity " + name;
+           if (skippedPE && !docIsStandalone) {
+               handler.verror (message);
+               // we don't know this entity, and it might be external...
+               if (externalAllowed)
+                   handler.skippedEntity (name);
+           } else
+               error (message);
+           break;
+       case ENTITY_INTERNAL:
+            pushString (name, getEntityValue (name));
+           
+           //workaround for possible input pop before marking
+            //the buffer reading position      
+            char t = readCh ();
+            unread (t);
+            int bufferPosMark = readBufferPos;
+           
+            int end = readBufferPos + getEntityValue (name).length();
+            for(int k = readBufferPos; k < end; k++){
+                   t = readCh ();
+                   if (t == '&'){
+                       t = readCh ();   
+                       if (t  == '#'){ 
+                          //try to match a character ref
+                          tryReadCharRef ();
+                          
+                          //everything has been read
+                          if (readBufferPos >= end)
+                             break;
+                          k = readBufferPos;
+                          continue;
+                       }
+                       else if (Character.isLetter(t)){
+                          //looks like an entity ref
+                          unread (t);
+                          readNmtoken (true);
+                          require (';');
+                       
+                          //everything has been read
+                          if (readBufferPos >= end)
+                             break;
+                          k = readBufferPos;
+                          continue;
+                       }
+                       error(" malformed entity reference");
+                   }
+                  
+            }
+            readBufferPos = bufferPosMark;
+           break;
+       case ENTITY_TEXT:
+           if (externalAllowed) {
+               pushURL (false, name, getEntityIds (name),
+                       null, null, null, true);
+           } else {
+               error ("reference to external entity in attribute value.",
+                       name, null);
+           }
+           break;
+       case ENTITY_NDATA:
+           if (externalAllowed) {
+               error ("unparsed entity reference in content", name, null);
+           } else {
+               error ("reference to external entity in attribute value.",
+                       name, null);
+           }
+           break;
+       default:
+           throw new RuntimeException ();
+       }
+    }
+
+
+    /**
+     * Parse and expand a parameter entity reference.
+     * <pre>
+     * [69] PEReference ::= '%' Name ';'
+     * </pre>
+     * <p>NOTE: the '%' has already been read.
+     */
+    private void parsePEReference ()
+    throws SAXException, IOException
+    {
+       String name;
+
+       name = "%" + readNmtoken (true);
+       require (';');
+       switch (getEntityType (name)) {
+       case ENTITY_UNDECLARED:
+           // VC: Entity Declared
+           handler.verror ("reference to undeclared parameter entity " + name);
+
+           // we should disable handling of all subsequent declarations
+           // unless this is a standalone document (info discarded)
+           break;
+       case ENTITY_INTERNAL:
+           if (inLiteral)
+               pushString (name, getEntityValue (name));
+           else
+               pushString (name, ' ' + getEntityValue (name) + ' ');
+           break;
+       case ENTITY_TEXT:
+           if (!inLiteral)
+               pushString (null, " ");
+           pushURL (true, name, getEntityIds (name), null, null, null, true);
+           if (!inLiteral)
+               pushString (null, " ");
+           break;
+       }
+    }
+
+    /**
+     * Parse an entity declaration.
+     * <pre>
+     * [70] EntityDecl ::= GEDecl | PEDecl
+     * [71] GEDecl ::= '&lt;!ENTITY' S Name S EntityDef S? '&gt;'
+     * [72] PEDecl ::= '&lt;!ENTITY' S '%' S Name S PEDef S? '&gt;'
+     * [73] EntityDef ::= EntityValue | (ExternalID NDataDecl?)
+     * [74] PEDef ::= EntityValue | ExternalID
+     * [75] ExternalID ::= 'SYSTEM' S SystemLiteral
+     *            | 'PUBLIC' S PubidLiteral S SystemLiteral
+     * [76] NDataDecl ::= S 'NDATA' S Name
+     * </pre>
+     * <p>NOTE: the '&lt;!ENTITY' has already been read.
+     */
+    private void parseEntityDecl ()
+    throws Exception
+    {
+       boolean peFlag = false;
+       int flags = 0;
+
+       // Check for a parameter entity.
+       expandPE = false;
+       requireWhitespace ();
+       if (tryRead ('%')) {
+           peFlag = true;
+           requireWhitespace ();
+       }
+       expandPE = true;
+
+       // Read the entity name, and prepend
+       // '%' if necessary.
+       String name = readNmtoken (true);
+        //NE08
+       if (name.indexOf(':') >= 0)
+           error ("Illegal character(':') in entity name ", name, null);
+       if (peFlag) {
+           name = "%" + name;
+       }
+
+       // Read the entity value.
+       requireWhitespace ();
+       char c = readCh ();
+       unread (c);
+       if (c == '"' || c == '\'') {
+           // Internal entity ... replacement text has expanded refs
+           // to characters and PEs, but not to general entities
+           String value = readLiteral (flags);
+           setInternalEntity (name, value);
+       } else {
+           // Read the external IDs
+           String ids [] = readExternalIds (false, false);
+
+           // Check for NDATA declaration.
+           boolean white = tryWhitespace ();
+           if (!peFlag && tryRead ("NDATA")) {
+               if (!white)
+                   error ("whitespace required before NDATA");
+               requireWhitespace ();
+               String notationName = readNmtoken (true);
+               if (!skippedPE) {
+                   setExternalEntity (name, ENTITY_NDATA, ids, notationName);
+                   handler.unparsedEntityDecl (name, ids, notationName);
+               }
+           } else if (!skippedPE) {
+               setExternalEntity (name, ENTITY_TEXT, ids, null);
+               handler.getDeclHandler ()
+                   .externalEntityDecl (name, ids [0],
+                           handler.resolveURIs ()
+                                       // FIXME: ASSUMES not skipped
+                                       // "false" forces error on bad URI
+                               ? handler.absolutize (ids [2], ids [1], false)
+                               : ids [1]);
+           }
+       }
+
+       // Finish the declaration.
+       skipWhitespace ();
+       require ('>');
+    }
+
+
+    /**
+     * Parse a notation declaration.
+     * <pre>
+     * [82] NotationDecl ::= '&lt;!NOTATION' S Name S
+     *         (ExternalID | PublicID) S? '&gt;'
+     * [83] PublicID ::= 'PUBLIC' S PubidLiteral
+     * </pre>
+     * <P>NOTE: the '&lt;!NOTATION' has already been read.
+     */
+    private void parseNotationDecl ()
+    throws Exception
+    {
+       String nname, ids[];
+
+
+       requireWhitespace ();
+       nname = readNmtoken (true);
+        //NE08
+       if (nname.indexOf(':') >= 0)
+           error ("Illegal character(':') in notation name ", nname, null);
+       requireWhitespace ();
+
+       // Read the external identifiers.
+       ids = readExternalIds (true, false);
+
+       // Register the notation.
+       setNotation (nname, ids);
+
+       skipWhitespace ();
+       require ('>');
+    }
+
+
+    /**
+     * Parse character data.
+     * <pre>
+     * [14] CharData ::= [^&lt;&amp;]* - ([^&lt;&amp;]* ']]&gt;' [^&lt;&amp;]*)
+     * </pre>
+     */
+    private void parseCharData ()
+    throws Exception
+    {
+       char    c;
+       int     state = 0;
+       boolean pureWhite = false;
+
+       // assert (dataBufferPos == 0);
+
+       // are we expecting pure whitespace?  it might be dirty...
+       if ((currentElementContent == CONTENT_ELEMENTS) && !isDirtyCurrentElement)
+           pureWhite = true;
+
+       // always report right out of readBuffer
+       // to minimize (pointless) buffer copies
+       while (true) {
+           int lineAugment = 0;
+           int columnAugment = 0;
+           int i;
+
+loop:
+           for (i = readBufferPos; i < readBufferLength; i++) {
+               switch (c = readBuffer [i]) {
+               case '\n':
+                   lineAugment++;
+                   columnAugment = 0;
+                   // pureWhite unmodified
+                   break;
+               case '\r':      // should not happen!!
+               case '\t':
+               case ' ':
+                   // pureWhite unmodified
+                   columnAugment++;
+                   break;
+               case '&':
+               case '<':
+                   columnAugment++;
+                   // pureWhite unmodified
+                   // CLEAN end of text sequence
+                   state = 1;
+                   break loop;
+               case ']':
+                   // that's not a whitespace char, and
+                   // can not terminate pure whitespace either
+                   pureWhite = false;
+                   if ((i + 2) < readBufferLength) {
+                       if (readBuffer [i + 1] == ']'
+                               && readBuffer [i + 2] == '>') {
+                           // ERROR end of text sequence
+                           state = 2;
+                           break loop;
+                       }
+                   } else {
+                       // FIXME missing two end-of-buffer cases
+                   }
+                   columnAugment++;
+                   break;
+               default:
+                       if ((c < 0x0020 || c > 0xFFFD)
+                          || ((c >= 0x007f) && (c <= 0x009f) && (c != 0x0085) 
+                              && xmlVersion == XML_11)) 
+                               error ("illegal XML character U+"
+                                       + Integer.toHexString (c));
+                   // that's not a whitespace char
+                   pureWhite = false;
+                   columnAugment++;
+               }
+           }
+
+           // report text thus far
+           if (lineAugment > 0) {
+               line += lineAugment;
+               column = columnAugment;
+           } else {
+               column += columnAugment;
+           }
+
+           // report characters/whitspace
+           int         length = i - readBufferPos;
+
+           if (length != 0) {
+               if (pureWhite)
+                   handler.ignorableWhitespace (readBuffer,
+                               readBufferPos, length);
+               else
+                   handler.charData (readBuffer, readBufferPos, length);
+               readBufferPos = i;
+           }
+           
+           if (state != 0)
+               break;
+
+           // fill next buffer from this entity, or
+           // pop stack and continue with previous entity
+           unread (readCh ());
+       }
+        if (!pureWhite)
+           isDirtyCurrentElement = true;
+       // finish, maybe with error
+       if (state != 1) // finish, no error
+           error ("character data may not contain ']]>'");
+    }
+
+
+    //////////////////////////////////////////////////////////////////////
+    // High-level reading and scanning methods.
+    //////////////////////////////////////////////////////////////////////
+
+    /**
+     * Require whitespace characters.
+     */
+    private void requireWhitespace ()
+    throws SAXException, IOException
+    {
+       char c = readCh ();
+       if (isWhitespace (c)) {
+           skipWhitespace ();
+       } else {
+           error ("whitespace required", c, null);
+       }
+    }
+
+
+    /**
+     * Skip whitespace characters.
+     * <pre>
+     * [3] S ::= (#x20 | #x9 | #xd | #xa)+
+     * </pre>
+     */
+    private void skipWhitespace ()
+    throws SAXException, IOException
+    {
+       // Start with a little cheat.  Most of
+       // the time, the white space will fall
+       // within the current read buffer; if
+       // not, then fall through.
+       if (USE_CHEATS) {
+           int lineAugment = 0;
+           int columnAugment = 0;
+
+loop:
+           for (int i = readBufferPos; i < readBufferLength; i++) {
+               switch (readBuffer [i]) {
+               case ' ':
+               case '\t':
+               case '\r':
+                   columnAugment++;
+                   break;
+               case '\n':
+                   lineAugment++;
+                   columnAugment = 0;
+                   break;
+               case '%':
+                   if (expandPE)
+                       break loop;
+                   // else fall through...
+               default:
+                   readBufferPos = i;
+                   if (lineAugment > 0) {
+                       line += lineAugment;
+                       column = columnAugment;
+                   } else {
+                       column += columnAugment;
+                   }
+                   return;
+               }
+           }
+       }
+
+       // OK, do it the slow way.
+       char c = readCh ();
+       while (isWhitespace (c)) {
+           c = readCh ();
+       }
+       unread (c);
+    }
+
+
+    /**
+     * Read a name or (when parsing an enumeration) name token.
+     * <pre>
+     * [5] Name ::= (Letter | '_' | ':') (NameChar)*
+     * [7] Nmtoken ::= (NameChar)+
+     * </pre>
+     */
+    private String readNmtoken (boolean isName)
+    throws SAXException, IOException
+    {
+       char c;
+
+       if (USE_CHEATS) {
+loop:
+           for (int i = readBufferPos; i < readBufferLength; i++) {
+               c = readBuffer [i];
+               switch (c) {
+                 case '%':
+                   if (expandPE)
+                       break loop;
+                   // else fall through...
+
+                   // What may legitimately come AFTER a name/nmtoken?
+                 case '<': case '>': case '&':
+                 case ',': case '|': case '*': case '+': case '?':
+                 case ')':
+                 case '=':
+                 case '\'': case '"':
+                 case '[':
+                 case ' ': case '\t': case '\r': case '\n':
+                 case ';':
+                 case '/':
+                   int start = readBufferPos;
+                   if (i == start)
+                       error ("name expected", readBuffer [i], null);
+                   readBufferPos = i;
+                   return intern (readBuffer, start, i - start);
+
+                 default:
+// FIXME ... per IBM's OASIS test submission, these:
+//   ?         U+06dd 
+//   Combining U+309B
+                   //these switches are kind of ugly but at least we won't
+                   //have to go over the whole lits for each char
+                   if (isName && i == readBufferPos){
+                           char c2 = (char) (c & 0x00f0);
+                           switch (c & 0xff00){
+                               //starting with 01
+                               case 0x0100:
+                                   switch (c2){
+                                       case 0x0030:
+                                           if (c == 0x0132 || c == 0x0133 || c == 0x013f)
+                                               error ("Not a name start character, U+"
+                                                      + Integer.toHexString (c));
+                                       break;
+                                       case 0x0040:
+                                           if (c == 0x0140 || c == 0x0149)
+                                               error ("Not a name start character, U+"
+                                                      + Integer.toHexString (c));
+                                       break;
+                                       case 0x00c0:
+                                           if (c == 0x01c4 || c == 0x01cc)
+                                               error ("Not a name start character, U+"
+                                                      + Integer.toHexString (c));
+                                       break;
+                                       case 0x00f0:
+                                           if (c == 0x01f1 || c == 0x01f3)
+                                               error ("Not a name start character, U+"
+                                                      + Integer.toHexString (c));
+                                       break;
+                                       case 0x00b0:
+                                           if (c == 0x01f1 || c == 0x01f3)
+                                               error ("Not a name start character, U+"
+                                                      + Integer.toHexString (c));
+                                       break;
+                                       default:
+                                           if (c == 0x017f)
+                                               error ("Not a name start character, U+"
+                                                       + Integer.toHexString (c));     
+                                   }
+                                   
+                               break;
+                               //starting with 11
+                               case 0x1100:
+                                   switch (c2){
+                                       case 0x0000:
+                                           if (c == 0x1104 || c == 0x1108 ||
+                                               c == 0x110a || c == 0x110d)
+                                               error ("Not a name start character, U+"
+                                                    + Integer.toHexString (c));
+                                       break;
+                                       case 0x0030:
+                                           if (c == 0x113b || c == 0x113f)
+                                               error ("Not a name start character, U+"
+                                                      + Integer.toHexString (c));
+                                       break;
+                                       case 0x0040:
+                                           if (c == 0x1141 || c == 0x114d
+                                               || c == 0x114f )
+                                               error ("Not a name start character, U+"
+                                                      + Integer.toHexString (c));
+                                       break;
+                                       case 0x0050:
+                                            if (c == 0x1151 || c == 0x1156)
+                                                error ("Not a name start character, U+"
+                                                       + Integer.toHexString (c));
+                                       break;
+                                       case 0x0060:
+                                            if (c == 0x1162 || c == 0x1164
+                                                || c == 0x1166 || c == 0x116b
+                                                || c == 0x116f)
+                                                error ("Not a name start character, U+"
+                                                        + Integer.toHexString (c));
+                                               break;
+                                       case 0x00b0:
+                                            if (c == 0x11b6 || c == 0x11b9
+                                                || c == 0x11bb || c == 0x116f)
+                                                error ("Not a name start character, U+"
+                                                       + Integer.toHexString (c));
+                                       break;
+                                       default:
+                                           if (c == 0x1174 || c == 0x119f
+                                               || c == 0x11ac || c == 0x11c3
+                                               || c == 0x11f1)
+                                               error ("Not a name start character, U+"
+                                                       + Integer.toHexString (c));
+                                   }
+                               break;
+                               default:
+                                  if (c == 0x0e46 || c == 0x1011 
+                                      || c == 0x212f || c == 0x0587
+                                      || c == 0x0230 )
+                                      error ("Not a name start character, U+"
+                                             + Integer.toHexString (c));
+                           }
+                   }
+                   // punt on exact tests from Appendix A; approximate
+                   // them using the Unicode ID start/part rules
+                   if (i == readBufferPos && isName) {
+                       if (!Character.isUnicodeIdentifierStart (c)
+                               && c != ':' && c != '_')
+                           error ("Not a name start character, U+"
+                                 + Integer.toHexString (c));
+                   } else if (!Character.isUnicodeIdentifierPart (c)
+                           && c != '-' && c != ':' && c != '_' && c != '.'
+                           && !isExtender (c))
+                       error ("Not a name character, U+"
+                               + Integer.toHexString (c));
+               }
+           }
+       }
+
+       nameBufferPos = 0;
+
+       // Read the first character.
+loop:
+       while (true) {
+           c = readCh ();
+           switch (c) {
+           case '%':
+           case '<': case '>': case '&':
+           case ',': case '|': case '*': case '+': case '?':
+           case ')':
+           case '=':
+           case '\'': case '"':
+           case '[':
+           case ' ': case '\t': case '\n': case '\r':
+           case ';':
+           case '/':
+               unread (c);
+               if (nameBufferPos == 0) {
+                   error ("name expected");
+               }
+               // punt on exact tests from Appendix A, but approximate them
+               if (isName
+                       && !Character.isUnicodeIdentifierStart (
+                               nameBuffer [0])
+                       && ":_".indexOf (nameBuffer [0]) == -1)
+                   error ("Not a name start character, U+"
+                             + Integer.toHexString (nameBuffer [0]));
+               String s = intern (nameBuffer, 0, nameBufferPos);
+               nameBufferPos = 0;
+               return s;
+           default:
+               // punt on exact tests from Appendix A, but approximate them
+
+               if ((nameBufferPos != 0 || !isName)
+                       && !Character.isUnicodeIdentifierPart (c)
+                       && ":-_.".indexOf (c) == -1
+                       && !isExtender (c))
+                   error ("Not a name character, U+"
+                           + Integer.toHexString (c));
+               if (nameBufferPos >= nameBuffer.length)
+                   nameBuffer =
+                       (char[]) extendArray (nameBuffer,
+                                   nameBuffer.length, nameBufferPos);
+               nameBuffer [nameBufferPos++] = c;
+           }
+       }
+    }
+
+    private static boolean isExtender (char c)
+    {
+       // [88] Extender ::= ...
+       return c == 0x00b7 || c == 0x02d0 || c == 0x02d1 || c == 0x0387
+              || c == 0x0640 || c == 0x0e46 || c == 0x0ec6 || c == 0x3005
+              || (c >= 0x3031 && c <= 0x3035)
+              || (c >= 0x309d && c <= 0x309e)
+              || (c >= 0x30fc && c <= 0x30fe);
+    }
+
+
+    /**
+     * Read a literal.  With matching single or double quotes as
+     * delimiters (and not embedded!) this is used to parse:
+     * <pre>
+     * [9] EntityValue ::= ... ([^%&amp;] | PEReference | Reference)* ...
+     * [10] AttValue ::= ... ([^<&] | Reference)* ...
+     * [11] SystemLiteral ::= ... (URLchar - "'")* ...
+     * [12] PubidLiteral ::= ... (PubidChar - "'")* ...
+     * </pre>
+     * as well as the quoted strings in XML and text declarations
+     * (for version, encoding, and standalone) which have their
+     * own constraints.
+     */
+    private String readLiteral (int flags)
+    throws SAXException, IOException
+    {
+       char    delim, c;
+       int     startLine = line;
+       boolean saved = expandPE;
+       boolean savedReport = doReport;
+
+       // Find the first delimiter.
+       delim = readCh ();
+       if (delim != '"' && delim != '\'') {
+           error ("expected '\"' or \"'\"", delim, null);
+           return null;
+       }
+       inLiteral = true;
+       if ((flags & LIT_DISABLE_PE) != 0)
+           expandPE = false;
+       doReport = false;
+
+       // Each level of input source has its own buffer; remember
+       // ours, so we won't read the ending delimiter from any
+       // other input source, regardless of entity processing.
+       char ourBuf [] = readBuffer;
+
+       // Read the literal.
+       try {
+           c = readCh ();
+           boolean ampRead = false;
+loop:
+           while (! (c == delim && readBuffer == ourBuf)) {
+               switch (c) {
+                   // attributes and public ids are normalized
+                   // in almost the same ways
+               case '\n':
+               case '\r':
+                   if ((flags & (LIT_ATTRIBUTE | LIT_PUBID)) != 0)
+                       c = ' ';
+                   break;
+               case '\t':
+                   if ((flags & LIT_ATTRIBUTE) != 0)
+                       c = ' ';
+                   break;
+               case '&':
+                   c = readCh ();
+                   // Char refs are expanded immediately, except for
+                   // all the cases where it's deferred.
+                   if (c == '#') {
+                       if ((flags & LIT_DISABLE_CREF) != 0) {
+                           dataBufferAppend ('&');
+                           break;
+                       }
+                        parseCharRef (false /* Do not do flushDataBuffer */);
+
+                       // exotic WFness risk: this is an entity literal,
+                       // dataBuffer [dataBufferPos - 1] == '&', and
+                       // following chars are a _partial_ entity/char ref
+                   
+                   // It looks like an entity ref ...
+                   } else {
+                       unread (c);
+                       // Expand it?
+                       if ((flags & LIT_ENTITY_REF) > 0) {
+                           parseEntityRef (false);
+                           if (String.valueOf (readBuffer).equals("&#38;"))
+                               ampRead = true;
+                        //Is it just data?
+                       } else if ((flags & LIT_DISABLE_EREF) != 0) {
+                           dataBufferAppend ('&');
+
+                       // OK, it will be an entity ref -- expanded later.
+                       } else {
+                           String name = readNmtoken (true);
+                           require (';');
+                           dataBufferAppend ('&');
+                           dataBufferAppend (name);
+                           dataBufferAppend (';');
+                       }
+                   }
+                   c = readCh ();
+                   continue loop;
+
+               case '<':
+                   // and why?  Perhaps so "&foo;" expands the same
+                   // inside and outside an attribute?
+                   if ((flags & LIT_ATTRIBUTE) != 0)
+                       error ("attribute values may not contain '<'");
+                   break;
+
+               // We don't worry about case '%' and PE refs, readCh does.
+
+               default:
+                   break;
+               }
+               dataBufferAppend (c);
+               c = readCh ();
+           }
+       } catch (EOFException e) {
+           error ("end of input while looking for delimiter (started on line "
+                  + startLine + ')', null, new Character (delim).toString ());
+       }
+       inLiteral = false;
+       expandPE = saved;
+       doReport = savedReport;
+
+       // Normalise whitespace if necessary.
+       if ((flags & LIT_NORMALIZE) > 0) {
+           dataBufferNormalize ();
+       }
+
+       // Return the value.
+       return dataBufferToString ();
+    }
+
+
+    /**
+     * Try reading external identifiers.
+     * A system identifier is not required for notations.
+     * @param inNotation Are we parsing a notation decl?
+     * @param isSubset Parsing external subset decl (may be omitted)?
+     * @return A three-member String array containing the identifiers,
+     * or nulls. Order: public, system, baseURI.
+     */
+    private String[] readExternalIds (boolean inNotation, boolean isSubset)
+    throws Exception
+    {
+       char    c;
+       String  ids[] = new String [3];
+       int     flags = LIT_DISABLE_CREF | LIT_DISABLE_PE | LIT_DISABLE_EREF;
+
+       if (tryRead ("PUBLIC")) {
+           requireWhitespace ();
+           ids [0] = readLiteral (LIT_NORMALIZE | LIT_PUBID | flags);
+           if (inNotation) {
+               skipWhitespace ();
+               c = readCh ();
+               unread (c);
+               if (c == '"' || c == '\'') {
+                   ids [1] = readLiteral (flags);
+               }
+           } else {
+               requireWhitespace ();
+               ids [1] = readLiteral (flags);
+           }
+
+           for (int i = 0; i < ids [0].length (); i++) {
+               c = ids [0].charAt (i);
+               if (c >= 'a' && c <= 'z')
+                   continue;
+               if (c >= 'A' && c <= 'Z')
+                   continue;
+               if (" \r\n0123456789-' ()+,./:=?;!*#@$_%".indexOf (c) != -1)
+                   continue;
+               error ("illegal PUBLIC id character U+"
+                       + Integer.toHexString (c));
+           }
+       } else if (tryRead ("SYSTEM")) {
+           requireWhitespace ();
+           ids [1] = readLiteral (flags);
+       } else if (!isSubset) 
+               error ("missing SYSTEM or PUBLIC keyword");
+
+       if (ids [1] != null) {
+           if (ids [1].indexOf ('#') != -1)
+               handler.verror ("SYSTEM id has a URI fragment: " + ids [1]);
+           ids [2] = handler.getSystemId ();
+           if (ids [2] == null)
+               handler.warn ("No base URI; hope URI is absolute: "
+                       + ids [1]);
+       }
+
+       return ids;
+    }
+
+
+    /**
+     * Test if a character is whitespace.
+     * <pre>
+     * [3] S ::= (#x20 | #x9 | #xd | #xa)+
+     * </pre>
+     * @param c The character to test.
+     * @return true if the character is whitespace.
+     */
+    private final boolean isWhitespace (char c)
+    {
+       if (c > 0x20)
+           return false;
+       if (c == 0x20 || c == 0x0a || c == 0x09 || c == 0x0d)
+           return true;
+       return false;   // illegal ...
+    }
+
+
+    //////////////////////////////////////////////////////////////////////
+    // Utility routines.
+    //////////////////////////////////////////////////////////////////////
+
+
+    /**
+     * Add a character to the data buffer.
+     */
+    private void dataBufferAppend (char c)
+    {
+       // Expand buffer if necessary.
+       if (dataBufferPos >= dataBuffer.length)
+           dataBuffer =
+               (char[]) extendArray (dataBuffer,
+                       dataBuffer.length, dataBufferPos);
+       dataBuffer [dataBufferPos++] = c;
+    }
+
+
+    /**
+     * Add a string to the data buffer.
+     */
+    private void dataBufferAppend (String s)
+    {
+       dataBufferAppend (s.toCharArray (), 0, s.length ());
+    }
+
+
+    /**
+     * Append (part of) a character array to the data buffer.
+     */
+    private void dataBufferAppend (char ch[], int start, int length)
+    {
+       dataBuffer = (char[])
+               extendArray (dataBuffer, dataBuffer.length,
+                                   dataBufferPos + length);
+
+       System.arraycopy (ch, start, dataBuffer, dataBufferPos, length);
+       dataBufferPos += length;
+    }
+
+
+    /**
+     * Normalise space characters in the data buffer.
+     */
+    private void dataBufferNormalize ()
+    {
+       int i = 0;
+       int j = 0;
+       int end = dataBufferPos;
+
+       // Skip spaces at the start.
+       while (j < end && dataBuffer [j] == ' ') {
+           j++;
+       }
+
+       // Skip whitespace at the end.
+       while (end > j && dataBuffer [end - 1] == ' ') {
+           end --;
+       }
+
+       // Start copying to the left.
+       while (j < end) {
+
+           char c = dataBuffer [j++];
+
+           // Normalise all other spaces to
+           // a single space.
+           if (c == ' ') {
+               while (j < end && dataBuffer [j++] == ' ')
+                   continue;
+               dataBuffer [i++] = ' ';
+               dataBuffer [i++] = dataBuffer [j - 1];
+           } else {
+               dataBuffer [i++] = c;
+           }
+       }
+
+       // The new length is <= the old one.
+       dataBufferPos = i;
+    }
+
+
+    /**
+     * Convert the data buffer to a string.
+     */
+    private String dataBufferToString ()
+    {
+       String s = new String (dataBuffer, 0, dataBufferPos);
+       dataBufferPos = 0;
+       return s;
+    }
+
+
+    /**
+     * Flush the contents of the data buffer to the handler, as
+     * appropriate, and reset the buffer for new input.
+     */
+    private void dataBufferFlush ()
+    throws SAXException
+    {
+       if (currentElementContent == CONTENT_ELEMENTS
+               && dataBufferPos > 0
+               && !inCDATA
+               ) {
+           // We can't just trust the buffer to be whitespace, there
+           // are (error) cases when it isn't
+           for (int i = 0; i < dataBufferPos; i++) {
+               if (!isWhitespace (dataBuffer [i])) {
+                   handler.charData (dataBuffer, 0, dataBufferPos);
+                   dataBufferPos = 0;
+               }
+           }
+           if (dataBufferPos > 0) {
+               handler.ignorableWhitespace (dataBuffer, 0, dataBufferPos);
+               dataBufferPos = 0;
+           }
+       } else if (dataBufferPos > 0) {
+           handler.charData (dataBuffer, 0, dataBufferPos);
+           dataBufferPos = 0;
+       }
+    }
+
+
+    /**
+     * Require a string to appear, or throw an exception.
+     * <p><em>Precondition:</em> Entity expansion is not required.
+     * <p><em>Precondition:</em> data buffer has no characters that
+     * will get sent to the application.
+     */
+    private void require (String delim)
+    throws SAXException, IOException
+    {
+       int     length = delim.length ();
+       char    ch [];
+               
+       if (length < dataBuffer.length) {
+           ch = dataBuffer;
+           delim.getChars (0, length, ch, 0);
+       } else
+           ch = delim.toCharArray ();
+
+       if (USE_CHEATS
+               && length <= (readBufferLength - readBufferPos)) {
+           int offset = readBufferPos;
+
+           for (int i = 0; i < length; i++, offset++)
+               if (ch [i] != readBuffer [offset])
+                   error ("required string", null, delim);
+           readBufferPos = offset;
+           
+       } else {
+           for (int i = 0; i < length; i++)
+               require (ch [i]);
+       }
+    }
+
+
+    /**
+     * Require a character to appear, or throw an exception.
+     */
+    private void require (char delim)
+    throws SAXException, IOException
+    {
+       char c = readCh ();
+
+       if (c != delim) {
+           error ("required character", c, new Character (delim).toString ());
+       }
+    }
+
+
+    /**
+     * Create an interned string from a character array.
+     * &AElig;lfred uses this method to create an interned version
+     * of all names and name tokens, so that it can test equality
+     * with <code>==</code> instead of <code>String.equals ()</code>.
+     *
+     * <p>This is much more efficient than constructing a non-interned
+     * string first, and then interning it.
+     *
+     * @param ch an array of characters for building the string.
+     * @param start the starting position in the array.
+     * @param length the number of characters to place in the string.
+     * @return an interned string.
+     * @see #intern (String)
+     * @see java.lang.String#intern
+     */
+    public String intern (char ch[], int start, int length)
+    {
+       int     index = 0;
+       int     hash = 0;
+       Object  bucket [];
+
+       // Generate a hash code.  This is a widely used string hash,
+       // often attributed to Brian Kernighan.
+       for (int i = start; i < start + length; i++)
+           hash = 31 * hash + ch [i];
+       hash = (hash & 0x7fffffff) % SYMBOL_TABLE_LENGTH;
+
+       // Get the bucket -- consists of {array,String} pairs
+       if ((bucket = symbolTable [hash]) == null) {
+           // first string in this bucket
+           bucket = new Object [8];
+
+       // Search for a matching tuple, and
+       // return the string if we find one.
+       } else {
+           while (index < bucket.length) {
+               char chFound [] = (char []) bucket [index];
+
+               // Stop when we hit an empty entry.
+               if (chFound == null)
+                   break;
+
+               // If they're the same length, check for a match.
+               if (chFound.length == length) {
+                   for (int i = 0; i < chFound.length; i++) {
+                       // continue search on failure
+                       if (ch [start + i] != chFound [i]) {
+                           break;
+                       } else if (i == length - 1) {
+                           // That's it, we have a match!
+                           return (String) bucket [index + 1];
+                       }
+                   }
+               }
+               index += 2;
+           }
+           // Not found -- we'll have to add it.
+
+           // Do we have to grow the bucket?
+           bucket = (Object []) extendArray (bucket, bucket.length, index);
+       }
+       symbolTable [hash] = bucket;
+
+       // OK, add it to the end of the bucket -- "local" interning.
+       // Intern "globally" to let applications share interning benefits.
+       // That is, "!=" and "==" work on our strings, not just equals().
+       String s = new String (ch, start, length).intern ();
+       bucket [index] = s.toCharArray ();
+       bucket [index + 1] = s;
+       return s;
+    }
+
+    /**
+     * Ensure the capacity of an array, allocating a new one if
+     * necessary.  Usually extends only for name hash collisions. 
+     */
+    private Object extendArray (Object array, int currentSize, int requiredSize)
+    {
+       if (requiredSize < currentSize) {
+           return array;
+       } else {
+           Object newArray = null;
+           int newSize = currentSize * 2;
+
+           if (newSize <= requiredSize)
+               newSize = requiredSize + 1;
+
+           if (array instanceof char[])
+               newArray = new char [newSize];
+           else if (array instanceof Object[])
+               newArray = new Object [newSize];
+           else
+               throw new RuntimeException ();
+
+           System.arraycopy (array, 0, newArray, 0, currentSize);
+           return newArray;
+       }
+    }
+
+
+    //////////////////////////////////////////////////////////////////////
+    // XML query routines.
+    //////////////////////////////////////////////////////////////////////
+
+
+    boolean isStandalone () { return docIsStandalone; }
+
+
+    //
+    // Elements
+    //
+
+    private int getContentType (Object element [], int defaultType)
+    {
+       int retval;
+
+       if (element == null)
+           return defaultType;
+       retval = ((Integer) element [0]).intValue ();
+       if (retval == CONTENT_UNDECLARED)
+           retval = defaultType;
+       return retval;
+    }
+
+
+    /**
+     * Look up the content type of an element.
+     * @param name The element type name.
+     * @return An integer constant representing the content type.
+     * @see #CONTENT_UNDECLARED
+     * @see #CONTENT_ANY
+     * @see #CONTENT_EMPTY
+     * @see #CONTENT_MIXED
+     * @see #CONTENT_ELEMENTS
+     */
+    public int getElementContentType (String name)
+    {
+       Object element [] = (Object []) elementInfo.get (name);
+       return getContentType (element, CONTENT_UNDECLARED);
+    }
+
+
+    /**
+     * Register an element.
+     * Array format:
+     *  [0] element type name
+     *  [1] content model (mixed, elements only)
+     *  [2] attribute hash table
+     */
+    private void setElement (
+       String          name,
+       int             contentType,
+       String          contentModel,
+       Hashtable       attributes
+    ) throws SAXException 
+    {
+       if (skippedPE)
+           return;
+
+       Object element [] = (Object []) elementInfo.get (name);
+
+       // first <!ELEMENT ...> or <!ATTLIST ...> for this type?
+       if (element == null) {
+           element = new Object [3];
+           element [0] = new Integer (contentType);
+           element [1] = contentModel;
+           element [2] = attributes;
+           elementInfo.put (name, element);
+           return;
+       }
+
+       // <!ELEMENT ...> declaration?
+       if (contentType != CONTENT_UNDECLARED) {
+           // ... following an associated <!ATTLIST ...>
+           if (((Integer) element [0]).intValue () == CONTENT_UNDECLARED) {
+               element [0] = new Integer (contentType);
+               element [1] = contentModel;
+           } else
+               // VC: Unique Element Type Declaration
+               handler.verror ("multiple declarations for element type: "
+                       + name);
+       }
+
+       // first <!ATTLIST ...>, before <!ELEMENT ...> ?
+       else if (attributes != null)
+           element [2] = attributes;
+    }
+
+
+    /**
+     * Look up the attribute hash table for an element.
+     * The hash table is the second item in the element array.
+     */
+    private Hashtable getElementAttributes (String name)
+    {
+       Object element[] = (Object[]) elementInfo.get (name);
+       if (element == null)
+           return null;
+       else
+           return (Hashtable) element [2];
+    }
+
+
+
+    //
+    // Attributes
+    //
+
+    /**
+     * Get the declared attributes for an element type.
+     * @param elname The name of the element type.
+     * @return An Enumeration of all the attributes declared for
+     *  a specific element type.  The results will be valid only
+     *  after the DTD (if any) has been parsed.
+     * @see #getAttributeType
+     * @see #getAttributeEnumeration
+     * @see #getAttributeDefaultValueType
+     * @see #getAttributeDefaultValue
+     * @see #getAttributeExpandedValue
+     */
+    private Enumeration declaredAttributes (Object element [])
+    {
+       Hashtable attlist;
+
+       if (element == null)
+           return null;
+       if ((attlist = (Hashtable) element [2]) == null)
+           return null;
+       return attlist.keys ();
+    }
+
+    /**
+     * Get the declared attributes for an element type.
+     * @param elname The name of the element type.
+     * @return An Enumeration of all the attributes declared for
+     *  a specific element type.  The results will be valid only
+     *  after the DTD (if any) has been parsed.
+     * @see #getAttributeType
+     * @see #getAttributeEnumeration
+     * @see #getAttributeDefaultValueType
+     * @see #getAttributeDefaultValue
+     * @see #getAttributeExpandedValue
+     */
+    public Enumeration declaredAttributes (String elname)
+    {
+       return declaredAttributes ((Object []) elementInfo.get (elname));
+    }
+
+
+    /**
+     * Retrieve the declared type of an attribute.
+     * @param name The name of the associated element.
+     * @param aname The name of the attribute.
+     * @return An interend string denoting the type, or null
+     * indicating an undeclared attribute.
+     */
+    public String getAttributeType (String name, String aname)
+    {
+       Object attribute[] = getAttribute (name, aname);
+       if (attribute == null) {
+           return null;
+       } else {
+           return (String) attribute [0];
+       }
+    }
+
+
+    /**
+     * Retrieve the allowed values for an enumerated attribute type.
+     * @param name The name of the associated element.
+     * @param aname The name of the attribute.
+     * @return A string containing the token list.
+     */
+    public String getAttributeEnumeration (String name, String aname)
+    {
+       Object attribute[] = getAttribute (name, aname);
+       if (attribute == null) {
+           return null;
+       } else {
+           // assert:  attribute [0] is "ENUMERATION" or "NOTATION"
+           return (String) attribute [3];
+       }
+    }
+
+
+    /**
+     * Retrieve the default value of a declared attribute.
+     * @param name The name of the associated element.
+     * @param aname The name of the attribute.
+     * @return The default value, or null if the attribute was
+     *  #IMPLIED or simply undeclared and unspecified.
+     * @see #getAttributeExpandedValue
+     */
+    public String getAttributeDefaultValue (String name, String aname)
+    {
+       Object attribute[] = getAttribute (name, aname);
+       if (attribute == null) {
+           return null;
+       } else {
+           return (String) attribute [1];
+       }
+    }
+
+    /*
+
+// FIXME:  Leaving this in, until W3C finally resolves the confusion
+// between parts of the XML 2nd REC about when entity declararations
+// are guaranteed to be known.  Current code matches what section 5.1
+// (conformance) describes, but some readings of the self-contradicting
+// text in 4.1 (the "Entity Declared" WFC and VC) seem to expect that
+// attribute expansion/normalization must be deferred in some cases
+// (just TRY to identify them!).
+
+     * Retrieve the expanded value of a declared attribute.
+     * <p>General entities (and char refs) will be expanded (once).
+     * @param name The name of the associated element.
+     * @param aname The name of the attribute.
+     * @return The expanded default value, or null if the attribute was
+     *  #IMPLIED or simply undeclared
+     * @see #getAttributeDefaultValue
+    public String getAttributeExpandedValue (String name, String aname)
+    throws Exception
+    {
+       Object attribute[] = getAttribute (name, aname);
+
+       if (attribute == null) {
+           return null;
+       } else if (attribute [4] == null && attribute [1] != null) {
+           // we MUST use the same buf for both quotes else the literal
+           // can't be properly terminated
+           char buf [] = new char [1];
+           int flags = LIT_ENTITY_REF | LIT_ATTRIBUTE;
+           String type = getAttributeType (name, aname);
+
+           if (type != "CDATA" && type != null)
+               flags |= LIT_NORMALIZE;
+           buf [0] = '"';
+           pushCharArray (null, buf, 0, 1);
+           pushString (null, (String) attribute [1]);
+           pushCharArray (null, buf, 0, 1);
+           attribute [4] = readLiteral (flags);
+       }
+       return (String) attribute [4];
+    }
+     */
+
+    /**
+     * Retrieve the default value mode of a declared attribute.
+     * @see #ATTRIBUTE_DEFAULT_SPECIFIED
+     * @see #ATTRIBUTE_DEFAULT_IMPLIED
+     * @see #ATTRIBUTE_DEFAULT_REQUIRED
+     * @see #ATTRIBUTE_DEFAULT_FIXED
+     */
+    public int getAttributeDefaultValueType (String name, String aname)
+    {
+       Object attribute[] = getAttribute (name, aname);
+       if (attribute == null) {
+           return ATTRIBUTE_DEFAULT_UNDECLARED;
+       } else {
+           return ((Integer) attribute [2]).intValue ();
+       }
+    }
+
+
+    /**
+     * Register an attribute declaration for later retrieval.
+     * Format:
+     * - String type
+     * - String default value
+     * - int value type
+     * - enumeration
+     * - processed default value
+     */
+    private void setAttribute (String elName, String name, String type,
+                       String enumeration,
+                       String value, int valueType)
+    throws Exception
+    {
+       Hashtable attlist;
+
+       if (skippedPE)
+           return;
+
+       // Create a new hashtable if necessary.
+       attlist = getElementAttributes (elName);
+       if (attlist == null)
+           attlist = new Hashtable ();
+
+       // ignore multiple attribute declarations!
+       if (attlist.get (name) != null) {
+           // warn ...
+           return;
+       } else {
+           Object attribute [] = new Object [5];
+           attribute [0] = type;
+           attribute [1] = value;
+           attribute [2] = new Integer (valueType);
+           attribute [3] = enumeration;
+           attribute [4] = null;
+           attlist.put (name, attribute);
+
+           // save; but don't overwrite any existing <!ELEMENT ...>
+           setElement (elName, CONTENT_UNDECLARED, null, attlist);
+       }
+    }
+
+
+    /**
+     * Retrieve the array representing an attribute declaration.
+     */
+    private Object[] getAttribute (String elName, String name)
+    {
+       Hashtable attlist;
+
+       attlist = getElementAttributes (elName);
+       if (attlist == null)
+           return null;
+       return (Object[]) attlist.get (name);
+    }
+
+
+    //
+    // Entities
+    //
+
+    /**
+     * Find the type of an entity.
+     * @returns An integer constant representing the entity type.
+     * @see #ENTITY_UNDECLARED
+     * @see #ENTITY_INTERNAL
+     * @see #ENTITY_NDATA
+     * @see #ENTITY_TEXT
+     */
+    public int getEntityType (String ename)
+    {
+       Object entity[] = (Object[]) entityInfo.get (ename);
+       if (entity == null) {
+           return ENTITY_UNDECLARED;
+       } else {
+           return ((Integer) entity [0]).intValue ();
+       }
+    }
+
+
+    /**
+     * Return an external entity's identifier array.
+     * @param ename The name of the external entity.
+     * @return Three element array containing (in order) the entity's
+     * public identifier, system identifier, and base URI.  Null if
+     *  the entity was not declared as an external entity.
+     * @see #getEntityType
+     */
+    public String [] getEntityIds (String ename)
+    {
+       Object entity[] = (Object[]) entityInfo.get (ename);
+       if (entity == null) {
+           return null;
+       } else {
+           return (String []) entity [1];
+       }
+    }
+
+
+    /**
+     * Return an internal entity's replacement text.
+     * @param ename The name of the internal entity.
+     * @return The entity's replacement text, or null if
+     *  the entity was not declared as an internal entity.
+     * @see #getEntityType
+     */
+    public String getEntityValue (String ename)
+    {
+       Object entity[] = (Object[]) entityInfo.get (ename);
+       if (entity == null) {
+           return null;
+       } else {
+           return (String) entity [3];
+       }
+    }
+
+
+    /**
+     * Register an entity declaration for later retrieval.
+     */
+    private void setInternalEntity (String eName, String value)
+    throws SAXException
+    {
+       if (skippedPE)
+           return;
+
+       if (entityInfo.get (eName) == null) {
+           Object entity[] = new Object [5];
+           entity [0] = new Integer (ENTITY_INTERNAL);
+// FIXME: shrink!!  [2] useless
+           entity [3] = value;
+           entityInfo.put (eName, entity);
+       }
+  if (handler.getFeature (SAXDriver.FEATURE + "string-interning")) {
+    if ("lt" == eName || "gt" == eName || "quot" == eName
+        || "apos" == eName || "amp" == eName)
+           return;
+  } else {
+    if ("lt".equals(eName) || "gt".equals(eName) || "quot".equals(eName)
+        || "apos".equals(eName) || "amp".equals(eName))
+           return;
+  }
+       handler.getDeclHandler ()
+           .internalEntityDecl (eName, value);
+    }
+
+
+    /**
+     * Register an external entity declaration for later retrieval.
+     */
+    private void setExternalEntity (String eName, int eClass,
+                    String ids [], String nName)
+    {
+       if (entityInfo.get (eName) == null) {
+           Object entity[] = new Object [5];
+           entity [0] = new Integer (eClass);
+           entity [1] = ids;
+// FIXME: shrink!!  [2] no longer used, [4] irrelevant given [0]
+           entity [4] = nName;
+           entityInfo.put (eName, entity);
+       }
+    }
+
+
+    //
+    // Notations.
+    //
+
+    /**
+     * Report a notation declaration, checking for duplicates.
+     */
+    private void setNotation (String nname, String ids [])
+    throws SAXException
+    {
+       if (skippedPE)
+           return;
+
+       handler.notationDecl (nname, ids);
+       if (notationInfo.get (nname) == null)
+           notationInfo.put (nname, nname);
+       else
+           // VC: Unique Notation Name
+           handler.verror ("Duplicate notation name decl: " + nname);
+    }
+
+
+    //
+    // Location.
+    //
+
+
+    /**
+     * Return the current line number.
+     */
+    public int getLineNumber ()
+    {
+       return line;
+    }
+
+
+    /**
+     * Return the current column number.
+     */
+    public int getColumnNumber ()
+    {
+       return column;
+    }
+
+
+    //////////////////////////////////////////////////////////////////////
+    // High-level I/O.
+    //////////////////////////////////////////////////////////////////////
+
+
+    /**
+     * Read a single character from the readBuffer.
+     * <p>The readDataChunk () method maintains the buffer.
+     * <p>If we hit the end of an entity, try to pop the stack and
+     * keep going.
+     * <p> (This approach doesn't really enforce XML's rules about
+     * entity boundaries, but this is not currently a validating
+     * parser).
+     * <p>This routine also attempts to keep track of the current
+     * position in external entities, but it's not entirely accurate.
+     * @return The next available input character.
+     * @see #unread (char)
+     * @see #readDataChunk
+     * @see #readBuffer
+     * @see #line
+     * @return The next character from the current input source.
+     */
+    private char readCh ()
+    throws SAXException, IOException
+    {
+       // As long as there's nothing in the
+       // read buffer, try reading more data
+       // (for an external entity) or popping
+       // the entity stack (for either).
+       while (readBufferPos >= readBufferLength) {
+           switch (sourceType) {
+           case INPUT_READER:
+           case INPUT_STREAM:
+               readDataChunk ();
+               while (readBufferLength < 1) {
+                   popInput ();
+                   if (readBufferLength < 1) {
+                       readDataChunk ();
+                   }
+               }
+               break;
+
+           default:
+
+               popInput ();
+               break;
+           }
+       }
+
+       char c = readBuffer [readBufferPos++];
+       
+       if (c == '\n') {
+           line++;
+           column = 0;
+       } else {
+           if (c == '<') {
+               /* the most common return to parseContent () ... NOP */
+           } else if (((c < 0x0020 && (c != '\t') && (c != '\r')) || c > 0xFFFD)
+                       || ((c >= 0x007f) && (c <= 0x009f) && (c != 0x0085) 
+                          && xmlVersion == XML_11)) 
+               error ("illegal XML character U+"
+                       + Integer.toHexString (c));
+
+           // If we're in the DTD and in a context where PEs get expanded,
+           // do so ... 1/14/2000 errata identify those contexts.  There
+           // are also spots in the internal subset where PE refs are fatal
+           // errors, hence yet another flag.
+           else if (c == '%' && expandPE) {
+               if (peIsError)
+                   error ("PE reference within decl in internal subset.");
+               parsePEReference ();
+               return readCh ();
+           }
+           column++;
+       }
+
+       return c;
+    }
+
+
+    /**
+     * Push a single character back onto the current input stream.
+     * <p>This method usually pushes the character back onto
+     * the readBuffer.
+     * <p>I don't think that this would ever be called with 
+     * readBufferPos = 0, because the methods always reads a character
+     * before unreading it, but just in case, I've added a boundary
+     * condition.
+     * @param c The character to push back.
+     * @see #readCh
+     * @see #unread (char[])
+     * @see #readBuffer
+     */
+    private void unread (char c)
+    throws SAXException
+    {
+       // Normal condition.
+       if (c == '\n') {
+           line--;
+           column = -1;
+       }
+       if (readBufferPos > 0) {
+           readBuffer [--readBufferPos] = c;
+       } else {
+           pushString (null, new Character (c).toString ());
+       }
+    }
+
+
+    /**
+     * Push a char array back onto the current input stream.
+     * <p>NOTE: you must <em>never</em> push back characters that you
+     * haven't actually read: use pushString () instead.
+     * @see #readCh
+     * @see #unread (char)
+     * @see #readBuffer
+     * @see #pushString
+     */
+    private void unread (char ch[], int length)
+    throws SAXException
+    {
+       for (int i = 0; i < length; i++) {
+           if (ch [i] == '\n') {
+               line--;
+               column = -1;
+           }
+       }
+       if (length < readBufferPos) {
+           readBufferPos -= length;
+       } else {
+           pushCharArray (null, ch, 0, length);
+       }
+    }
+
+
+    /**
+     * Push, or skip, a new external input source.
+     * The source will be some kind of parsed entity, such as a PE
+     * (including the external DTD subset) or content for the body.
+     *
+     * @param url The java.net.URL object for the entity.
+     * @see SAXDriver#resolveEntity
+     * @see #pushString
+     * @see #sourceType
+     * @see #pushInput
+     * @see #detectEncoding
+     * @see #sourceType
+     * @see #readBuffer
+     */
+    private void pushURL (
+        boolean                isPE,
+       String          ename,
+       String          ids [],         // public, system, baseURI
+       Reader          reader,
+       InputStream     stream,
+       String          encoding,
+       boolean         doResolve
+    ) throws SAXException, IOException
+    {
+       boolean         ignoreEncoding;
+       String          systemId;
+       InputSource     source;
+
+       if (!isPE)
+           dataBufferFlush ();
+
+       scratch.setPublicId (ids [0]);
+       scratch.setSystemId (ids [1]);
+
+       // See if we should skip or substitute the entity.
+       // If we're not skipping, resolving reports startEntity()
+       // and updates the (handler's) stack of URIs.
+       if (doResolve) {
+           // assert (stream == null && reader == null && encoding == null)
+           source = handler.resolveEntity (isPE, ename, scratch, ids [2]);
+           if (source == null) {
+               handler.warn ("skipping entity: " + ename);
+               handler.skippedEntity (ename);
+               if (isPE)
+                   skippedPE = true;
+               return;
+           }
+
+           // we might be using alternate IDs/encoding
+           systemId = source.getSystemId ();
+           // The following warning and setting systemId was deleted bcause
+           // the application has the option of not setting systemId
+           // provided that it has set the characte/byte stream.
+           /*
+           if (systemId == null) {
+               handler.warn ("missing system ID, using " + ids [1]);
+               systemId = ids [1];
+           }
+           */
+       } else {
+           // "[document]", or "[dtd]" via getExternalSubset()
+           scratch.setCharacterStream (reader);
+           scratch.setByteStream (stream);
+           scratch.setEncoding (encoding);
+           source = scratch;
+           systemId = ids [1];
+      if (handler.getFeature (SAXDriver.FEATURE + "string-interning")) {
+        handler.startExternalEntity (ename, systemId,
+                                     "[document]" == ename);
+      } else {
+        handler.startExternalEntity (ename, systemId,
+                                     "[document]".equals(ename));
+      }
+       }
+
+       // we may have been given I/O streams directly
+       if (source.getCharacterStream () != null) {
+           if (source.getByteStream () != null)
+               error ("InputSource has two streams!");
+           reader = source.getCharacterStream ();
+       } else if (source.getByteStream () != null) {
+           encoding = source.getEncoding ();
+           if (encoding == null)
+               stream = source.getByteStream ();
+           else try {
+               reader = new InputStreamReader (
+                   source.getByteStream (),
+                   encoding);
+           } catch (IOException e) {
+               stream = source.getByteStream ();
+           }
+       } else if (systemId == null)
+           error ("InputSource has no URI!");
+       scratch.setCharacterStream (null);
+       scratch.setByteStream (null);
+       scratch.setEncoding (null);
+
+       // Push the existing status.
+       pushInput (ename);
+
+       // Create a new read buffer.
+       // (Note the four-character margin)
+       readBuffer = new char [READ_BUFFER_MAX + 4];
+       readBufferPos = 0;
+       readBufferLength = 0;
+       readBufferOverflow = -1;
+       is = null;
+       line = 1;
+       column = 0;
+       currentByteCount = 0;
+
+       // If there's an explicit character stream, just
+       // ignore encoding declarations.
+       if (reader != null) {
+           sourceType = INPUT_READER;
+           this.reader = reader;
+           tryEncodingDecl (true);
+           return;
+       }
+       
+       // Else we handle the conversion, and need to ensure
+       // it's done right.
+       sourceType = INPUT_STREAM;
+       if (stream != null) {
+           is = stream;
+       } else {
+           // We have to open our own stream to the URL.
+           URL url = new URL (systemId);
+
+           externalEntity = url.openConnection ();
+           externalEntity.connect ();
+           is = externalEntity.getInputStream ();
+       }
+
+       // If we get to here, there must be
+       // an InputStream available.
+       if (!is.markSupported ()) {
+           is = new BufferedInputStream (is);
+       }
+
+       // Get any external encoding label.
+       if (encoding == null && externalEntity != null) {
+           // External labels can be untrustworthy; filesystems in
+           // particular often have the wrong default for content
+           // that wasn't locally originated.  Those we autodetect.
+           if (!"file".equals (externalEntity.getURL ().getProtocol ())) {
+               int temp;
+
+               // application/xml;charset=something;otherAttr=...
+               // ... with many variants on 'something'
+               encoding = externalEntity.getContentType ();
+
+               // MHK code (fix for Saxon 5.5.1/007):
+               // protect against encoding==null
+               if (encoding==null) {
+                   temp = -1;
+               } else {
+                   temp = encoding.indexOf ("charset");
+               }
+
+               // RFC 2376 sez MIME text defaults to ASCII, but since the
+               // JDK will create a MIME type out of thin air, we always
+               // autodetect when there's no explicit charset attribute.
+               if (temp < 0)
+                   encoding = null;    // autodetect
+               else {
+                   // only this one attribute
+                   if ((temp = encoding.indexOf (';')) > 0)
+                       encoding = encoding.substring (0, temp);
+
+                   if ((temp = encoding.indexOf ('=', temp + 7)) > 0) {
+                       encoding = encoding.substring (temp + 1);
+
+                       // attributes can have comment fields (RFC 822)
+                       if ((temp = encoding.indexOf ('(')) > 0)
+                           encoding = encoding.substring (0, temp);
+                       // ... and values may be quoted
+                       if ((temp = encoding.indexOf ('"')) > 0)
+                           encoding = encoding.substring (temp + 1,
+                                   encoding.indexOf ('"', temp + 2));
+                       encoding.trim ();
+                   } else {
+                       handler.warn ("ignoring illegal MIME attribute: "
+                               + encoding);
+                       encoding = null;
+                   }
+               }
+           }
+       }
+
+       // if we got an external encoding label, use it ...
+       if (encoding != null) {
+           this.encoding = ENCODING_EXTERNAL;
+           setupDecoding (encoding);
+           ignoreEncoding = true;
+       
+       // ... else autodetect from first bytes.
+       } else {
+           detectEncoding ();
+           ignoreEncoding = false;
+       }
+
+       // Read any XML or text declaration.
+       // If we autodetected, it may tell us the "real" encoding.
+       try {
+           tryEncodingDecl (ignoreEncoding);
+       } catch (UnsupportedEncodingException x) {
+           encoding = x.getMessage ();
+
+           // if we don't handle the declared encoding,
+           // try letting a JVM InputStreamReader do it
+           try {
+               if (sourceType != INPUT_STREAM)
+                   throw x;
+
+               is.reset ();
+               readBufferPos = 0;
+               readBufferLength = 0;
+               readBufferOverflow = -1;
+               line = 1;
+               currentByteCount = column = 0;
+
+               sourceType = INPUT_READER;
+               this.reader = new InputStreamReader (is, encoding);
+               is = null;
+
+               tryEncodingDecl (true);
+
+           } catch (IOException e) {
+               error ("unsupported text encoding",
+                      encoding,
+                      null);
+           }
+       }
+    }
+
+
+    /**
+     * Check for an encoding declaration.  This is the second part of the
+     * XML encoding autodetection algorithm, relying on detectEncoding to
+     * get to the point that this part can read any encoding declaration
+     * in the document (using only US-ASCII characters).
+     *
+     * <p> Because this part starts to fill parser buffers with this data,
+     * it's tricky to setup a reader so that Java's built-in decoders can be
+     * used for the character encodings that aren't built in to this parser
+     * (such as EUC-JP, KOI8-R, Big5, etc).
+     *
+     * @return any encoding in the declaration, uppercased; or null
+     * @see detectEncoding
+     */
+    private String tryEncodingDecl (boolean ignoreEncoding)
+    throws SAXException, IOException
+    {
+       // Read the XML/text declaration.
+       if (tryRead ("<?xml")) {
+           if (tryWhitespace ()) {
+               if (inputStack.size () > 0) {
+                   return parseTextDecl (ignoreEncoding);
+               } else {
+                   return parseXMLDecl (ignoreEncoding);
+               }
+           } else {
+               // <?xml-stylesheet ...?> or similar
+               unread ('l');
+               unread ('m');
+               unread ('x');
+               unread ('?');
+               unread ('<');
+           }
+       }
+       return null;
+    }
+
+
+    /**
+     * Attempt to detect the encoding of an entity.
+     * <p>The trick here (as suggested in the XML standard) is that
+     * any entity not in UTF-8, or in UCS-2 with a byte-order mark, 
+     * <b>must</b> begin with an XML declaration or an encoding
+     * declaration; we simply have to look for "&lt;?xml" in various
+     * encodings.
+     * <p>This method has no way to distinguish among 8-bit encodings.
+     * Instead, it sets up for UTF-8, then (possibly) revises its assumption
+     * later in setupDecoding ().  Any ASCII-derived 8-bit encoding
+     * should work, but most will be rejected later by setupDecoding ().
+     * @see #tryEncoding (byte[], byte, byte, byte, byte)
+     * @see #tryEncoding (byte[], byte, byte)
+     * @see #setupDecoding
+     */
+    private void detectEncoding ()
+    throws SAXException, IOException
+    {
+       byte signature[] = new byte [4];
+
+       // Read the first four bytes for
+       // autodetection.
+       is.mark (4);
+       is.read (signature);
+       is.reset ();
+
+       //
+       // FIRST:  four byte encodings (who uses these?)
+       //
+       if (tryEncoding (signature, (byte) 0x00, (byte) 0x00,
+                         (byte) 0x00, (byte) 0x3c)) {
+           // UCS-4 must begin with "<?xml"
+           // 0x00 0x00 0x00 0x3c: UCS-4, big-endian (1234)
+           // "UTF-32BE"
+           encoding = ENCODING_UCS_4_1234;
+
+       } else if (tryEncoding (signature, (byte) 0x3c, (byte) 0x00,
+                                (byte) 0x00, (byte) 0x00)) {
+           // 0x3c 0x00 0x00 0x00: UCS-4, little-endian (4321)
+           // "UTF-32LE"
+           encoding = ENCODING_UCS_4_4321;
+
+       } else if (tryEncoding (signature, (byte) 0x00, (byte) 0x00,
+                                (byte) 0x3c, (byte) 0x00)) {
+           // 0x00 0x00 0x3c 0x00: UCS-4, unusual (2143)
+           encoding = ENCODING_UCS_4_2143;
+
+       } else if (tryEncoding (signature, (byte) 0x00, (byte) 0x3c,
+                                (byte) 0x00, (byte) 0x00)) {
+           // 0x00 0x3c 0x00 0x00: UCS-4, unusual (3421)
+           encoding = ENCODING_UCS_4_3412;
+
+           // 00 00 fe ff UCS_4_1234 (with BOM)
+           // ff fe 00 00 UCS_4_4321 (with BOM)
+       }
+
+       //
+       // SECOND:  two byte encodings
+       // note ... with 1/14/2000 errata the XML spec identifies some
+       // more "broken UTF-16" autodetection cases, with no XML decl,
+       // which we don't handle here (that's legal too).
+       //
+       else if (tryEncoding (signature, (byte) 0xfe, (byte) 0xff)) {
+           // UCS-2 with a byte-order marker. (UTF-16)
+           // 0xfe 0xff: UCS-2, big-endian (12)
+           encoding = ENCODING_UCS_2_12;
+           is.read (); is.read ();
+
+       } else if (tryEncoding (signature, (byte) 0xff, (byte) 0xfe)) {
+           // UCS-2 with a byte-order marker. (UTF-16)
+           // 0xff 0xfe: UCS-2, little-endian (21)
+           encoding = ENCODING_UCS_2_21;
+           is.read (); is.read ();
+
+       } else if (tryEncoding (signature, (byte) 0x00, (byte) 0x3c,
+                                (byte) 0x00, (byte) 0x3f)) {
+           // UTF-16BE (otherwise, malformed UTF-16)
+           // 0x00 0x3c 0x00 0x3f: UCS-2, big-endian, no byte-order mark
+           encoding = ENCODING_UCS_2_12;
+           error ("no byte-order mark for UCS-2 entity");
+
+       } else if (tryEncoding (signature, (byte) 0x3c, (byte) 0x00,
+                                (byte) 0x3f, (byte) 0x00)) {
+           // UTF-16LE (otherwise, malformed UTF-16)
+           // 0x3c 0x00 0x3f 0x00: UCS-2, little-endian, no byte-order mark
+           encoding = ENCODING_UCS_2_21;
+           error ("no byte-order mark for UCS-2 entity");
+       }
+
+       //
+       // THIRD:  ASCII-derived encodings, fixed and variable lengths
+       //
+       else if (tryEncoding (signature, (byte) 0x3c, (byte) 0x3f,
+                              (byte) 0x78, (byte) 0x6d)) {
+           // ASCII derived
+           // 0x3c 0x3f 0x78 0x6d: UTF-8 or other 8-bit markup (read ENCODING)
+           encoding = ENCODING_UTF_8;
+           prefetchASCIIEncodingDecl ();
+
+       } else if (signature [0] == (byte) 0xef
+               && signature [1] == (byte) 0xbb
+               && signature [2] == (byte) 0xbf) {
+           // 0xef 0xbb 0xbf: UTF-8 BOM (not part of document text)
+           // this un-needed notion slipped into XML 2nd ed through a
+           // "non-normative" erratum; now required by MSFT and UDDI,
+           // and E22 made it normative.
+           encoding = ENCODING_UTF_8;
+           is.read (); is.read (); is.read ();
+
+       } else {
+           // 4c 6f a7 94 ... we don't understand EBCDIC flavors
+           // ... but we COULD at least kick in some fixed code page
+
+           // (default) UTF-8 without encoding/XML declaration
+           encoding = ENCODING_UTF_8;
+       }
+    }
+
+
+    /**
+     * Check for a four-byte signature.
+     * <p>Utility routine for detectEncoding ().
+     * <p>Always looks for some part of "<?XML" in a specific encoding.
+     * @param sig The first four bytes read.
+     * @param b1 The first byte of the signature
+     * @param b2 The second byte of the signature
+     * @param b3 The third byte of the signature
+     * @param b4 The fourth byte of the signature
+     * @see #detectEncoding
+     */
+    private static boolean tryEncoding (
+       byte sig[], byte b1, byte b2, byte b3, byte b4)
+    {
+       return (sig [0] == b1 && sig [1] == b2
+               && sig [2] == b3 && sig [3] == b4);
+    }
+
+
+    /**
+     * Check for a two-byte signature.
+     * <p>Looks for a UCS-2 byte-order mark.
+     * <p>Utility routine for detectEncoding ().
+     * @param sig The first four bytes read.
+     * @param b1 The first byte of the signature
+     * @param b2 The second byte of the signature
+     * @see #detectEncoding
+     */
+    private static boolean tryEncoding (byte sig[], byte b1, byte b2)
+    {
+       return ((sig [0] == b1) && (sig [1] == b2));
+    }
+
+
+    /**
+     * This method pushes a string back onto input.
+     * <p>It is useful either as the expansion of an internal entity, 
+     * or for backtracking during the parse.
+     * <p>Call pushCharArray () to do the actual work.
+     * @param s The string to push back onto input.
+     * @see #pushCharArray
+     */
+    private void pushString (String ename, String s)
+    throws SAXException
+    {
+       char ch[] = s.toCharArray ();
+       pushCharArray (ename, ch, 0, ch.length);
+    }
+
+
+    /**
+     * Push a new internal input source.
+     * <p>This method is useful for expanding an internal entity,
+     * or for unreading a string of characters.  It creates a new
+     * readBuffer containing the characters in the array, instead
+     * of characters converted from an input byte stream.
+     * @param ch The char array to push.
+     * @see #pushString
+     * @see #pushURL
+     * @see #readBuffer
+     * @see #sourceType
+     * @see #pushInput
+     */
+    private void pushCharArray (String ename, char ch[], int start, int length)
+    throws SAXException
+    {
+       // Push the existing status
+       pushInput (ename);
+       if (ename != null && doReport) {
+           dataBufferFlush ();
+           handler.startInternalEntity (ename);
+       }
+       sourceType = INPUT_INTERNAL;
+       readBuffer = ch;
+       readBufferPos = start;
+       readBufferLength = length;
+       readBufferOverflow = -1;
+    }
+
+
+    /**
+     * Save the current input source onto the stack.
+     * <p>This method saves all of the global variables associated with
+     * the current input source, so that they can be restored when a new
+     * input source has finished.  It also tests for entity recursion.
+     * <p>The method saves the following global variables onto a stack
+     * using a fixed-length array:
+     * <ol>
+     * <li>sourceType
+     * <li>externalEntity
+     * <li>readBuffer
+     * <li>readBufferPos
+     * <li>readBufferLength
+     * <li>line
+     * <li>encoding
+     * </ol>
+     * @param ename The name of the entity (if any) causing the new input.
+     * @see #popInput
+     * @see #sourceType
+     * @see #externalEntity
+     * @see #readBuffer
+     * @see #readBufferPos
+     * @see #readBufferLength
+     * @see #line
+     * @see #encoding
+     */
+    private void pushInput (String ename)
+    throws SAXException
+    {
+       // Check for entity recursion.
+       if (ename != null) {
+           Enumeration entities = entityStack.elements ();
+           while (entities.hasMoreElements ()) {
+               String e = (String) entities.nextElement ();
+               if (e != null && e == ename) {
+                   error ("recursive reference to entity", ename, null);
+               }
+           }
+       }
+       entityStack.push (ename);
+
+       // Don't bother if there is no current input.
+       if (sourceType == INPUT_NONE) {
+           return;
+       }
+
+       // Set up a snapshot of the current
+       // input source.
+       Object input[] = new Object [12];
+
+       input [0] = new Integer (sourceType);
+       input [1] = externalEntity;
+       input [2] = readBuffer;
+       input [3] = new Integer (readBufferPos);
+       input [4] = new Integer (readBufferLength);
+       input [5] = new Integer (line);
+       input [6] = new Integer (encoding);
+       input [7] = new Integer (readBufferOverflow);
+       input [8] = is;
+       input [9] = new Integer (currentByteCount);
+       input [10] = new Integer (column);
+       input [11] = reader;
+
+       // Push it onto the stack.
+       inputStack.push (input);
+    }
+
+
+    /**
+     * Restore a previous input source.
+     * <p>This method restores all of the global variables associated with
+     * the current input source.
+     * @exception java.io.EOFException
+     *    If there are no more entries on the input stack.
+     * @see #pushInput
+     * @see #sourceType
+     * @see #externalEntity
+     * @see #readBuffer
+     * @see #readBufferPos
+     * @see #readBufferLength
+     * @see #line
+     * @see #encoding
+     */
+    private void popInput ()
+    throws SAXException, IOException
+    {
+       String ename = (String) entityStack.pop ();
+
+       if (ename != null && doReport)
+           dataBufferFlush ();
+       switch (sourceType) {
+       case INPUT_STREAM:
+           handler.endExternalEntity (ename);
+           is.close ();
+           break;
+       case INPUT_READER:
+           handler.endExternalEntity (ename);
+           reader.close ();
+           break;
+       case INPUT_INTERNAL:
+           if (ename != null && doReport)
+               handler.endInternalEntity (ename);
+           break;
+       }
+
+       // Throw an EOFException if there
+       // is nothing else to pop.
+       if (inputStack.isEmpty ()) {
+           throw new EOFException ("no more input");
+       }
+
+       Object input [] = (Object[]) inputStack.pop ();
+
+       sourceType = ((Integer) input [0]).intValue ();
+       externalEntity = (URLConnection) input [1];
+       readBuffer = (char[]) input [2];
+       readBufferPos = ((Integer) input [3]).intValue ();
+       readBufferLength = ((Integer) input [4]).intValue ();
+       line = ((Integer) input [5]).intValue ();
+       encoding = ((Integer) input [6]).intValue ();
+       readBufferOverflow = ((Integer) input [7]).intValue ();
+       is = (InputStream) input [8];
+       currentByteCount = ((Integer) input [9]).intValue ();
+       column = ((Integer) input [10]).intValue ();
+       reader = (Reader) input [11];
+    }
+
+
+    /**
+     * Return true if we can read the expected character.
+     * <p>Note that the character will be removed from the input stream
+     * on success, but will be put back on failure.  Do not attempt to
+     * read the character again if the method succeeds.
+     * @param delim The character that should appear next.  For a
+     *       insensitive match, you must supply this in upper-case.
+     * @return true if the character was successfully read, or false if
+     *  it was not.
+     * @see #tryRead (String)
+     */
+    private boolean tryRead (char delim)
+    throws SAXException, IOException
+    {
+       char c;
+
+       // Read the character
+       c = readCh ();
+
+       // Test for a match, and push the character
+       // back if the match fails.
+       if (c == delim) {
+           return true;
+       } else {
+           unread (c);
+           return false;
+       }
+    }
+
+
+    /**
+     * Return true if we can read the expected string.
+     * <p>This is simply a convenience method.
+     * <p>Note that the string will be removed from the input stream
+     * on success, but will be put back on failure.  Do not attempt to
+     * read the string again if the method succeeds.
+     * <p>This method will push back a character rather than an
+     * array whenever possible (probably the majority of cases).
+     * @param delim The string that should appear next.
+     * @return true if the string was successfully read, or false if
+     *  it was not.
+     * @see #tryRead (char)
+     */
+    private boolean tryRead (String delim)
+    throws SAXException, IOException
+    {
+       return tryRead (delim.toCharArray ());
+    }
+
+    private boolean tryRead (char ch [])
+    throws SAXException, IOException
+    {
+       char c;
+
+       // Compare the input, character-
+       // by character.
+
+       for (int i = 0; i < ch.length; i++) {
+           c = readCh ();
+           if (c != ch [i]) {
+               unread (c);
+               if (i != 0) {
+                   unread (ch, i);
+               }
+               return false;
+           }
+       }
+       return true;
+    }
+
+
+
+    /**
+     * Return true if we can read some whitespace.
+     * <p>This is simply a convenience method.
+     * <p>This method will push back a character rather than an
+     * array whenever possible (probably the majority of cases).
+     * @return true if whitespace was found.
+     */
+    private boolean tryWhitespace ()
+    throws SAXException, IOException
+    {
+       char c;
+       c = readCh ();
+       if (isWhitespace (c)) {
+           skipWhitespace ();
+           return true;
+       } else {
+           unread (c);
+           return false;
+       }
+    }
+
+
+    /**
+     * Read all data until we find the specified string.
+     * This is useful for scanning CDATA sections and PIs.
+     * <p>This is inefficient right now, since it calls tryRead ()
+     * for every character.
+     * @param delim The string delimiter
+     * @see #tryRead (String, boolean)
+     * @see #readCh
+     */
+    private void parseUntil (String delim)
+    throws SAXException, IOException
+    {
+       parseUntil (delim.toCharArray ());
+    }
+
+    private void parseUntil (char delim [])
+    throws SAXException, IOException
+    {
+       char c;
+       int startLine = line;
+
+       try {
+           while (!tryRead (delim)) {
+               c = readCh ();
+               dataBufferAppend (c);
+           }
+       } catch (EOFException e) {
+           error ("end of input while looking for delimiter "
+               + "(started on line " + startLine
+               + ')', null, new String (delim));
+       }
+    }
+
+
+    //////////////////////////////////////////////////////////////////////
+    // Low-level I/O.
+    //////////////////////////////////////////////////////////////////////
+
+
+    /**
+     * Prefetch US-ASCII XML/text decl from input stream into read buffer.
+     * Doesn't buffer more than absolutely needed, so that when an encoding
+     * decl says we need to create an InputStreamReader, we can discard our
+     * buffer and reset().  Caller knows the first chars of the decl exist
+     * in the input stream.
+     */
+    private void prefetchASCIIEncodingDecl ()
+    throws SAXException, IOException
+    {
+       int ch;
+       readBufferPos = readBufferLength = 0;
+
+       is.mark (readBuffer.length);
+       while (true) {
+           ch = is.read ();
+           readBuffer [readBufferLength++] = (char) ch;
+           switch (ch) {
+             case (int) '>':
+               return;
+             case -1:
+               error ("file ends before end of XML or encoding declaration.",
+                      null, "?>");
+           }
+           if (readBuffer.length == readBufferLength)
+               error ("unfinished XML or encoding declaration");
+       }
+    }
+
+    /**
+     * Read a chunk of data from an external input source.
+     * <p>This is simply a front-end that fills the rawReadBuffer
+     * with bytes, then calls the appropriate encoding handler.
+     * @see #encoding
+     * @see #rawReadBuffer
+     * @see #readBuffer
+     * @see #filterCR
+     * @see #copyUtf8ReadBuffer
+     * @see #copyIso8859_1ReadBuffer
+     * @see #copyUcs_2ReadBuffer
+     * @see #copyUcs_4ReadBuffer
+     */
+    private void readDataChunk ()
+    throws SAXException, IOException
+    {
+       int count;
+
+       // See if we have any overflow (filterCR sets for CR at end)
+       if (readBufferOverflow > -1) {
+           readBuffer [0] = (char) readBufferOverflow;
+           readBufferOverflow = -1;
+           readBufferPos = 1;
+           sawCR = true;
+       } else {
+           readBufferPos = 0;
+           sawCR = false;
+       }
+
+       // input from a character stream.
+       if (sourceType == INPUT_READER) {
+           count = reader.read (readBuffer,
+                           readBufferPos, READ_BUFFER_MAX - readBufferPos);
+           if (count < 0)
+               readBufferLength = readBufferPos;
+           else
+               readBufferLength = readBufferPos + count;
+           if (readBufferLength > 0)
+               filterCR (count >= 0);
+           sawCR = false;
+           return;
+       }
+
+       // Read as many bytes as possible into the raw buffer.
+       count = is.read (rawReadBuffer, 0, READ_BUFFER_MAX);
+
+       // Dispatch to an encoding-specific reader method to populate
+       // the readBuffer.  In most parser speed profiles, these routines
+       // show up at the top of the CPU usage chart.
+       if (count > 0) {
+           switch (encoding) {
+             // one byte builtins
+             case ENCODING_ASCII:
+               copyIso8859_1ReadBuffer (count, (char) 0x0080);
+               break;
+             case ENCODING_UTF_8:
+               copyUtf8ReadBuffer (count);
+               break;
+             case ENCODING_ISO_8859_1:
+               copyIso8859_1ReadBuffer (count, (char) 0);
+               break;
+
+             // two byte builtins
+             case ENCODING_UCS_2_12:
+               copyUcs2ReadBuffer (count, 8, 0);
+               break;
+             case ENCODING_UCS_2_21:
+               copyUcs2ReadBuffer (count, 0, 8);
+               break;
+
+             // four byte builtins
+             case ENCODING_UCS_4_1234:
+               copyUcs4ReadBuffer (count, 24, 16, 8, 0);
+               break;
+             case ENCODING_UCS_4_4321:
+               copyUcs4ReadBuffer (count, 0, 8, 16, 24);
+               break;
+             case ENCODING_UCS_4_2143:
+               copyUcs4ReadBuffer (count, 16, 24, 0, 8);
+               break;
+             case ENCODING_UCS_4_3412:
+               copyUcs4ReadBuffer (count, 8, 0, 24, 16);
+               break;
+           }
+       } else
+           readBufferLength = readBufferPos;
+
+       readBufferPos = 0;
+
+       // Filter out all carriage returns if we've seen any
+       // (including any saved from a previous read)
+       if (sawCR) {
+           filterCR (count >= 0);
+           sawCR = false;
+
+           // must actively report EOF, lest some CRs get lost.
+           if (readBufferLength == 0 && count >= 0)
+               readDataChunk ();
+       }
+
+       if (count > 0)
+           currentByteCount += count;
+    }
+
+
+    /**
+     * Filter carriage returns in the read buffer.
+     * CRLF becomes LF; CR becomes LF.
+     * @param moreData true iff more data might come from the same source
+     * @see #readDataChunk
+     * @see #readBuffer
+     * @see #readBufferOverflow
+     */
+    private void filterCR (boolean moreData)
+    {
+       int i, j;
+
+       readBufferOverflow = -1;
+
+loop:
+       for (i = j = readBufferPos; j < readBufferLength; i++, j++) {
+           switch (readBuffer [j]) {
+           case '\r':
+               if (j == readBufferLength - 1) {
+                   if (moreData) {
+                       readBufferOverflow = '\r';
+                       readBufferLength--;
+                   } else      // CR at end of buffer
+                       readBuffer [i++] = '\n';
+                   break loop;
+               } else if (readBuffer [j + 1] == '\n') {
+                   j++;
+               }
+               readBuffer [i] = '\n';
+               break;
+
+           case '\n':
+           default:
+               readBuffer [i] = readBuffer [j];
+               break;
+           }
+       }
+       readBufferLength = i;
+    }
+
+    /**
+     * Convert a buffer of UTF-8-encoded bytes into UTF-16 characters.
+     * <p>When readDataChunk () calls this method, the raw bytes are in 
+     * rawReadBuffer, and the final characters will appear in 
+     * readBuffer.
+     * <p>Note that as of Unicode 3.1, good practice became a requirement,
+     * so that each Unicode character has exactly one UTF-8 representation.
+     * @param count The number of bytes to convert.
+     * @see #readDataChunk
+     * @see #rawReadBuffer
+     * @see #readBuffer
+     * @see #getNextUtf8Byte
+     */
+    private void copyUtf8ReadBuffer (int count)
+    throws SAXException, IOException
+    {
+       int     i = 0;
+       int     j = readBufferPos;
+       int     b1;
+       char    c = 0;
+
+       /*
+       // check once, so the runtime won't (if it's smart enough)
+       if (count < 0 || count > rawReadBuffer.length)
+           throw new ArrayIndexOutOfBoundsException (Integer.toString (count));
+       */
+
+       while (i < count) {
+           b1 = rawReadBuffer [i++];
+
+           // Determine whether we are dealing
+           // with a one-, two-, three-, or four-
+           // byte sequence.
+           if (b1 < 0) {
+               if ((b1 & 0xe0) == 0xc0) {
+                   // 2-byte sequence: 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
+                   c = (char) (((b1 & 0x1f) << 6)
+                               | getNextUtf8Byte (i++, count));
+                   if (c < 0x0080)
+                       encodingError ("Illegal two byte UTF-8 sequence",
+                               c, 0);
+                   //Sec 2.11
+                   // [1] the two-character sequence #xD #xA
+                   // [2] the two-character sequence #xD #x85
+                   if ((c == 0x0085 || c == 0x000a) && sawCR)
+                       continue;
+                   
+                   // Sec 2.11
+                   // [3] the single character #x85
+                   
+                   if(c == 0x0085  && xmlVersion == XML_11)
+                       readBuffer[j++] = '\r';
+               } else if ((b1 & 0xf0) == 0xe0) {
+                   // 3-byte sequence:
+                   // zzzzyyyyyyxxxxxx = 1110zzzz 10yyyyyy 10xxxxxx
+                   // most CJKV characters
+                   c = (char) (((b1 & 0x0f) << 12) |
+                                  (getNextUtf8Byte (i++, count) << 6) |
+                                  getNextUtf8Byte (i++, count));
+                    //sec 2.11
+                   //[4] the single character #x2028
+                   if(c == 0x2028 && xmlVersion == XML_11){
+                       readBuffer[j++] = '\r';
+                       sawCR = true;
+                       continue;
+                   }
+                   if (c < 0x0800 || (c >= 0xd800 && c <= 0xdfff))
+                       encodingError ("Illegal three byte UTF-8 sequence",
+                               c, 0);
+               } else if ((b1 & 0xf8) == 0xf0) {
+                   // 4-byte sequence: 11101110wwwwzzzzyy + 110111yyyyxxxxxx
+                   //     = 11110uuu 10uuzzzz 10yyyyyy 10xxxxxx
+                   // (uuuuu = wwww + 1)
+                   // "Surrogate Pairs" ... from the "Astral Planes"
+                   // Unicode 3.1 assigned the first characters there
+                   int iso646 = b1 & 07;
+                   iso646 = (iso646 << 6) + getNextUtf8Byte (i++, count);
+                   iso646 = (iso646 << 6) + getNextUtf8Byte (i++, count);
+                   iso646 = (iso646 << 6) + getNextUtf8Byte (i++, count);
+
+                   if (iso646 <= 0xffff) {
+                       encodingError ("Illegal four byte UTF-8 sequence",
+                               iso646, 0);
+                   } else {
+                       if (iso646 > 0x0010ffff)
+                           encodingError (
+                               "UTF-8 value out of range for Unicode",
+                               iso646, 0);
+                       iso646 -= 0x010000;
+                       readBuffer [j++] = (char) (0xd800 | (iso646 >> 10));
+                       readBuffer [j++] = (char) (0xdc00 | (iso646 & 0x03ff));
+                       continue;
+                   }
+               } else {
+                   // The five and six byte encodings aren't supported;
+                   // they exceed the Unicode (and XML) range.
+                   encodingError (
+                           "unsupported five or six byte UTF-8 sequence",
+                           0xff & b1, i);
+                   // NOTREACHED
+                   c = 0;
+               }
+           } else {
+               // 1-byte sequence: 000000000xxxxxxx = 0xxxxxxx
+               // (US-ASCII character, "common" case, one branch to here)
+               c = (char) b1;
+           }
+           readBuffer [j++] = c;
+           if (c == '\r')
+               sawCR = true;
+       }
+       // How many characters have we read?
+       readBufferLength = j;
+    }
+
+
+    /**
+     * Return the next byte value in a UTF-8 sequence.
+     * If it is not possible to get a byte from the current
+     * entity, throw an exception.
+     * @param pos The current position in the rawReadBuffer.
+     * @param count The number of bytes in the rawReadBuffer
+     * @return The significant six bits of a non-initial byte in
+     *  a UTF-8 sequence.
+     * @exception EOFException If the sequence is incomplete.
+     */
+    private int getNextUtf8Byte (int pos, int count)
+    throws SAXException, IOException
+    {
+       int val;
+
+       // Take a character from the buffer
+       // or from the actual input stream.
+       if (pos < count) {
+           val = rawReadBuffer [pos];
+       } else {
+           val = is.read ();
+           if (val == -1) {
+               encodingError ("unfinished multi-byte UTF-8 sequence at EOF",
+                       -1, pos);
+           }
+       }
+
+       // Check for the correct bits at the start.
+       if ((val & 0xc0) != 0x80) {
+           encodingError ("bad continuation of multi-byte UTF-8 sequence",
+                   val, pos + 1);
+       }
+
+       // Return the significant bits.
+       return (val & 0x3f);
+    }
+
+
+    /**
+     * Convert a buffer of US-ASCII or ISO-8859-1-encoded bytes into
+     * UTF-16 characters.
+     *
+     * <p>When readDataChunk () calls this method, the raw bytes are in 
+     * rawReadBuffer, and the final characters will appear in 
+     * readBuffer.
+     *
+     * @param count The number of bytes to convert.
+     * @param mask For ASCII conversion, 0x7f; else, 0xff.
+     * @see #readDataChunk
+     * @see #rawReadBuffer
+     * @see #readBuffer
+     */
+    private void copyIso8859_1ReadBuffer (int count, char mask)
+    throws IOException
+    {
+       int i, j;
+       for (i = 0, j = readBufferPos; i < count; i++, j++) {
+           char c = (char) (rawReadBuffer [i] & 0xff);
+           if ((c & mask) != 0)
+               throw new CharConversionException ("non-ASCII character U+"
+                                                   + Integer.toHexString (c));
+           if (c == 0x0085 && xmlVersion == XML_11)
+              c = '\r';        
+           readBuffer [j] = c;
+           if (c == '\r') {
+               sawCR = true;
+           }
+       }
+       readBufferLength = j;
+    }
+
+
+    /**
+     * Convert a buffer of UCS-2-encoded bytes into UTF-16 characters
+     * (as used in Java string manipulation).
+     *
+     * <p>When readDataChunk () calls this method, the raw bytes are in 
+     * rawReadBuffer, and the final characters will appear in 
+     * readBuffer.
+     * @param count The number of bytes to convert.
+     * @param shift1 The number of bits to shift byte 1.
+     * @param shift2 The number of bits to shift byte 2
+     * @see #readDataChunk
+     * @see #rawReadBuffer
+     * @see #readBuffer
+     */
+    private void copyUcs2ReadBuffer (int count, int shift1, int shift2)
+    throws SAXException
+    {
+       int j = readBufferPos;
+
+       if (count > 0 && (count % 2) != 0) {
+           encodingError ("odd number of bytes in UCS-2 encoding", -1, count);
+       }
+       // The loops are faster with less internal brancing; hence two
+       if (shift1 == 0) {      // "UTF-16-LE"
+           for (int i = 0; i < count; i += 2) {
+               char c = (char) (rawReadBuffer [i + 1] << 8);
+               c |= 0xff & rawReadBuffer [i];
+               readBuffer [j++] = c;
+               if (c == '\r')
+                   sawCR = true;
+           }
+       } else {        // "UTF-16-BE"
+           for (int i = 0; i < count; i += 2) {
+               char c = (char) (rawReadBuffer [i] << 8);
+               c |= 0xff & rawReadBuffer [i + 1];
+               readBuffer [j++] = c;
+               if (c == '\r')
+                   sawCR = true;
+           }
+       }
+       readBufferLength = j;
+    }
+
+
+    /**
+     * Convert a buffer of UCS-4-encoded bytes into UTF-16 characters.
+     *
+     * <p>When readDataChunk () calls this method, the raw bytes are in 
+     * rawReadBuffer, and the final characters will appear in 
+     * readBuffer.
+     * <p>Java has Unicode chars, and this routine uses surrogate pairs
+     * for ISO-10646 values between 0x00010000 and 0x000fffff.  An
+     * exception is thrown if the ISO-10646 character has no Unicode
+     * representation.
+     *
+     * @param count The number of bytes to convert.
+     * @param shift1 The number of bits to shift byte 1.
+     * @param shift2 The number of bits to shift byte 2
+     * @param shift3 The number of bits to shift byte 2
+     * @param shift4 The number of bits to shift byte 2
+     * @see #readDataChunk
+     * @see #rawReadBuffer
+     * @see #readBuffer
+     */
+    private void copyUcs4ReadBuffer (int count, int shift1, int shift2,
+                             int shift3, int shift4)
+    throws SAXException
+    {
+       int j = readBufferPos;
+
+       if (count > 0 && (count % 4) != 0) {
+           encodingError (
+                   "number of bytes in UCS-4 encoding not divisible by 4",
+                   -1, count);
+       }
+       for (int i = 0; i < count; i += 4) {
+           int value = (((rawReadBuffer [i] & 0xff) << shift1) |
+                     ((rawReadBuffer [i + 1] & 0xff) << shift2) |
+                     ((rawReadBuffer [i + 2] & 0xff) << shift3) |
+                     ((rawReadBuffer [i + 3] & 0xff) << shift4));
+           if (value < 0x0000ffff) {
+               readBuffer [j++] = (char) value;
+               if (value == (int) '\r') {
+                   sawCR = true;
+               }
+           } else if (value < 0x0010ffff) {
+               value -= 0x010000;
+               readBuffer [j++] = (char) (0xd8 | ((value >> 10) & 0x03ff));
+               readBuffer [j++] = (char) (0xdc | (value & 0x03ff));
+           } else {
+               encodingError ("UCS-4 value out of range for Unicode",
+                              value, i);
+           }
+       }
+       readBufferLength = j;
+    }
+
+
+    /**
+     * Report a character encoding error.
+     */
+    private void encodingError (String message, int value, int offset)
+    throws SAXException
+    {
+       if (value != -1)
+           message = message + " (character code: 0x" +
+                     Integer.toHexString (value) + ')';
+       error (message);
+    }
+
+
+    //////////////////////////////////////////////////////////////////////
+    // Local Variables.
+    //////////////////////////////////////////////////////////////////////
+
+    /**
+     * Re-initialize the variables for each parse.
+     */
+    private void initializeVariables ()
+    {
+       // First line
+       line = 1;
+       column = 0;
+
+       // Set up the buffers for data and names
+       dataBufferPos = 0;
+       dataBuffer = new char [DATA_BUFFER_INITIAL];
+       nameBufferPos = 0;
+       nameBuffer = new char [NAME_BUFFER_INITIAL];
+
+       // Set up the DTD hash tables
+       elementInfo = new Hashtable ();
+       entityInfo = new Hashtable ();
+       notationInfo = new Hashtable ();
+       skippedPE = false;
+
+       // Set up the variables for the current
+       // element context.
+       currentElement = null;
+       currentElementContent = CONTENT_UNDECLARED;
+
+       // Set up the input variables
+       sourceType = INPUT_NONE;
+       inputStack = new Stack ();
+       entityStack = new Stack ();
+       externalEntity = null;
+       tagAttributePos = 0;
+       tagAttributes = new String [100];
+       rawReadBuffer = new byte [READ_BUFFER_MAX];
+       readBufferOverflow = -1;
+
+       scratch = new InputSource ();
+
+       inLiteral = false;
+       expandPE = false;
+       peIsError = false;
+
+       doReport = false;
+
+       inCDATA = false;
+
+       symbolTable = new Object [SYMBOL_TABLE_LENGTH][];
+    }
+
+
+    //
+    // The current XML handler interface.
+    //
+    private SAXDriver  handler;
+
+    //
+    // I/O information.
+    //
+    private Reader     reader;         // current reader
+    private InputStream        is;             // current input stream
+    private int                line;           // current line number
+    private int                column;         // current column number
+    private int                sourceType;     // type of input source
+    private Stack      inputStack;     // stack of input soruces
+    private URLConnection externalEntity; // current external entity
+    private int                encoding;       // current character encoding
+    private int                currentByteCount; // bytes read from current source
+    private InputSource        scratch;        // temporary
+
+    //
+    // Buffers for decoded but unparsed character input.
+    //
+    private char       readBuffer [];
+    private int                readBufferPos;
+    private int                readBufferLength;
+    private int                readBufferOverflow;  // overflow from last data chunk.
+
+
+    //
+    // Buffer for undecoded raw byte input.
+    //
+    private final static int READ_BUFFER_MAX = 16384;
+    private byte       rawReadBuffer [];
+
+
+    //
+    // Buffer for attribute values, char refs, DTD stuff.
+    //
+    private static int DATA_BUFFER_INITIAL = 4096;
+    private char       dataBuffer [];
+    private int                dataBufferPos;
+
+    //
+    // Buffer for parsed names.
+    //
+    private static int NAME_BUFFER_INITIAL = 1024;
+    private char       nameBuffer [];
+    private int                nameBufferPos;
+
+    //
+    // Save any standalone flag
+    //
+    private boolean    docIsStandalone;
+
+    //
+    // Hashtables for DTD information on elements, entities, and notations.
+    // Populated until we start ignoring decls (because of skipping a PE)
+    //
+    private Hashtable  elementInfo;
+    private Hashtable  entityInfo;
+    private Hashtable  notationInfo;
+    private boolean    skippedPE;
+
+
+    //
+    // Element type currently in force.
+    //
+    private String     currentElement;
+    private int                currentElementContent;
+
+    //
+    // Stack of entity names, to detect recursion.
+    //
+    private Stack      entityStack;
+
+    //
+    // PE expansion is enabled in most chunks of the DTD, not all.
+    // When it's enabled, literals are treated differently.
+    //
+    private boolean    inLiteral;
+    private boolean    expandPE;
+    private boolean    peIsError;
+
+    //
+    // can't report entity expansion inside two constructs:
+    // - attribute expansions (internal entities only)
+    // - markup declarations (parameter entities only)
+    //
+    private boolean    doReport;
+
+    //
+    // Symbol table, for caching interned names.
+    //
+    // These show up wherever XML names or nmtokens are used:  naming elements,
+    // attributes, PIs, notations, entities, and enumerated attribute values.
+    //
+    // NOTE:  This hashtable doesn't grow.  The default size is intended to be
+    // rather large for most documents.  Example:  one snapshot of the DocBook
+    // XML 4.1 DTD used only about 350 such names.  As a rule, only pathological
+    // documents (ones that don't reuse names) should ever see much collision.
+    //
+    // Be sure that SYMBOL_TABLE_LENGTH always stays prime, for best hashing.
+    // "2039" keeps the hash table size at about two memory pages on typical
+    // 32 bit hardware.
+    //
+    private final static int SYMBOL_TABLE_LENGTH = 2039;
+
+    private Object     symbolTable [][];
+
+    //
+    // Hash table of attributes found in current start tag.
+    //
+    private String     tagAttributes [];
+    private int                tagAttributePos;
+
+    //
+    // Utility flag: have we noticed a CR while reading the last
+    // data chunk?  If so, we will have to go back and normalise
+    // CR or CR/LF line ends.
+    //
+    private boolean    sawCR;
+
+    //
+    // Utility flag: are we in CDATA?  If so, whitespace isn't ignorable.
+    // 
+    private boolean    inCDATA;
+    
+    //
+    // Xml version.
+    //  
+    private static final int XML_10 = 0; 
+    private static final int XML_11 = 1; 
+    private int        xmlVersion = XML_10;
+}
diff --git a/libjava/gnu/xml/aelfred2/XmlReader.java b/libjava/gnu/xml/aelfred2/XmlReader.java
new file mode 100644 (file)
index 0000000..96c9c72
--- /dev/null
+++ b/libjava/gnu/xml/aelfred2/XmlReader.java
@@ -0,0 +1,315 @@
+/* XmlReader.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.aelfred2;
+
+import java.io.IOException;
+import java.util.Locale;
+
+import org.xml.sax.*;
+import org.xml.sax.ext.*;
+
+import gnu.xml.pipeline.EventFilter;
+import gnu.xml.pipeline.ValidationConsumer;
+
+
+/**
+ * This SAX2 parser optionally layers a validator over the &AElig;lfred2
+ * SAX2 parser.  While this will not evaluate every XML validity constraint,
+ * it does support all the validity constraints that are of any real utility
+ * outside the strict SGML-compatible world.  See the documentation for the
+ * SAXDriver class for information about the SAX2 features and properties
+ * that are supported, and documentation for the ValidationConsumer for
+ * information about what validity constraints may not be supported.
+ * (&AElig;lfred2 tests some of those, even in non-validating mode, to
+ * achieve better conformance.)
+ *
+ * <p> Note that due to its internal construction, you can't change most
+ * handlers until parse() returns.  This diverges slightly from SAX, which
+ * expects later binding to be supported.  Early binding involves less
+ * runtime overhead, which is an issue for event pipelines as used inside
+ * this parser.  Rather than relying on the parser to handle late binding
+ * to your own handlers, do it yourself.
+ *
+ * @see SAXDriver
+ * @see gnu.xml.pipeline.ValidationConsumer
+ *
+ * @author David Brownell
+ */
+public final class XmlReader implements XMLReader
+{
+    private SAXDriver          aelfred2 = new SAXDriver ();
+    private EventFilter                filter = new EventFilter ();
+    private boolean            isValidating;
+    private boolean            active;
+
+
+    /** Constructs a SAX Parser.  */
+    public XmlReader ()
+       { }
+
+    /**
+     * Constructs a SAX Parser, optionally treating validity errors
+     * as if they were fatal errors.
+     */
+    public XmlReader (boolean invalidIsFatal)
+    {
+       if (invalidIsFatal)
+           setErrorHandler (new DefaultHandler2 () {
+               public void error (SAXParseException e)
+               throws SAXException
+                   { throw e; }
+               });
+    }
+
+    /**
+     * <b>SAX2</b>: Returns the object used to report the logical
+     * content of an XML document.
+     */
+    public ContentHandler getContentHandler ()
+       { return filter.getContentHandler (); }
+
+    /**
+     * <b>SAX2</b>: Assigns the object used to report the logical
+     * content of an XML document.
+     * @exception IllegalStateException if called mid-parse
+     */
+    public void setContentHandler (ContentHandler handler)
+    {
+       if (active)
+           throw new IllegalStateException ("already parsing");
+       filter.setContentHandler (handler);
+    }
+
+    /**
+     * <b>SAX2</b>: Returns the object used to process declarations related
+     * to notations and unparsed entities.
+     */
+    public DTDHandler getDTDHandler ()
+       { return filter.getDTDHandler (); }
+
+    /**
+     * <b>SAX1</b> Assigns DTD handler
+     * @exception IllegalStateException if called mid-parse
+     */
+    public void setDTDHandler (DTDHandler handler)
+    {
+       if (active)
+           throw new IllegalStateException ("already parsing");
+       filter.setDTDHandler (handler);
+    }
+
+    /**
+     * <b>SAX2</b>: Returns the object used when resolving external
+     * entities during parsing (both general and parameter entities).
+     */
+    public EntityResolver getEntityResolver ()
+       { return aelfred2.getEntityResolver (); }
+
+    /** <b>SAX1</b> Assigns parser's entity resolver */
+    public void setEntityResolver (EntityResolver handler)
+       { aelfred2.setEntityResolver (handler); }
+
+    /**
+     * <b>SAX2</b>: Returns the object used to receive callbacks for XML
+     * errors of all levels (fatal, nonfatal, warning); this is never null;
+     */
+    public ErrorHandler getErrorHandler ()
+       { return aelfred2.getErrorHandler (); }
+
+    /**
+     * <b>SAX1</b> Assigns error handler
+     * @exception IllegalStateException if called mid-parse
+     */
+    public void setErrorHandler (ErrorHandler handler)
+    {
+       if (active)
+           throw new IllegalStateException ("already parsing");
+       aelfred2.setErrorHandler (handler);
+    }
+
+    /**
+     * <b>SAX2</b>:  Assigns the specified property.
+     * @exception IllegalStateException if called mid-parse
+     */
+    public void setProperty (String propertyId, Object value)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+    {
+       if (active)
+           throw new IllegalStateException ("already parsing");
+       if (getProperty (propertyId) != value)
+           filter.setProperty (propertyId, value);
+    }
+
+    /**
+     * <b>SAX2</b>:  Returns the specified property.
+     */
+    public Object getProperty (String propertyId)
+    throws SAXNotRecognizedException
+    {
+       if ((SAXDriver.PROPERTY + "declaration-handler")
+                       .equals (propertyId)
+               || (SAXDriver.PROPERTY + "lexical-handler")
+                       .equals (propertyId))
+           return filter.getProperty (propertyId);
+       throw new SAXNotRecognizedException (propertyId);
+    }
+
+    private void forceValidating ()
+    throws SAXNotRecognizedException, SAXNotSupportedException
+    {
+       aelfred2.setFeature (
+           SAXDriver.FEATURE + "namespace-prefixes",
+           true);
+       aelfred2.setFeature (
+           SAXDriver.FEATURE + "external-general-entities",
+           true);
+       aelfred2.setFeature (
+           SAXDriver.FEATURE + "external-parameter-entities",
+           true);
+    }
+
+    /**
+     * <b>SAX2</b>:  Sets the state of features supported in this parser.
+     * Note that this parser requires reporting of namespace prefixes when
+     * validating.
+     */
+    public void setFeature (String featureId, boolean state)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+    {
+       boolean value = getFeature (featureId);
+
+       if (state == value)
+           return;
+
+       if ((SAXDriver.FEATURE + "validation").equals (featureId)) {
+           if (active)
+               throw new SAXNotSupportedException ("already parsing");
+           if (state)
+               forceValidating ();
+           isValidating = state;
+       } else
+           aelfred2.setFeature (featureId, state);
+    }
+
+    /**
+     * <b>SAX2</b>: Tells whether this parser supports the specified feature.
+     * At this time, this directly parallels the underlying SAXDriver,
+     * except that validation is optionally supported.
+     *
+     * @see SAXDriver
+     */
+    public boolean getFeature (String featureId)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+    {
+       if ((SAXDriver.FEATURE + "validation").equals (featureId))
+           return isValidating;
+
+       return aelfred2.getFeature (featureId);
+    }
+
+    /**
+     * <b>SAX1</b>: Sets the locale used for diagnostics; currently,
+     * only locales using the English language are supported.
+     * @param locale The locale for which diagnostics will be generated
+     */
+    public void setLocale (Locale locale)
+    throws SAXException
+       { aelfred2.setLocale (locale); }
+
+    /**
+     * <b>SAX1</b>: Preferred API to parse an XML document, using a
+     * system identifier (URI).
+     */
+    public void parse (String systemId)
+    throws SAXException, IOException
+    {
+       parse (new InputSource (systemId));
+    }
+
+    /**
+     * <b>SAX1</b>: Underlying API to parse an XML document, used
+     * directly when no URI is available.  When this is invoked,
+     * and the parser is set to validate, some features will be
+     * automatically reset to appropriate values:  for reporting
+     * namespace prefixes, and incorporating external entities.
+     *
+     * @param source The XML input source.
+     *
+     * @exception IllegalStateException if called mid-parse
+     * @exception SAXException The handlers may throw any SAXException,
+     * and the parser normally throws SAXParseException objects.
+     * @exception IOException IOExceptions are normally through through
+     * the parser if there are problems reading the source document.
+     */
+    public void parse (InputSource source)
+    throws SAXException, IOException
+    {
+       EventFilter     next;
+       boolean         nsdecls;
+
+       synchronized (aelfred2) {
+           if (active)
+               throw new IllegalStateException ("already parsing");
+           active = true;
+       }
+
+       // set up the output pipeline
+       if (isValidating) {
+           forceValidating ();
+           next = new ValidationConsumer (filter);
+       } else
+           next = filter;
+
+       // connect pipeline and error handler
+       // don't let _this_ call to bind() affect xmlns* attributes
+       nsdecls = aelfred2.getFeature (
+           SAXDriver.FEATURE + "namespace-prefixes");
+       EventFilter.bind (aelfred2, next);
+       if (!nsdecls)
+           aelfred2.setFeature (
+               SAXDriver.FEATURE + "namespace-prefixes",
+               false);
+
+       // parse, clean up
+       try {
+           aelfred2.parse (source);
+       } finally {
+           active = false;
+       }
+    }
+}
diff --git a/libjava/gnu/xml/aelfred2/package.html b/libjava/gnu/xml/aelfred2/package.html
new file mode 100644 (file)
index 0000000..e204258
--- /dev/null
+++ b/libjava/gnu/xml/aelfred2/package.html
@@ -0,0 +1,506 @@
+<!DOCTYPE html PUBLIC
+       '-//W3C//DTD XHTML 1.0 Transitional//EN'
+       'http://www.w3.org/TR/xhtml1/DTD/transitional.dtd'>
+
+<html><head>
+    <title>package overview</title>
+<!--
+/*
+ * Copyright (C) 1999,2000,2001 The Free Software Foundation, Inc.
+ */
+-->
+</head><body>
+
+<p> This package contains &AElig;lfred2, which includes an
+enhanced SAX2-compatible version of the &AElig;lfred
+non-validating XML parser, a modular (and hence optional) 
+DTD validating parser, and modular (and hence optional)
+JAXP glue to those.
+Use these like any other SAX2 parsers. </p>
+
+<ul>
+    <li><a href="#about">About &AElig;lfred</a><ul>
+       <li><a href="#principles">Design Principles</a></li>
+       <li><a href="#name">About the Name &AElig;lfred</a></li>
+       <li><a href="#encodings">Character Encodings</a></li>
+       <li><a href="#violations">Known Conformance Violations</a></li>
+       <li><a href="#copyright">Licensing</a></li>
+       </ul></li>
+
+    <li><a href="#changes">Changes Since the Last Microstar Release</a><ul>
+       <li><a href="#sax2">SAX2 Support</a></li>
+       <li><a href="#validation">Validation</a></li>
+       <li><a href="#smaller">You Want Smaller?</a></li>
+       <li><a href="#bugfixes">Bugs Fixed</a></li>
+       </ul></li>
+
+</ul>
+
+<h2><a name="about">About &AElig;lfred</a></h2>
+
+<p>&AElig;lfred is a XML parser written in the java programming language.
+
+<h3><a name="principles">Design Principles</a></h3>
+
+<p>In most Java applets and applications, XML should not be the central
+feature; instead, XML is the means to another end, such as loading
+configuration information, reading meta-data, or parsing transactions.</p>
+
+<p> When an XML parser is only a single component of a much larger
+program, it cannot be large, slow, or resource-intensive.  With Java
+applets, in particular, code size is a significant issue.  The standard
+modem is still not operating at 56 Kbaud, or sometimes even with data
+compression.  Assuming an uncompressed 28.8 Kbaud modem, only about
+3 KBytes can be downloaded in one second; compression often doubles
+that speed, but a V.90 modem may not provide another doubling.  When
+used with embedded processors, similar size concerns apply.  </p>
+
+<p> &AElig;lfred is designed for easy and efficient use over the Internet,
+based on the following principles: </p> <ol>
+
+<li> &AElig;lfred must be as small as possible, so that it doesn't add too
+   much to an applet's download time. </li>
+
+<li> &AElig;lfred must use as few class files as possible, to minimize the
+   number of HTTP connections necessary.  (The use of JAR files has made this
+   be less of a concern.) </li>
+
+<li> &AElig;lfred must be compatible with most or all Java implementations
+   and platforms. (Write once, run anywhere.) </li>
+
+<li> &AElig;lfred must use as little memory as possible, so that it does
+   not take away resources from the rest of your program.  (It doesn't force
+   you to use DOM or a similar costly data structure API.)</li>
+
+<li> &AElig;lfred must run as fast as possible, so that it does not slow down
+   the rest of your program. </li>
+
+<li> &AElig;lfred must produce correct output for well-formed and valid
+   documents, but need not reject every document that is not valid or
+   not well-formed. (In &AElig;lfred2, correctness was a bigger concern
+   than in the original version; and a validation option is available.) </li>
+
+<li> &AElig;lfred must provide full internationalization from the first
+    release.  (&AElig;lfred2 now automatically handles all encodings
+    supported by the underlying JVM; previous versions handled only
+    UTF-8, UTF_16, ASCII, and ISO-8859-1.)</li>
+
+</ol>
+
+<p>As you can see from this list, &AElig;lfred is designed for production
+use, but neither validation nor perfect conformance was a requirement.
+Good validating parsers exist, including one in this package,
+and you should use them as appropriate.  (See conformance reviews
+available at <a href="http://www.xml.com/">http://www.xml.com</a>)
+</p>
+
+<p> One of the main goals of &AElig;lfred2 was to significantly improve
+conformance, while not significantly affecting the other goals stated above.
+Since the only use of this parser is with SAX, some classes could be
+removed, and so the overall size of &AElig;lfred was actually reduced.
+Subsequent performance work produced a notable speedup (over twenty
+percent on larger files).  That is, the tradeoffs between speed, size, and
+conformance were re-targeted towards conformance and support of newer APIs
+(SAX2), with a a positive performance impact. </p>
+
+<p> The role anticipated for this version of &AElig;lfred is as a
+lightweight Free Software SAX parser that can be used in essentially every
+Java program where the handful of conformance violations (noted below)
+are acceptable.
+That certainly includes applets, and
+nowadays one must also mention embedded systems as being even more
+size-critical.
+At this writing, all parsers that are more conformant are
+significantly larger, even when counting the optional
+validation support in this version of &AElig;lfred. </p>
+
+
+<h3><a name="name">About the Name <em>&AElig;lfred</em></a></h3>
+
+<p>&AElig;lfred the Great (AElfred in ASCII) was King of Wessex, and
+some say of King of England, at the time of his death in 899 AD.
+&AElig;lfred introduced a wide-spread literacy program in the hope that
+his people would learn to read English, at least, if Latin was too
+difficult for them.  This &AElig;lfred hopes to bring another sort of
+literacy to Java, using XML, at least, if full SGML is too difficult.</p>
+
+<p>The initial &AElig; ligature ("AE)" is also a reminder that XML is
+not limited to ASCII.</p>
+
+
+<h3><a name="encodings">Character Encodings</a></h3>
+
+<p> The &AElig;lfred parser currently builds in support for a handful
+of input encodings.  Of course these include UTF-8 and UTF-16, which
+all XML parsers are required to support:</p> <ul>
+
+    <li> UTF-8 ... the standard eight bit encoding, used unless
+    you provide an encoding declaration or a MIME charset tag.</li>
+
+    <li> US-ASCII ... an extremely common seven bit encoding,
+    which happens to be a subset of UTF-8 and ISO-8859-1 as well
+    as many other encodings.  XHTML web pages using US-ASCII
+    (without an encoding declaration) are probably more
+    widely interoperable than those in any other encoding. </li>
+
+    <li> ISO-8859-1 ... includes accented characters used in
+    much of western Europe (but excluding the Euro currency
+    symbol).</li>
+
+    <li> UTF-16 ... with several variants, this encodes each
+    sixteen bit Unicode character in sixteen bits of output.
+    Variants include UTF-16BE (big endian, no byte order mark),
+    UTF-16LE (little endian, no byte order mark), and
+    ISO-10646-UCS-2 (an older and less used encoding, using a
+    version of Unicode without surrogate pairs).  This is
+    essentially the native encoding used by Java.  </li>
+
+    <li> ISO-10646-UCS-4 ... a seldom-used four byte encoding,
+    also known as UTF-32BE.  Four byte order variants are supported,
+    including one known as UTF-32LE.  Some operating systems
+    standardized on UCS-4 despite its significant size penalty,
+    in anticipation that Unicode (even with surrogate pairs)
+    would eventually become limiting.  UCS-4 permits encoding
+    of non-Unicode characters, which Java can't represent (and
+    XML doesn't allow).  
+    </li>
+
+    </ul>
+
+<p> If you use any encoding other than UTF-8 or UTF-16 you should
+make sure to label your data appropriately: </p>
+
+<blockquote>
+&lt;?xml version="1.0" encoding="<b>ISO-8859-15</b>"?&gt;
+</blockquote>
+
+<p> Encodings accessed through <code>java.io.InputStreamReader</code>
+are now fully supported for both external labels (such as MIME types)
+and internal types (as shown above).
+There is one limitation in the support for internal labels:
+the encodings must be derived from the US-ASCII encoding,
+the EBCDIC family of encodings is not recognized.
+Note that Java defines its
+own encoding names, which don't always correspond to the standard
+Internet encoding names defined by the IETF/IANA, and that Java
+may even <em>require</em> use of nonstandard encoding names.
+Please report
+such problems; some of them can be worked around in this parser,
+and many can be worked around by using external labels.
+</p>
+
+<p>Note that if you are using the Euro symbol with an fixed length
+eight bit encoding, you should probably be using the encoding label
+<em>iso-8859-15</em> or, with a Microsoft OS, <em>cp-1252</em>.
+Of course, UTF-8 and UTF-16 handle the Euro symbol directly.
+</p>
+
+
+<h3><a name="violations">Known Conformance Violations</a></h3>
+
+<p>Known conformance issues should be of negligible importance for 
+most applications, and include: </p><ul>
+    
+    <li> Rather than following the voluminous "Appendix B" rules about
+    what characters may appear in names (and name tokens), the Unicode
+    rules embedded in <em>java.lang.Character</em> are used.
+    This means mostly that some names are inappropriately accepted,
+    though a few are inappropriately rejected.  (It's much simpler
+    to avoid that much special case code.  Recent OASIS/NIST test
+    cases may have these rules be realistically testable.) </li>
+
+    <li> Text containing "]]&gt;" is not rejected unless it fully resides
+    in an internal buffer ... which is, thankfully, the typical case.  This
+    text is illegal, but sometimes appears in illegal attempts to
+    nest CDATA sections.  (Not catching that boundary condition
+    substantially simplifies parsing text.) </li>
+
+    <li> Surrogate characters that aren't correctly paired are ignored
+    rather than rejected, unless they were encoded using UTF-8.  (This
+    simplifies parsing text.)  Unicode 3.1 assigned the first characters
+    to those character codes, in early 2001, so few documents (or tools)
+    use such characters in any case. </li>
+
+    <li> Declarations following references to an undefined parameter
+    entity reference are not ignored. (Not maintaining and using state
+    about this validity error simplifies declaration handling; few
+    XML parsers address this constraint in any case.) </li>
+
+    <li> Well formedness constraints for general entity references
+    are not enforced.  (The code to handle the "content" production
+    is merged with the element parsing code, making it hard to reuse
+    for this additional situation.) </li>
+
+</ul>
+
+<p> When tested against the July 12, 1999 version of the OASIS
+XML Conformance test suite, an earlier version passed 1057 of 1067 tests.
+That contrasts with the original version, which passed 867.  The
+current parser is top-ranked in terms of conformance, as is its
+validating sibling (which has some additional conformance violations
+imposed on it by SAX2 API deficiencies as well as some of the more
+curious SGML layering artifacts found in the XML specification). </p>
+
+<p> The XML 1.0 specification itself was not without problems,
+and after some delays the W3C has come out with a revised
+"second edition" specification.  While that doesn't resolve all
+the problems identified the XML specification, many of the most
+egregious problems have been resolved.  (You still need to drink
+magic Kool-Aid before some DTD-related issues make sense.)
+To the extent possible, this parser conforms to that second
+edition specification, and does well against corrected versions
+of the OASIS/NIST XML conformance test cases.  See <a href=
+"http://xmlconf.sourceforge.net">http://xmlconf.sourceforge.net</a>
+for more information about SAX2/XML conformance testing. </p>
+
+
+<h3><a name="copyright">Copyright and distribution terms</a></h3>
+
+<p>
+The software in this package is distributed under the GNU General Public
+License (with a special exception described below).
+</p>
+
+<p>
+A copy of GNU General Public License (GPL) is included in this distribution,
+in the file COPYING.  If you do not have the source code, it is available at:
+
+    <a href="http://www.gnu.org/software/classpath/">http://www.gnu.org/software/classpath/</a>
+</p>
+
+<pre>
+  Linking this library statically or dynamically with other modules is
+  making a combined work based on this library.  Thus, the terms and
+  conditions of the GNU General Public License cover the whole
+  combination.
+
+  As a special exception, the copyright holders of this library give you
+  permission to link this library with independent modules to produce an
+  executable, regardless of the license terms of these independent
+  modules, and to copy and distribute the resulting executable under
+  terms of your choice, provided that you also meet, for each linked
+  independent module, the terms and conditions of the license of that
+  module.  An independent module is a module which is not derived from
+  or based on this library.  If you modify this library, you may extend
+  this exception to your version of the library, but you are not
+  obligated to do so.  If you do not wish to do so, delete this
+  exception statement from your version.
+
+  Parts derived from code which carried the following notice:
+
+  Copyright (c) 1997, 1998 by Microstar Software Ltd.
+
+  AElfred is free for both commercial and non-commercial use and
+  redistribution, provided that Microstar's copyright and disclaimer are
+  retained intact.  You are free to modify AElfred for your own use and
+  to redistribute AElfred with your modifications, provided that the
+  modifications are clearly documented.
+
+  This program 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.  Please use it AT
+  YOUR OWN RISK.
+</pre>
+
+<p> Some of this documentation was modified from the original
+&AElig;lfred README.txt file.  All of it has been updated. </p>
+
+</p>
+
+
+<h2><a name="changes">Changes Since the last Microstar Release</a></h2>
+
+<p> As noted above, Microstar has not updated this parser since
+the summer of 1998, when it released version 1.2a on its web site.
+This release is intended to benefit the developer community by
+refocusing the API on SAX2, and improving conformance to the extent
+that most developers should not need to use another XML parser.  </p>
+
+<p> The code has been cleaned up (referring to the XML 1.0 spec in
+all the production numbers in 
+comments, rather than some preliminary draft, for one example) and
+has been sped up a bit as well.
+JAXP support has been added, although developers are still
+strongly encouraged to use the SAX2 APIs directly.  </p>
+
+
+<h3><a name="sax2">SAX2 Support</a></h3>
+
+<p> The original version of &AElig;lfred did not support the
+SAX2 APIs. </p>
+
+<p> This version supports the SAX2 APIs, exposing the standard
+boolean feature descriptors.  It supports the "DeclHandler" property
+to provide access to all DTD declarations not already exposed
+through the SAX1 API.  The "LexicalHandler" property is supported,
+exposing entity boundaries (including the unnamed external subset) and
+things like comments and CDATA boundaries.  SAX1 compatibility is
+currently provided.</p>
+
+
+<h3><a name="validation">Validation</a></h3>
+
+<p> In the 'pipeline' package in this same software distribution is an
+<a href="../pipeline/ValidationConsumer.html">XML Validation component</a>
+using any full SAX2 event stream (including all document type declarations)
+to validate.  There is now a <a href="XmlReader.html">XmlReader</a> class
+which combines that class and this enhanced &AElig;lfred parser, creating
+an optionally validating SAX2 parser. </p>
+
+<p> As noted in the documentation for that validating component, certain
+validity constraints can't reliably be tested by a layered validator.
+These include all constraints relying on
+layering violations (exposing XML at the level of tokens or below,
+required since XML isn't a context-free grammar), some that
+SAX2 doesn't support, and a few others.  The resulting validating
+parser is conformant enough for most applications that aren't doing
+strange SGML tricks with DTDs.
+Moreover, that validating filter can be used without
+a parser ... any application component that emits SAX event streams
+can DTD-validate its output on demand. </p>
+
+<h3><a name="smaller">You want Smaller?</a></h3>
+
+<p> You'll have noticed that the original version of &AElig;lfred
+had small size as a top goal.  &AElig;lfred2 normally includes a
+DTD validation layer, but you can package without that.
+Similarly, JAXP factory support is available but optional.
+Then the main added cost due to this revision are for
+supporting the SAX2 API itself; DTD validation is as
+cleanly layered as allowed by SAX2.</p>
+
+<h3><a name="bugfixes">Bugs Fixed</a></h3>
+
+<p> Bugs fixed in &AElig;lfred2 include: </p>
+
+<ol>
+    <li> Originally &AElig;lfred didn't close file descriptors, which
+    led to file descriptor leakage on programs which ran for any
+    length of time. </li>
+
+    <li> NOTATION declarations without system identifiers are
+    now handled correctly. </li>
+
+    <li> DTD events are now reported for all invocations of a
+    given parser, not just the first one. </li>
+
+    <li> More correct character handling: <ul>
+
+       <li> Rejects out-of-range characters, both in text and in
+       character references. </li>
+
+       <li> Correctly handles character references that expand to
+       surrogate pairs. </li>
+
+       <li> Correctly handles UTF-8 encodings of surrogate pairs. </li>
+
+       <li> Correctly handles Unicode 3.1 rules about illegal UTF-8
+       encodings: there is only one legal encoding per character. </li>
+
+       <li> PUBLIC identifiers are now rejected if they have illegal
+       characters. </li>
+
+       <li> The parser is more correct about what characters are allowed
+       in names and name tokens.  Uses Unicode rules (built in to Java)
+       rather than the voluminous XML rules, although some extensions
+       have been made to match XML rules more closely.</li>
+
+       <li> Line ends are now normalized to newlines in all known
+       cases. </li>
+
+       </ul></li>
+
+    <li> Certain validity errors were previously treated as well
+    formedness violations. <ul>
+
+       <li> Repeated declarations of an element type are no
+       longer fatal errors. </li>
+
+       <li> Undeclared parameter entity references are no longer
+       fatal errors. </li>
+
+       </ul></li>
+
+    <li> Attribute handling is improved: <ul>
+
+       <li> Whitespace must exist between attributes. </li>
+
+       <li> Only one value for a given attribute is permitted. </li>
+
+       <li> ATTLIST declarations don't need to declare attributes. </li>
+
+       <li> Attribute values are normalized when required. </li>
+
+       <li> Tabs in attribute values are normalized to spaces. </li>
+
+       <li> Attribute values containing a literal "&lt;" are rejected. </li>
+
+       </ul></li>
+
+    <li> More correct entity handling: <ul>
+
+       <li> Whitespace must precede NDATA when declaring unparsed
+       entities.</li>
+
+       <li> Parameter entity declarations may not have NDATA annotations. </li>
+
+       <li> The XML specification has a bug in that it doesn't specify
+       that certain contexts exist within which parameter entity
+       expansion must not be performed.  Lacking an offical erratum,
+       this parser now disables such expansion inside comments,
+       processing instructions, ignored sections, public identifiers,
+       and parts of entity declarations. </li>
+
+       <li> Entity expansions that include quote characters no longer
+       confuse parsing of strings using such expansions. </li>
+
+       <li> Whitespace in the values of internal entities is not mapped
+       to space characters. </li>
+
+       <li> General Entity references in attribute defaults within the
+       DTD now cause fatal errors when the entity is not defined at the
+       time it is referenced. </li>
+
+       <li> Malformed general entity references in entity declarations are
+       now detected.  </li>
+
+       </ul></li>
+
+    <li> Neither conditional sections
+    nor parameter entity references within markup declarations
+    are permitted in the internal subset. </li>
+
+    <li> Processing instructions whose target names are "XML"
+    (ignoring case) are now rejected. </li>
+
+    <li> Comments may not include "--".</li>
+
+    <li> Most "]]&gt;" sequences in text are rejected. </li>
+
+    <li> Correct syntax for standalone declarations is enforced. </li>
+
+    <li> Setting a locale for diagnostics only produces an exception
+    if the language of that locale isn't English. </li>
+
+    <li> Some more encoding names are recognized.  These include the
+    Unicode 3.0 variants of UTF-16 (UTF-16BE, UTF-16LE) as well as
+    US-ASCII and a few commonly seen synonyms. </li>
+
+    <li> Text (from character content, PIs, or comments) large enough
+    not to fit into internal buffers is now handled correctly even in
+    some cases which were originally handled incorrectly.</li>
+
+    <li> Content is now reported for element types for which attributes
+    have been declared, but no content model is known.  (Such documents
+    are invalid, but may still be well formed.) </li>
+
+</ol>
+
+<p> Other bugs may also have been fixed. </p>
+
+<p> For better overall validation support, some of the validity
+constraints that can't be verified using the SAX2 event stream
+are now reported directly by &AElig;lfred2. </p>
+
+</body></html>
+
diff --git a/libjava/gnu/xml/dom/Consumer.java b/libjava/gnu/xml/dom/Consumer.java
new file mode 100644 (file)
index 0000000..1aad5be
--- /dev/null
+++ b/libjava/gnu/xml/dom/Consumer.java
@@ -0,0 +1,373 @@
+/* Consumer.java -- 
+   Copyright (C) 2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.xml.dom;
+
+import java.io.IOException;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.Attributes2;
+
+import gnu.xml.pipeline.DomConsumer;
+import gnu.xml.pipeline.EventConsumer;
+
+
+/**
+ * Event consumer which constructs DOM documents using the implementation
+ * in this package, using SAX2 events.  This packages various backdoors
+ * into this DOM implementation, as needed to address DOM requirements
+ * that can't be met by strictly conforming implementations of DOM.
+ *
+ * <p> These requirements all relate to {@link DocumentType} nodes and
+ * features of that node type.  These features are normally not used,
+ * because that interface only exposes a subset of the information found
+ * in DTDs.  More, that subset does not include the most important typing
+ * information.  For example, it excludes element content models and
+ * attribute typing.  It does expose some entity management issues,
+ * although entity management doesn't relate to document typing.
+ *
+ * <p> Note that SAX2 does not expose the literal text of the DTD's
+ * internal subset, so it will not be present in DOM trees constructed
+ * using this API.  (Though with a good SAX2 implementation, it could
+ * be partially recreated...)
+ *
+ * @author David Brownell
+ */
+public class Consumer extends DomConsumer
+{
+    /**
+     * Constructs an unconfigured event consumer,
+     * as a terminus in a SAX event pipeline.
+     */
+    // used by PipelineFactory [terminus]
+    public Consumer ()
+    throws SAXException
+    {
+       super (DomDocument.class);
+       setHandler (new Backdoor (this));
+    }
+
+    /**
+     * Constructs an unconfigured event consumer,
+     * as a stage in a SAX event pipeline.
+     */
+    // used by PipelineFactory [filter]
+    public Consumer (EventConsumer next)
+    throws SAXException
+    {
+       super (DomDocument.class, next);
+       setHandler (new Backdoor (this));
+    }
+
+    /**
+     * Implements the backdoors needed by DOM.
+     * All methods in this class use implementation-specific APIs that are
+     * implied by the DOM specification (needed to implement testable
+     * behavior) but which are excluded from the DOM specification.
+     */
+    public static class Backdoor extends DomConsumer.Handler
+    {
+       /**
+        * Constructor.
+        * @param consumer must have been initialized to use the
+        *      {@link DomDocument} class (or a subclass) for
+        *      constructing DOM trees
+        */
+       protected Backdoor (DomConsumer consumer)
+       throws SAXException
+           { super (consumer); }
+
+       // helper routine
+       private DomDoctype getDoctype ()
+       throws SAXException
+       {
+           DomDocument         doc = (DomDocument) getDocument ();
+           DocumentType        dt = doc.getDoctype ();
+
+           if (dt == null)
+               throw new SAXException ("doctype missing!");
+           return (DomDoctype) dt;
+       }
+
+       // SAX2 "lexical" event
+       public void startDTD (String name, String publicId, String systemId)
+       throws SAXException
+       {
+           DomDocument         doc = (DomDocument) getDocument ();
+
+           super.startDTD (name, publicId, systemId);
+           // DOM L2 doctype creation model is bizarre
+           DomDoctype dt = new DomDoctype (doc, name, publicId, systemId);
+           doc.appendChild (dt);
+       }
+
+       // SAX2 "lexical" event
+       public void endDTD ()
+       throws SAXException
+       {
+           super.endDTD ();
+           // DOM L2 has no way to make things readonly
+           getDoctype ().makeReadonly ();
+       }
+
+       // SAX1 DTD event
+       public void notationDecl (
+           String name,
+           String publicId, String systemId
+       ) throws SAXException
+       {
+           // DOM L2 can't create/save notation nodes
+           getDoctype ().declareNotation (name, publicId, systemId);
+       }
+
+       // SAX1 DTD event
+       public void unparsedEntityDecl (
+           String name,
+           String publicId, String systemId,
+           String notationName
+       ) throws SAXException
+       {
+           // DOM L2 can't create/save entity nodes
+           getDoctype ().declareEntity (name, publicId, systemId,
+               notationName);
+       }
+
+       // SAX2 declaration event
+       public void internalEntityDecl (String name, String value)
+       throws SAXException
+       {
+           // DOM L2 can't create/save entity nodes
+           // NOTE:  this doesn't save the value as a child of this
+           // node, though it could realistically do so.
+           getDoctype ().declareEntity (name, null, null, null);
+       }
+
+       // SAX2 declaration event
+       public void externalEntityDecl (
+           String name,
+           String publicId,
+           String systemId
+       ) throws SAXException
+       {
+           // DOM L2 can't create/save entity nodes
+           // NOTE:  DOM allows for these to have children, if
+           // they don't have unbound namespace references.
+           getDoctype ().declareEntity (name, publicId, systemId, null);
+       }
+
+       // SAX2 element
+       public void startElement (
+           String uri,
+           String localName,
+           String qName,
+           Attributes atts
+       ) throws SAXException
+       {
+           Node                top;
+
+           super.startElement (uri, localName, qName, atts);
+
+           // might there be more work?
+           top = getTop ();
+           if (!top.hasAttributes () || !(atts instanceof Attributes2))
+               return;
+
+           // remember any attributes that got defaulted
+           DomNamedNodeMap     map = (DomNamedNodeMap) top.getAttributes ();
+           Attributes2         attrs = (Attributes2) atts;
+           int                 length = atts.getLength ();
+
+           //map.compact ();
+           for (int i = 0; i < length; i++) {
+               if (attrs.isSpecified (i))
+                   continue;
+
+               // value was defaulted.
+               String          temp = attrs.getQName (i);
+               DomAttr         attr;
+
+               if ("".equals (temp))
+                   attr = (DomAttr) map.getNamedItemNS (attrs.getURI (i),
+                           atts.getLocalName (i));
+               else
+                   attr = (DomAttr) map.getNamedItem (temp);
+
+               // DOM L2 can't write this flag, only read it
+               attr.setSpecified (false);
+           }
+       }
+
+       public void endElement (
+           String uri,
+           String localName,
+           String qName
+       ) throws SAXException
+       {
+           DomNode     top = (DomNode) getTop ();
+           top.compact ();
+           super.endElement (uri, localName, qName);
+       }
+
+       protected Text createText (
+           boolean     isCDATA,
+           char        buf [],
+           int         off,
+           int         len
+       ) {
+           DomDocument doc = (DomDocument) getDocument ();
+
+           if (isCDATA)
+               return doc.createCDATASection (buf, off, len);
+           else
+               return doc.createTextNode (buf, off, len);
+       }
+
+        public void elementDecl(String name, String model)
+          throws SAXException
+        {
+          getDoctype().elementDecl(name, model);
+        }
+
+       public void attributeDecl (
+           String      ename,
+           String      aname,
+           String      type,
+           String      mode,
+           String      value
+       ) throws SAXException
+       {
+          getDoctype().attributeDecl(ename, aname, type, mode, value);
+            /*
+           if (value == null && !"ID".equals (type))
+               return;
+           
+           DomDoctype.ElementInfo      info;
+
+           info = getDoctype ().getElementInfo (ename);
+           if (value != null)
+               info.setAttrDefault (aname, value);
+           if ("ID".equals (type))
+               info.setIdAttr (aname);
+                */
+            
+       }
+
+       // force duplicate name checking off while we're
+       // using parser output (don't duplicate the work)
+       public void startDocument () throws SAXException
+       {
+           super.startDocument ();
+           
+            DomDocument doc = (DomDocument) getDocument ();
+            doc.setStrictErrorChecking(false);
+            doc.setBuilding(true);
+       }
+
+        /**
+         * Required by DOM Level 3 to report document parameters
+         */
+        public void xmlDecl(String version,
+                            String encoding,
+                            boolean standalone,
+                            String inputEncoding)
+          throws SAXException
+        {
+          super.xmlDecl(version, encoding, standalone, inputEncoding);
+
+          DomDocument doc = (DomDocument) getDocument();
+          doc.setXmlEncoding(encoding);
+          doc.setInputEncoding(inputEncoding);
+        }
+
+       public void endDocument ()
+       throws SAXException
+       {
+           DomDocument doc = (DomDocument) getDocument ();
+           doc.setStrictErrorChecking(true);
+            doc.setBuilding(false);
+           doc.compact ();
+            DomDoctype doctype = (DomDoctype) doc.getDoctype();
+            if (doctype != null)
+              {
+                doctype.makeReadonly();
+              }
+           super.endDocument ();
+       }
+
+       // these three methods collaborate to populate entity
+       // refs, marking contents readonly on end-of-entity
+
+       public boolean canPopulateEntityRefs ()
+           { return true; }
+
+       public void startEntity (String name)
+       throws SAXException
+       {
+           if (name.charAt (0) == '%' || "[dtd]".equals (name))
+               return;
+           super.startEntity (name);
+
+           DomNode     top = (DomNode) getTop ();
+
+           if (top.getNodeType () == Node.ENTITY_REFERENCE_NODE)
+               top.readonly = false;
+       }
+
+       public void endEntity (String name)
+       throws SAXException
+       {
+           if (name.charAt (0) == '%' || "[dtd]".equals (name))
+               return;
+           DomNode     top = (DomNode) getTop ();
+
+           if (top.getNodeType () == Node.ENTITY_REFERENCE_NODE) {
+               top.compact ();
+               top.makeReadonly ();
+           }
+           super.endEntity (name);
+       }
+    }
+}
diff --git a/libjava/gnu/xml/dom/DTDAttributeTypeInfo.java b/libjava/gnu/xml/dom/DTDAttributeTypeInfo.java
new file mode 100644 (file)
index 0000000..53e5fbd
--- /dev/null
+++ b/libjava/gnu/xml/dom/DTDAttributeTypeInfo.java
@@ -0,0 +1,84 @@
+/* DTDAttributeTypeInfo.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import org.w3c.dom.TypeInfo;
+
+/**
+ * Attribute type information supplied by a DTD attribute declaration.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class DTDAttributeTypeInfo
+  implements TypeInfo
+{
+
+  final String elementName;
+  final String name;
+  final String type;
+  final String mode;
+  final String value;
+
+  DTDAttributeTypeInfo(String elementName, String name, String type,
+                       String mode, String value)
+  {
+    this.elementName = elementName;
+    this.name = name;
+    this.type = type;
+    this.mode = mode;
+    this.value = value;
+  }
+
+  public final String getTypeName()
+  {
+    return type;
+  }
+
+  public final String getTypeNamespace()
+  {
+    return "http://www.w3.org/TR/REC-xml";
+  }
+
+  public final boolean isDerivedFrom(String typeNamespace, String typeName,
+                                     int derivationMethod)
+  {
+    return false;
+  }
+
+}
+
diff --git a/libjava/gnu/xml/dom/DTDElementTypeInfo.java b/libjava/gnu/xml/dom/DTDElementTypeInfo.java
new file mode 100644 (file)
index 0000000..535ea3c
--- /dev/null
+++ b/libjava/gnu/xml/dom/DTDElementTypeInfo.java
@@ -0,0 +1,112 @@
+/* DTDElementTypeInfo.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import org.w3c.dom.TypeInfo;
+
+/**
+ * Element type information provided by a DTD element declaration.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class DTDElementTypeInfo
+  implements TypeInfo
+{
+
+  final String name;
+  String model;
+  HashMap attributes;
+  String idAttrName;
+
+  DTDElementTypeInfo(String name, String model)
+  {
+    this.name = name;
+    this.model = model;
+  }
+
+  public final String getTypeName()
+  {
+    return null;
+  }
+
+  public final String getTypeNamespace()
+  {
+    return "http://www.w3.org/TR/REC-xml";
+  }
+
+  public final boolean isDerivedFrom(String typeNamespace, String typeName,
+                                     int derivationMethod)
+  {
+    return false;
+  }
+
+  DTDAttributeTypeInfo getAttributeTypeInfo(String name)
+  {
+    if (attributes == null)
+      {
+        return null;
+      }
+    return (DTDAttributeTypeInfo) attributes.get(name);
+  }
+
+  void setAttributeTypeInfo(String name, DTDAttributeTypeInfo info)
+  {
+    if (attributes == null)
+      {
+        attributes = new HashMap();
+      }
+    attributes.put(name, info);
+    if ("ID".equals(info.type))
+      {
+        idAttrName = name;
+      }
+  }
+
+  Iterator attributes()
+  {
+    if (attributes == null)
+      {
+        return null;
+      }
+    return attributes.values().iterator();
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/DomAttr.java b/libjava/gnu/xml/dom/DomAttr.java
new file mode 100644 (file)
index 0000000..2890430
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomAttr.java
@@ -0,0 +1,379 @@
+/* DomAttr.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.TypeInfo;
+import org.w3c.dom.events.MutationEvent;
+
+
+/**
+ * <p> "Attr" implementation.  In DOM, attributes cost quite a lot of
+ * memory because their values are complex structures rather than just
+ * simple strings.  To reduce your costs, avoid having more than one
+ * child of an attribute; stick to a single Text node child, and ignore
+ * even that by using the attribute's "nodeValue" property.</p>
+ *
+ * <p> As a bit of general advice, only look at attribute modification
+ * events through the DOMAttrModified event (sent to the associated
+ * element).  Implementations are not guaranteed to report other events
+ * in the same order, so you're very likely to write nonportable code if
+ * you monitor events at the "children of Attr" level.</p>
+ *
+ * <p> At this writing, not all attribute modifications will cause the
+ * DOMAttrModified event to be triggered ... only the ones using the string
+ * methods (setNodeValue, setValue, and Element.setAttribute) to modify
+ * those values.  That is, if you manipulate those children directly,
+ * elements won't get notified that attribute values have changed.
+ * The natural fix for that will report other modifications, but won't 
+ * be able to expose "previous" attribute value; it'll need to be cached
+ * or something (at which point why bother using child nodes). </p>
+ *
+ * <p><em>You are strongly advised not to use "children" of any attribute
+ * nodes you work with.</em> </p>
+ *
+ * @author David Brownell
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomAttr
+  extends DomNsNode
+  implements Attr
+{
+  
+  private boolean specified;
+  private String value; // string value cache
+  
+  /**
+   * Constructs an Attr node associated with the specified document.
+   * The "specified" flag is initialized to true, since this DOM has
+   * no current "back door" mechanisms to manage default values so
+   * that every value must effectively be "specified".
+   *
+   * <p>This constructor should only be invoked by a Document as part of
+   * its createAttribute functionality, or through a subclass which is
+   * similarly used in a "Sub-DOM" style layer.
+   *
+   * @param owner The document with which this node is associated
+   * @param namespaceURI Combined with the local part of the name,
+   *   this is used to uniquely identify a type of attribute
+   * @param name Name of this attribute, which may include a prefix
+   */
+  protected DomAttr(DomDocument owner, String namespaceURI, String name)
+  {
+    super(ATTRIBUTE_NODE, owner, namespaceURI, name);
+    specified = true;
+    length = 1;
+    
+    // XXX register self to get insertion/removal events
+    // and character data change events and when they happen,
+    // report self-mutation
+  }
+  
+  /**
+   * <b>DOM L1</b>
+   * Returns the attribute name (same as getNodeName)
+   */
+  public final String getName()
+  {
+    return getNodeName();
+  }
+  
+  /**
+   * <b>DOM L1</b>
+   * Returns true if a parser reported this was in the source text.
+   */
+  public final boolean getSpecified()
+  {
+    return specified;
+  }
+  
+  /**
+   * Records whether this attribute was in the source text.
+   */
+  public final void setSpecified(boolean value)
+  {
+    specified = value;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the attribute value, with character and entity
+   * references substituted.
+   * <em>NOTE:  entity refs as children aren't currently handled.</em>
+   */
+  public String getNodeValue()
+  {
+    // If we have a simple node-value, use that
+    if (first == null)
+      {
+        return (value == null) ? "" : value;
+      }
+    // Otherwise collect child node-values
+    StringBuffer buf = new StringBuffer();
+    for (DomNode ctx = first; ctx != null; ctx = ctx.next)
+      {
+        switch (ctx.nodeType)
+          {
+          case Node.TEXT_NODE:
+            buf.append(ctx.getNodeValue());
+            break;
+          case Node.ENTITY_REFERENCE_NODE:
+            // TODO
+            break;
+          }
+      }
+    return buf.toString();
+  }
+  
+  /**
+   * <b>DOM L1</b>
+   * Assigns the value of the attribute; it will have one child,
+   * which is a text node with the specified value (same as
+   * setNodeValue).
+   */
+  public final void setValue(String value)
+  {
+    setNodeValue(value);
+  }
+  
+  /**
+   * <b>DOM L1</b>
+   * Returns the value of the attribute as a non-null string; same
+   * as getNodeValue.
+   * <em>NOTE:  entity refs as children aren't currently handled.</em>
+   */
+  public final String getValue()
+  {
+    return getNodeValue();
+  }
+  
+  /**
+   * <b>DOM L1</b>
+   * Assigns the attribute value; using this API, no entity or
+   * character references will exist.
+   * Causes a DOMAttrModified mutation event to be sent.
+   */
+  public void setNodeValue(String value)
+  {
+    if (readonly)
+      {
+        throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+      }
+    if (value == null)
+      {
+        value = "";
+      }
+    String oldValue = getNodeValue();
+    while (last != null)
+      {
+        removeChild(last);
+      }
+    // don't create a new node just for this...
+    /*
+     Node text = owner.createTextNode(value);
+     appendChild(text);
+     */
+    this.value = value;
+    length = 1;
+    specified = true;
+    
+    mutating(oldValue, value, MutationEvent.MODIFICATION);
+  }
+
+  public final Node getFirstChild()
+  {
+    // Create a child text node if necessary
+    if (first == null)
+      {
+        length = 0;
+        Node text = owner.createTextNode((value == null) ? "" : value);
+        appendChild(text);
+      }
+    return first;
+  }
+
+  public final Node getLastChild()
+  {
+    // Create a child text node if necessary
+    if (last == null)
+      {
+        length = 0;
+        Node text = owner.createTextNode((value == null) ? "" : value);
+        appendChild(text);
+      }
+    return last;
+  }
+
+  public Node item(int index)
+  {
+    // Create a child text node if necessary
+    if (first == null)
+      {
+        length = 0;
+        Node text = owner.createTextNode((value == null) ? "" : value);
+        appendChild(text);
+      }
+    return super.item(index);
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Returns the element with which this attribute is associated.
+   */
+  public final Element getOwnerElement()
+  {
+    return (Element) parent;
+  }
+
+  public final Node getNextSibling()
+  {
+    return null;
+  }
+
+  public final Node getPreviousSibling()
+  {
+    return null;
+  }
+
+  public Node getParentNode()
+  {
+    return null;
+  }
+
+  /**
+   * Records the element with which this attribute is associated.
+   */
+  public final void setOwnerElement(Element e)
+  {
+    if (parent != null)
+      {
+        throw new DomEx (DomEx.HIERARCHY_REQUEST_ERR);
+      }
+    if (!(e instanceof DomElement))
+      {
+        throw new DomEx(DomEx.WRONG_DOCUMENT_ERR);
+      }
+    parent = (DomElement) e;
+    depth = parent.depth + 1;
+  }
+
+  /**
+   * The base URI of an Attr is always <code>null</code>.
+   */
+  public final String getBaseURI()
+  {
+    return null;
+  }
+    
+  /**
+   * Shallow clone of the attribute, breaking all ties with any
+   * elements.
+   */
+  public Object clone()
+  {
+    DomAttr retval = (DomAttr) super.clone();
+    retval.specified = true;
+    return retval;
+  }
+    
+  private void mutating(String oldValue, String newValue, short why)
+  {
+    if (!reportMutations || parent == null)
+      {
+        return;
+      }
+    
+    // EVENT:  DOMAttrModified, target = parent,
+    // prev/new values provided, also attr name
+    MutationEvent      event;
+    
+    event = (MutationEvent) createEvent ("MutationEvents");
+    event.initMutationEvent ("DOMAttrModified",
+                             true /* bubbles */, false /* nocancel */,
+                             null, oldValue, newValue, getNodeName (), why);
+    parent.dispatchEvent (event);
+  }
+
+  // DOM Level 3 methods
+  
+  public TypeInfo getSchemaTypeInfo()
+  {
+    if (parent != null)
+      {
+        // DTD implementation
+        DomDoctype doctype = (DomDoctype) parent.owner.getDoctype();
+        if (doctype != null)
+          {
+            return doctype.getAttributeTypeInfo(parent.getNodeName(),
+                                                getNodeName());
+          }
+        // TODO XML Schema implementation
+      }
+    return null;
+  }
+
+  public boolean isId()
+  {
+    if (parent != null)
+      {
+        DomDoctype doctype = (DomDoctype) parent.owner.getDoctype();
+        if (doctype != null)
+          {
+            DTDAttributeTypeInfo info =
+              doctype.getAttributeTypeInfo(parent.getNodeName(),
+                                           getNodeName());
+            if (info != null && "ID".equals(info.type))
+              {
+                return true;
+              }
+          }
+        DomElement element = (DomElement) parent;
+        if (element.userIdAttrs != null &&
+            element.userIdAttrs.contains(this))
+          {
+            return true;
+          }
+        // TODO XML Schema implementation
+      }
+    return false;
+  }
+
+}
+
diff --git a/libjava/gnu/xml/dom/DomCDATA.java b/libjava/gnu/xml/dom/DomCDATA.java
new file mode 100644 (file)
index 0000000..f6f471c
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomCDATA.java
@@ -0,0 +1,91 @@
+/* DomCDATA.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import org.w3c.dom.CDATASection;
+
+/**
+ * <p> "CDATASection" implementation.
+ * This is a non-core DOM class, supporting the "XML" feature.
+ * CDATA sections are just ways to represent text using different
+ * delimeters. </p>
+ *
+ * <p> <em>You are strongly advised not to use CDATASection nodes.</em>
+ * The advantage of having slightly prettier ways to print text that may
+ * have lots of embedded XML delimiters, such as "&amp;" and "&lt;",
+ * can be dwarfed by the cost of dealing with multiple kinds of text
+ * nodes in all your algorithms. </p>
+ *
+ * @author David Brownell
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomCDATA
+  extends DomText
+  implements CDATASection
+{
+  
+  /**
+   * Constructs a CDATA section node associated with the specified
+   * document and holding the specified data.
+   *
+   * <p>This constructor should only be invoked by a Document as part of
+   * its createCDATASection functionality, or through a subclass which is
+   * similarly used in a "Sub-DOM" style layer.
+   *
+   */
+  protected DomCDATA(DomDocument owner, String value)
+  {
+    super(CDATA_SECTION_NODE, owner, value);
+  }
+
+  protected DomCDATA(DomDocument owner, char buf [], int off, int len)
+  {
+    super(CDATA_SECTION_NODE, owner, buf, off, len);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the string "#cdata-section".
+   */
+  final public String getNodeName()
+  {
+       return "#cdata-section";
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/DomCharacterData.java b/libjava/gnu/xml/dom/DomCharacterData.java
new file mode 100644 (file)
index 0000000..48ccb82
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomCharacterData.java
@@ -0,0 +1,311 @@
+/* DomCharacterData.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import org.w3c.dom.CharacterData;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.events.MutationEvent;
+
+
+/**
+ * <p> Abstract "CharacterData" implementation.  This
+ * facilitates reusing code in classes implementing subtypes of that DOM
+ * interface (Text, Comment, CDATASection).  </p>
+ *
+ * @author David Brownell
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public abstract class DomCharacterData
+  extends DomNode
+  implements CharacterData
+{
+
+  private String text;
+  
+  // package private
+  DomCharacterData(short nodeType, DomDocument doc, String value)
+  {
+    super(nodeType, doc);
+    text = (value == null) ? "" : value;
+  }
+
+  // package private
+  DomCharacterData(short nodeType, DomDocument doc,
+                   char[] buf, int offset, int length)
+  {
+    super(nodeType, doc);
+    text = (buf == null) ? "" : new String(buf, offset, length);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Appends the specified data to the value of this node.
+   * Causes a DOMCharacterDataModified mutation event to be reported.
+   */
+  public void appendData(String arg)
+  {
+    if (isReadonly())
+      {
+      throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+      }
+    String value = text + arg;
+    mutating(value);
+    text = value;
+  }
+  
+  /**
+   * <b>DOM L1</b>
+   * Modifies the value of this node.
+   * Causes a DOMCharacterDataModified mutation event to be reported.
+   */
+  public void deleteData(int offset, int count)
+  {
+    if (isReadonly())
+      {
+        throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+      }
+    char[] raw = text.toCharArray();
+    if (offset < 0 || count < 0 || offset > raw.length)
+      {
+        throw new DomEx(DomEx.INDEX_SIZE_ERR);
+      }
+    if ((offset + count) > raw.length)
+      {
+        count = raw.length - offset;
+      }
+    if (count == 0)
+      {
+        return;
+      }
+    try
+      {
+        char[] buf = new char[raw.length - count];
+        System.arraycopy(raw, 0, buf, 0, offset);
+        System.arraycopy(raw, offset + count, buf, offset,
+                         raw.length - (offset + count));
+        String value = new String(buf);
+        mutating(value);
+        text = value;
+      }
+    catch (IndexOutOfBoundsException x)
+      {
+        throw new DomEx(DomEx.INDEX_SIZE_ERR);
+      }
+  }
+    
+  /**
+   * <b>DOM L1</b>
+   * Returns the value of this node.
+   */
+  public String getNodeValue()
+  {
+    return text;
+  }
+    
+  /**
+   * <b>DOM L1</b>
+   * Returns the value of this node; same as getNodeValue.
+   */
+  public final String getData()
+  {
+    return text;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the length of the data.
+   */
+  public int getLength()
+  {
+    return text.length();
+  }
+  
+  /**
+   * <b>DOM L1</b>
+   * Modifies the value of this node.
+   */
+  public void insertData(int offset, String arg)
+  {
+    if (isReadonly())
+      {
+      throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+      }
+    char[] raw = text.toCharArray();
+    char[] tmp = arg.toCharArray ();
+    char[] buf = new char[raw.length + tmp.length];
+    
+    try
+      {
+        System.arraycopy(raw, 0, buf, 0, offset);
+        System.arraycopy(tmp, 0, buf, offset, tmp.length);
+        System.arraycopy(raw, offset, buf, offset + tmp.length,
+                         raw.length - offset);
+        String value = new String(buf);
+        mutating(value);
+        text = value;
+      }
+    catch (IndexOutOfBoundsException x)
+      {
+        throw new DomEx(DomEx.INDEX_SIZE_ERR);
+      }
+  }
+    
+  /**
+   * <b>DOM L1</b>
+   * Modifies the value of this node.  Causes DOMCharacterDataModified
+   * mutation events to be reported (at least one).
+   */
+  public void replaceData(int offset, int count, String arg)
+  {
+    if (readonly)
+      {
+        throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+      }
+    char[] raw = text.toCharArray();
+    
+    // deleteData
+    if (offset < 0 || count < 0 || offset > raw.length)
+      {
+        throw new DomEx(DomEx.INDEX_SIZE_ERR);
+      }
+    if ((offset + count) > raw.length)
+      {
+        count = raw.length - offset;
+      }
+    try
+      {
+        char[] buf = new char[raw.length - count];
+        System.arraycopy(raw, 0, buf, 0, offset);
+        System.arraycopy(raw, offset + count, buf, offset,
+                         raw.length - (offset + count));
+        
+        // insertData
+        char[] tmp = arg.toCharArray ();
+        char[] buf2 = new char[buf.length + tmp.length];
+        System.arraycopy(raw, 0, buf, 0, offset);
+        System.arraycopy(tmp, 0, buf, offset, tmp.length);
+        System.arraycopy(raw, offset, buf, offset + tmp.length,
+                         raw.length - offset);
+        String value = new String(buf);
+        mutating(value);
+        text = value;
+      }
+    catch (IndexOutOfBoundsException x)
+      {
+        throw new DomEx(DomEx.INDEX_SIZE_ERR);
+      }
+  }
+    
+  /**
+   * <b>DOM L1</b>
+   * Assigns the value of this node.
+   * Causes a DOMCharacterDataModified mutation event to be reported.
+   */
+  public void setNodeValue(String value)
+  {
+    if (isReadonly())
+      {
+        throw new DomEx (DomEx.NO_MODIFICATION_ALLOWED_ERR);
+      }
+    if (value == null)
+      {
+        value = "";
+      }
+    mutating(value);
+    text = value;
+  }
+ 
+  /**
+   * <b>DOM L1</b>
+   * Assigns the value of this node; same as setNodeValue.
+   */
+  final public void setData(String data)
+  {
+    setNodeValue(data);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the specified substring.
+   */
+  public String substringData(int offset, int count)
+  {
+    try
+      {
+        return text.substring(offset, count);
+      }
+    catch (StringIndexOutOfBoundsException e)
+      {
+        if (offset >= 0 && count >= 0 && offset < text.length())
+          {
+            return text.substring(offset);
+          }
+        throw new DomEx(DomEx.INDEX_SIZE_ERR);
+      }
+  }
+
+  /**
+   * The base URI for character data is <code>null</code>.
+   * @since DOM Level 3 Core
+   */
+  public final String getBaseURI()
+  {
+    return null;
+  }
+
+  private void mutating(String newValue)
+  {
+    if (!reportMutations)
+      {
+        return;
+      }
+    
+    // EVENT:  DOMCharacterDataModified, target = this,
+    //  prev/new values provided
+    MutationEvent  event;
+    
+    event = (MutationEvent) createEvent("MutationEvents");
+    event.initMutationEvent("DOMCharacterDataModified",
+                            true /* bubbles */, false /* nocancel */,
+                            null, text, newValue, null, (short) 0);
+    dispatchEvent(event);
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/DomComment.java b/libjava/gnu/xml/dom/DomComment.java
new file mode 100644 (file)
index 0000000..d1d84d1
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomComment.java
@@ -0,0 +1,81 @@
+/* DomComment.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import org.w3c.dom.Comment;
+
+/**
+ * <p> "Comment" implementation.
+ * Comments hold data intended for direct consumption by people;
+ * programs should only use ProcessingInstruction nodes.  Note that
+ * since SAX makes comment reporting optional, XML systems that
+ * rely on comments (such as by using this class) will often lose
+ * those comments at some point in the processing pipeline. </p>
+ *
+ * @author David Brownell
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomComment
+  extends DomCharacterData
+  implements Comment
+{
+ 
+  /**
+   * Constructs a comment node associated with the specified
+   * document and holding the specified data.
+   *
+   * <p>This constructor should only be invoked by a Document as part of
+   * its createComment functionality, or through a subclass which is
+   * similarly used in a "Sub-DOM" style layer.
+   */
+  protected DomComment(DomDocument owner, String value)
+  {
+    super(COMMENT_NODE, owner, value);
+  }
+  
+  /**
+   * <b>DOM L1</b>
+   * Returns the string "#comment".
+   */
+  final public String getNodeName()
+  {
+    return "#comment";
+  }
+
+}
+
diff --git a/libjava/gnu/xml/dom/DomDoctype.java b/libjava/gnu/xml/dom/DomDoctype.java
new file mode 100644 (file)
index 0000000..35fb613
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomDoctype.java
@@ -0,0 +1,454 @@
+/* DomDoctype.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import java.util.HashMap;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Entity;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.Notation;
+
+/**
+ * <p> "DocumentType" implementation (with no extensions for supporting
+ * any document typing information).  This is a non-core DOM class,
+ * supporting the "XML" feature. </p>
+ *
+ * <p> <em>Few XML applications will actually care about this partial
+ * DTD support</em>, since it doesn't expose any (!) of the data typing
+ * facilities which can motivate applications to use DTDs.  It does not
+ * expose element content models, or information about attribute typing
+ * rules.  Plus the information it exposes isn't very useful; as one example,
+ * DOM exposes information about unparsed ENTITY objects, which is only used
+ * with certain element attributes, but does not expose the information about
+ * those attributes which is needed to apply that data! </p>
+ *
+ * <p> Also, note that there are no nonportable ways to associate even the
+ * notation and entity information exposed by DOM with a DocumentType.  While
+ * there is a DOM L2 method to construct a DocumentType, it only gives access
+ * to the textual content of the &lt;!DOCTYPE ...&gt; declaration.  </p>
+ *
+ * <p> In short, <em>you are strongly advised not to rely on this incomplete
+ * DTD functionality</em> in your application code.</p>
+ *
+ * @see DomEntity
+ * @see DomEntityReference
+ * @see DomNotation
+ *
+ * @author David Brownell 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomDoctype
+  extends DomExtern
+  implements DocumentType
+{
+  
+  private DomNamedNodeMap notations;
+  private DomNamedNodeMap entities;
+  private final DOMImplementation implementation;
+  private String subset;
+  
+  private HashMap elements = new HashMap();
+  private boolean ids;
+  
+  /**
+   * Constructs a DocumentType node associated with the specified
+   * implementation, with the specified name.
+   *
+   * <p>This constructor should only be invoked by a DOMImplementation as
+   * part of its createDocumentType functionality, or through a subclass
+   * which is similarly used in a "Sub-DOM" style layer.
+   *
+   * <p> Note that at this time there is no standard SAX API granting
+   * access to the internal subset text, so that relying on that value
+   * is not currently portable.
+   *
+   * @param impl The implementation with which this object is associated
+   * @param name Name of this root element
+   * @param publicId If non-null, provides the external subset's
+   *   PUBLIC identifier
+   * @param systemId If non-null, provides the external subset's
+   *   SYSTEM identifier
+   * @param internalSubset Provides the literal value (unparsed, no
+   *   entities expanded) of the DTD's internal subset.
+   */
+  protected DomDoctype(DOMImplementation impl,
+                       String name,
+                       String publicId,
+                       String systemId,
+                       String internalSubset)
+  {
+    super(DOCUMENT_TYPE_NODE, null, name, publicId, systemId);
+    implementation = impl;
+    subset = internalSubset;
+  }
+
+  /**
+   * JAXP builder constructor.
+   * @param doc the document
+   * @param name the name of the document element
+   * @param publicId the public ID of the document type declaration
+   * @param systemId the system ID of the document type declaration
+   */
+  public DomDoctype(DomDocument doc,
+                    String name,
+                    String publicId,
+                    String systemId)
+  {
+    super(DOCUMENT_TYPE_NODE, doc, name, publicId, systemId);
+    implementation = doc.getImplementation();
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the root element's name (just like getNodeName).
+   */
+  final public String getName()
+  {
+    return getNodeName();
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns information about any general entities declared
+   * in the DTD.
+   *
+   * <p><em>Note:  DOM L1 doesn't throw a DOMException here, but
+   * then it doesn't have the strange construction rules of L2.</em>
+   *
+   * @exception DOMException HIERARCHY_REQUEST_ERR if the DocumentType
+   *   is not associated with a document.
+   */
+  public NamedNodeMap getEntities()
+  {
+    if (entities == null)
+      {
+        entities = new DomNamedNodeMap(this, Node.ENTITY_NODE);
+      }
+    return entities;
+  }
+
+  /**
+   * Records the declaration of a general entity in this DocumentType.
+   *
+   * @param name Name of the entity
+   * @param publicId If non-null, provides the entity's PUBLIC identifier
+   * @param systemId Provides the entity's SYSTEM identifier
+   * @param notation If non-null, provides the entity's notation
+   *   (indicating an unparsed entity)
+   * @return The Entity that was declared, or null if the entity wasn't
+   *   recorded (because it's a parameter entity or because an entity with
+   *   this name was already declared).
+   *
+   * @exception DOMException NO_MODIFICATION_ALLOWED_ERR if the
+   *   DocumentType is no longer writable.
+   * @exception DOMException HIERARCHY_REQUEST_ERR if the DocumentType
+   *   is not associated with a document.
+   */
+  public Entity declareEntity(String name,
+                              String publicId,
+                              String systemId,
+                              String notation)
+  {
+    DomEntity entity;
+    
+    if (name.charAt(0) == '%' || "[dtd]".equals(name))
+      {
+        return null;
+      }
+    if (isReadonly())
+      {
+        throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+      }
+    getEntities();
+    
+    DomDocument.checkName(name, (owner != null) ?
+                          "1.1".equals(owner.getXmlVersion()) : false);
+    if (entities.getNamedItem(name) != null)
+      {
+        return null;
+      }
+    
+    entity = new DomEntity(owner, name, publicId, systemId, notation);
+    entities.setNamedItem(entity);
+    return entity;
+  }
+  
+  /**
+   * <b>DOM L1</b>
+   * Returns information about any notations declared in the DTD.
+   *
+   * <p><em>Note:  DOM L1 doesn't throw a DOMException here, but
+   * then it doesn't have the strange construction rules of L2.</em>
+   *
+   * @exception DOMException HIERARCHY_REQUEST_ERR if the DocumentType
+   *   is not associated with a document.
+   */
+  public NamedNodeMap getNotations()
+  {
+    if (notations == null)
+      {
+        notations = new DomNamedNodeMap(this, Node.NOTATION_NODE);
+      }
+    return notations;
+  }
+
+  /**
+   * Records the declaration of a notation in this DocumentType.
+   *
+   * @param name Name of the notation
+   * @param publicId If non-null, provides the notation's PUBLIC identifier
+   * @param systemId If non-null, provides the notation's SYSTEM identifier
+   * @return The notation that was declared.
+   *
+   * @exception DOMException NO_MODIFICATION_ALLOWED_ERR if the
+   *   DocumentType is no longer writable.
+   * @exception DOMException HIERARCHY_REQUEST_ERR if the DocumentType
+   *   is not associated with a document.
+   */
+  public Notation declareNotation(String name,
+                                  String publicId,
+                                  String systemId)
+  {
+    DomNotation notation;
+    
+    if (isReadonly())
+      {
+        throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+      }
+    getNotations();
+    
+    DomDocument.checkName(name, (owner != null) ?
+                          "1.1".equals(owner.getXmlVersion()) : false);
+    
+    notation = new DomNotation(owner, name, publicId, systemId);
+    notations.setNamedItem(notation);
+    return notation;
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Returns the internal subset of the document, as a string of unparsed
+   * XML declarations (and comments, PIs, whitespace); or returns null if
+   * there is no such subset.  There is no vendor-independent expectation
+   * that this attribute be set, or that declarations found in it be
+   * reflected in the <em>entities</em> or <em>notations</em> attributes
+   * of this Document "Type" object.
+   *
+   * <p> Some application-specific XML profiles require that documents
+   * only use specific PUBLIC identifiers, without an internal subset
+   * to modify the interperetation of the declarations associated with
+   * that PUBLIC identifier through some standard.
+   */
+  public String getInternalSubset()
+  {
+    return subset;
+  }
+
+  /**
+   * The base URI of a DocumentType is always <code>null</code>.
+   * See the Infoset Mapping, appendix C.
+   */
+  public final String getBaseURI()
+  {
+    return null;
+  }
+    
+  /**
+   * Sets the internal "readonly" flag so the node and its associated
+   * data (only lists of entities and notations, no type information
+   * at the moment) can't be changed.
+   */
+  public void makeReadonly()
+  {
+    super.makeReadonly();
+    if (entities != null)
+      {
+        entities.makeReadonly();
+      }
+    if (notations != null)
+      {
+        notations.makeReadonly();
+      }
+  }
+
+  void setOwner(DomDocument doc)
+  {
+    if (entities != null)
+      {
+        for (DomNode ctx = entities.first; ctx != null; ctx = ctx.next)
+          {
+            ctx.setOwner(doc);
+          }
+      }
+    if (notations != null)
+      {
+        for (DomNode ctx = notations.first; ctx != null; ctx = ctx.next)
+          {
+            ctx.setOwner(doc);
+          }
+      }
+    super.setOwner(doc);
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Consults the DOM implementation to determine if the requested
+   * feature is supported.
+   */
+  final public boolean supports(String feature, String version)
+  {
+    return implementation.hasFeature(feature, version);
+  }
+    
+  /**
+   * Returns the implementation associated with this document type.
+   */
+  final public DOMImplementation getImplementation()
+  {
+    return implementation;
+  }
+
+  public void elementDecl(String name, String model)
+  {
+    DTDElementTypeInfo info = getElementTypeInfo(name);
+    if (info == null)
+      {
+        info = new DTDElementTypeInfo(name, model);
+        elements.put(name, info);
+      }
+    else
+      {
+        info.model = model;
+      }
+  }
+
+  DTDElementTypeInfo getElementTypeInfo(String name)
+  {
+    return (DTDElementTypeInfo) elements.get(name);
+  }
+
+  public void attributeDecl(String eName, String aName, String type,
+                            String mode, String value)
+  {
+    DTDAttributeTypeInfo info = new DTDAttributeTypeInfo(eName, aName, type,
+                                                         mode, value);
+    DTDElementTypeInfo elementInfo = getElementTypeInfo(eName);
+    if (elementInfo == null)
+      {
+        elementInfo = new DTDElementTypeInfo(eName, null);
+        elements.put(eName, elementInfo);
+      }
+    elementInfo.setAttributeTypeInfo(aName, info);
+    if ("ID".equals(type))
+      {
+        ids = true;
+      }
+  }
+
+  DTDAttributeTypeInfo getAttributeTypeInfo(String elementName, String name)
+  {
+    DTDElementTypeInfo elementInfo =
+      (DTDElementTypeInfo) elements.get(elementName);
+    return (elementInfo == null) ? null :
+      elementInfo.getAttributeTypeInfo(name);
+  }
+
+  boolean hasIds()
+  {
+    return ids;
+  }
+  
+  public boolean isSameNode(Node arg)
+  {
+    if (equals(arg))
+      {
+        return true;
+      }
+    if (!(arg instanceof DocumentType))
+      {
+        return false;
+      }
+    DocumentType doctype = (DocumentType) arg;
+    if (!equal(getPublicId(), doctype.getPublicId()))
+      {
+        return false;
+      }
+    if (!equal(getSystemId(), doctype.getSystemId()))
+      {
+        return false;
+      }
+    if (!equal(getInternalSubset(), doctype.getInternalSubset()))
+      {
+        return false;
+      }
+    // TODO entities
+    // TODO notations
+    return true;
+  }
+  
+  /**
+   * Shallow clone of the doctype, except that associated
+   * entities and notations are (deep) cloned.
+   */
+  public Object clone()
+  {
+    DomDoctype node = (DomDoctype) super.clone();
+
+    if (entities != null)
+      {
+        node.entities = new DomNamedNodeMap(node, Node.ENTITY_NODE);
+        for (DomNode ctx = entities.first; ctx != null; ctx = ctx.next)
+          {
+            node.entities.setNamedItem(ctx.cloneNode(true));
+          }
+      }
+    if (notations != null)
+      {
+        node.notations = new DomNamedNodeMap(node, Node.NOTATION_NODE);
+        for (DomNode ctx = notations.first; ctx != null; ctx = ctx.next)
+          {
+            node.notations.setNamedItem(ctx.cloneNode(true));
+          }
+      }
+    return node;
+  }
+
+
+}
diff --git a/libjava/gnu/xml/dom/DomDocument.java b/libjava/gnu/xml/dom/DomDocument.java
new file mode 100644 (file)
index 0000000..10693ae
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomDocument.java
@@ -0,0 +1,1376 @@
+/* DomDocument.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import java.util.Iterator;
+import javax.xml.XMLConstants;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.CDATASection;
+import org.w3c.dom.Comment;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Element;
+import org.w3c.dom.Entity;
+import org.w3c.dom.EntityReference;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Notation;
+import org.w3c.dom.ProcessingInstruction;
+import org.w3c.dom.Text;
+import org.w3c.dom.UserDataHandler;
+import org.w3c.dom.traversal.DocumentTraversal;
+import org.w3c.dom.traversal.NodeFilter;
+import org.w3c.dom.traversal.NodeIterator;
+import org.w3c.dom.traversal.TreeWalker;
+import org.w3c.dom.xpath.XPathEvaluator;
+import org.w3c.dom.xpath.XPathException;
+import org.w3c.dom.xpath.XPathExpression;
+import org.w3c.dom.xpath.XPathNSResolver;
+
+/**
+ * <p> "Document" and "DocumentTraversal" implementation.
+ *
+ * <p> Note that when this checks names for legality, it uses an
+ * approximation of the XML rules, not the real ones.  Specifically,
+ * it uses Unicode rules, with sufficient tweaks to pass a majority
+ * of basic XML conformance tests.  (The huge XML character tables are
+ * hairy to implement.)
+ *
+ * @author David Brownell 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomDocument
+  extends DomNode
+  implements Document, DocumentTraversal, XPathEvaluator
+{
+
+  private final DOMImplementation implementation;
+  private boolean checkingCharacters = true;
+  boolean checkingWellformedness = true;
+
+  boolean building; // if true, skip mutation events in the tree
+  
+  DomDocumentConfiguration config;
+
+  String inputEncoding;
+  String encoding;
+  String version = "1.0";
+  boolean standalone;
+  String systemId;
+  
+  /**
+   * Constructs a Document node, associating it with an instance
+   * of the DomImpl class.
+   *
+   * <p> Note that this constructor disables character checking.
+   * It is normally used when connecting a DOM to an XML parser,
+   * and duplicating such checks is undesirable.  When used for
+   * purposes other than connecting to a parser, you should
+   * re-enable that checking.
+   *
+   * @see #setCheckingCharacters
+   */
+  public DomDocument()
+  {
+    this(new DomImpl());
+  }
+  
+  /**
+   * Constructs a Document node, associating it with the specified
+   * implementation.  This should only be used in conjunction with
+   * a specialized implementation; it will normally be called by
+   * that implementation.
+   *
+   * @see DomImpl
+   * @see #setCheckingCharacters
+   */
+  protected DomDocument(DOMImplementation impl)
+  {
+    super(DOCUMENT_NODE, null);
+    implementation = impl;
+  }
+
+  /**
+   * Sets the <code>building</code> flag.
+   * Mutation events in the document are not reported.
+   */
+  public void setBuilding(boolean flag)
+  {
+    building = flag;
+  }
+
+  /**
+   * Sets whether to check for document well-formedness.
+   * If true, an exception will be raised if a second doctype or root
+   * element node is added to the document.
+   */
+  public void setCheckWellformedness(boolean flag)
+  {
+    checkingWellformedness = flag;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the constant "#document".
+   */
+  final public String getNodeName()
+  {
+    return "#document";
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the document's root element, or null.
+   */
+  final public Element getDocumentElement()
+  {
+    for (DomNode ctx = first; ctx != null; ctx = ctx.next)
+      {
+        if (ctx.nodeType == ELEMENT_NODE)
+          {
+            return (Element) ctx;
+          }
+      }
+    return null;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the document's DocumentType, or null.
+   */
+  final public DocumentType getDoctype()
+  {
+    for (DomNode ctx = first; ctx != null; ctx = ctx.next)
+      {
+      if (ctx.nodeType == DOCUMENT_TYPE_NODE)
+          {
+            return (DocumentType) ctx;
+          }
+      }
+    return null;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the document's DOMImplementation.
+   */
+  final public DOMImplementation getImplementation()
+  {
+    return implementation;
+  }
+
+  /**
+   * <b>DOM L1 (relocated in DOM L2)</b>
+   * Returns the element with the specified "ID" attribute, or null.
+   *
+   * <p>Returns null unless {@link Consumer} was used to populate internal
+   * DTD declaration information, using package-private APIs.  If that
+   * internal DTD information is available, the document may be searched for
+   * the element with that ID.
+   */
+  public Element getElementById(String id)
+  {
+    DomDoctype doctype = (DomDoctype) getDoctype();
+    
+    if (doctype == null || !doctype.hasIds()
+        || id == null || id.length() == 0)
+      {
+        return null;
+      }
+    
+    // yes, this is linear in size of document.
+    // it'd be easy enough to maintain a hashtable.
+    Node current = getDocumentElement();
+    Node temp;
+    
+    if (current == null)
+      {
+        return null;
+      }
+    while (current != this)
+      {
+        // done?
+        if (current.getNodeType() == ELEMENT_NODE)
+          {
+            DomElement element = (DomElement) current;
+            DTDElementTypeInfo info =
+              doctype.getElementTypeInfo(current.getNodeName());
+            if (info != null &&
+                id.equals(element.getAttribute(info.idAttrName)))
+              {
+                return element;
+              }
+            else if (element.userIdAttrs != null)
+              {
+                for (Iterator i = element.userIdAttrs.iterator();
+                     i.hasNext(); )
+                  {
+                    Node idAttr = (Node) i.next();
+                    if (id.equals(idAttr.getNodeValue()))
+                      {
+                        return element;
+                      }
+                  }
+              }
+          }
+        
+        // descend?
+        if (current.hasChildNodes())
+          {
+            current = current.getFirstChild();
+            continue;
+          }
+        
+        // lateral?
+        temp = current.getNextSibling();
+        if (temp != null)
+          {
+            current = temp;
+            continue;
+          }
+        
+        // back up ... 
+        do
+          {
+            temp = current.getParentNode();
+            if (temp == null)
+              {
+                return null;
+              }
+            current = temp;
+            temp = current.getNextSibling();
+          }
+        while (temp == null);
+        current = temp;
+      }
+    return null;
+  }
+
+  private void checkNewChild(Node newChild)
+  {
+    if (newChild.getNodeType() == ELEMENT_NODE
+        && getDocumentElement() != null)
+      {
+        throw new DomEx (DomEx.HIERARCHY_REQUEST_ERR,
+                         "document element already present: " +
+                         getDocumentElement(), newChild, 0);
+      }
+    if (newChild.getNodeType() == DOCUMENT_TYPE_NODE
+        && getDoctype() != null)
+      {
+        throw new DomEx (DomEx.HIERARCHY_REQUEST_ERR,
+                         "document type already present: " +
+                         getDoctype(), newChild, 0);
+      }
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Appends the specified node to this node's list of children,
+   * enforcing the constraints that there be only one root element
+   * and one document type child.
+   */
+  public Node appendChild(Node newChild)
+  {
+    if (checkingWellformedness)
+      {
+        checkNewChild(newChild);
+      }
+    return super.appendChild(newChild);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Inserts the specified node in this node's list of children,
+   * enforcing the constraints that there be only one root element
+   * and one document type child.
+   */
+  public Node insertBefore(Node newChild, Node refChild)
+  {
+    if (checkingWellformedness)
+      {
+        checkNewChild(newChild);
+      }
+    return super.insertBefore(newChild, refChild);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Replaces the specified node in this node's list of children,
+   * enforcing the constraints that there be only one root element
+   * and one document type child.
+   */
+  public Node replaceChild(Node newChild, Node refChild)
+  {
+    if (checkingWellformedness &&
+        ((newChild.getNodeType() == ELEMENT_NODE &&
+          refChild.getNodeType() != ELEMENT_NODE) ||
+         (newChild.getNodeType() == DOCUMENT_TYPE_NODE &&
+          refChild.getNodeType() != DOCUMENT_TYPE_NODE)))
+      {
+        checkNewChild(newChild);
+      }
+    return super.replaceChild(newChild, refChild);
+  }
+ 
+  // NOTE:  DOM can't really tell when the name of an entity,
+  // notation, or PI must follow the namespace rules (excluding
+  // colons) instead of the XML rules (which allow them without
+  // much restriction).  That's an API issue.  verifyXmlName
+  // aims to enforce the XML rules, not the namespace rules.
+  
+  /**
+   * Throws a DOM exception if the specified name is not a legal XML 1.0
+   * Name.
+   * @deprecated This method is deprecated and may be removed in future
+   * versions of GNU JAXP
+   */
+  public static void verifyXmlName(String name)
+  {
+    // XXX why is this public?
+    checkName(name, false);
+  }
+
+  static void checkName(String name, boolean xml11)
+  {
+    if (name == null)
+      {
+        throw new DomEx (DomEx.NAMESPACE_ERR, name, null, 0);
+      }
+    int len = name.length();
+    if (len == 0)
+      {
+        throw new DomEx (DomEx.NAMESPACE_ERR, name, null, 0);
+      }
+
+    // dog: rewritten to use the rules for XML 1.0 and 1.1
+    
+    // Name start character
+    char c = name.charAt(0);
+    if (xml11)
+      {
+        // XML 1.1
+        if ((c < 0x0041 || c > 0x005a) &&
+            (c < 0x0061 || c > 0x007a) &&
+            c != ':' && c != '_' &&
+            (c < 0x00c0 || c > 0x00d6) &&
+            (c < 0x00d8 || c > 0x00f6) &&
+            (c < 0x00f8 || c > 0x02ff) &&
+            (c < 0x0370 || c > 0x037d) &&
+            (c < 0x037f || c > 0x1fff) &&
+            (c < 0x200c || c > 0x200d) &&
+            (c < 0x2070 || c > 0x218f) &&
+            (c < 0x2c00 || c > 0x2fef) &&
+            (c < 0x3001 || c > 0xd7ff) &&
+            (c < 0xf900 || c > 0xfdcf) &&
+            (c < 0xfdf0 || c > 0xfffd) &&
+            (c < 0x10000 || c > 0xeffff))
+          {
+            throw new DomEx(DomEx.INVALID_CHARACTER_ERR, name, null, c);
+          }
+      }
+    else
+      {
+        // XML 1.0
+        int type = Character.getType(c);
+        switch (type)
+          {
+          case Character.LOWERCASE_LETTER: // Ll
+          case Character.UPPERCASE_LETTER: // Lu
+          case Character.OTHER_LETTER: // Lo
+          case Character.TITLECASE_LETTER: // Lt
+          case Character.LETTER_NUMBER: // Nl
+            if ((c > 0xf900 && c < 0xfffe) ||
+                (c >= 0x20dd && c <= 0x20e0))
+              {
+                // Compatibility area and Unicode 2.0 exclusions
+                throw new DomEx(DomEx.INVALID_CHARACTER_ERR, name, null, c);
+              }
+            break;
+          default:
+            if (c != ':' && c != '_' && (c < 0x02bb || c > 0x02c1) &&
+                c != 0x0559 && c != 0x06e5 && c != 0x06e6)
+              {
+                throw new DomEx(DomEx.INVALID_CHARACTER_ERR, name, null, c);
+              }
+          }
+      }
+
+    // Subsequent characters
+    for (int i = 1; i < len; i++)
+      {
+        c = name.charAt(i);
+        if (xml11)
+          {
+            // XML 1.1
+            if ((c < 0x0041 || c > 0x005a) &&
+                (c < 0x0061 || c > 0x007a) &&
+                (c < 0x0030 || c > 0x0039) &&
+                c != ':' && c != '_' && c != '-' && c != '.' &&
+                (c < 0x00c0 || c > 0x00d6) &&
+                (c < 0x00d8 || c > 0x00f6) &&
+                (c < 0x00f8 || c > 0x02ff) &&
+                (c < 0x0370 || c > 0x037d) &&
+                (c < 0x037f || c > 0x1fff) &&
+                (c < 0x200c || c > 0x200d) &&
+                (c < 0x2070 || c > 0x218f) &&
+                (c < 0x2c00 || c > 0x2fef) &&
+                (c < 0x3001 || c > 0xd7ff) &&
+                (c < 0xf900 || c > 0xfdcf) &&
+                (c < 0xfdf0 || c > 0xfffd) &&
+                (c < 0x10000 || c > 0xeffff) &&
+                c != 0x00b7 &&
+                (c < 0x0300 || c > 0x036f) &&
+                (c < 0x203f || c > 0x2040))
+              {
+                throw new DomEx(DomEx.INVALID_CHARACTER_ERR, name, null, c);
+              }
+          }
+        else
+          {
+            // XML 1.0
+            int type = Character.getType(c);
+            switch (type)
+              {
+              case Character.LOWERCASE_LETTER: // Ll
+              case Character.UPPERCASE_LETTER: // Lu
+              case Character.DECIMAL_DIGIT_NUMBER: // Nd
+              case Character.OTHER_LETTER: // Lo
+              case Character.TITLECASE_LETTER: // Lt
+              case Character.LETTER_NUMBER: // Nl
+              case Character.COMBINING_SPACING_MARK: // Mc
+              case Character.ENCLOSING_MARK: // Me
+              case Character.NON_SPACING_MARK: // Mn
+              case Character.MODIFIER_LETTER: // Lm
+                if ((c > 0xf900 && c < 0xfffe) ||
+                    (c >= 0x20dd && c <= 0x20e0))
+                  {
+                    // Compatibility area and Unicode 2.0 exclusions
+                    throw new DomEx(DomEx.INVALID_CHARACTER_ERR, name, null, c);
+                  }
+                break;
+              default:
+                if (c != '-' && c != '.' && c != ':' && c != '_' &&
+                    c != 0x0387 && (c < 0x02bb || c > 0x02c1) &&
+                    c != 0x0559 && c != 0x06e5 && c != 0x06e6 && c != 0x00b7)
+                  {
+                    throw new DomEx(DomEx.INVALID_CHARACTER_ERR, name, null, c);
+                  }
+              }
+          }
+      }
+
+    // FIXME characters with a font or compatibility decomposition (i.e.
+    // those with a "compatibility formatting tag" in field 5 of the
+    // database -- marked by field 5 beginning with a "<") are not allowed.
+  }
+
+  // package private
+  static void checkNCName(String name, boolean xml11)
+  {
+    checkName(name, xml11);
+    int len = name.length();
+    int index = name.indexOf(':');
+    if (index != -1)
+      {
+        if (index == 0 || index == (len - 1) ||
+            name.lastIndexOf(':') != index)
+          {
+            throw new DomEx(DomEx.NAMESPACE_ERR, name, null, 0);
+          }
+      }
+  }
+
+  // package private
+  static void checkChar(String value, boolean xml11)
+  {
+    char[] chars = value.toCharArray();
+    checkChar(chars, 0, chars.length, xml11);
+  }
+  
+  static void checkChar(char[] buf, int off, int len, boolean xml11)
+  {
+    for (int i = 0; i < len; i++)
+      {
+        char c = buf[i];
+        
+        // assume surrogate pairing checks out OK, for simplicity
+        if ((c >= 0x0020 && c <= 0xd7ff) ||
+            (c == 0x000a || c == 0x000d || c == 0x0009) ||
+            (c >= 0xe000 && c <= 0xfffd) ||
+            (c >= 0x10000 && c <= 0x10ffff))
+          {
+            continue;
+          }
+        if (xml11)
+          {
+            if ((c >= 0x0001 && c <= 0x001f) ||
+                (c >= 0x007f && c <= 0x0084) ||
+                (c >= 0x0086 && c <= 0x009f))
+              {
+                continue;
+              }
+          }
+        throw new DomEx(DomEx.INVALID_CHARACTER_ERR,
+                        new String(buf, off, len), null, c);
+      }
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns a newly created element with the specified name.
+   */
+  public Element createElement(String name)
+  {
+    Element element;
+    
+    if (checkingCharacters)
+      {
+        checkName(name, "1.1".equals(version));
+      }
+    if (name.startsWith("xml:"))
+      {
+        element = createElementNS(null, name);
+      }
+    else
+      {
+        element = new DomElement(this, null, name);
+      }
+    defaultAttributes(element, name);
+    return element;
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Returns a newly created element with the specified name
+   * and namespace information.
+   */
+  public Element createElementNS(String namespaceURI, String name)
+  {
+    if (checkingCharacters)
+      {
+        checkNCName(name, "1.1".equals(version));
+      }
+    
+    if ("".equals(namespaceURI))
+      {
+        namespaceURI = null;
+      }
+    if (name.startsWith("xml:"))
+      {
+        if (namespaceURI != null
+            && !XMLConstants.XML_NS_URI.equals(namespaceURI))
+          {
+            throw new DomEx(DomEx.NAMESPACE_ERR,
+                            "xml namespace is always " +
+                            XMLConstants.XML_NS_URI, this, 0);
+          }
+        namespaceURI = XMLConstants.XML_NS_URI;
+      }
+    else if (XMLConstants.XMLNS_ATTRIBUTE.equals(name) ||
+             name.startsWith("xmlns:"))
+      {
+        throw new DomEx(DomEx.NAMESPACE_ERR,
+                        "xmlns is reserved", this, 0);
+      }
+    else if (namespaceURI == null && name.indexOf(':') != -1)
+      {
+        throw new DomEx(DomEx.NAMESPACE_ERR,
+                        "prefixed name '" + name + "' needs a URI", this, 0);
+      }
+    
+    Element  element = new DomElement(this, namespaceURI, name);
+    defaultAttributes(element, name);
+    return element;
+  }
+  
+  private void defaultAttributes(Element element, String name)
+  {
+    DomDoctype doctype = (DomDoctype) getDoctype();
+    if (doctype == null)
+      {
+        return;
+      }
+
+    // default any attributes that need it
+    DTDElementTypeInfo info = doctype.getElementTypeInfo(name);
+    if (info != null)
+      {
+        for (Iterator i = info.attributes(); i != null && i.hasNext(); )
+          {
+            DTDAttributeTypeInfo attr = (DTDAttributeTypeInfo) i.next();
+            DomAttr node = (DomAttr) createAttribute(attr.name);
+            
+            String value = attr.value;
+            if (value == null)
+              {
+                value = "";
+              }
+            node.setValue(value);
+            node.setSpecified(false);
+            element.setAttributeNode(node);
+          }
+      }
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns a newly created document fragment.
+   */
+  public DocumentFragment createDocumentFragment()
+  {
+    return new DomFragment(this);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns a newly created text node with the specified value.
+   */
+  public Text createTextNode(String value)
+  {
+    if (checkingCharacters)
+      {
+        checkChar(value, "1.1".equals(version));
+      }
+    return new DomText(this, value);
+  }
+
+  /**
+   * Returns a newly created text node with the specified value.
+   */
+  public Text createTextNode(char[] buf, int off, int len)
+  {
+    if (checkingCharacters)
+      {
+        checkChar(buf, off, len, "1.1".equals(version));
+      }
+    return new DomText(this, buf, off, len);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns a newly created comment node with the specified value.
+   */
+  public Comment createComment(String value)
+  {
+    if (checkingCharacters)
+      {
+        checkChar(value, "1.1".equals(version));
+      }
+    return new DomComment(this, value);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns a newly created CDATA section node with the specified value.
+   */
+  public CDATASection createCDATASection(String value)
+  {
+    if (checkingCharacters)
+      {
+        checkChar(value, "1.1".equals(version));
+      }
+    return new DomCDATA(this, value);
+  }
+
+  /**
+   * Returns a newly created CDATA section node with the specified value.
+   */
+  public CDATASection createCDATASection(char[] buf, int off, int len)
+  {
+    if (checkingCharacters)
+      {
+        checkChar(buf, off, len, "1.1".equals(version));
+      }
+    return new DomCDATA(this, buf, off, len);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns a newly created processing instruction.
+   */
+  public ProcessingInstruction createProcessingInstruction(String target,
+                                                           String data)
+  {
+    if (checkingCharacters)
+      {
+        boolean xml11 = "1.1".equals(version);
+        checkName(target, xml11);
+        if ("xml".equalsIgnoreCase(target))
+          {
+            throw new DomEx(DomEx.SYNTAX_ERR,
+                            "illegal PI target name", this, 0);
+          }
+        checkChar(data, xml11);
+      }
+    return new DomPI(this, target, data);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns a newly created attribute with the specified name.
+   */
+  public Attr createAttribute(String name)
+  {
+    if (checkingCharacters)
+      {
+        checkName(name, "1.1".equals(version));
+      }
+    if (name.startsWith("xml:"))
+      {
+        return createAttributeNS(XMLConstants.XML_NS_URI, name);
+      }
+    else if (XMLConstants.XMLNS_ATTRIBUTE.equals(name) ||
+             name.startsWith("xmlns:"))
+      {
+        return createAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, name);
+      }
+    else
+      {
+        return new DomAttr(this, null, name);
+      }
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Returns a newly created attribute with the specified name
+   * and namespace information.
+   */
+  public Attr createAttributeNS(String namespaceURI, String name)
+  {
+    if (checkingCharacters)
+      {
+        checkNCName(name, "1.1".equals(version));
+      }
+    
+    if ("".equals(namespaceURI))
+      {
+        namespaceURI = null;
+      }
+    if (name.startsWith ("xml:"))
+      {
+        if (namespaceURI == null)
+          {
+            namespaceURI = XMLConstants.XML_NS_URI;
+          }
+        else if (!XMLConstants.XML_NS_URI.equals(namespaceURI))
+          {
+            throw new DomEx(DomEx.NAMESPACE_ERR,
+                            "xml namespace is always " +
+                            XMLConstants.XML_NS_URI, this, 0);
+          }
+      }
+    else if (XMLConstants.XMLNS_ATTRIBUTE.equals(name) ||
+             name.startsWith("xmlns:"))
+      {
+        if (namespaceURI == null)
+          {
+            namespaceURI = XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
+          }
+        else if (!XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceURI))
+          {
+            throw new DomEx(DomEx.NAMESPACE_ERR,
+                            "xmlns namespace must be " +
+                            XMLConstants.XMLNS_ATTRIBUTE_NS_URI, this, 0);
+          }
+      }
+    else if (namespaceURI == null && name.indexOf(':') != -1)
+      {
+        throw new DomEx(DomEx.NAMESPACE_ERR,
+                        "prefixed name needs a URI: " + name, this, 0);
+      }
+    return new DomAttr(this, namespaceURI, name);
+  }
+  
+  /**
+   * <b>DOM L1</b>
+   * Returns a newly created reference to the specified entity.
+   * The caller should populate this with the appropriate children
+   * and then mark it as readonly.
+   *
+   * @see DomNode#makeReadonly
+   */
+  public EntityReference createEntityReference(String name)
+  {
+    DomEntityReference ret = new DomEntityReference(this, name);
+    DocumentType doctype = getDoctype();
+    if (doctype != null)
+      {
+        DomEntity ent = (DomEntity) doctype.getEntities().getNamedItem(name);
+        if (ent != null)
+          {
+            for (DomNode ctx = ent.first; ctx != null; ctx = ctx.next)
+              {
+                ret.appendChild(ctx.cloneNode(true));
+              }
+          }
+      }
+    ret.makeReadonly();
+    return ret;
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Makes a copy of the specified node, with all nodes "owned" by
+   * this document and with children optionally copied.  This type
+   * of standard utility has become, well, a standard utility.
+   *
+   * <p> Note that EntityReference nodes created through this method (either
+   * directly, or recursively) never have children, and that there is no
+   * portable way to associate them with such children.
+   *
+   * <p> Note also that there is no requirement that the specified node
+   * be associated with a different document.  This differs from the
+   * <em>cloneNode</em> operation in that the node itself is not given
+   * an opportunity to participate, so that any information managed
+   * by node subclasses will be lost.
+   */
+  public Node importNode(Node src, boolean deep)
+  {
+    Node dst = null;
+    switch (src.getNodeType())
+      {
+      case TEXT_NODE:
+        dst = createTextNode(src.getNodeValue());
+        break;
+      case CDATA_SECTION_NODE:
+        dst = createCDATASection(src.getNodeValue());
+        break;
+      case COMMENT_NODE:
+        dst = createComment(src.getNodeValue());
+        break;
+      case PROCESSING_INSTRUCTION_NODE:
+        dst = createProcessingInstruction(src.getNodeName(),
+                                          src.getNodeValue());
+        break;
+      case NOTATION_NODE:
+        // NOTE:  There's no standard way to create
+        // these, or add them to a doctype.  Useless.
+        Notation notation = (Notation) src;
+        dst = new DomNotation(this, notation.getNodeName(),
+                              notation.getPublicId(),
+                              notation.getSystemId());
+        break;
+      case ENTITY_NODE:
+        // NOTE:  There's no standard way to create
+        // these, or add them to a doctype.  Useless.
+        Entity entity = (Entity) src;
+        dst = new DomEntity(this, entity.getNodeName(),
+                            entity.getPublicId(),
+                            entity.getSystemId(),
+                            entity.getNotationName());
+        if (deep)
+          {
+            for (Node ctx = src.getFirstChild(); ctx != null;
+                 ctx = ctx.getNextSibling())
+              {
+                dst.appendChild(importNode(ctx, deep));
+              }
+          }
+        break;
+      case ENTITY_REFERENCE_NODE:
+        dst = createEntityReference(src.getNodeName());
+        break;
+      case DOCUMENT_FRAGMENT_NODE:
+        dst = new DomFragment(this);
+        if (deep)
+          {
+            for (Node ctx = src.getFirstChild(); ctx != null;
+                 ctx = ctx.getNextSibling())
+              {
+                dst.appendChild(importNode(ctx, deep));
+              }
+          }
+        break;
+      case ATTRIBUTE_NODE:
+        String attr_nsuri = src.getNamespaceURI();
+        if (attr_nsuri != null)
+          {
+            dst = createAttributeNS(attr_nsuri, src.getNodeName());
+          }
+        else
+          {
+            dst = createAttribute(src.getNodeName());
+          }
+        // this is _always_ done regardless of "deep" setting
+        for (Node ctx = src.getFirstChild(); ctx != null;
+             ctx = ctx.getNextSibling())
+          {
+            dst.appendChild(importNode(ctx, false));
+          }
+        break;
+      case ELEMENT_NODE:
+        String elem_nsuri = src.getNamespaceURI();
+        if (elem_nsuri != null)
+          {
+            dst = createElementNS(elem_nsuri, src.getNodeName());
+          }
+        else
+          {
+            dst = createElement(src.getNodeName());
+          }
+        NamedNodeMap srcAttrs = src.getAttributes();
+        NamedNodeMap dstAttrs = dst.getAttributes();
+        int len = srcAttrs.getLength();
+        for (int i = 0; i < len; i++)
+          {
+            Attr a = (Attr) srcAttrs.item(i);
+            Attr dflt;
+            
+            // maybe update defaulted attributes
+            dflt = (Attr) dstAttrs.getNamedItem(a.getNodeName());
+            if (dflt != null)
+              {
+                String newval = a.getNodeValue();
+                if (!dflt.getNodeValue().equals(newval)
+                    || a.getSpecified () == true)
+                  {
+                    dflt.setNodeValue (newval);
+                  }
+                continue;
+              }
+            
+            dstAttrs.setNamedItem((Attr) importNode(a, false));
+          }
+        if (deep)
+          {
+            for (Node ctx = src.getFirstChild(); ctx != null;
+                 ctx = ctx.getNextSibling())
+              {
+                dst.appendChild(importNode(ctx, true));
+              }
+          }
+        break;
+        // can't import document or doctype nodes
+      case DOCUMENT_NODE:
+      case DOCUMENT_TYPE_NODE:
+        // FALLTHROUGH
+        // can't import unrecognized or nonstandard nodes
+      default:
+        throw new DomEx(DomEx.NOT_SUPPORTED_ERR, null, src, 0);
+      }
+    
+    // FIXME cleanup a bit -- for deep copies, copy those
+    // children in one place, here (code sharing is healthy)
+
+    if (src instanceof DomNode)
+      {
+        ((DomNode) src).notifyUserDataHandlers(UserDataHandler.NODE_IMPORTED,
+                                               src, dst);
+      }
+    return dst;
+  }
+
+  /**
+   * <b>DOM L2 (Traversal)</b>
+   * Returns a newly created node iterator.  Don't forget to detach
+   * this iterator when you're done using it!
+   *
+   * @see DomIterator
+   */
+  public NodeIterator createNodeIterator(Node root,
+                                         int whatToShow,
+                                         NodeFilter filter,
+                                         boolean expandEntities)
+  {
+    return new DomNodeIterator(root, whatToShow, filter, expandEntities,
+                               false);
+  }
+
+  public TreeWalker createTreeWalker(Node root,
+                                     int whatToShow,
+                                     NodeFilter filter,
+                                     boolean expandEntities)
+  {
+    return new DomNodeIterator(root, whatToShow, filter, expandEntities,
+                               true);
+  }
+
+  // DOM Level 3 methods
+  
+  /**
+   * DOM L3
+   */
+  public String getInputEncoding()
+  {
+    return inputEncoding;
+  }
+
+  public void setInputEncoding(String inputEncoding)
+  {
+    this.inputEncoding = inputEncoding;
+  }
+  
+  /**
+   * DOM L3
+   */
+  public String getXmlEncoding()
+  {
+    return encoding;
+  }
+  
+  public void setXmlEncoding(String encoding)
+  {
+    this.encoding = encoding;
+  }
+  
+  public boolean getXmlStandalone()
+  {
+    return standalone;
+  }
+
+  public void setXmlStandalone(boolean xmlStandalone)
+  {
+    standalone = xmlStandalone;
+  }
+
+  public String getXmlVersion()
+  {
+    return version;
+  }
+
+  public void setXmlVersion(String xmlVersion)
+  {
+    if (xmlVersion == null)
+      {
+        xmlVersion = "1.0";
+      }
+    if ("1.0".equals(xmlVersion) ||
+        "1.1".equals(xmlVersion))
+      {
+        version = xmlVersion;
+      }
+    else
+      {
+        throw new DomEx(DomEx.NOT_SUPPORTED_ERR);
+      }
+  }
+
+  public boolean getStrictErrorChecking()
+  {
+    return checkingCharacters;
+  }
+
+  public void setStrictErrorChecking(boolean strictErrorChecking)
+  {
+    checkingCharacters = strictErrorChecking;
+  }
+
+  public String lookupPrefix(String namespaceURI)
+  {
+    Node root = getDocumentElement();
+    return (root == null) ? null : root.lookupPrefix(namespaceURI);
+  }
+
+  public boolean isDefaultNamespace(String namespaceURI)
+  {
+    Node root = getDocumentElement();
+    return (root == null) ? false : root.isDefaultNamespace(namespaceURI);
+  }
+
+  public String lookupNamespaceURI(String prefix)
+  {
+    Node root = getDocumentElement();
+    return (root == null) ? null : root.lookupNamespaceURI(prefix);
+  }
+
+  public String getBaseURI()
+  {
+    return getDocumentURI();
+    /*
+    Node root = getDocumentElement();
+    if (root != null)
+      {
+        NamedNodeMap attrs = root.getAttributes();
+        Node xmlBase = attrs.getNamedItemNS(XMLConstants.XML_NS_URI, "base");
+        if (xmlBase != null)
+          {
+            return xmlBase.getNodeValue();
+          }
+      }
+    return systemId;
+    */
+  }
+  
+  public String getDocumentURI()
+  {
+    return systemId;
+  }
+
+  public void setDocumentURI(String documentURI)
+  {
+    systemId = documentURI;
+  }
+
+  public Node adoptNode(Node source)
+  {
+    switch (source.getNodeType())
+      {
+      case DOCUMENT_NODE:
+      case DOCUMENT_TYPE_NODE:
+        throw new DomEx(DomEx.NOT_SUPPORTED_ERR);
+      case ENTITY_NODE:
+      case NOTATION_NODE:
+        throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+      }
+    if (source instanceof DomNode)
+      {
+        DomNode src = (DomNode) source;
+        DomNode dst = src;
+        if (dst.parent != null)
+          {
+            dst = (DomNode) dst.cloneNode(true);
+          }
+        dst.setOwner(this);
+        src.notifyUserDataHandlers(UserDataHandler.NODE_ADOPTED, src, dst);
+        return dst;
+      }
+    return null;
+  }
+
+  public DOMConfiguration getDomConfig()
+  {
+    if (config == null)
+      {
+        config = new DomDocumentConfiguration();
+      }
+    return config;
+  }
+
+  public void normalizeDocument()
+  {
+    boolean save = building;
+    building = true;
+    normalizeNode(this);
+    building = save;
+  }
+
+  void normalizeNode(DomNode node)
+  {
+    node.normalize();
+    if (config != null)
+      {
+        switch (node.nodeType)
+          {
+          case CDATA_SECTION_NODE:
+            if (!config.cdataSections)
+              {
+                // replace CDATA section with text node
+                Text text = createTextNode(node.getNodeValue());
+                node.parent.insertBefore(text, node);
+                node.parent.removeChild(node);
+                // merge adjacent text nodes
+                String data = text.getWholeText();
+                node = (DomNode) text.replaceWholeText(data);
+              }
+            else if (config.splitCdataSections)
+              {
+                String value = node.getNodeValue();
+                int i = value.indexOf("]]>");
+                while (i != -1)
+                  {
+                    Node node2 = createCDATASection(value.substring(0, i));
+                    node.parent.insertBefore(node2, node);
+                    value = value.substring(i + 3);
+                    node.setNodeValue(value);
+                    i = value.indexOf("]]>");
+                  }
+              }
+            break;
+          case COMMENT_NODE:
+            if (!config.comments)
+              {
+                node.parent.removeChild(node);
+              }
+            break;
+          case TEXT_NODE:
+            if (!config.elementContentWhitespace &&
+                ((Text) node).isElementContentWhitespace())
+              {
+                node.parent.removeChild(node);
+              }
+            break;
+          case ENTITY_REFERENCE_NODE:
+            if (!config.entities)
+              {
+                for (DomNode ctx = node.first; ctx != null; )
+                  {
+                    DomNode ctxNext = ctx.next;
+                    node.parent.insertBefore(ctx, node);
+                    ctx = ctxNext;
+                  }
+                node.parent.removeChild(node);
+              }
+            break;
+          case ELEMENT_NODE:
+            if (!config.namespaceDeclarations)
+              {
+                DomNamedNodeMap attrs =
+                  (DomNamedNodeMap) node.getAttributes();
+                boolean aro = attrs.readonly;
+                attrs.readonly = false; // Ensure we can delete if necessary
+                int len = attrs.getLength();
+                for (int i = 0; i < len; i++)
+                  {
+                    Node attr = attrs.item(i);
+                    String namespace = attr.getNamespaceURI();
+                    if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespace))
+                      {
+                        attrs.removeNamedItemNS(namespace,
+                                                attr.getLocalName());
+                        i--;
+                        len--;
+                      }
+                  }
+                attrs.readonly = aro;
+              }
+            break;
+          }
+      }
+    for (DomNode ctx = node.first; ctx != null; )
+      {
+        DomNode ctxNext = ctx.next;
+        normalizeNode(ctx);
+        ctx = ctxNext;
+      }
+  }
+  
+  public Node renameNode(Node n, String namespaceURI, String qualifiedName)
+    throws DOMException
+  {
+    if (n instanceof DomNsNode)
+      {
+        DomNsNode src = (DomNsNode) n;
+        if (src == null)
+          {
+            throw new DomEx(DomEx.NOT_FOUND_ERR);
+          }
+        if (src.owner != this)
+          {
+            throw new DomEx(DomEx.WRONG_DOCUMENT_ERR, null, src, 0);
+          }
+        boolean xml11 = "1.1".equals(version);
+        checkName(qualifiedName, xml11);
+        int ci = qualifiedName.indexOf(':');
+        if ("".equals(namespaceURI))
+          {
+            namespaceURI = null;
+          }
+        if (namespaceURI != null)
+          {
+            checkNCName(qualifiedName, xml11);
+            String prefix = (ci == -1) ? "" :
+              qualifiedName.substring(0, ci);
+            if (XMLConstants.XML_NS_PREFIX.equals(prefix) &&
+                !XMLConstants.XML_NS_URI.equals(namespaceURI))
+              {
+                throw new DomEx(DomEx.NAMESPACE_ERR,
+                                "xml namespace must be " +
+                                XMLConstants.XML_NS_URI, src, 0);
+              }
+            else if (src.nodeType == ATTRIBUTE_NODE &&
+                     (XMLConstants.XMLNS_ATTRIBUTE.equals(prefix) ||
+                      XMLConstants.XMLNS_ATTRIBUTE.equals(qualifiedName)) &&
+                     !XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceURI))
+              {
+                throw new DomEx(DomEx.NAMESPACE_ERR,
+                                "xmlns namespace must be " +
+                                XMLConstants.XMLNS_ATTRIBUTE_NS_URI, src, 0);
+              }
+            if (XMLConstants.XML_NS_URI.equals(namespaceURI) &&
+                !XMLConstants.XML_NS_PREFIX.equals(prefix))
+              {
+                throw new DomEx(DomEx.NAMESPACE_ERR,
+                                "xml namespace must be " +
+                                XMLConstants.XML_NS_URI, src, 0);
+              }
+            else if (src.nodeType == ATTRIBUTE_NODE &&
+                     XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceURI) &&
+                     !(XMLConstants.XMLNS_ATTRIBUTE.equals(prefix) ||
+                       XMLConstants.XMLNS_ATTRIBUTE.equals(qualifiedName)))
+              {
+                throw new DomEx(DomEx.NAMESPACE_ERR,
+                                "xmlns namespace must be " +
+                                XMLConstants.XMLNS_ATTRIBUTE_NS_URI, src, 0);
+              }
+                
+          }
+        src.setNodeName(qualifiedName);
+        src.setNamespaceURI(namespaceURI);
+        src.notifyUserDataHandlers(UserDataHandler.NODE_RENAMED, src, src);
+        // TODO MutationNameEvents
+        // DOMElementNameChanged or DOMAttributeNameChanged
+        return src;
+      }
+    throw new DomEx(DomEx.NOT_SUPPORTED_ERR, null, n, 0);
+  }
+
+  // -- XPathEvaluator --
+  
+  public XPathExpression createExpression(String expression,
+                                          XPathNSResolver resolver)
+    throws XPathException, DOMException
+  {
+    return new DomXPathExpression(this, expression, resolver);
+  }
+  
+  public XPathNSResolver createNSResolver(Node nodeResolver)
+  {
+    return new DomXPathNSResolver(nodeResolver);
+  }
+    
+  public Object evaluate(String expression,
+                         Node contextNode,
+                         XPathNSResolver resolver,
+                         short type,
+                         Object result)
+    throws XPathException, DOMException
+  {
+    XPathExpression xpe =
+      new DomXPathExpression(this, expression, resolver);
+    return xpe.evaluate(contextNode, type, result);
+  }
+
+}
+
diff --git a/libjava/gnu/xml/dom/DomDocumentBuilder.java b/libjava/gnu/xml/dom/DomDocumentBuilder.java
new file mode 100644 (file)
index 0000000..16ea2ae
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomDocumentBuilder.java
@@ -0,0 +1,160 @@
+/* DomDocumentBuilder.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import java.io.InputStream;
+import java.io.IOException;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.ParserConfigurationException;
+import org.w3c.dom.Document;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSParser;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * Document builder using the GNU DOM Load &amp; Save implementation.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class DomDocumentBuilder
+  extends DocumentBuilder
+{
+
+  final DOMImplementation impl;
+  final DOMImplementationLS ls;
+  final LSParser parser;
+  
+  DomDocumentBuilder(DOMImplementation impl,
+                     DOMImplementationLS ls,
+                     LSParser parser)
+  {
+    this.impl = impl;
+    this.ls = ls;
+    this.parser = parser;
+  }
+
+  public boolean isNamespaceAware()
+  {
+    DOMConfiguration config = parser.getDomConfig();
+    return ((Boolean) config.getParameter("namespaces")).booleanValue();
+  }
+  
+  public boolean isValidating()
+  {
+    DOMConfiguration config = parser.getDomConfig();
+    return ((Boolean) config.getParameter("validating")).booleanValue();
+  }
+
+  public boolean isXIncludeAware()
+  {
+    DOMConfiguration config = parser.getDomConfig();
+    return ((Boolean) config.getParameter("xinclude-aware")).booleanValue();
+  }
+
+  public void setEntityResolver(EntityResolver resolver)
+  {
+    DOMConfiguration config = parser.getDomConfig();
+    config.setParameter("entity-resolver", resolver);
+  }
+
+  public void setErrorHandler(ErrorHandler handler)
+  {
+    DOMConfiguration config = parser.getDomConfig();
+    config.setParameter("error-handler", handler);
+  }
+
+  public DOMImplementation getDOMImplementation()
+  {
+    return impl;
+  }
+  
+  public Document newDocument()
+  {
+    return impl.createDocument(null, null, null);
+  }
+
+  public Document parse(InputStream in)
+    throws SAXException, IOException
+  {
+    LSInput input = ls.createLSInput();
+    input.setByteStream(in);
+    return parser.parse(input);
+  }
+
+  public Document parse(InputStream in, String systemId)
+    throws SAXException, IOException
+  {
+    LSInput input = ls.createLSInput();
+    input.setByteStream(in);
+    input.setSystemId(systemId);
+    return parser.parse(input);
+  }
+
+  public Document parse(String systemId)
+    throws SAXException, IOException
+  {
+    return parser.parseURI(systemId);
+  }
+
+  public Document parse(InputSource is)
+    throws SAXException, IOException
+  {
+    LSInput input = ls.createLSInput();
+    InputStream in = is.getByteStream();
+    if (in != null)
+      {
+        input.setByteStream(in);
+      }
+    else
+      {
+        input.setCharacterStream(is.getCharacterStream());
+      }
+    input.setPublicId(is.getPublicId());
+    input.setSystemId(is.getSystemId());
+    input.setEncoding(is.getEncoding());
+    return parser.parse(input);
+  }
+
+}
+
diff --git a/libjava/gnu/xml/dom/DomDocumentBuilderFactory.java b/libjava/gnu/xml/dom/DomDocumentBuilderFactory.java
new file mode 100644 (file)
index 0000000..2d049bd
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomDocumentBuilderFactory.java
@@ -0,0 +1,128 @@
+/* DomDocumentBuilderFactory.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.FactoryConfigurationError;
+import javax.xml.parsers.ParserConfigurationException;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.bootstrap.DOMImplementationRegistry;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSParser;
+
+/**
+ * Document builder factory that uses a DOM Level 3 Load &amp; Save
+ * implementation.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomDocumentBuilderFactory
+  extends DocumentBuilderFactory
+{
+
+  final DOMImplementation impl;
+  final DOMImplementationLS ls;
+
+  public DomDocumentBuilderFactory()
+  {
+    try
+      {
+        DOMImplementationRegistry reg =
+          DOMImplementationRegistry.newInstance();
+        impl = reg.getDOMImplementation("LS 3.0");
+        if (impl == null)
+          {
+            throw new FactoryConfigurationError("no LS implementations found");
+          }
+        ls = (DOMImplementationLS) impl;
+      }
+    catch (Exception e)
+      {
+        throw new FactoryConfigurationError(e);
+      }
+  }
+
+  public DocumentBuilder newDocumentBuilder()
+    throws ParserConfigurationException
+  {
+    LSParser parser = ls.createLSParser(DOMImplementationLS.MODE_ASYNCHRONOUS,
+                                        "http://www.w3.org/TR/REC-xml");
+    DOMConfiguration config = parser.getDomConfig();
+    setParameter(config, "namespaces",
+                 isNamespaceAware() ? Boolean.TRUE : Boolean.FALSE);
+    setParameter(config, "element-content-whitespace",
+                 isIgnoringElementContentWhitespace() ? Boolean.FALSE :
+                 Boolean.TRUE);
+    setParameter(config, "comments",
+                 isIgnoringComments() ? Boolean.FALSE : Boolean.TRUE);
+    setParameter(config, "expand-entity-references",
+                 isExpandEntityReferences() ? Boolean.TRUE : Boolean.FALSE);
+    setParameter(config, "coalescing",
+                 isCoalescing() ? Boolean.TRUE : Boolean.FALSE);
+    setParameter(config, "validating",
+                 isValidating() ? Boolean.TRUE : Boolean.FALSE);
+    setParameter(config, "xinclude-aware",
+                 isXIncludeAware() ? Boolean.TRUE : Boolean.FALSE);
+    return new DomDocumentBuilder(impl, ls, parser);
+  }
+
+  void setParameter(DOMConfiguration config, String name, Object value)
+    throws ParserConfigurationException
+  {
+    if (!config.canSetParameter(name, value))
+      {
+        throw new ParserConfigurationException(name);
+      }
+    config.setParameter(name, value);
+  }
+
+  public Object getAttribute(String name)
+  {
+    // TODO
+    return null;
+  }
+
+  public void setAttribute(String name, Object value)
+  {
+    // TODO
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/DomDocumentConfiguration.java b/libjava/gnu/xml/dom/DomDocumentConfiguration.java
new file mode 100644 (file)
index 0000000..eebee09
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomDocumentConfiguration.java
@@ -0,0 +1,259 @@
+/* DomDocumentConfiguration.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import java.util.Arrays;
+import java.util.List;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.DOMErrorHandler;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.DOMStringList;
+
+/**
+ * Document configuration, used to store normalization and other parameters.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class DomDocumentConfiguration
+  implements DOMConfiguration, DOMStringList
+{
+
+  private static final List SUPPORTED_PARAMETERS =
+    Arrays.asList(new String[] { "cdata-sections",
+                  "comments",
+                  "element-content-whitespace",
+                  "entities",
+                  "error-handler",
+                  "namespace-declarations",
+                  "split-cdata-sections",
+                  "infoset"});
+
+  boolean cdataSections = true;
+  boolean comments = true;
+  boolean elementContentWhitespace = true;
+  boolean entities = true;
+  DOMErrorHandler errorHandler;
+  boolean namespaceDeclarations = true;
+  boolean splitCdataSections = true;
+
+  public void setParameter(String name, Object value)
+    throws DOMException
+  {
+    name = name.toLowerCase();
+    if ("cdata-sections".equals(name))
+      {
+        cdataSections = "true".equals(value.toString());
+      }
+    else if ("comments".equals(name))
+      {
+        comments = "true".equals(value.toString());
+      }
+    else if ("element-content-whitespace".equals(name))
+      {
+        elementContentWhitespace = "true".equals(value.toString());
+      }
+    else if ("entities".equals(name))
+      {
+        entities = "true".equals(value.toString());
+      }
+    else if ("error-handler".equals(name))
+      {
+        try
+          {
+            errorHandler = (DOMErrorHandler) value;
+          }
+        catch (ClassCastException e)
+          {
+            throw new DomEx(DomEx.TYPE_MISMATCH_ERR,
+                            value.getClass().getName(), null, 0);
+          }
+      }
+    else if ("namespace-declarations".equals(name))
+      {
+        namespaceDeclarations = "true".equals(value.toString());
+      }
+    else if ("split-cdata-sections".equals(name))
+      {
+        comments = "true".equals(value.toString());
+      }
+    else if ("infoset".equals(name))
+      {
+        if ("true".equals(value.toString()))
+          {
+            entities = false;
+            cdataSections = false;
+            namespaceDeclarations = true;
+            elementContentWhitespace = true;
+            comments = true;
+          }
+      }
+    else if (("canonical-form".equals(name) ||
+              "check-character-normalization".equals(name) ||
+              "datatype-normalization".equals(name) ||
+              "normalize-characters".equals(name) ||
+              "validate".equals(name) ||
+              "validate-if-schema".equals(name)) &&
+             "false".equals(value.toString()))
+      {
+        // NOOP
+      }
+    else if (("namespaces".equals(name) ||
+              "well-formed".equals(name)) &&
+             "true".equals(value.toString()))
+      {
+        // NOOP
+      }
+    else
+      {
+        throw new DomEx(DomEx.NOT_SUPPORTED_ERR, name, null, 0);
+      }
+  }
+
+  public Object getParameter(String name)
+    throws DOMException
+  {
+    name = name.toLowerCase();
+    if ("cdata-sections".equals(name))
+      {
+        return cdataSections ? Boolean.TRUE : Boolean.FALSE;
+      }
+    else if ("comments".equals(name))
+      {
+        return comments ? Boolean.TRUE : Boolean.FALSE;
+      }
+    else if ("element-content-whitespace".equals(name))
+      {
+        return elementContentWhitespace ? Boolean.TRUE : Boolean.FALSE;
+      }
+    else if ("entities".equals(name))
+      {
+        return entities ? Boolean.TRUE : Boolean.FALSE;
+      }
+    else if ("error-handler".equals(name))
+      {
+        return errorHandler;
+      }
+    else if ("namespace-declarations".equals(name))
+      {
+        return namespaceDeclarations ? Boolean.TRUE : Boolean.FALSE;
+      }
+    else if ("split-cdata-sections".equals(name))
+      {
+        return comments ? Boolean.TRUE : Boolean.FALSE;
+      }
+    else if ("canonical-form".equals(name) ||
+             "check-character-normalization".equals(name) ||
+             "datatype-normalization".equals(name) ||
+             "normalize-characters".equals(name) ||
+             "validate".equals(name) ||
+             "validate-if-schema".equals(name))
+      {
+        return Boolean.FALSE;
+      }
+    else if ("namespaces".equals(name) ||
+             "well-formed".equals(name))
+      {
+        return Boolean.TRUE;
+      }
+    else if ("infoset".equals(name))
+      {
+        return (entities == false &&
+            cdataSections == false &&
+            namespaceDeclarations == true &&
+            comments == true) ? Boolean.TRUE : Boolean.FALSE;
+      }
+    throw new DomEx(DomEx.NOT_SUPPORTED_ERR, name, null, 0);
+  }
+
+  public boolean canSetParameter(String name, Object value)
+  {
+    name = name.toLowerCase();
+    if ("error-handler".equals(name))
+      {
+        return (value == null || value instanceof DOMErrorHandler);
+      }
+    else if (contains(name))
+      {
+        return true;
+      }
+    else if ("canonical-form".equals(name) ||
+             "check-character-normalization".equals(name) ||
+             "datatype-normalization".equals(name) ||
+             "normalize-characters".equals(name) ||
+             "validate".equals(name) ||
+             "validate-if-schema".equals(name))
+      {
+        return "false".equals(value.toString());
+      }
+    else if ("namespaces".equals(name) ||
+             "well-formed".equals(name))
+      {
+        return "true".equals(value.toString());
+      }
+    return false;
+  }
+
+  public DOMStringList getParameterNames()
+  {
+    return this;
+  }
+
+  public String item(int i)
+  {
+    try
+      {
+        return (String) SUPPORTED_PARAMETERS.get(i);
+      }
+    catch (IndexOutOfBoundsException e)
+      {
+        return null;
+      }
+  }
+  
+  public int getLength()
+  {
+    return SUPPORTED_PARAMETERS.size();
+  }
+  
+  public boolean contains(String str)
+  {
+    str = str.toLowerCase();
+    return SUPPORTED_PARAMETERS.contains(str);
+  }
+
+}
diff --git a/libjava/gnu/xml/dom/DomElement.java b/libjava/gnu/xml/dom/DomElement.java
new file mode 100644 (file)
index 0000000..fb04638
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomElement.java
@@ -0,0 +1,522 @@
+/* DomElement.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import java.util.HashSet;
+import java.util.Set;
+import javax.xml.XMLConstants;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.TypeInfo;
+
+/**
+ * <p> "Element" implementation.
+ *
+ * @author David Brownell 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomElement
+  extends DomNsNode
+  implements Element
+{
+
+  /**
+   * User-defined ID attributes.
+   * Used by DomAttr.isId and DomDocument.getElementById
+   */
+  Set userIdAttrs;
+
+  // Attributes are VERY expensive in DOM, and not just for
+  // this implementation.  Avoid creating them.
+  private DomNamedNodeMap attributes;
+
+  // xml:space cache
+  String xmlSpace = "";
+
+  /**
+   * Constructs an Element node associated with the specified document.
+   *
+   * <p>This constructor should only be invoked by a Document as part
+   * of its createElement functionality, or through a subclass which is
+   * similarly used in a "Sub-DOM" style layer.
+   *
+   * @param owner The document with which this node is associated
+   * @param namespaceURI Combined with the local part of the name,
+   *   this is used to uniquely identify a type of element
+   * @param name Name of this element, which may include a prefix
+   */
+  protected DomElement(DomDocument owner, String namespaceURI, String name)
+  {
+    super(ELEMENT_NODE, owner, namespaceURI, name);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the element's attributes
+   */
+  public NamedNodeMap getAttributes()
+  {
+    if (attributes == null)
+      {
+        attributes = new DomNamedNodeMap(this, Node.ATTRIBUTE_NODE);
+      }
+    return attributes;
+  }
+
+  /**
+   * <b>DOM L2></b>
+   * Returns true iff this is an element node with attributes.
+   */
+  public boolean hasAttributes()
+  {
+    return attributes != null && attributes.length != 0;
+  }
+
+  /**
+   * Shallow clone of the element, except that associated
+   * attributes are (deep) cloned.
+   */
+  public Object clone()
+  {
+    DomElement node = (DomElement) super.clone();
+
+    if (attributes != null)
+      {
+        node.attributes = new DomNamedNodeMap(node, Node.ATTRIBUTE_NODE);
+        for (DomNode ctx = attributes.first; ctx != null; ctx = ctx.next)
+          {
+            node.attributes.setNamedItemNS(ctx.cloneNode(true));
+          }
+      }
+    return node;
+  }
+
+  void setOwner(DomDocument doc)
+  {
+    if (attributes != null)
+      {
+        for (DomNode ctx = attributes.first; ctx != null; ctx = ctx.next)
+          {
+            ctx.setOwner(doc);
+          }
+      }
+    super.setOwner(doc);
+  }
+
+  /**
+   * Marks this element, its children, and its associated attributes as
+   * readonly.
+   */
+  public void makeReadonly()
+  {
+    super.makeReadonly();
+    if (attributes != null)
+      {
+        attributes.makeReadonly();
+      }
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the element name (same as getNodeName).
+   */
+  final public String getTagName()
+  {
+    return getNodeName();
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the value of the specified attribute, or an
+   * empty string.
+   */
+  public String getAttribute(String name)
+  {
+    if ("xml:space" == name) // NB only works on interned string
+      {
+        // Use cached value
+        return xmlSpace;
+      }
+    Attr attr = getAttributeNode(name);
+    return (attr == null) ? "" : attr.getValue();
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Returns true if the element has an attribute with the
+   * specified name (specified or DTD defaulted).
+   */
+  public boolean hasAttribute(String name)
+  {
+    return getAttributeNode(name) != null;
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Returns true if the element has an attribute with the
+   * specified name (specified or DTD defaulted).
+   */
+  public boolean hasAttributeNS(String namespaceURI, String local)
+  {
+    return getAttributeNodeNS(namespaceURI, local) != null;
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Returns the value of the specified attribute, or an
+   * empty string.
+   */
+  public String getAttributeNS(String namespaceURI, String local)
+  {
+    Attr attr = getAttributeNodeNS(namespaceURI, local);
+    return (attr == null) ? "" : attr.getValue();
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the appropriate attribute node; the name is the
+   * nodeName property of the attribute.
+   */
+  public Attr getAttributeNode(String name)
+  {
+    return (attributes == null) ? null :
+      (Attr) attributes.getNamedItem(name);
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Returns the appropriate attribute node; the name combines
+   * the namespace name and the local part.
+   */
+  public Attr getAttributeNodeNS(String namespace, String localPart)
+  {
+    return (attributes == null) ? null :
+      (Attr) attributes.getNamedItemNS(namespace, localPart);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Modifies an existing attribute to have the specified value,
+   * or creates a new one with that value.  The name used is the
+   * nodeName value. 
+   */
+  public void setAttribute(String name, String value)
+  {
+    Attr attr = getAttributeNode(name);
+    if (attr != null)
+      {
+        attr.setNodeValue(value);
+        ((DomAttr) attr).setSpecified(true);
+        return;
+      }
+    attr = owner.createAttribute(name);
+    attr.setNodeValue(value);
+    setAttributeNode(attr);
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Modifies an existing attribute to have the specified value,
+   * or creates a new one with that value.
+   */
+  public void setAttributeNS(String uri, String aname, String value)
+  {
+    if (("xmlns".equals (aname) || aname.startsWith ("xmlns:"))
+        && !XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals (uri))
+      {
+        throw new DomEx(DomEx.NAMESPACE_ERR,
+                        "setting xmlns attribute to illegal value", this, 0);
+      }
+
+    Attr attr = getAttributeNodeNS(uri, aname);
+    if (attr != null)
+      {
+        attr.setNodeValue(value);
+        return;
+      }
+    attr = owner.createAttributeNS(uri, aname);
+    attr.setNodeValue(value);
+    setAttributeNodeNS(attr);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Stores the specified attribute, optionally overwriting any
+   * existing one with that name.
+   */
+  public Attr setAttributeNode(Attr attr)
+  {
+    return (Attr) getAttributes().setNamedItem(attr);
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Stores the specified attribute, optionally overwriting any
+   * existing one with that name.
+   */
+  public Attr setAttributeNodeNS(Attr attr)
+  {
+    return (Attr) getAttributes().setNamedItemNS(attr);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Removes the appropriate attribute node.
+   * If there is no such node, this is (bizarrely enough) a NOP so you
+   * won't see exceptions if your code deletes non-existent attributes.
+   *
+   * <p>Note that since there is no portable way for DOM to record
+   * DTD information, default values for attributes will never be
+   * provided automatically.
+   */
+  public void removeAttribute(String name)
+  {
+    if (attributes == null)
+      {
+        return;
+      }
+
+    try
+      {
+        attributes.removeNamedItem(name);
+      }
+    catch (DomEx e)
+      {
+        if (e.code != DomEx.NOT_FOUND_ERR)
+          {
+            throw e;
+          }
+      }
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Removes the appropriate attribute node; the name is the
+   * nodeName property of the attribute.
+   *
+   * <p>Note that since there is no portable way for DOM to record
+   * DTD information, default values for attributes will never be
+   * provided automatically.
+   */
+  public Attr removeAttributeNode(Attr node)
+  {
+    if (attributes == null)
+      {
+        throw new DomEx(DomEx.NOT_FOUND_ERR, null, node, 0);
+      }
+    return (Attr) attributes.removeNamedItem(node.getNodeName());
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Removes the appropriate attribute node; the name combines
+   * the namespace name and the local part.
+   *
+   * <p>Note that since there is no portable way for DOM to record
+   * DTD information, default values for attributes will never be
+   * provided automatically.
+   */
+  public void removeAttributeNS(String namespace, String localPart)
+  {
+    if (attributes == null)
+      {
+        throw new DomEx(DomEx.NOT_FOUND_ERR, localPart, null, 0);
+      }
+    attributes.removeNamedItemNS (namespace, localPart);
+  }
+
+  // DOM Level 3 methods
+
+  public String lookupPrefix(String namespaceURI)
+  {
+    if (namespaceURI == null)
+      {
+        return null;
+      }
+    String namespace = getNamespaceURI();
+    if (namespace != null && namespace.equals(namespaceURI))
+      {
+        return getPrefix();
+      }
+    if (attributes != null)
+      {
+        for (DomNode ctx = attributes.first; ctx != null; ctx = ctx.next)
+          {
+            if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI
+                .equals(ctx.getNamespaceURI()))
+              {
+                String value = ctx.getNodeValue();
+                if (value.equals(namespaceURI))
+                  {
+                    return ctx.getLocalName();
+                  }
+              }
+          }
+      }
+    return super.lookupPrefix(namespaceURI);
+  }
+
+  public boolean isDefaultNamespace(String namespaceURI)
+  {
+    String namespace = getNamespaceURI();
+    if (namespace != null && namespace.equals(namespaceURI))
+      {
+        return getPrefix() == null;
+      }
+    if (attributes != null)
+      {
+        for (DomNode ctx = attributes.first; ctx != null; ctx = ctx.next)
+          {
+            if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI
+                .equals(ctx.getNamespaceURI()))
+              {
+                String qName = ctx.getNodeName();
+                return (XMLConstants.XMLNS_ATTRIBUTE.equals(qName));
+              }
+          }
+      }
+    return super.isDefaultNamespace(namespaceURI);
+  }
+
+  public String lookupNamespaceURI(String prefix)
+  {
+    String namespace = getNamespaceURI();
+    if (namespace != null && equal(prefix, getPrefix()))
+      {
+        return namespace;
+      }
+    if (attributes != null)
+      {
+        for (DomNode ctx = attributes.first; ctx != null; ctx = ctx.next)
+          {
+            if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI
+                .equals(ctx.getNamespaceURI()))
+              {
+                if (prefix == null)
+                  {
+                    if (XMLConstants.XMLNS_ATTRIBUTE.equals(ctx.getNodeName()))
+                      {
+                        return ctx.getNodeValue();
+                      }
+                  }
+                else
+                  {
+                    if (prefix.equals(ctx.getLocalName()))
+                      {
+                        return ctx.getNodeValue();
+                      }
+                  }
+              }
+          }
+      }
+    return super.lookupNamespaceURI(prefix);
+  }
+  
+  public String getBaseURI()
+  {
+    if (attributes != null)
+      {
+        Node xmlBase =
+          attributes.getNamedItemNS(XMLConstants.XML_NS_URI, "base");
+        if (xmlBase != null)
+          {
+            return xmlBase.getNodeValue();
+          }
+      }
+    return super.getBaseURI();
+  }
+  
+  public TypeInfo getSchemaTypeInfo()
+  {
+    // DTD implementation
+    DomDoctype doctype = (DomDoctype) owner.getDoctype();
+    if (doctype != null)
+      {
+        return doctype.getElementTypeInfo(getNodeName());
+      }
+    // TODO XML Schema implementation
+    return null;
+  }
+
+  public void setIdAttribute(String name, boolean isId)
+  {
+    NamedNodeMap attrs = getAttributes();
+    Attr attr = (Attr) attrs.getNamedItem(name);
+    setIdAttributeNode(attr, isId);
+  }
+  
+  public void setIdAttributeNode(Attr attr, boolean isId)
+  {
+    if (readonly)
+      {
+        throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+      }
+    if (attr == null || attr.getOwnerElement() != this)
+      {
+        throw new DomEx(DomEx.NOT_FOUND_ERR);
+      }
+    if (isId)
+      {
+        if (userIdAttrs == null)
+          {
+            userIdAttrs = new HashSet();
+          }
+        userIdAttrs.add(attr);
+      }
+    else if (userIdAttrs != null)
+      {
+        userIdAttrs.remove(attr);
+        if (userIdAttrs.isEmpty())
+          {
+            userIdAttrs = null;
+          }
+      }
+  }
+
+  public void setIdAttributeNS(String namespaceURI, String localName,
+                               boolean isId)
+  {
+    NamedNodeMap attrs = getAttributes();
+    Attr attr = (Attr) attrs.getNamedItemNS(namespaceURI, localName);
+    setIdAttributeNode(attr, isId);
+  }
+  
+}
diff --git a/libjava/gnu/xml/dom/DomEntity.java b/libjava/gnu/xml/dom/DomEntity.java
new file mode 100644 (file)
index 0000000..5432bbc
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomEntity.java
@@ -0,0 +1,147 @@
+/* DomEntity.java -- 
+   Copyright (C) 1999,2000,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import org.w3c.dom.Entity;
+
+/**
+ * <p> "Entity" implementation.  This is a non-core DOM class, supporting the
+ * "XML" feature.  There are two types of entities, neither of which works
+ * particularly well in this API:</p><dl>
+ *
+ * <dt><em>Unparsed Entities</em></dt>
+ *     <dd>Since ENTITY/ENTITIES attributes, the only legal use of unparsed
+ *     entities in XML, can't be detected with DOM, there isn't much point in
+ *     trying to use unparsed entities in DOM applications.  (XML Linking is
+ *     working to provide a better version of this functionality.) </dd>
+ *
+ * <dt><em>Parsed Entities</em></dt>
+ *     <dd> While the DOM specification permits nodes for parsed entities
+ *     to have a readonly set of children, this is not required and there
+ *     is no portable way to provide such children.  <em>This implementation
+ *     currently does not permit children to be added to Entities.</em>
+ *     There are related issues with the use of EntityReference nodes.  </dd>
+ *
+ * </dl>
+ *
+ * <p> In short, <em>avoid using this DOM functionality</em>.
+ *
+ * @see DomDoctype
+ * @see DomEntityReference
+ * @see DomNotation
+ *
+ * @author David Brownell 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomEntity
+  extends DomExtern
+  implements Entity
+{
+  
+  private String notation;
+
+  /**
+   * Constructs an Entity node associated with the specified document,
+   * with the specified descriptive data.
+   *
+   * <p>This constructor should only be invoked by a DomDoctype as part
+   * of its declareEntity functionality, or through a subclass which is
+   * similarly used in a "Sub-DOM" style layer.
+   *
+   * @param owner The document with which this entity is associated
+   * @param name Name of this entity
+   * @param publicId If non-null, provides the entity's PUBLIC identifier
+   * @param systemId Provides the entity's SYSTEM identifier (URI)
+   * @param notation If non-null, provides the unparsed entity's notation.
+   */
+  protected DomEntity(DomDocument owner,
+                      String name,
+                      String publicId,
+                      String systemId,
+                      String notation)
+  {
+    super(ENTITY_NODE, owner, name, publicId, systemId);
+    this.notation = notation;
+
+    // NOTE:  if notation == null, this is a parsed entity
+    // which could reasonably be given child nodes ...
+    makeReadonly();
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the NOTATION identifier associated with this entity, if any.
+   */
+  final public String getNotationName()
+  {
+    return notation;
+  }
+
+  // DOM Level 3 methods
+  
+  public String getInputEncoding()
+  {
+    // TODO
+    return null;    
+  }
+  
+  public String getXmlEncoding()
+  {
+    // TODO
+    return null;
+  }
+
+  public String getXmlVersion()
+  {
+    // TODO
+    return null;
+  }
+
+  /**
+   * The base URI of an external entity is its system ID.
+   * The base URI of an internal entity is the parent document's base URI.
+   * @since DOM Level 3 Core
+   */
+  public String getBaseURI()
+  {
+    String systemId = getSystemId();
+    return (systemId == null) ? owner.getBaseURI() : systemId;
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/DomEntityReference.java b/libjava/gnu/xml/dom/DomEntityReference.java
new file mode 100644 (file)
index 0000000..65efcfc
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomEntityReference.java
@@ -0,0 +1,130 @@
+/* DomEntityReference.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Entity;
+import org.w3c.dom.EntityReference;
+
+/**
+ * <p> "EntityReference" implementation (reference to parsed entity).
+ * This is a non-core DOM class, supporting the "XML" feature.
+ * It does not represent builtin entities (such as "&amp;amp;")
+ * or character references, which are always directly expanded in
+ * DOM trees.</p>
+ *
+ * <p> Note that while the DOM specification permits these nodes to have
+ * a readonly set of children, this is not required.  Similarly, it does
+ * not require a DOM to couple EntityReference nodes with any Entity nodes
+ * that have the same entity name (and equivalent children).  It also
+ * effectively guarantees that references created directly or indirectly
+ * through the <em>Document.ImportNode</em> method will not have children.
+ * The level of functionality you may get is extremely variable.
+ *
+ * <p> Also significant is that even at their most functional level, the fact
+ * that EntityReference children must be readonly has caused significant
+ * problems when modifying work products held in DOM trees.  Other problems
+ * include issues related to undeclared namespace prefixes (and references
+ * to the current default namespace) that may be found in the text of such
+ * parsed entities nodes.  These must be contextually bound as part of DOM
+ * tree construction.  When such nodes are moved, the namespace associated
+ * with a given prefix (or default) may change to be in conflict with the
+ * namespace bound to the node at creation time.
+ *
+ * <p> In short, <em>avoid using this DOM functionality</em>.
+ *
+ * @see DomDoctype
+ * @see DomEntity
+ *
+ * @author David Brownell 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomEntityReference
+  extends DomNode
+  implements EntityReference
+{
+
+  private String name;
+  
+  /**
+   * Constructs an EntityReference node associated with the specified
+   * document.  The creator should populate this with whatever contents
+   * are appropriate, and then mark it as readonly.
+   *
+   * <p>This constructor should only be invoked by a Document as part of
+   * its createEntityReference functionality, or through a subclass which
+   * is similarly used in a "Sub-DOM" style layer.
+   *
+   * @see DomNode#makeReadonly
+   */
+  protected DomEntityReference(DomDocument owner, String name)
+  {
+    super(ENTITY_REFERENCE_NODE, owner);
+    this.name = name;
+  }
+  
+  /**
+   * Returns the name of the referenced entity.
+   * @since DOM Level 1 Core
+   */
+  public final String getNodeName()
+  {
+    return name;
+  }
+
+  /**
+   * The base URI of an entity reference is the base URI where the entity
+   * declaration occurs.
+   * @since DOM Level 3 Core
+   */
+  public final String getBaseURI()
+  {
+    DocumentType doctype = owner.getDoctype();
+    if (doctype == null)
+      {
+        return null;
+      }
+    Entity entity = (Entity) doctype.getEntities().getNamedItem(name);
+    if (entity == null)
+      {
+        return null;
+      }
+    return entity.getBaseURI();
+  }
+
+}
diff --git a/libjava/gnu/xml/dom/DomEvent.java b/libjava/gnu/xml/dom/DomEvent.java
new file mode 100644 (file)
index 0000000..4a52492
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomEvent.java
@@ -0,0 +1,345 @@
+/* DomEvent.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import org.w3c.dom.*;
+import org.w3c.dom.events.*;
+import org.w3c.dom.views.AbstractView;         // used by UIEvent
+
+/**
+ * "Event" implementation.  Events are
+ * created (through DocumentEvent interface methods on the document object),
+ * and are sent to any target node in the document.
+ *
+ * <p> Applications may define application specific event subclasses, but
+ * should otherwise use the <em>DocumentTraversal</em> interface to acquire
+ * event objects.
+ *
+ * @author David Brownell
+ */
+public class DomEvent
+  implements Event
+{
+  
+  String  type;  // init
+  EventTarget  target;
+  EventTarget  currentNode;
+  short  eventPhase;
+  boolean  bubbles; // init
+  boolean  cancelable; // init
+  long  timeStamp; // ?
+
+  /** Returns the event's type (name) as initialized */
+  public final String getType()
+  {
+    return type;
+  }
+
+  /**
+   * Returns event's target; delivery of an event is initiated
+   * by a <em>target.dispatchEvent(event)</em> invocation.
+   */
+  public final EventTarget getTarget()
+  {
+    return target;
+  }
+
+  /**
+   * Returns the target to which events are currently being
+   * delivered.  When capturing or bubbling, this will not
+   * be what <em>getTarget</em> returns.
+   */
+  public final EventTarget getCurrentTarget()
+  {
+    return currentNode;
+  }
+
+  /**
+   * Returns CAPTURING_PHASE, AT_TARGET, or BUBBLING;
+   * only meaningful within EventListener.handleEvent
+   */
+  public final short getEventPhase()
+  {
+    return eventPhase;
+  }
+
+  /**
+   * Returns true if the news of the event bubbles to tree tops
+   * (as specified during initialization).
+   */
+  public final boolean getBubbles()
+  {
+    return bubbles;
+  }
+
+  /**
+   * Returns true if the default handling may be canceled
+   * (as specified during initialization).
+   */
+  public final boolean getCancelable()
+  {
+    return cancelable;
+  }
+
+  /**
+   * Returns the event's timestamp.
+   */
+  public final long getTimeStamp()
+  {
+    return timeStamp;
+  }
+  
+  boolean stop;
+  boolean doDefault;
+  
+  /**
+   * Requests the event no longer be captured or bubbled; only
+   * listeners on the event target will see the event, if they
+   * haven't yet been notified.
+   *
+   * <p> <em> Avoid using this </em> except for application-specific
+   * events, for which you the protocol explicitly "blesses" the use
+   * of this with some event types.  Otherwise, you are likely to break
+   * algorithms which depend on event notification either directly or
+   * through bubbling or capturing.  </p>
+   *
+   * <p> Note that this method is not final, specifically to enable
+   * enforcing of policies about events always propagating. </p>
+   */
+  public void stopPropagation()
+  {
+    stop = true;
+  }
+
+  /**
+   * Requests that whoever dispatched the event not perform their
+   * default processing when event delivery completes.  Initializes
+   * event timestamp.
+   */
+  public final void preventDefault()
+  {
+    doDefault = false;
+  }
+
+  /** Initializes basic event state.  */
+  public void initEvent(String typeArg,
+                        boolean canBubbleArg,
+                        boolean cancelableArg)
+  {
+    eventPhase = 0;
+    type = typeArg;
+    bubbles = canBubbleArg;
+    cancelable = cancelableArg;
+    timeStamp = System.currentTimeMillis();
+  }
+  
+  /** Constructs, but does not initialize, an event. */
+  public DomEvent(String type)
+  {
+    this.type = type;
+  }
+
+  /**
+   * Returns a basic printable description of the event's type,
+   * state, and delivery conditions
+   */
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer("[Event ");
+    buf.append(type);
+    switch (eventPhase)
+      {
+      case CAPTURING_PHASE:
+        buf.append(", CAPTURING");
+        break;
+      case AT_TARGET:
+        buf.append(", AT TARGET");
+        break;
+      case BUBBLING_PHASE:
+        buf.append(", BUBBLING");
+        break;
+      default:
+        buf.append(", (inactive)");
+        break;
+      }
+    if (bubbles && eventPhase != BUBBLING_PHASE)
+      {
+        buf.append(", bubbles");
+      }
+    if (cancelable)
+      {
+        buf.append(", can cancel");
+      }
+    // were we to provide subclass info, this's where it'd live
+    buf.append("]");
+    return buf.toString();
+  }
+  
+  /**
+   * "MutationEvent" implementation.
+   */
+  public static final class DomMutationEvent
+    extends DomEvent
+    implements MutationEvent
+  {
+    
+    // package private
+    Node   relatedNode; // init
+    
+    private String  prevValue; // init
+    private String  newValue; // init
+    
+    private String  attrName; // init
+    private short  attrChange; // init
+    
+    /** Returns any "related" node provided by this type of event */
+    public final Node getRelatedNode()
+    {
+      return relatedNode;
+    }
+    
+    /** Returns any "previous value" provided by this type of event */
+    public final String getPrevValue()
+    {
+      return prevValue;
+    }
+    
+    /** Returns any "new value" provided by this type of event */
+    public final String getNewValue()
+    {
+      return newValue;
+    }
+    
+    /** For attribute change events, returns the attribute's name */
+    public final String getAttrName()
+    {
+      return attrName;
+    }
+    
+    /** For attribute change events, returns how the attribuet changed */
+    public final short getAttrChange()
+    {
+      return attrChange;
+    }
+    
+    /** Initializes a mutation event */
+    public final void initMutationEvent(String typeArg,
+                                        boolean canBubbleArg,
+                                        boolean cancelableArg,
+                                        Node relatedNodeArg,
+                                        String prevValueArg,
+                                        String newValueArg,
+                                        String attrNameArg,
+                                        short attrChangeArg)
+    {
+      // super.initEvent is inlined here for speed
+      // (mutation events are issued on all DOM changes)
+      eventPhase = 0;
+      type = typeArg;
+      bubbles = canBubbleArg;
+      cancelable = cancelableArg;
+      timeStamp = System.currentTimeMillis();
+      
+      relatedNode = relatedNodeArg;
+      prevValue = prevValueArg;
+      newValue = newValueArg;
+      attrName = attrNameArg;
+      attrChange = attrChangeArg;
+    }
+
+    // clear everything that should be GC-able
+    void clear()
+    {
+      type = null;
+      target = null;
+      relatedNode = null;
+      currentNode = null;
+      prevValue = newValue = attrName = null;
+    }
+
+    /** Constructs an uninitialized mutation event. */
+    public DomMutationEvent(String type)
+    {
+      super(type);
+    }
+  
+  }
+
+  /**
+   * "UIEvent" implementation.
+   */
+  public static class DomUIEvent
+    extends DomEvent
+    implements UIEvent
+  {
+    
+    private AbstractView view;  // init
+    private int  detail;  // init
+    
+    /** Constructs an uninitialized User Interface (UI) event */
+    public DomUIEvent (String type) { super (type); }
+    
+    public final AbstractView getView () { return view; }
+    public final int getDetail () { return detail; }
+    
+    /** Initializes a UI event */
+    public final void initUIEvent(String typeArg,
+                                  boolean canBubbleArg,
+                                  boolean cancelableArg,
+                                  AbstractView viewArg,
+                                  int detailArg)
+    {
+      super.initEvent(typeArg, canBubbleArg, cancelableArg);
+      view = viewArg;
+      detail = detailArg;
+    }
+  
+  }
+
+    /*
+
+    static final class DomMouseEvent extends DomUIEvent
+ implements MouseEvent
+    {
+ // another half dozen state variables/accessors
+    }
+
+    */
+
+}
+
diff --git a/libjava/gnu/xml/dom/DomEx.java b/libjava/gnu/xml/dom/DomEx.java
new file mode 100644 (file)
index 0000000..aacac96
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomEx.java
@@ -0,0 +1,175 @@
+/* DomEx.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Node;
+
+/**
+ * <p> DOMException implementation.   The version that
+ * is provided by the W3C is abstract, so it can't be instantiated.
+ *
+ * <p> This also provides a bit more information about the error
+ * that is being reported, in terms of the relevant DOM structures
+ * and data.
+ *
+ * @author David Brownell 
+ */
+public class DomEx
+  extends DOMException
+{
+
+  /** @serial Data that caused an error to be reported */
+  private String data;
+  
+  /** @serial Node associated with the error. */
+  private Node node;
+  
+  /** @serial Data associated with the error. */
+  private int value;
+  
+  /**
+   * Constructs an exception, with the diagnostic message
+   * corresponding to the specified code.
+   */
+  public DomEx(short code)
+  {
+    super(code, diagnostic(code));
+  }
+  
+  /**
+   * Constructs an exception, with the diagnostic message
+   * corresponding to the specified code and additional
+   * information as provided.
+   */
+  public DomEx(short code, String data, Node node, int value)
+  {
+    super(code, diagnostic(code));
+    this.data = data;
+    this.node = node;
+    this.value = value;
+  }
+
+  /** Returns the node to which the diagnotic applies, or null. */
+  final public Node getNode()
+  {
+    return node;
+  }
+
+  /** Returns data to which the diagnotic applies, or null. */
+  final public String getData()
+  {
+    return data;
+  }
+
+  /** Returns data to which the diagnotic applies, or null. */
+  final public int getValue()
+  {
+    return value;
+  }
+
+  /**
+   * Returns a diagnostic message that may be slightly more useful
+   * than the generic one, where possible.
+   */
+  public String getMessage()
+  {
+    String retval = super.getMessage();
+    
+    if (data != null)
+      {
+        retval += "\nMore Information: " + data;
+      }
+    if (value != 0)
+      {
+        retval += "\nNumber: " + value;
+      }
+    if (node != null)
+      {
+        retval += "\nNode Name: " + node.getNodeName();
+      }
+    return retval;
+  }
+
+  // these strings should be localizable.
+  
+  private static String diagnostic(short code)
+  {
+    switch (code)
+      {        
+        // DOM L1:
+      case INDEX_SIZE_ERR:
+        return "An index or size is out of range.";
+      case DOMSTRING_SIZE_ERR:
+        return "A string is too big.";
+      case HIERARCHY_REQUEST_ERR:
+        return "The node doesn't belong here.";
+      case WRONG_DOCUMENT_ERR:
+        return "The node belongs in another document.";
+      case INVALID_CHARACTER_ERR:
+        return "That character is not permitted.";
+      case NO_DATA_ALLOWED_ERR:
+        return "This node does not permit data.";
+      case NO_MODIFICATION_ALLOWED_ERR:
+        return "No changes are allowed.";
+      case NOT_FOUND_ERR:
+        return "The node was not found in that context.";
+      case NOT_SUPPORTED_ERR:
+        return "That object is not supported.";
+      case INUSE_ATTRIBUTE_ERR:
+        return "The attribute belongs to a different element.";
+        
+        // DOM L2:
+      case INVALID_STATE_ERR:
+        return "The object is not usable.";
+      case SYNTAX_ERR:
+        return "An illegal string was provided.";
+      case INVALID_MODIFICATION_ERR:
+        return "An object's type may not be changed.";
+      case NAMESPACE_ERR:
+        return "The operation violates XML Namespaces.";
+      case INVALID_ACCESS_ERR:
+        return "Parameter or operation isn't supported by this node.";
+      case TYPE_MISMATCH_ERR:
+        return "The type of the argument is incompatible with the expected type.";
+      }
+    return "Reserved exception number: " + code;
+  }
+
+}
+
diff --git a/libjava/gnu/xml/dom/DomExtern.java b/libjava/gnu/xml/dom/DomExtern.java
new file mode 100644 (file)
index 0000000..afd5301
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomExtern.java
@@ -0,0 +1,117 @@
+/* DomExtern.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+/**
+ * <p> Abstract implemention of nodes describing external DTD-related
+ * objects.  This facilitates reusing code for Entity, Notation, and
+ * DocumentType (really, external subset) nodes.  Such support is not
+ * part of the core DOM; it's for the "XML" feature.  </p>
+ *
+ * <p> Note that you are strongly advised to avoid using the DOM
+ * features that take advantage of this class, since (as of L2) none
+ * of them is defined fully enough to permit full use of the
+ * XML feature they partially expose. </p>
+ *
+ * @author David Brownell 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public abstract class DomExtern
+  extends DomNode
+{
+ 
+  private final String name;
+  private final String publicId;
+  private final String systemId;
+  
+  /**
+   * Constructs a node associated with the specified document,
+   * with the specified descriptive data.
+   *
+   * @param owner The document with which this object is associated
+   * @param name Name of this object
+   * @param publicId If non-null, provides the entity's PUBLIC identifier
+   * @param systemId If non-null, provides the entity's SYSTEM identifier
+   */
+  // package private
+  DomExtern(short nodeType,
+            DomDocument owner,
+            String name,
+            String publicId,
+            String systemId)
+  {
+    super(nodeType, owner);
+    this.name = name;
+    this.publicId = publicId;
+    this.systemId = systemId;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the SYSTEM identifier associated with this object, if any.
+   */
+  public final String getSystemId()
+  {
+    return systemId;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the PUBLIC identifier associated with this object, if any.
+   */
+  public final String getPublicId()
+  {
+    return publicId;
+  }
+  
+  /**
+   * <b>DOM L1</b>
+   * Returns the object's name.
+   */
+  public final String getNodeName()
+  {
+    return name;
+  }
+
+  public final String getLocalName()
+  {
+    return name;
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/DomFragment.java b/libjava/gnu/xml/dom/DomFragment.java
new file mode 100644 (file)
index 0000000..44763a9
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomFragment.java
@@ -0,0 +1,76 @@
+/* DomFragment.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import org.w3c.dom.DocumentFragment;
+
+/**
+ * <p> "DocumentFragment" implementation.  </p>
+ *
+ * @author David Brownell 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomFragment
+  extends DomNode
+  implements DocumentFragment
+{
+  
+  /**
+   * Constructs a DocumentFragment node associated with the
+   * specified document.
+   *
+   * <p>This constructor should only be invoked by a Document as part of
+   * its createDocumentFragment functionality, or through a subclass which
+   * is similarly used in a "Sub-DOM" style layer.
+   */
+  protected DomFragment(DomDocument owner)
+  {
+    super(DOCUMENT_FRAGMENT_NODE, owner);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the string "#document-fragment".
+   */
+  final public String getNodeName()
+  {
+    return "#document-fragment";
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/DomImpl.java b/libjava/gnu/xml/dom/DomImpl.java
new file mode 100644 (file)
index 0000000..1a16de3
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomImpl.java
@@ -0,0 +1,260 @@
+/* DomImpl.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Element;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSOutput;
+import org.w3c.dom.ls.LSParser;
+import org.w3c.dom.ls.LSSerializer;
+import gnu.xml.dom.ls.DomLSInput;
+import gnu.xml.dom.ls.DomLSOutput;
+import gnu.xml.dom.ls.DomLSParser;
+import gnu.xml.dom.ls.DomLSSerializer;
+
+/**
+ * <p> "DOMImplementation" implementation. </p>
+ *
+ * <p> At this writing, the following features are supported:
+ * "XML" (L1, L2, L3),
+ * "Events" (L2), "MutationEvents" (L2), "USER-Events" (a conformant extension),
+ * "HTMLEvents" (L2), "UIEvents" (L2), "Traversal" (L2), "XPath" (L3),
+ * "LS" (L3) "LS-Async" (L3).
+ * It is possible to compile the package so it doesn't support some of these
+ * features (notably, Traversal).
+ *
+ * @author David Brownell 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomImpl
+  implements DOMImplementation, DOMImplementationLS
+{
+  
+  /**
+   * Constructs a DOMImplementation object which supports
+   * "XML" and other DOM Level 2 features.
+   */
+  public DomImpl()
+  {
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns true if the specified feature and version are
+   * supported.  Note that the case of the feature name is ignored.
+   */
+  public boolean hasFeature(String name, String version)
+  {
+    if (name.length() == 0)
+      {
+        return false;
+      }
+    name = name.toLowerCase();
+    if (name.charAt(0) == '+')
+      {
+        name = name.substring(1);
+      }
+    
+    if ("xml".equals(name) || "core".equals(name))
+      {
+        return (version == null ||
+                "".equals(version) ||
+                "1.0".equals(version) ||
+                "2.0".equals(version) ||
+                "3.0".equals(version));
+      
+      }
+    else if ("ls".equals(name) || "ls-async".equals(name))
+      {
+        return (version == null ||
+                "".equals(version) ||
+                "3.0".equals(version));
+      }
+    else if ("events".equals(name)
+             || "mutationevents".equals(name)
+             || "uievents".equals(name)
+             // || "mouseevents".equals(name)
+             || "htmlevents".equals(name))
+      {
+        return (version == null ||
+                "".equals(version) ||
+                "2.0".equals(version));
+       
+        // Extension:  "USER-" prefix event types can
+        // be created and passed through the DOM.
+
+      }
+    else if ("user-events".equals(name))
+      {
+        return (version == null ||
+                "".equals(version) ||
+                "0.1".equals(version));
+
+       // NOTE:  "hasFeature" for events is here interpreted to
+       // mean the DOM can manufacture those sorts of events,
+       // since actually choosing to report the events is more
+       // often part of the environment or application.  It's
+       // only really an issue for mutation events.
+
+      }
+    else if (DomNode.reportMutations
+             && "traversal".equals(name))
+      {
+        return (version == null ||
+                "".equals(version) ||
+               "2.0".equals(version));
+      }
+    else if ("xpath".equals(name))
+      {
+        return (version == null ||
+                "".equals(version) ||
+                "3.0".equals(version));
+      }
+
+    // views
+    // stylesheets
+    // css, css2
+    // range
+    
+    return false;
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Creates and returns a DocumentType, associated with this
+   * implementation.  This DocumentType can have no associated
+   * objects(notations, entities) until the DocumentType is
+   * first associated with a document.
+   *
+   * <p> Note that there is no implication that this DTD will
+   * be parsed by the DOM, or ever have contents.  Moreover, the
+   * DocumentType created here can only be added to a document by
+   * the createDocument method(below).  <em>That means that the only
+   * portable way to create a Document object is to start parsing,
+   * queue comment and processing instruction (PI) nodes, and then only
+   * create a DOM Document after <b>(a)</b> it's known if a DocumentType
+   * object is needed, and <b>(b) the name and namespace of the root
+   * element is known.  Queued comment and PI nodes would then be
+   * inserted appropriately in the document prologue, both before and
+   * after the DTD node, and additional attributes assigned to the
+   * root element.</em>
+   *(One hopes that the final DOM REC fixes this serious botch.)
+   */
+  public DocumentType createDocumentType(String rootName,
+                                         String publicId,
+                                         String systemId)
+    // CR2 deleted internal subset, ensuring DocumentType
+    // is 100% useless instead of just 90% so.
+  {
+    DomDocument.checkNCName(rootName, false);
+    return new DomDoctype(this, rootName, publicId, systemId, null);
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Creates and returns a Document, populated only with a root element and
+   * optionally a document type(if that was provided).
+   */
+  public Document createDocument(String namespaceURI,
+                                 String rootName,
+                                 DocumentType doctype)
+  {
+    Document doc = new DomDocument(this);
+    Element root = null;
+    
+    if (rootName != null)
+      {
+        root = doc.createElementNS(namespaceURI, rootName);
+        if (rootName.startsWith("xmlns:"))
+          {
+            throw new DomEx(DomEx.NAMESPACE_ERR, "xmlns is reserved", null, 0);
+          }
+      }
+    // Bleech -- L2 seemingly _requires_ omission of xmlns attributes.
+    if (doctype != null)
+      {
+        doc.appendChild(doctype);              // handles WRONG_DOCUMENT error
+      }
+    if (root != null)
+      {
+        doc.appendChild(root);
+      }
+    return doc;
+  }
+
+  // DOM Level 3
+  
+  public Object getFeature(String feature, String version)
+  {
+    if (hasFeature(feature, version))
+      {
+        return this;
+      }
+    return null;
+  }
+
+  // -- DOMImplementationLS --
+
+  public LSParser createLSParser(short mode, String schemaType)
+    throws DOMException
+  {
+    return new DomLSParser(mode, schemaType);
+  }
+
+  public LSSerializer createLSSerializer()
+  {
+    return new DomLSSerializer();
+  }
+
+  public LSInput createLSInput()
+  {
+    return new DomLSInput();
+  }
+
+  public LSOutput createLSOutput()
+  {
+    return new DomLSOutput();
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/DomIterator.java b/libjava/gnu/xml/dom/DomIterator.java
new file mode 100644 (file)
index 0000000..3dfd964
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomIterator.java
@@ -0,0 +1,374 @@
+/* DomIterator.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import java.util.Vector;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.events.Event;
+import org.w3c.dom.events.EventListener;
+import org.w3c.dom.events.EventTarget;
+import org.w3c.dom.events.MutationEvent;
+import org.w3c.dom.traversal.NodeFilter;
+import org.w3c.dom.traversal.NodeIterator;
+
+/**
+ * <p> "NodeIterator" implementation, usable with any L2 DOM which
+ * supports MutationEvents. </p>
+ *
+ * @author David Brownell 
+ */
+public final class DomIterator
+  implements NodeIterator, EventListener
+{
+  
+  private Node reference;
+  private boolean right;
+  private boolean done;
+  
+  private final Node root;
+  private final int whatToShow;
+  private final NodeFilter filter;
+  private final boolean expandEntityReferences;
+  
+  /**
+   * Constructs and initializes an iterator.
+   */
+  protected DomIterator(Node root,
+                        int whatToShow,
+                        NodeFilter filter,
+                        boolean entityReferenceExpansion)
+  {
+    if (!root.isSupported("MutationEvents", "2.0")) 
+      {
+        throw new DomEx(DomEx.NOT_SUPPORTED_ERR,
+                        "Iterator needs mutation events", root, 0);
+      }
+       
+    this.root = root;
+    this.whatToShow = whatToShow;
+    this.filter = filter;
+    this.expandEntityReferences = entityReferenceExpansion;
+    
+    // start condition:  going right, seen nothing yet.
+    reference = null;
+    right = true;
+    
+    EventTarget        target = (EventTarget) root;
+    target.addEventListener("DOMNodeRemoved", this, false);
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Flags the iterator as done, unregistering its event listener so
+   * that the iterator can be garbage collected without relying on weak
+   * references (a "Java 2" feature) in the event subsystem.
+   */
+  public void detach()
+  {
+    EventTarget        target = (EventTarget) root;
+    target.removeEventListener("DOMNodeRemoved", this, false);
+    done = true;
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Returns the flag controlling whether iteration descends
+   * through entity references.
+   */
+  public boolean getExpandEntityReferences()
+  {
+    return expandEntityReferences;
+  }
+    
+  /**
+   * <b>DOM L2</b>
+   * Returns the filter provided during construction.
+   */
+  public NodeFilter getFilter()
+  {
+    return filter;
+  }
+    
+  /**
+   * <b>DOM L2</b>
+   * Returns the root of the tree this is iterating through.
+   */
+  public Node getRoot()
+  {
+    return root;
+  }
+    
+  /**
+   * <b>DOM L2</b>
+   * Returns the mask of flags provided during construction.
+   */
+  public int getWhatToShow()
+  {
+    return whatToShow;
+  }
+    
+  /**
+   * <b>DOM L2</b>
+   * Returns the next node in a forward iteration, masked and filtered.
+   * Note that the node may be read-only due to entity expansions.
+   * A null return indicates the iteration is complete, but may still
+   * be processed backwards.
+   */
+  public Node nextNode()
+  {
+    if (done)
+      {
+        throw new DomEx(DomEx.INVALID_STATE_ERR);
+      }
+    right = true;
+    return walk(true);
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Returns the next node in a backward iteration, masked and filtered.
+   * Note that the node may be read-only due to entity expansions.
+   * A null return indicates the iteration is complete, but may still
+   * be processed forwards.
+   */
+  public Node previousNode()
+  {
+    if (done)
+      {
+        throw new DomEx(DomEx.INVALID_STATE_ERR);
+      }
+    Node previous = reference;
+    right = false;
+    walk(false);
+    return previous;
+  }
+
+  private boolean shouldShow(Node node)
+    // raises Runtime exceptions indirectly, via acceptNode()
+  {
+    if ((whatToShow & (1 << (node.getNodeType() - 1))) == 0)
+      {
+        return false;
+      }
+    if (filter == null)
+      {
+        return true;
+      }
+    return filter.acceptNode(node) == NodeFilter.FILTER_ACCEPT;
+  }
+
+  //
+  // scenario:  root = 1, sequence = 1 2 ... 3 4
+  // forward walk: 1 2 ... 3 4 null
+  // then backward: 4 3 ... 2 1 null
+  //
+  // At the leftmost end, "previous" == null
+  // At the rightmost end, "previous" == 4
+  //
+  // The current draft spec really seem to make no sense re the
+  // role of the reference node, so what it says is ignored here.
+  //
+  private Node walk(boolean forward)
+  {
+    Node here = reference;
+
+    while ((here = successor(here, forward)) != null
+           && !shouldShow(here))
+      {
+        continue;
+      }
+    if (here != null || !forward)
+      {
+        reference = here;
+      }
+    return here;
+  }
+
+  private boolean isLeaf(Node here)
+  {
+    boolean leaf = !here.hasChildNodes();
+    if (!leaf && !expandEntityReferences)
+      {
+        leaf = (here.getNodeType() == Node.ENTITY_REFERENCE_NODE);
+      }
+    return leaf;
+  }
+    
+  //
+  // Returns the immediate successor in a forward (or backward)
+  // document order walk, sans filtering ... except that it knows
+  // how to stop, returning null when done.  This is a depth first
+  // preorder traversal when run in the forward direction.
+  //
+  private Node successor(Node here, boolean forward)
+  {
+    Node next;
+
+    // the "leftmost" end is funky
+    if (here == null)
+      {
+        return forward ? root : null;
+      }
+
+    //
+    // Forward, this is preorder: children before siblings.
+    // Backward, it's postorder: we saw the children already.
+    //
+    if (forward && !isLeaf(here))
+      {
+        return here.getFirstChild();
+      }
+
+    //
+    // Siblings ... if forward, we visit them, if backwards
+    // we visit their children first.
+    //
+    if (forward)
+      {
+        if ((next = here.getNextSibling()) != null)
+          {
+            return next;
+          }
+      }
+    else if ((next = here.getPreviousSibling()) != null)
+      {
+        if (isLeaf(next))
+          {
+            return next;
+          }
+        next = next.getLastChild();
+        while (!isLeaf(next))
+          {
+            next = next.getLastChild();
+          }
+        return next;
+      }
+       
+    //
+    // We can't go down or lateral -- it's up, then.  The logic is
+    // the converse of what's above:  backwards is easy (the parent
+    // is next), forwards isn't.
+    //
+    next = here.getParentNode();
+    if (!forward)
+      {
+        return next;
+      }
+    
+    Node temp = null;
+    while (next != null
+           && next != root
+           && (temp = next.getNextSibling()) == null)
+      {
+        next = next.getParentNode();
+      }
+    if (next == root)
+      {
+        return null;
+      }
+    return temp;
+  }
+
+  /**
+   * Not for public use.  This lets the iterator know when its
+   * reference node will be removed from the tree, so that a new
+   * one may be selected.
+   *
+   * <p> This version works by watching removal events as they
+   * bubble up.  So, don't prevent them from bubbling.
+   */
+  public void handleEvent(Event e)
+  {
+    MutationEvent event;
+    Node ancestor, removed;
+    
+    if (reference == null
+        || !"DOMNodeRemoved".equals(e.getType())
+        || e.getEventPhase() != Event.BUBBLING_PHASE)
+      {
+        return;
+      }
+
+    event = (MutationEvent) e;
+    removed = (Node) event.getTarget();
+
+    // See if the removal will cause trouble for this iterator
+    // by being the reference node or an ancestor of it.
+    for (ancestor = reference;
+         ancestor != null && ancestor != root;
+         ancestor = ancestor.getParentNode())
+      {
+        if (ancestor == removed)
+          {
+            break;
+          }
+      }
+    if (ancestor != removed)
+      {
+        return;
+      }
+
+    // OK, it'll cause trouble.  We want to make the "next"
+    // node in our current traversal direction seem right.
+    // So we pick the nearest node that's not getting removed,
+    // but go in the _opposite_ direction from our current
+    // traversal ... so the "next" doesn't skip anything.
+    Node candidate;
+
+search:
+    while ((candidate = walk(!right)) != null)
+      {
+        for (ancestor = candidate;
+             ancestor != null && ancestor != root;
+             ancestor = ancestor.getParentNode())
+          {
+            if (ancestor == removed)
+              {
+                continue search;
+              }
+          }
+        return;
+      }
+       
+    // The current DOM WD talks about a special case here;
+    // I've not yet seen it.
+    }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/DomNSResolverContext.java b/libjava/gnu/xml/dom/DomNSResolverContext.java
new file mode 100644 (file)
index 0000000..cf75ec1
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomNSResolverContext.java
@@ -0,0 +1,90 @@
+/* DomNSResolverContext.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import java.util.Iterator;
+import javax.xml.namespace.NamespaceContext;
+import org.w3c.dom.xpath.XPathNSResolver;
+
+/**
+ * Namespace content wrapper for an XPathNSResolver.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class DomNSResolverContext
+  implements NamespaceContext, Iterator
+{
+
+       final XPathNSResolver resolver;
+
+       DomNSResolverContext(XPathNSResolver resolver)
+       {
+               this.resolver = resolver;
+       }
+
+       public String getNamespaceURI(String prefix)
+       {
+               return resolver.lookupNamespaceURI(prefix);
+       }
+
+       public String getPrefix(String namespaceURI)
+       {
+               return null;
+       }
+
+       public Iterator getPrefixes(String namespaceURI)
+       {
+               return this;
+       }
+
+       public boolean hasNext()
+       {
+               return false;
+       }
+
+       public Object next()
+       {
+               return null;
+       }
+
+       public void remove()
+       {
+               throw new UnsupportedOperationException();
+       }
+
+}
diff --git a/libjava/gnu/xml/dom/DomNamedNodeMap.java b/libjava/gnu/xml/dom/DomNamedNodeMap.java
new file mode 100644 (file)
index 0000000..af75942
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomNamedNodeMap.java
@@ -0,0 +1,416 @@
+/* DomNamedNodeMap.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+/**
+ * <p> "NamedNodeMap" implementation. </p>
+ * Used mostly to hold element attributes, but sometimes also
+ * to list notations or entities.
+ *
+ * @author David Brownell 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomNamedNodeMap
+  implements NamedNodeMap
+{
+
+  final DomNode owner;
+  final short type;
+  
+  DomNode first;
+  int length;
+  boolean readonly;
+  
+  // package private
+  DomNamedNodeMap(DomNode owner, short type)
+  {
+    this.owner = owner;
+    this.type = type;
+  }
+
+  /**
+   * Exposes the internal "readonly" flag.  In DOM, all NamedNodeMap
+   * objects found in a DocumentType object are read-only (after
+   * they are fully constructed), and those holding attributes of
+   * a readonly element will also be readonly.
+   */
+  public final boolean isReadonly()
+  {
+    return readonly;
+  }  
+    
+  /**
+   * Sets the internal "readonly" flag so the node and its
+   * children can't be changed.
+   */
+  public void makeReadonly()
+  {
+    readonly = true;
+    for (DomNode ctx = first; ctx != null; ctx = ctx.next)
+      {
+        ctx.makeReadonly();
+      }
+  }
+  
+  /**
+   * <b>DOM L1</b>
+   * Returns the named item from the map, or null; names are just
+   * the nodeName property.
+   */
+  public Node getNamedItem(String name)
+  {
+    for (DomNode ctx = first; ctx != null; ctx = ctx.next)
+      {
+        if (ctx.getNodeName().equals(name))
+          {
+            return ctx;
+          }
+      }
+    return null;
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Returns the named item from the map, or null; names are the
+   * localName and namespaceURI properties, ignoring any prefix.
+   */
+  public Node getNamedItemNS(String namespaceURI, String localName)
+  {
+    if ("".equals(namespaceURI))
+      {
+        namespaceURI = null;
+      }
+    for (DomNode ctx = first; ctx != null; ctx = ctx.next)
+      {
+        String name = ctx.getLocalName();
+        if ((localName == null && name == null) ||
+            (localName != null && localName.equals(name)))
+          {
+            String uri = ctx.getNamespaceURI();
+            if ("".equals(uri))
+              {
+                uri = null;
+              }
+            if ((namespaceURI == null && uri == null) ||
+                (namespaceURI != null && namespaceURI.equals(uri)))
+              {
+                return ctx;
+              }
+          }
+      }
+    return null;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Stores the named item into the map, optionally overwriting
+   * any existing node with that name.  The name used is just
+   * the nodeName attribute.
+   */
+  public Node setNamedItem(Node arg)
+  {
+    return setNamedItem(arg, false);
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Stores the named item into the map, optionally overwriting
+   * any existing node with that fully qualified name.  The name
+   * used incorporates the localName and namespaceURI properties,
+   * and ignores any prefix.
+   */
+  public Node setNamedItemNS(Node arg)
+  {
+    return setNamedItem(arg, true);
+  }
+
+  Node setNamedItem(Node arg, boolean ns)
+  {
+    if (readonly)
+      {
+        throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+      }
+
+    DomNode node = (DomNode) arg;
+    if (node.owner != owner.owner)
+      {
+        throw new DomEx(DomEx.WRONG_DOCUMENT_ERR);
+      }
+    if (node.nodeType != type)
+      {
+        throw new DomEx(DomEx.HIERARCHY_REQUEST_ERR);
+      }
+    if (node.nodeType == Node.ATTRIBUTE_NODE)
+      {
+        DomNode element = node.parent;
+        if (element != null && element != owner)
+          {
+            throw new DomEx(DomEx.INUSE_ATTRIBUTE_ERR);
+          }
+        node.parent = owner;
+        node.depth = owner.depth + 1;
+      }
+    
+    String nodeName = node.getNodeName();
+    String localName = ns ? node.getLocalName() : null;
+    String namespaceURI = ns ? node.getNamespaceURI() : null;
+    if ("".equals(namespaceURI))
+      {
+        namespaceURI = null;
+      }
+    
+    // maybe attribute ADDITION events (?)
+    DomNode last = null;
+    for (DomNode ctx = first; ctx != null; ctx = ctx.next)
+      {
+        boolean test = false;
+        if (ns)
+          {
+            String tln = ctx.getLocalName();
+            if (tln.equals(localName))
+              {
+                String tu = ctx.getNamespaceURI();
+                if ((tu == null && namespaceURI == null) ||
+                    (tu != null && tu.equals(namespaceURI)))
+                  {
+                    test = true;
+                  }
+              }
+          }
+        else
+          {
+            test = ctx.getNodeName().equals(nodeName);
+          }
+        if (test)
+          {
+            // replace
+            node.previous = ctx.previous;
+            node.next = ctx.next;
+            if (ctx.previous != null)
+              {
+                ctx.previous.next = node;
+              }
+            if (ctx.next != null)
+              {
+                ctx.next.previous = node;
+              }
+            if (first == ctx)
+              {
+                first = node;
+              }
+            reparent(node, nodeName, ctx.index);
+            ctx.parent = null;
+            ctx.next = null;
+            ctx.previous = null;
+            ctx.setDepth(0);
+            ctx.index = 0;
+            return ctx;
+          }
+        last = ctx;
+      }
+    // append
+    if (last != null)
+      {
+        last.next = node;
+        node.previous = last;
+      }
+    else
+      {
+        first = node;
+      }
+    length++;
+    reparent(node, nodeName, 0);
+    return null;
+  }
+
+  void reparent(DomNode node, String nodeName, int i)
+  {
+    node.parent = owner;
+    node.setDepth(owner.depth + 1);
+    // index renumbering
+    for (DomNode ctx = node; ctx != null; ctx = ctx.next)
+      {
+        ctx.index = i++;
+      }
+    // cache xml:space
+    boolean xmlSpace = "xml:space".equals(nodeName);
+    if (xmlSpace && owner instanceof DomElement)
+      {
+        ((DomElement) owner).xmlSpace = node.getNodeValue();
+      }
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Removes the named item from the map, or reports an exception;
+   * names are just the nodeName property.
+   */
+  public Node removeNamedItem(String name)
+  {
+    return removeNamedItem(null, name, false);
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Removes the named item from the map, or reports an exception;
+   * names are the localName and namespaceURI properties.
+   */
+  public Node removeNamedItemNS(String namespaceURI, String localName)
+  {
+    return removeNamedItem(namespaceURI, localName, true);
+  }
+
+  Node removeNamedItem(String uri, String name, boolean ns)
+  {
+    if (readonly)
+      {
+        throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+      }
+
+    // report attribute REMOVAL event?
+
+    for (DomNode ctx = first; ctx != null; ctx = ctx.next)
+      {
+        boolean test = false;
+        String nodeName = ctx.getNodeName();
+        if (ns)
+          {
+            String tln = ctx.getLocalName();
+            if (tln.equals(name))
+              {
+                String tu = ctx.getNamespaceURI();
+                if ((tu == null && uri == null) ||
+                    (tu != null && tu.equals(uri)))
+                  {
+                    test = true;
+                  }
+              }
+          }
+        else
+          {
+            test = nodeName.equals(name);
+          }
+        if (test)
+          {
+            // uncache xml:space
+            boolean xmlSpace = "xml:space".equals(nodeName);
+            if (xmlSpace && owner instanceof DomElement)
+              {
+                ((DomElement) owner).xmlSpace = "";
+              }
+            // is this a default attribute?
+            if (ctx.nodeType == Node.ATTRIBUTE_NODE)
+              {
+                String def = getDefaultValue(ctx.getNodeName());
+                if (def != null)
+                  {
+                    ctx.setNodeValue(def);
+                    ((DomAttr) ctx).setSpecified(false);
+                    return null;
+                  }
+              }
+            // remove
+            if (ctx == first)
+              {
+                first = ctx.next;
+              }
+            if (ctx.previous != null)
+              {
+                ctx.previous.next = ctx.next;
+              }
+            if (ctx.next != null)
+              {
+                ctx.next.previous = ctx.previous;
+              }
+            length--;
+            ctx.previous = null;
+            ctx.next = null;
+            ctx.parent = null;
+            ctx.setDepth(0);
+            ctx.index = 0;
+            return ctx;
+          }
+      }    
+    throw new DomEx(DomEx.NOT_FOUND_ERR);
+  }
+  
+  String getDefaultValue(String name)
+  {
+    DomDoctype doctype = (DomDoctype) owner.owner.getDoctype();
+    if (doctype == null)
+      {
+        return null;
+      }
+    DTDAttributeTypeInfo info =
+      doctype.getAttributeTypeInfo(owner.getNodeName(), name);
+    if (info == null)
+      {
+        return null;
+      }
+    return info.value;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the indexed item from the map, or null.
+   */
+  public Node item(int index)
+  {
+    DomNode ctx = first;
+    int count = 0;
+    while (ctx != null && count < index)
+      {
+        ctx = ctx.next;
+        count++;
+      }
+    return ctx;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the length of the map.
+   */
+  public int getLength()
+  {
+    return length;
+  }
+  
+}
diff --git a/libjava/gnu/xml/dom/DomNode.java b/libjava/gnu/xml/dom/DomNode.java
new file mode 100644 (file)
index 0000000..3858fe8
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomNode.java
@@ -0,0 +1,2180 @@
+/* DomNode.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import javax.xml.XMLConstants;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+import org.w3c.dom.UserDataHandler;
+import org.w3c.dom.events.DocumentEvent;
+import org.w3c.dom.events.Event;
+import org.w3c.dom.events.EventException;
+import org.w3c.dom.events.EventListener;
+import org.w3c.dom.events.EventTarget;
+import org.w3c.dom.events.MutationEvent;
+import org.w3c.dom.traversal.NodeFilter;
+import org.w3c.dom.traversal.NodeIterator;
+import org.w3c.dom.traversal.TreeWalker;
+
+/**
+ * <p> "Node", "EventTarget", and "DocumentEvent" implementation.
+ * This provides most of the core DOM functionality; only more
+ * specialized features are provided by subclasses.  Those subclasses may
+ * have some particular constraints they must implement, by overriding
+ * methods defined here.  Such constraints are noted here in the method
+ * documentation. </p>
+ *
+ * <p> Note that you can create events with type names prefixed with "USER-",
+ * and pass them through this DOM.  This lets you use the DOM event scheme
+ * for application specific purposes, although you must use a predefined event
+ * structure (such as MutationEvent) to pass data along with those events.
+ * Test for existence of this feature with the "USER-Events" DOM feature
+ * name.</p>
+ *
+ * <p> Other kinds of events you can send include the "html" events,
+ * like "load", "unload", "abort", "error", and "blur"; and the mutation
+ * events.  If this DOM has been compiled with mutation event support
+ * enabled, it will send mutation events when you change parts of the
+ * tree; otherwise you may create and send such events yourself, but
+ * they won't be generated by the DOM itself. </p>
+ *
+ * <p> Note that there is a namespace-aware name comparison method,
+ * <em>nameAndTypeEquals</em>, which compares the names (and types) of
+ * two nodes in conformance with the "Namespaces in XML" specification.
+ * While mostly intended for use with elements and attributes, this should
+ * also be helpful for ProcessingInstruction nodes and some others which
+ * do not have namespace URIs.
+ *
+ * @author David Brownell
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public abstract class DomNode
+  implements Node, NodeList, EventTarget, DocumentEvent, Cloneable, Comparable
+{
+
+  // package private
+  //final static String xmlNamespace = "http://www.w3.org/XML/1998/namespace";
+  //final static String xmlnsURI = "http://www.w3.org/2000/xmlns/";
+
+  // tunable
+  //   NKIDS_* affects arrays of children (which grow)
+  // (currently) fixed size:
+  //   ANCESTORS_* is for event capture/bubbling, # ancestors
+  //   NOTIFICATIONS_* is for per-node event delivery, # events
+  private static final int NKIDS_DELTA = 8;
+  private static final int ANCESTORS_INIT = 20;
+  private static final int NOTIFICATIONS_INIT = 10;
+
+  // tunable: enable mutation events or not?  Enabling it costs about
+  // 10-15% in DOM construction time, last time it was measured.
+
+  // package private !!!
+  static final boolean reportMutations = true;
+
+  // locking protocol changeable only within this class
+  private static final Object lockNode = new Object();
+
+  // NON-FINAL class data
+
+  // Optimize event dispatch by not allocating memory each time
+  private static boolean dispatchDataLock;
+  private static DomNode[] ancestors = new DomNode[ANCESTORS_INIT];
+  private static ListenerRecord[] notificationSet
+    = new ListenerRecord[NOTIFICATIONS_INIT];
+
+  // Ditto for the (most common) event object itself!
+  private static boolean eventDataLock;
+  private static DomEvent.DomMutationEvent mutationEvent
+    = new DomEvent.DomMutationEvent(null);
+
+  //
+  // PER-INSTANCE DATA
+  //
+
+  DomDocument owner;
+  DomNode parent; // parent node;
+  DomNode previous; // previous sibling node
+  DomNode next; // next sibling node
+  DomNode first; // first child node
+  DomNode last; // last child node
+  int index; // index of this node in its parent's children
+  int depth; // depth of the node in the document
+  int length; // number of children
+  final short nodeType;
+
+  // Bleech ... "package private" so a builder can populate entity refs.
+  // writable during construction.  DOM spec is nasty.
+  boolean readonly;
+
+  // event registrations
+  private ListenerRecord[] listeners;
+  private int nListeners;
+
+  // DOM Level 3 userData dictionary.
+  private HashMap userData;
+  private HashMap userDataHandlers;
+
+  //
+  // Some of the methods here are declared 'final' because
+  // knowledge about their implementation is built into this
+  // class -- for both integrity and performance.
+  //
+
+  /**
+   * Reduces space utilization for this node.
+   */
+  public void compact()
+  {
+    if (listeners != null && listeners.length != nListeners)
+      {
+        if (nListeners == 0)
+          {
+            listeners = null;
+          }
+        else
+          {
+            ListenerRecord[] l = new ListenerRecord[nListeners];
+            System.arraycopy(listeners, 0, l, 0, nListeners);
+            listeners = l;
+          }
+      }
+  }
+
+  /**
+   * Constructs a node and associates it with its owner.  Only
+   * Document and DocumentType nodes may be created with no owner,
+   * and DocumentType nodes get an owner as soon as they are
+   * associated with a document.
+   */
+  protected DomNode(short nodeType, DomDocument owner)
+  {
+    this.nodeType = nodeType;
+
+    if (owner == null)
+      {
+        // DOM calls never go down this path
+        if (nodeType != DOCUMENT_NODE && nodeType != DOCUMENT_TYPE_NODE)
+          {
+            throw new IllegalArgumentException ("no owner!");
+          }
+      }
+    this.owner = owner;
+  }
+  
+
+  /**
+   * <b>DOM L1</b>
+   * Returns null; Element subclasses must override this method.
+   */
+  public NamedNodeMap getAttributes()
+  {
+    return null;
+  }
+
+  /**
+   * <b>DOM L2></b>
+   * Returns true iff this is an element node with attributes.
+   */
+  public boolean hasAttributes()
+  {
+    return false;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns a list, possibly empty, of the children of this node.
+   * In this implementation, to conserve memory, nodes are the same
+   * as their list of children.  This can have ramifications for
+   * subclasses, which may need to provide their own getLength method
+   * for reasons unrelated to the NodeList method of the same name.
+   */
+  public NodeList getChildNodes()
+  {
+    return this;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the first child of this node, or null if there are none.
+   */
+  public Node getFirstChild()
+  {
+    return first;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the last child of this node, or null if there are none.
+   */
+  public Node getLastChild()
+  {
+    return last;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns true if this node has children.
+   */
+  public boolean hasChildNodes()
+  {
+    return length != 0;
+  }
+
+
+  /**
+   * Exposes the internal "readonly" flag.  In DOM, children of
+   * entities and entity references are readonly, as are the
+   * objects associated with DocumentType objets.
+   */
+  public final boolean isReadonly()
+  {
+    return readonly;
+  }
+
+  /**
+   * Sets the internal "readonly" flag so this subtree can't be changed.
+   * Subclasses need to override this method for any associated content
+   * that's not a child node, such as an element's attributes or the
+   * (few) declarations associated with a DocumentType.
+   */
+  public void makeReadonly()
+  {
+    readonly = true;
+    for (DomNode child = first; child != null; child = child.next)
+      {
+        child.makeReadonly();
+      }
+  }
+
+  /**
+   * Used to adopt a node to a new document.
+   */
+  void setOwner(DomDocument doc)
+  {
+    this.owner = doc;
+    for (DomNode ctx = first; ctx != null; ctx = ctx.next)
+      {
+        ctx.setOwner(doc);
+      }
+  }
+
+  // just checks the node for inclusion -- may be called many
+  // times (docfrag) before anything is allowed to change
+  private void checkMisc(DomNode child)
+  {
+    if (readonly && !owner.building)
+      {
+        throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR,
+                        null, this, 0);
+      }
+    for (DomNode ctx = this; ctx != null; ctx = ctx.parent)
+      {
+        if (child == ctx)
+          {
+            throw new DomEx(DomEx.HIERARCHY_REQUEST_ERR,
+                            "can't make ancestor into a child", this, 0);
+          }
+      }
+
+    DomDocument owner = (nodeType == DOCUMENT_NODE) ? (DomDocument) this :
+      this.owner;
+    DomDocument childOwner = child.owner;
+    short childNodeType = child.nodeType;
+    
+    if (childOwner != owner)
+      {
+        // new in DOM L2, this case -- patch it up later, in reparent()
+        if (!(childNodeType == DOCUMENT_TYPE_NODE && childOwner == null))
+          {
+            throw new DomEx(DomEx.WRONG_DOCUMENT_ERR,
+                            null, child, 0);
+          }
+      }
+
+    // enforce various structural constraints
+    switch (nodeType)
+      {
+      case DOCUMENT_NODE:
+        switch (childNodeType)
+          {
+          case ELEMENT_NODE:
+          case PROCESSING_INSTRUCTION_NODE:
+          case COMMENT_NODE:
+          case DOCUMENT_TYPE_NODE:
+            return;
+          }
+        break;
+        
+      case ATTRIBUTE_NODE:
+        switch (childNodeType)
+          {
+          case TEXT_NODE:
+          case ENTITY_REFERENCE_NODE:
+            return;
+          }
+        break;
+        
+      case DOCUMENT_FRAGMENT_NODE:
+      case ENTITY_REFERENCE_NODE:
+      case ELEMENT_NODE:
+      case ENTITY_NODE:
+        switch (childNodeType)
+          {
+          case ELEMENT_NODE:
+          case TEXT_NODE:
+          case COMMENT_NODE:
+          case PROCESSING_INSTRUCTION_NODE:
+          case CDATA_SECTION_NODE:
+          case ENTITY_REFERENCE_NODE:
+            return;
+          }
+        break;
+      }
+    if (owner.checkingWellformedness)
+      {
+        throw new DomEx(DomEx.HIERARCHY_REQUEST_ERR,
+                        "can't append " + nodeTypeToString(childNodeType) +
+                        " to node of type " + nodeTypeToString(nodeType),
+                        this, 0);
+      }
+  }
+  
+  // Here's hoping a good optimizer will detect the case when the
+  // next several methods are never called, and won't allocate
+  // object code space of any kind.  (Case:  not reporting any
+  // mutation events.  We can also remove some static variables
+  // listed above.)
+
+  private void insertionEvent(DomEvent.DomMutationEvent event,
+                              DomNode target)
+  {
+    if (owner == null || owner.building)
+      {
+        return;
+      }
+    boolean doFree = false;
+    
+    if (event == null)
+      {
+        event = getMutationEvent();
+      }
+    if (event != null)
+      {
+        doFree = true;
+      }
+    else
+      {
+        event = new DomEvent.DomMutationEvent(null);
+      }
+    event.initMutationEvent("DOMNodeInserted",
+                            true /* bubbles */, false /* nocancel */,
+                            this /* related */, null, null, null, (short) 0);
+    target.dispatchEvent(event);
+
+    // XXX should really visit every descendant of 'target'
+    // and sent a DOMNodeInsertedIntoDocument event to it...
+    // bleech, there's no way to keep that acceptably fast.
+
+    if (doFree)
+      {
+        event.target = null;
+        event.relatedNode = null;
+        event.currentNode = null;
+        eventDataLock = false;
+      } // else we created work for the GC
+  }
+
+  private void removalEvent(DomEvent.DomMutationEvent event,
+                            DomNode target)
+  {
+    if (owner == null || owner.building)
+      {
+        return;
+      }
+    boolean doFree = false;
+
+    if (event == null)
+      {
+        event = getMutationEvent();
+      }
+    if (event != null)
+      {
+        doFree = true;
+      }
+    else
+      {
+        event = new DomEvent.DomMutationEvent(null);
+      }
+    event.initMutationEvent("DOMNodeRemoved",
+                            true /* bubbles */, false /* nocancel */,
+                            this /* related */, null, null, null, (short) 0);
+    target.dispatchEvent(event);
+
+    // XXX should really visit every descendant of 'target'
+    // and sent a DOMNodeRemovedFromDocument event to it...
+    // bleech, there's no way to keep that acceptably fast.
+
+    event.target = null;
+    event.relatedNode = null;
+    event.currentNode = null;
+    if (doFree)
+      {
+        eventDataLock = false;
+      }
+    // else we created more work for the GC
+  }
+
+  //
+  // Avoid creating lots of memory management work, by using a simple
+  // allocation strategy for the mutation event objects that get used
+  // at least once per tree modification.  We can't use stack allocation,
+  // so we do the next simplest thing -- more or less, static allocation.
+  // Concurrent notifications should be rare, anyway.
+  //
+  // Returns the preallocated object, which needs to be carefully freed,
+  // or null to indicate the caller needs to allocate their own.
+  //
+  static private DomEvent.DomMutationEvent getMutationEvent()
+  {
+    synchronized (lockNode)
+      {
+        if (eventDataLock)
+          {
+            return null;
+          }
+        eventDataLock = true;
+        return mutationEvent;
+      }
+  }
+
+  // NOTE:  this is manually inlined in the insertion
+  // and removal event methods above; change in sync.
+  static private void freeMutationEvent()
+  {
+    // clear fields to enable GC
+    mutationEvent.clear();
+    eventDataLock = false;
+  }
+
+  void setDepth(int depth)
+  {
+    this.depth = depth;
+    for (DomNode ctx = first; ctx != null; ctx = ctx.next)
+      {
+        ctx.setDepth(depth + 1);
+      }
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Appends the specified node to this node's list of children.
+   * Document subclasses must override this to enforce the restrictions
+   * that there be only one element and document type child.
+   *
+   * <p> Causes a DOMNodeInserted mutation event to be reported.
+   * Will first cause a DOMNodeRemoved event to be reported if the
+   * parameter already has a parent.  If the new child is a document
+   * fragment node, both events will be reported for each child of
+   * the fragment; the order in which children are removed and
+   * inserted is implementation-specific.
+   *
+   * <p> If this DOM has been compiled without mutation event support,
+   * these events will not be reported.
+   */
+  public Node appendChild(Node newChild)
+  {
+    try
+      {
+        DomNode        child = (DomNode) newChild;
+
+        if (child.nodeType == DOCUMENT_FRAGMENT_NODE)
+          {
+            // Append all nodes in the fragment to this node
+            for (DomNode ctx = child.first; ctx != null; ctx = ctx.next)
+              {
+                checkMisc(ctx);
+              }
+            for (DomNode ctx = child.first; ctx != null; )
+              {
+                DomNode ctxNext = ctx.next;
+                appendChild(ctx);
+                ctx = ctxNext;
+              }
+          }
+        else
+          {
+            checkMisc(child);
+            if (child.parent != null)
+              {
+                child.parent.removeChild(child);
+              }
+            child.parent = this;
+            child.index = length++;
+            child.setDepth(depth + 1);
+            child.next = null;
+            if (last == null)
+              {
+                first = child;
+                child.previous = null;
+              }
+            else
+              {
+                last.next = child;
+                child.previous = last;
+              }
+            last = child;
+
+            if (reportMutations)
+              {
+                insertionEvent(null, child);
+              }
+          }
+
+        return child;
+      }
+    catch (ClassCastException e)
+      {
+        throw new DomEx(DomEx.WRONG_DOCUMENT_ERR,
+                        null, newChild, 0);
+    }
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Inserts the specified node in this node's list of children.
+   * Document subclasses must override this to enforce the restrictions
+   * that there be only one element and document type child.
+   *
+   * <p> Causes a DOMNodeInserted mutation event to be reported.  Will
+   * first cause a DOMNodeRemoved event to be reported if the newChild
+   * parameter already has a parent. If the new child is a document
+   * fragment node, both events will be reported for each child of
+   * the fragment; the order in which children are removed and inserted
+   * is implementation-specific.
+   *
+   * <p> If this DOM has been compiled without mutation event support,
+   * these events will not be reported.
+   */
+  public Node insertBefore(Node newChild, Node refChild)
+  {
+    if (refChild == null)
+      {
+        return appendChild(newChild);
+      }
+
+    try
+      {
+        DomNode        child = (DomNode) newChild;
+        DomNode ref = (DomNode) refChild;
+        
+        if (child.nodeType == DOCUMENT_FRAGMENT_NODE)
+          {
+            // Append all nodes in the fragment to this node
+            for (DomNode ctx = child.first; ctx != null; ctx = ctx.next)
+              {
+                checkMisc(ctx);
+              }
+            for (DomNode ctx = child.first; ctx != null; )
+              {
+                DomNode ctxNext = ctx.next;
+                insertBefore(ctx, ref);
+                ctx = ctxNext;
+              }
+          }
+        else
+          {
+            checkMisc(child);
+            if (ref == null || ref.parent != this)
+              {
+                throw new DomEx(DomEx.NOT_FOUND_ERR, null, ref, 0);
+              }
+            if (ref == child)
+              {
+                throw new DomEx(DomEx.HIERARCHY_REQUEST_ERR,
+                                "can't insert node before itself", ref, 0);
+              }
+        
+            if (child.parent != null)
+              {
+                child.parent.removeChild(child);
+              }
+            child.parent = this;
+            int i = ref.index;
+            child.setDepth(depth + 1);
+            child.next = ref;
+            if (ref.previous != null)
+              {
+                ref.previous.next = child;
+              }
+            child.previous = ref.previous;
+            ref.previous = child;
+            if (first == ref)
+              {
+                first = child;
+              }
+            // index renumbering
+            for (DomNode ctx = child; ctx != null; ctx = ctx.next)
+              {
+                ctx.index = i++;
+              }
+
+            if (reportMutations)
+              {
+                insertionEvent(null, child);
+              }
+          }
+        
+        return child;
+      }
+    catch (ClassCastException e)
+      {
+        throw new DomEx(DomEx.WRONG_DOCUMENT_ERR,
+                        null, newChild, 0);
+      }
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Replaces the specified node in this node's list of children.
+   * Document subclasses must override this to test the restrictions
+   * that there be only one element and document type child.
+   *
+   * <p> Causes DOMNodeRemoved and DOMNodeInserted mutation event to be
+   * reported.  Will cause another DOMNodeRemoved event to be reported if
+   * the newChild parameter already has a parent.  These events may be
+   * delivered in any order, except that the event reporting removal
+   * from such an existing parent will always be delivered before the
+   * event reporting its re-insertion as a child of some other node.
+   * The order in which children are removed and inserted is implementation
+   * specific.
+   *
+   * <p> If your application needs to depend on the in which those removal
+   * and insertion events are delivered, don't use this API.  Instead,
+   * invoke the removeChild and insertBefore methods directly, to guarantee
+   * a specific delivery order.  Similarly, don't use document fragments,
+   * Otherwise your application code may not work on a DOM which implements
+   * this method differently.
+   *
+   * <p> If this DOM has been compiled without mutation event support,
+   * these events will not be reported.
+   */
+  public Node replaceChild(Node newChild, Node refChild)
+  {
+    try
+      {
+        DomNode child = (DomNode) newChild;
+        DomNode ref = (DomNode) refChild;
+        
+        DomEvent.DomMutationEvent event = getMutationEvent();
+        boolean doFree = (event != null);
+            
+        if (child.nodeType == DOCUMENT_FRAGMENT_NODE)
+          {
+            // Append all nodes in the fragment to this node
+            for (DomNode ctx = child.first; ctx != null; ctx = ctx.next)
+              {
+                checkMisc(ctx);
+              }
+            if (ref == null || ref.parent != this)
+              {
+                throw new DomEx(DomEx.NOT_FOUND_ERR, null, ref, 0);
+              }
+            
+            if (reportMutations)
+              {
+                removalEvent(event, ref);
+              }
+            length--;
+            length += child.length;
+            
+            if (child.length == 0)
+              {
+                // Removal
+                if (ref.previous != null)
+                  {
+                    ref.previous.next = ref.next;
+                  }
+                if (ref.next != null)
+                  {
+                    ref.next.previous = ref.previous;
+                  }
+                if (first == ref)
+                  {
+                    first = ref.next;
+                  }
+                if (last == ref)
+                  {
+                    last = ref.previous;
+                  }
+              }
+            else
+              {
+                int i = ref.index;
+                for (DomNode ctx = child.first; ctx != null; ctx = ctx.next)
+                  {
+                    // Insertion
+                    ctx.parent = this;
+                    ctx.index = i++;
+                    ctx.setDepth(ref.depth);
+                    if (ctx == child.first)
+                      {
+                        ctx.previous = ref.previous;
+                      }
+                    if (ctx == child.last)
+                      {
+                        ctx.next = ref.next;
+                      }
+                  }
+                if (first == ref)
+                  {
+                    first = child.first;
+                  }
+                if (last == ref)
+                  {
+                    last = child.last;
+                  }
+              }
+          }
+        else
+          {
+            checkMisc(child);
+            if (ref == null || ref.parent != this)
+              {
+                throw new DomEx(DomEx.NOT_FOUND_ERR, null, ref, 0);
+              }
+        
+            if (reportMutations)
+              {
+                removalEvent(event, ref);
+              }
+            
+            if (child.parent != null)
+              {
+                child.parent.removeChild(child);
+              }
+            child.parent = this;
+            child.index = ref.index;
+            child.setDepth(ref.depth);
+            if (ref.previous != null)
+              {
+                ref.previous.next = child;
+              }
+            child.previous = ref.previous;
+            if (ref.next != null)
+              {
+                ref.next.previous = child;
+              }
+            child.next = ref.next;
+            if (first == ref)
+              {
+                first = child;
+              }
+            if (last == ref)
+              {
+                last = child;
+              }
+
+            if (reportMutations)
+              {
+                insertionEvent(event, child);
+              }
+            if (doFree)
+              {
+                freeMutationEvent();
+              }
+          }
+        ref.parent = null;
+        ref.index = 0;
+        ref.setDepth(0);
+        ref.previous = null;
+        ref.next = null;
+        
+        return ref;
+      }
+    catch (ClassCastException e)
+      {
+        throw new DomEx(DomEx.WRONG_DOCUMENT_ERR,
+                        null, newChild, 0);
+      }
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Removes the specified child from this node's list of children,
+   * or else reports an exception.
+   *
+   * <p> Causes a DOMNodeRemoved mutation event to be reported.
+   *
+   * <p> If this DOM has been compiled without mutation event support,
+   * these events will not be reported.
+   */
+  public Node removeChild(Node refChild)
+  {
+    try
+      {
+        DomNode ref = (DomNode) refChild;
+
+        if (ref == null || ref.parent != this)
+          {
+            throw new DomEx(DomEx.NOT_FOUND_ERR, null, ref, 0);
+          }
+        if (readonly && !owner.building)
+          {
+            throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR,
+                            null, this, 0);
+          }
+        
+        for (DomNode child = first; child != null; child = child.next)
+          {
+            if (child == ref)
+              {
+                if (reportMutations)
+                  {
+                    removalEvent(null, child);
+                  }
+
+                length--;
+                if (ref.previous != null)
+                  {
+                    ref.previous.next = ref.next;
+                  }
+                if (ref.next != null)
+                  {
+                    ref.next.previous = ref.previous;
+                  }
+                if (first == ref)
+                  {
+                    first = ref.next;
+                  }
+                if (last == ref)
+                  {
+                    last = ref.previous;
+                  }
+                // renumber indices
+                int i = 0;
+                for (DomNode ctx = first; ctx != null; ctx = ctx.next)
+                  {
+                    ctx.index = i++;
+                  }
+                ref.parent = null;
+                ref.setDepth(0);
+                ref.index = 0;
+                ref.previous = null;
+                ref.next = null;
+                
+                return ref;
+              }
+          }
+        throw new DomEx(DomEx.NOT_FOUND_ERR,
+                        "that's no child of mine", refChild, 0);
+      }
+    catch (ClassCastException e)
+      {
+        throw new DomEx(DomEx.WRONG_DOCUMENT_ERR,
+                        null, refChild, 0);
+      }
+  }
+
+  /**
+   * <b>DOM L1 (NodeList)</b>
+   * Returns the item with the specified index in this NodeList,
+   * else null.
+   */
+  public Node item(int index)
+  {
+    DomNode child = first;
+    int count = 0;
+    while (child != null && count < index)
+      {
+        child = child.next;
+        count++;
+      }
+    return child;
+  }
+
+  /**
+   * <b>DOM L1 (NodeList)</b>
+   * Returns the number of elements in this NodeList.
+   * (Note that many interfaces have a "Length" property, not just
+   * NodeList, and if a node subtype must implement one of those,
+   * it will also need to override getChildNodes.)
+   */
+  public int getLength()
+  {
+    return length;
+  }
+
+  /**
+   * Minimize extra space consumed by this node to hold children and event
+   * listeners.
+   */
+  public void trimToSize()
+  {
+    if (listeners != null && listeners.length != nListeners)
+      {
+        ListenerRecord[] newKids = new ListenerRecord[length];
+        System.arraycopy(listeners, 0, newKids, 0, nListeners);
+        listeners = newKids;
+      }
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the previous sibling, if one is known.
+   */
+  public Node getNextSibling()
+  {
+    return next;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the previous sibling, if one is known.
+   */
+  public Node getPreviousSibling()
+  {
+    return previous;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the parent node, if one is known.
+   */
+  public Node getParentNode()
+  {
+    return parent;
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Consults the DOM implementation to determine if the requested
+   * feature is supported.  DocumentType subclasses must override
+   * this method, and associate themselves directly with the
+   * DOMImplementation node used.  (This method relies on being able
+   * to access the DOMImplementation from the owner document, but
+   * DocumentType nodes can be created without an owner.)
+   */
+  public boolean isSupported(String feature, String version)
+  {
+    Document           doc = owner;
+    DOMImplementation  impl = null;
+    
+    if (doc == null && nodeType == DOCUMENT_NODE)
+      {
+        doc = (Document) this;
+      }
+
+    if (doc == null)
+      {
+        // possible for DocumentType
+        throw new IllegalStateException ("unbound ownerDocument");
+      }
+
+    impl = doc.getImplementation();
+    return impl.hasFeature(feature, version);
+  }
+
+  /**
+   * <b>DOM L1 (modified in L2)</b>
+   * Returns the owner document.  This is only null for Document nodes,
+   * and (new in L2) for DocumentType nodes which have not yet been
+   * associated with the rest of their document.
+   */
+  final public Document getOwnerDocument()
+  {
+    return owner;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Does nothing; this must be overridden (along with the
+   * getNodeValue method) for nodes with a non-null defined value.
+   */
+  public void setNodeValue(String value)
+  {
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns null; this must be overridden for nodes types with
+   * a defined value, along with the setNodeValue method.
+   */
+  public String getNodeValue()
+  {
+    return null;
+  }
+
+  /** This forces GCJ compatibility.
+   * Without this method GCJ is unable to compile to byte code.
+   */
+  public final short getNodeType()
+  {
+    return nodeType;
+  }
+
+  /** This forces GCJ compatibility.
+   * Without this method GCJ seems unable to natively compile GNUJAXP.
+   */
+  public abstract String getNodeName();
+
+  /**
+   * <b>DOM L2</b>
+   * Does nothing; this must be overridden (along with the
+   * getPrefix method) for element and attribute nodes.
+   */
+  public void setPrefix(String prefix)
+  {
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Returns null; this must be overridden for element and
+   * attribute nodes.
+   */
+  public String getPrefix()
+  {
+    return null;
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Returns null; this must be overridden for element and
+   * attribute nodes.
+   */
+  public String getNamespaceURI()
+  {
+    return null;
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Returns the node name; this must be overridden for element and
+   * attribute nodes.
+   */
+  public String getLocalName()
+  {
+    return null;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns a clone of this node which optionally includes cloned
+   * versions of child nodes.  Clones are always mutable, except for
+   * entity reference nodes.
+   */
+  public Node cloneNode(boolean deep)
+  {
+    DomNode node = (DomNode) clone();
+    
+    if (deep)
+      {
+        DomDocument doc = (nodeType == DOCUMENT_NODE) ?
+          (DomDocument) node : node.owner;
+        for (DomNode ctx = first; ctx != null; ctx = ctx.next)
+          {
+            DomNode newChild = (DomNode) ctx.cloneNode(deep);
+            newChild.setOwner(doc);
+            node.appendChild(newChild);
+          }
+      }
+    
+    if (nodeType == ENTITY_REFERENCE_NODE)
+      {
+        node.makeReadonly();
+      }
+    notifyUserDataHandlers(UserDataHandler.NODE_CLONED, this, node);
+    return node;
+  }
+
+  void notifyUserDataHandlers(short op, Node src, Node dst)
+  {
+    if (userDataHandlers != null)
+      {
+        for (Iterator i = userDataHandlers.entrySet().iterator(); i.hasNext(); )
+          {
+            Map.Entry entry = (Map.Entry) i.next();
+            String key = (String) entry.getKey();
+            UserDataHandler handler = (UserDataHandler) entry.getValue();
+            Object data = userData.get(key);
+            handler.handle(op, key, data, src, dst);
+          }
+      }
+  }
+
+  /**
+   * Clones this node; roughly equivalent to cloneNode(false).
+   * Element subclasses must provide a new implementation which
+   * invokes this method to handle the basics, and then arranges
+   * to clone any element attributes directly.  Attribute subclasses
+   * must make similar arrangements, ensuring that existing ties to
+   * elements are broken by cloning.
+   */
+  public Object clone()
+  {
+    try
+      {
+        DomNode node = (DomNode) super.clone();
+        
+        node.parent = null;
+        node.depth = 0;
+        node.index = 0;
+        node.length = 0;
+        node.first = null;
+        node.last = null;
+        node.previous = null;
+        node.next = null;
+        
+        node.readonly = false;
+        node.listeners = null;
+        node.nListeners = 0;
+        return node;
+
+      }
+    catch (CloneNotSupportedException x)
+      {
+        throw new Error("clone didn't work");
+      }
+  }
+
+  // the elements-by-tagname stuff is needed for both
+  // elements and documents ... this is in lieu of a
+  // common base class between Node and NodeNS.
+
+  /**
+   * <b>DOM L1</b>
+   * Creates a NodeList giving array-style access to elements with
+   * the specified name.  Access is fastest if indices change by
+   * small values, and the DOM is not modified.
+   */
+  public NodeList getElementsByTagName(String tag)
+  {
+    return new ShadowList(null, tag);
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Creates a NodeList giving array-style access to elements with
+   * the specified namespace and local name.  Access is fastest if
+   * indices change by small values, and the DOM is not modified.
+   */
+  public NodeList getElementsByTagNameNS(String namespace, String local)
+  {
+    return new ShadowList(namespace, local);
+  }
+
+
+  //
+  // This shadow class is GC-able even when the live list it shadows
+  // can't be, because of event registration hookups.  Its finalizer
+  // makes that live list become GC-able.
+  //
+  final class ShadowList
+    implements NodeList
+  {
+
+    private LiveNodeList liveList;
+    
+    ShadowList(String ns, String local)
+    {
+      liveList = new LiveNodeList(ns, local);
+    }
+
+    public void finalize()
+    {
+      liveList.detach();
+      liveList = null;
+    }
+
+    public Node item(int index)
+    {
+      return liveList.item(index);
+    }
+
+    public int getLength()
+    {
+      return liveList.getLength();
+    }
+  }
+
+  final class LiveNodeList
+    implements NodeList, EventListener, NodeFilter
+  {
+ 
+    private final boolean matchAnyURI;
+    private final boolean matchAnyName; 
+    private final String elementURI;
+    private final String elementName;
+    
+    private DomIterator current;
+    private int lastIndex;
+    
+    LiveNodeList(String uri, String name)
+    {
+      elementURI = uri;
+      elementName = name;
+      matchAnyURI = "*".equals(uri);
+      matchAnyName = "*".equals(name);
+      
+      DomNode.this.addEventListener("DOMNodeInserted", this, true);
+      DomNode.this.addEventListener("DOMNodeRemoved", this, true);
+    }
+
+    void detach()
+    {
+      current.detach();
+      current = null;
+      
+      DomNode.this.removeEventListener("DOMNodeInserted", this, true);
+      DomNode.this.removeEventListener("DOMNodeRemoved", this, true);
+    }
+
+    public short acceptNode(Node element)
+    {
+      if (element == DomNode.this)
+        {
+          return FILTER_SKIP;
+        }
+
+      // use namespace-aware matching ...
+      if (elementURI != null)
+        {
+          if (!(matchAnyURI
+                || elementURI.equals(element.getNamespaceURI())))
+            {
+              return FILTER_SKIP;
+            }
+          if (!(matchAnyName
+                || elementName.equals(element.getLocalName())))
+            {
+              return FILTER_SKIP;
+            }
+
+          // ... or qName-based kind.
+        }
+      else
+        {
+          if (!(matchAnyName
+                || elementName.equals(element.getNodeName())))
+            {
+              return FILTER_SKIP;
+            }
+        }
+      return FILTER_ACCEPT;
+    }
+
+    private DomIterator createIterator()
+    {
+      return new DomIterator(DomNode.this,
+                             NodeFilter.SHOW_ELEMENT,
+                             this,     /* filter */
+                             true      /* expand entity refs */
+                            );
+    }
+
+    public void handleEvent(Event e)
+    {
+      MutationEvent    mutation = (MutationEvent) e;
+      Node             related = mutation.getRelatedNode();
+      
+      // XXX if it's got children ... check all kids too, they
+      // will invalidate our saved index
+      
+      if (related.getNodeType() != Node.ELEMENT_NODE ||
+          related.getNodeName() != elementName ||
+          related.getNamespaceURI() != elementURI)
+        {
+          return;
+        }
+      
+      current = null;
+    }
+
+    public Node item(int index)
+    {
+      if (current == null)
+        {
+          current = createIterator();
+          lastIndex = -1;
+        }
+      
+      // last node or before?  go backwards
+      if (index <= lastIndex) {
+        while (index != lastIndex) {
+          current.previousNode ();
+          lastIndex--;
+        }
+        Node ret = current.previousNode ();
+        current = null;
+        return ret;
+      } 
+      
+      // somewhere after last node
+      while (++lastIndex != index)
+        current.nextNode ();
+        Node ret = current.nextNode ();
+        current = null;
+        return ret;
+    }
+    
+    public int getLength()
+    {
+      int retval = 0;
+      NodeIterator iter = createIterator();
+      
+      while (iter.nextNode() != null)
+        {
+          retval++;
+        }
+      current = null;
+      return retval;
+    }
+    
+  }
+
+  //
+  // EventTarget support
+  //
+  static final class ListenerRecord
+  {
+  
+    String type;
+    EventListener listener;
+    boolean useCapture;
+
+    // XXX use JDK 1.2 java.lang.ref.WeakReference to listener,
+    // and we can both get rid of "shadow" classes and remove
+    // the need for applications to apply similar trix ... but
+    // JDK 1.2 support isn't generally available yet
+
+    ListenerRecord(String type, EventListener listener, boolean useCapture)
+    {
+      this.type = type.intern();
+      this.listener = listener;
+      this.useCapture = useCapture;
+    }
+
+    boolean equals(ListenerRecord rec)
+    {
+      return listener == rec.listener
+        && useCapture == rec.useCapture
+        && type == rec.type;
+    }
+    
+  }
+
+  /**
+   * <b>DOM L2 (Events)</b>
+   * Returns an instance of the specified type of event object.
+   * Understands about DOM Mutation, HTML, and UI events.
+   *
+   * <p>If the name of the event type begins with "USER-", then an object
+   * implementing the "Event" class will be returned; this provides a
+   * limited facility for application-defined events to use the DOM event
+   * infrastructure.  Alternatively, use one of the standard DOM event
+   * classes and initialize it using use such a "USER-" event type name;
+   * or defin, instantiate, and initialize an application-specific subclass
+   * of DomEvent and pass that to dispatchEvent().
+   *
+   * @param eventType Identifies the particular DOM feature module
+   *   defining the type of event, such as "MutationEvents".
+   *   <em>The event "name" is a different kind of "type".</em>
+   */
+  public Event createEvent(String eventType)
+  {
+    eventType = eventType.toLowerCase();
+    
+    if ("mutationevents".equals(eventType))
+      {
+        return new DomEvent.DomMutationEvent(null);
+      }
+    
+    if ("htmlevents".equals(eventType)
+        || "events".equals(eventType)
+        || "user-events".equals(eventType))
+      {
+        return new DomEvent(null);
+      }
+    
+    if ("uievents".equals(eventType))
+      {
+        return new DomEvent.DomUIEvent(null);
+      }
+
+    // mouse events 
+    
+    throw new DomEx(DomEx.NOT_SUPPORTED_ERR,
+                    eventType, null, 0);
+  }
+
+  /**
+   * <b>DOM L2 (Events)</b>
+   * Registers an event listener's interest in a class of events.
+   */
+  public final void addEventListener(String type,
+                                     EventListener listener,
+                                     boolean useCapture)
+  {
+    if (listeners == null)
+      {
+        listeners = new ListenerRecord[1];
+      }
+    else if (nListeners == listeners.length)
+      {
+        ListenerRecord[] newListeners =
+          new ListenerRecord[listeners.length + NKIDS_DELTA];
+        System.arraycopy(listeners, 0, newListeners, 0, nListeners);
+        listeners = newListeners;
+      }
+
+    // prune duplicates
+    ListenerRecord record;
+
+    record = new ListenerRecord(type, listener, useCapture);
+    for (int i = 0; i < nListeners; i++)
+      {
+        if (record.equals(listeners[i]))
+          {
+            return;
+          }
+      }
+    listeners [nListeners++] = record;
+  }
+
+  // XXX this exception should be discarded from DOM
+
+  // this class can be instantiated, unlike the one in the spec
+  static final class DomEventException
+    extends EventException
+  {
+   
+    DomEventException()
+    {
+      super(UNSPECIFIED_EVENT_TYPE_ERR, "unspecified event type");
+    }
+    
+  }
+
+  /**
+   * <b>DOM L2 (Events)</b>
+   * Delivers an event to all relevant listeners, returning true if the
+   * caller should perform their default action.  Note that the event
+   * must have been provided by the createEvent() method on this
+   * class, else it can't be dispatched.
+   *
+   * @see #createEvent
+   *
+   * @exception NullPointerException When a null event is passed.
+   * @exception ClassCastException When the event wasn't provided by
+   *   the createEvent method, or otherwise isn't a DomEvent.
+   * @exception EventException If the event type wasn't specified
+   */
+  public final boolean dispatchEvent(Event event)
+    throws EventException
+  {
+    DomEvent e = (DomEvent) event;
+    DomNode[] ancestors = null;
+    int ancestorMax = 0;
+    boolean haveDispatchDataLock = false;
+    
+    if (e.type == null)
+      {
+        throw new DomEventException();
+      }
+
+    e.doDefault = true;
+    e.target = this;
+    
+    //
+    // Typical case:  one nonrecursive dispatchEvent call at a time
+    // for this class.  If that's our case, we can avoid allocating
+    // garbage, which is overall a big win.  Even with advanced GCs
+    // that deal well with short-lived garbage, and wayfast allocators,
+    // it still helps.
+    //
+    // Remember -- EVERY mutation goes though here at least once.
+    //
+    // When populating a DOM tree, trying to send mutation events is
+    // the primary cost; this dominates the critical path.
+    //
+    try
+      {
+        DomNode current;
+        int index;
+        boolean haveAncestorRegistrations = false;
+        ListenerRecord[] notificationSet;
+        int ancestorLen;
+        
+        synchronized (lockNode)
+          {
+            if (!dispatchDataLock)
+              {
+                haveDispatchDataLock = dispatchDataLock = true;
+                notificationSet = DomNode.notificationSet;
+                ancestors = DomNode.ancestors;
+              }
+            else
+              {
+                notificationSet = new ListenerRecord[NOTIFICATIONS_INIT];
+                ancestors = new DomNode[ANCESTORS_INIT];
+              }
+            ancestorLen = ancestors.length;
+          }
+        
+        // XXX autogrow ancestors ... based on statistics
+        
+        // Climb to the top of this subtree and handle capture, letting
+        // each node (from the top down) capture until one stops it or
+        // until we get to this one.
+        
+        for (index = 0, current = parent;
+             current != null && index < ancestorLen;
+             index++, current = current.parent)
+          {
+            if (current.nListeners != 0)
+              {
+                haveAncestorRegistrations = true;
+              }
+            ancestors [index] = current;
+          }
+        if (current != null)
+          {
+            throw new RuntimeException("dispatchEvent capture stack size");
+          }
+        
+        ancestorMax = index;
+        e.stop = false;
+        
+        if (haveAncestorRegistrations)
+          {
+            e.eventPhase = Event.CAPTURING_PHASE;
+            while (!e.stop && index-- > 0)
+              {
+                current = ancestors [index];
+                if (current.nListeners != 0)
+                  {
+                    notifyNode(e, current, true, notificationSet);
+                  }
+              }
+          }
+        
+        // Always deliver events to the target node (this)
+        // unless stopPropagation was called.  If we saw
+        // no registrations yet (typical!), we never will.
+        if (!e.stop && nListeners != 0)
+          {
+            e.eventPhase = Event.AT_TARGET;
+            notifyNode (e, this, false, notificationSet);
+          }
+        else if (!haveAncestorRegistrations)
+          {
+            e.stop = true;
+          }
+        
+        // If the event bubbles and propagation wasn't halted,
+        // walk back up the ancestor list.  Stop bubbling when
+        // any bubbled event handler stops it.
+        
+        if (!e.stop && e.bubbles)
+          {
+            e.eventPhase = Event.BUBBLING_PHASE;
+            for (index = 0;
+                 !e.stop
+                 && index < ancestorMax
+                 && (current = ancestors[index]) != null;
+                 index++)
+              {
+                if (current.nListeners != 0)
+                  {
+                    notifyNode(e, current, false, notificationSet);
+                  }
+              }
+          }
+        e.eventPhase = 0;
+        
+        // Caller chooses whether to perform the default
+        // action based on return from this method.
+        return e.doDefault;
+        
+      }
+    finally
+      {
+        if (haveDispatchDataLock)
+          {
+            // synchronize to force write ordering
+            synchronized (lockNode)
+              {
+                // null out refs to ensure they'll be GC'd
+                for (int i = 0; i < ancestorMax; i++)
+                  {
+                    ancestors [i] = null;
+                  }
+                // notificationSet handled by notifyNode
+                
+                dispatchDataLock = false;
+              }
+          }
+      }
+  }
+  
+  private void notifyNode(DomEvent e,
+                          DomNode current,
+                          boolean capture,
+                          ListenerRecord[] notificationSet)
+  {
+    int count = 0;
+
+    // do any of this set of listeners get notified?
+    for (int i = 0; i < current.nListeners; i++)
+      {
+        ListenerRecord rec = current.listeners[i];
+
+        if (rec.useCapture != capture)
+          {
+            continue;
+          }
+        if (!e.type.equals (rec.type)) 
+          {
+            continue;
+          }
+        if (count < notificationSet.length)
+          {
+            notificationSet[count++] = rec;
+          }
+        else
+          // XXX fire up some cheap growth algorithm
+          throw new RuntimeException("Event notification set size exceeded");
+      }
+
+    // Notify just those listeners
+    e.currentNode = current; 
+    for (int i = 0; i < count; i++)
+      {
+        try
+          {
+            // Late in the DOM CR process (3rd or 4th CR?) the
+            // removeEventListener spec became asymmetric with respect
+            // to addEventListener ... effect is now immediate.
+            for (int j = 0; j < current.nListeners; j++)
+              {
+                if (current.listeners[j].equals(notificationSet[i]))
+                  {
+                    notificationSet[i].listener.handleEvent(e);
+                    break;
+                  }
+              }
+            
+          }
+        catch (Exception x)
+          {
+            // ignore all exceptions
+          }
+        notificationSet[i] = null;             // free for GC
+      }
+  }
+
+  /**
+   * <b>DOM L2 (Events)</b>
+   * Unregisters an event listener.
+   */
+  public final void removeEventListener(String type,
+                                        EventListener listener,
+                                        boolean useCapture)
+  {
+    for (int i = 0; i < nListeners; i++)
+      {
+        if (listeners[i].listener != listener)
+          {
+            continue;
+          }
+        if (listeners[i].useCapture != useCapture)
+          {
+            continue;
+          }
+        if (!listeners[i].type.equals(type))
+          {
+            continue;
+          }
+
+        if (nListeners == 1)
+          {
+            listeners = null;
+            nListeners = 0;
+          }
+        else
+          {
+            for (int j = i + 1; j < nListeners; j++)
+              {
+                listeners[i++] = listeners[j++];
+              }
+            listeners[--nListeners] = null;
+          }
+        break;
+      }
+    // no exceptions reported
+  }
+
+  /**
+   * <b>DOM L1 (relocated in DOM L2)</b>
+   * In this node and all contained nodes (including attributes if
+   * relevant) merge adjacent text nodes.  This is done while ignoring
+   * text which happens to use CDATA delimiters).
+   */
+  public final void normalize()
+  {
+    // Suspend readonly status
+    boolean saved = readonly;
+    readonly = false;
+    for (DomNode ctx = first; ctx != null; ctx = ctx.next)
+      {
+        switch (ctx.nodeType)
+          {
+          case TEXT_NODE:
+            while (ctx.next != null && ctx.next.nodeType == TEXT_NODE)
+              {
+                Text text = (Text) ctx;
+                text.appendData(ctx.next.getNodeValue());
+                removeChild(ctx.next);
+              }
+            break;
+          case ELEMENT_NODE:
+            NamedNodeMap attrs = ctx.getAttributes();
+            int len = attrs.getLength();
+            for (int i = 0; i < len; i++)
+              {
+                attrs.item(i).normalize();
+              }
+            // Fall through
+          case DOCUMENT_NODE:
+          case DOCUMENT_FRAGMENT_NODE:
+          case ATTRIBUTE_NODE:
+          case ENTITY_REFERENCE_NODE:
+            ctx.normalize();
+            break;
+          }
+      }
+    readonly = saved;
+  }
+
+  /**
+   * Returns true iff node types match, and either (a) both nodes have no
+   * namespace and their getNodeName() values are the same, or (b) both
+   * nodes have the same getNamespaceURI() and same getLocalName() values.
+   *
+   * <p>Note that notion of a "Per-Element-Type" attribute name scope, as
+   * found in a non-normative appendix of the XML Namespaces specification,
+   * is not supported here.  Your application must implement that notion,
+   * typically by not bothering to check nameAndTypeEquals for attributes
+   * without namespace URIs unless you already know their elements are
+   * nameAndTypeEquals.
+   */
+  public boolean nameAndTypeEquals(Node other)
+  {
+    if (other == this)
+      {
+        return true;
+      }
+    // node types must match
+    if (nodeType != other.getNodeType())
+      {
+        return false;
+      }
+
+    // if both have namespaces, do a "full" comparision
+    // this is a "global" partition
+    String ns1 = this.getNamespaceURI();
+    String ns2 = other.getNamespaceURI();
+
+    if (ns1 != null && ns2 != null)
+      {
+        return ns1.equals(ns2) &&
+          getLocalName().equals(other.getLocalName());
+      }
+
+    // if neither has a namespace, this is a "no-namespace" name.
+    if (ns1 == null && ns2 == null)
+      {
+        if (!getNodeName().equals(other.getNodeName()))
+          {
+            return false;
+          }
+        // can test the non-normative "per-element-type" scope here.
+        // if this is an attribute node and both nodes have been bound
+        // to elements (!!), then return the nameAndTypeEquals()
+        // comparison of those elements.
+        return true;
+      }
+
+    // otherwise they're unequal: one scoped, one not.
+    return false;
+  }
+
+  // DOM Level 3 methods
+
+  public String getBaseURI()
+  {
+    return (parent != null) ? parent.getBaseURI() : null;
+  }
+
+  public short compareDocumentPosition(Node other)
+    throws DOMException
+  {
+    return (short) compareTo(other);
+  }
+
+  /**
+   * DOM nodes have a natural ordering: document order.
+   */
+  public final int compareTo(Object other)
+  {
+    if (other instanceof DomNode)
+      {
+        DomNode n1 = this;
+        DomNode n2 = (DomNode) other;
+        if (n1.owner != n2.owner)
+          {
+            return 0;
+          }
+        int d1 = n1.depth, d2 = n2.depth;
+        int delta = d1 - d2;
+        while (d1 > d2)
+          {
+            n1 = n1.parent;
+            d1--;
+          }
+        while (d2 > d1)
+          {
+            n2 = n2.parent;
+            d2--;
+          }
+        int c = compareTo2(n1, n2);
+        return (c != 0) ? c : delta;
+      }
+    return 0;
+  }
+
+  /**
+   * Compare two nodes at the same depth.
+   */
+  final int compareTo2(DomNode n1, DomNode n2)
+  {
+    if (n1 == n2 || n1.depth == 0 || n2.depth == 0)
+      {
+        return 0;
+      }
+    int c = compareTo2(n1.parent, n2.parent);
+    return (c != 0) ? c : n1.index - n2.index;
+  }
+
+  public final String getTextContent()
+    throws DOMException
+  {
+    return getTextContent(true);
+  }
+
+  final String getTextContent(boolean topLevel)
+    throws DOMException
+  {
+    switch (nodeType)
+      {
+      case ELEMENT_NODE:
+      case ENTITY_NODE:
+      case ENTITY_REFERENCE_NODE:
+      case DOCUMENT_FRAGMENT_NODE:
+        StringBuffer buffer = new StringBuffer();
+        for (DomNode ctx = first; ctx != null; ctx = ctx.next)
+          {
+            String textContent = ctx.getTextContent(false);
+            if (textContent != null)
+              {
+                buffer.append(textContent);
+              }
+          }
+        return buffer.toString();
+      case TEXT_NODE:
+      case CDATA_SECTION_NODE:
+        if (((Text) this).isElementContentWhitespace())
+          {
+            return "";
+          }
+        return getNodeValue();
+      case ATTRIBUTE_NODE:
+        return getNodeValue();
+      case COMMENT_NODE:
+      case PROCESSING_INSTRUCTION_NODE:
+        return topLevel ? getNodeValue() : "";
+      default:
+        return null;
+      }
+  }
+
+  public void setTextContent(String textContent)
+    throws DOMException
+  {
+    switch (nodeType)
+      {
+      case ELEMENT_NODE:
+      case ATTRIBUTE_NODE:
+      case ENTITY_NODE:
+      case ENTITY_REFERENCE_NODE:
+      case DOCUMENT_FRAGMENT_NODE:
+        for (DomNode ctx = first; ctx != null; )
+          {
+            DomNode n = ctx.next;
+            removeChild(ctx);
+            ctx = n;
+          }
+        if (textContent != null)
+          {
+            Text text = owner.createTextNode(textContent);
+            appendChild(text);
+          }
+        break;
+      case TEXT_NODE:
+      case CDATA_SECTION_NODE:
+      case COMMENT_NODE:
+      case PROCESSING_INSTRUCTION_NODE:
+        setNodeValue(textContent);
+        break;
+      }
+  }
+
+  public boolean isSameNode(Node other)
+  {
+    return this == other;
+  }
+
+  public String lookupPrefix(String namespaceURI)
+  {
+    return (parent == null || parent == owner) ? null :
+      parent.lookupPrefix(namespaceURI);
+  }
+
+  public boolean isDefaultNamespace(String namespaceURI)
+  {
+    return (parent == null || parent == owner) ? false :
+      parent.isDefaultNamespace(namespaceURI);
+  }
+
+  public String lookupNamespaceURI(String prefix)
+  {
+    return (parent == null || parent == owner) ? null :
+      parent.lookupNamespaceURI(prefix);
+  }
+
+  public boolean isEqualNode(Node arg)
+  {
+    if (this == arg)
+      {
+        return true;
+      }
+    if (arg == null)
+      {
+        return false;
+      }
+    if (nodeType != arg.getNodeType() ||
+        !equal(getNodeName(), arg.getNodeName()) ||
+        !equal(getLocalName(), arg.getLocalName()) ||
+        !equal(getNamespaceURI(), arg.getNamespaceURI()) ||
+        !equal(getPrefix(), arg.getPrefix()) ||
+        !equal(getNodeValue(), arg.getNodeValue()))
+      {
+        return false;
+      }
+    // Children
+    Node argCtx = arg.getFirstChild();
+    getFirstChild(); // because of DomAttr lazy children
+    for (DomNode ctx = first; ctx != null; ctx = ctx.next)
+      {
+        if (!ctx.isEqualNode(argCtx))
+          {
+            return false;
+          }
+        argCtx = argCtx.getNextSibling();
+      }
+    if (argCtx != null)
+      {
+        return false;
+      }
+    
+    // TODO Attr NamedNodeMap
+    // TODO DocumentType
+    return true;
+  }
+
+  boolean equal(String arg1, String arg2)
+  {
+    return ((arg1 == null && arg2 == null) ||
+            (arg1 != null && arg1.equals(arg2))); 
+  }
+  
+  public Object getFeature(String feature, String version)
+  {
+    DOMImplementation impl = (nodeType == DOCUMENT_NODE) ?
+      ((Document) this).getImplementation() : owner.getImplementation();
+    if (impl.hasFeature(feature, version))
+      {
+        return this;
+      }
+    return null;
+  }
+
+  public Object setUserData(String key, Object data, UserDataHandler handler)
+  {
+    if (userData == null)
+      {
+        userData = new HashMap();
+      }
+    if (handler != null)
+      {
+        if (userDataHandlers == null)
+          {
+            userDataHandlers = new HashMap();
+          }
+        userDataHandlers.put(key, handler);
+      }
+    return userData.put(key, data);
+  }
+
+  public Object getUserData(String key)
+  {
+    if (userData == null)
+      {
+        return null;
+      }
+    return userData.get(key);
+  }
+
+  public String toString()
+  {
+    String nodeName = getNodeName();
+    String nodeValue = getNodeValue();
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    if (nodeName != null)
+      {
+        buf.append(nodeName);
+      }
+    if (nodeValue != null)
+      {
+        if (nodeName != null)
+          {
+            buf.append('=');
+          }
+        buf.append('\'');
+        buf.append(encode(nodeValue));
+        buf.append('\'');
+      }
+    buf.append(']');
+    return buf.toString();
+  }
+  
+  String encode(String value)
+  {
+    StringBuffer buf = null;
+    int len = value.length();
+    for (int i = 0; i < len; i++)
+      {
+        char c = value.charAt(i);
+        if (c == '\n')
+          {
+            if (buf == null)
+              {
+                buf = new StringBuffer(value.substring(0, i));
+              }
+            buf.append("\\n");
+          }
+        else if (c == '\r')
+          {
+            if (buf == null)
+              {
+                buf = new StringBuffer(value.substring(0, i));
+              }
+            buf.append("\\r");
+          }
+        else if (buf != null)
+          {
+            buf.append(c);
+          }
+      }
+    return (buf != null) ? buf.toString() : value;
+  }
+
+  String nodeTypeToString(short nodeType)
+  {
+    switch (nodeType)
+      {
+      case ELEMENT_NODE:
+        return "ELEMENT_NODE";
+      case ATTRIBUTE_NODE:
+        return "ATTRIBUTE_NODE";
+      case TEXT_NODE:
+        return "TEXT_NODE";
+      case CDATA_SECTION_NODE:
+        return "CDATA_SECTION_NODE";
+      case DOCUMENT_NODE:
+        return "DOCUMENT_NODE";
+      case DOCUMENT_TYPE_NODE:
+        return "DOCUMENT_TYPE_NODE";
+      case COMMENT_NODE:
+        return "COMMENT_NODE";
+      case PROCESSING_INSTRUCTION_NODE:
+        return "PROCESSING_INSTRUCTION_NODE";
+      case DOCUMENT_FRAGMENT_NODE:
+        return "DOCUMENT_FRAGMENT_NODE";
+      case ENTITY_NODE:
+        return "ENTITY_NODE";
+      case ENTITY_REFERENCE_NODE:
+        return "ENTITY_REFERENCE_NODE";
+      case NOTATION_NODE:
+        return "NOTATION_NODE";
+      default:
+        return "UNKNOWN";
+      }
+  }
+
+}
+
diff --git a/libjava/gnu/xml/dom/DomNodeIterator.java b/libjava/gnu/xml/dom/DomNodeIterator.java
new file mode 100644 (file)
index 0000000..c08e90a
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomNodeIterator.java
@@ -0,0 +1,327 @@
+/* DomNodeIterator.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+package gnu.xml.dom;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Node;
+import org.w3c.dom.traversal.NodeFilter;
+import org.w3c.dom.traversal.NodeIterator;
+import org.w3c.dom.traversal.TreeWalker;
+
+/**
+ * Node iterator and tree walker.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomNodeIterator
+  implements NodeIterator, TreeWalker
+{
+
+  Node root;
+  final int whatToShow;
+  final NodeFilter filter;
+  final boolean entityReferenceExpansion;
+  final boolean walk;
+  Node current;
+
+  public DomNodeIterator(Node root, int whatToShow, NodeFilter filter,
+                         boolean entityReferenceExpansion, boolean walk)
+  {
+    if (root == null)
+      {
+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "null root");
+      }
+    this.root = root;
+    this.whatToShow = whatToShow;
+    this.filter = filter;
+    this.entityReferenceExpansion = entityReferenceExpansion;
+    this.walk = walk;
+    current = root;
+  }
+
+  public Node getRoot()
+  {
+    return root;
+  }
+
+  public int getWhatToShow()
+  {
+    return whatToShow;
+  }
+
+  public NodeFilter getFilter()
+  {
+    return filter;
+  }
+
+  public boolean getExpandEntityReferences()
+  {
+    return entityReferenceExpansion;
+  }
+
+  public Node nextNode()
+    throws DOMException
+  {
+    if (root == null)
+      {
+        throw new DOMException(DOMException.INVALID_STATE_ERR, "null root");
+      }
+    Node ret;
+    do
+      {
+        if (current.equals(root))
+          {
+            ret = root.getFirstChild();
+          }
+        else if (walk)
+          {
+            ret = current.getFirstChild();
+            if (ret == null)
+              {
+                ret = current.getNextSibling();
+              }
+            if (ret == null)
+              {
+                Node tmp = current;
+                ret = tmp.getParentNode();
+                while (!ret.equals(root) && tmp.equals(ret.getLastChild()))
+                  {
+                    tmp = ret;
+                    ret = tmp.getParentNode();
+                  }
+                if (ret.equals(root))
+                  {
+                    ret = null;
+                  }
+                else
+                  {
+                    ret = ret.getNextSibling();
+                  }
+              }
+          }
+        else
+          {
+            ret = current.getNextSibling();
+          }
+      }
+    while (!accept(ret));
+    current = (ret == null) ? current : ret;
+    return ret;
+  }
+
+  public Node previousNode()
+    throws DOMException
+  {
+    if (root == null)
+      {
+        throw new DOMException(DOMException.INVALID_STATE_ERR, "null root");
+      }
+    Node ret;
+    do
+      {
+        if (current.equals(root))
+          {
+            ret = current.getLastChild();
+          }
+        else if (walk)
+          {
+            ret = current.getLastChild();
+            if (ret == null)
+              {
+                ret = current.getPreviousSibling();
+              }
+            if (ret == null)
+              {
+                Node tmp = current;
+                ret = tmp.getParentNode();
+                while (!ret.equals(root) && tmp.equals(ret.getFirstChild()))
+                  {
+                    tmp = ret;
+                    ret = tmp.getParentNode();
+                  }
+                if (ret.equals(root))
+                  {
+                    ret = null;
+                  }
+                else
+                  {
+                    ret = ret.getPreviousSibling();
+                  }
+              }
+          }
+        else
+          {
+            ret = current.getPreviousSibling();
+          }
+      }
+    while (!accept(ret));
+    current = (ret == null) ? current : ret;
+    return ret;
+  }
+
+  public Node getCurrentNode()
+  {
+    return current;
+  }
+
+  public void setCurrentNode(Node current)
+    throws DOMException
+  {
+    if (current == null)
+      {
+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "null root");
+      }
+    this.current = current;
+  }
+
+  public Node parentNode()
+  {
+    Node ret = current.getParentNode();
+    if (!accept (ret))
+      {
+        ret = null;
+      }
+    current = (ret == null) ? current : ret;
+    return ret;
+  }
+
+  public Node firstChild ()
+  {
+    Node ret = current.getFirstChild();
+    while (!accept(ret))
+      {
+        ret = ret.getNextSibling();
+      }
+    current = (ret == null) ? current : ret;
+    return ret;
+  }
+
+  public Node lastChild()
+  {
+    Node ret = current.getLastChild();
+    while (!accept(ret))
+      {
+        ret = ret.getPreviousSibling();
+      }
+    current = (ret == null) ? current : ret;
+    return ret;
+  }
+
+  public Node previousSibling()
+  {
+    Node ret = current.getPreviousSibling();
+    while (!accept(ret))
+      {
+        ret = ret.getPreviousSibling();
+      }
+    current = (ret == null) ? current : ret;
+    return ret;
+  }
+
+  public Node nextSibling()
+  {
+    Node ret = current.getNextSibling();
+    while (!accept(ret))
+      {
+        ret = ret.getNextSibling();
+      }
+    current = (ret == null) ? current : ret;
+    return ret;
+  }
+
+  public void detach()
+  {
+    root = null;
+  }
+
+  boolean accept(Node node)
+  {
+    if (node == null)
+      {
+        return true;
+      }
+    boolean ret;
+    switch (node.getNodeType())
+      {
+      case Node.ATTRIBUTE_NODE:
+        ret = (whatToShow & NodeFilter.SHOW_ATTRIBUTE) != 0;
+        break;
+      case Node.CDATA_SECTION_NODE:
+        ret = (whatToShow & NodeFilter.SHOW_CDATA_SECTION) != 0;
+        break;
+      case Node.COMMENT_NODE:
+        ret = (whatToShow & NodeFilter.SHOW_COMMENT) != 0;
+        break;
+      case Node.DOCUMENT_NODE:
+        ret = (whatToShow & NodeFilter.SHOW_DOCUMENT) != 0;
+        break;
+      case Node.DOCUMENT_FRAGMENT_NODE:
+        ret = (whatToShow & NodeFilter.SHOW_DOCUMENT_FRAGMENT) != 0;
+        break;
+      case Node.DOCUMENT_TYPE_NODE:
+        ret = (whatToShow & NodeFilter.SHOW_DOCUMENT_TYPE) != 0;
+        break;
+      case Node.ELEMENT_NODE:
+        ret = (whatToShow & NodeFilter.SHOW_ELEMENT) != 0;
+        break;
+      case Node.ENTITY_NODE:
+        ret = (whatToShow & NodeFilter.SHOW_ENTITY) != 0;
+        break;
+      case Node.ENTITY_REFERENCE_NODE:
+        ret = (whatToShow & NodeFilter.SHOW_ENTITY_REFERENCE) != 0;
+        ret = ret && entityReferenceExpansion;
+        break;
+      case Node.NOTATION_NODE:
+        ret = (whatToShow & NodeFilter.SHOW_NOTATION) != 0;
+        break;
+      case Node.PROCESSING_INSTRUCTION_NODE:
+        ret = (whatToShow & NodeFilter.SHOW_PROCESSING_INSTRUCTION) != 0;
+        break;
+      case Node.TEXT_NODE:
+        ret = (whatToShow & NodeFilter.SHOW_TEXT) != 0;
+        break;
+      default:
+        ret = true;
+      }
+    if (ret && filter != null)
+      {
+        ret = (filter.acceptNode(node) == NodeFilter.FILTER_ACCEPT);
+      }
+    return ret;
+  }
+
+}
diff --git a/libjava/gnu/xml/dom/DomNotation.java b/libjava/gnu/xml/dom/DomNotation.java
new file mode 100644 (file)
index 0000000..d666699
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomNotation.java
@@ -0,0 +1,103 @@
+/* DomNotation.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import org.w3c.dom.Notation;
+
+/**
+ * <p> "Notation" implementation.  This is a non-core DOM class, supporting
+ * the "XML" feature. </p>
+ *
+ * <p> Although unparsed entities using this notation can be detected using
+ * DOM, neither NOTATIONS nor ENTITY/ENTITIES attributes can be so detected.
+ * More, there is no portable way to construct a Notation node, so there's
+ * no way that vendor-neutral DOM construction APIs could even report a
+ * NOTATION used to identify the intended meaning of a ProcessingInstruction.
+ * </p>
+ *
+ * <p> In short, <em>avoid using this DOM functionality</em>.
+ *
+ * @see DomDoctype
+ * @see DomEntity
+ * @see DomPI
+ *
+ * @author David Brownell 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomNotation
+  extends DomExtern
+  implements Notation
+{
+    
+  /**
+   * Constructs a Notation node associated with the specified document,
+   * with the specified descriptive data.  Note that at least one of
+   * the PUBLIC and SYSTEM identifiers must be provided; unlike other
+   * external objects in XML, notations may have only a PUBLIC identifier.
+   *
+   * <p>This constructor should only be invoked by a DomDoctype object
+   * as part of its declareNotation functionality, or through a subclass
+   * which is similarly used in a "Sub-DOM" style layer. 
+   *
+   * @param owner The document with which this notation is associated
+   * @param name Name of this notation
+   * @param publicId If non-null, provides the notation's PUBLIC identifier
+   * @param systemId If non-null, rovides the notation's SYSTEM identifier
+   */
+  protected DomNotation(DomDocument owner,
+                        String name,
+                        String publicId,
+                        String systemId)
+  {
+    super(NOTATION_NODE, owner, name, publicId, systemId);
+    makeReadonly();
+  }
+  
+  /**
+   * The base URI of an external entity is its system ID.
+   * The base URI of an internal entity is the parent document's base URI.
+   * @since DOM Level 3 Core
+   */
+  public String getBaseURI()
+  {
+    String systemId = getSystemId();
+    return (systemId == null) ? owner.getBaseURI() : systemId;
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/DomNsNode.java b/libjava/gnu/xml/dom/DomNsNode.java
new file mode 100644 (file)
index 0000000..ea41fff
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomNsNode.java
@@ -0,0 +1,197 @@
+/* DomNsNode.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import javax.xml.XMLConstants;
+
+/**
+ * <p> Abstract implemention of namespace support.  This facilitates
+ * sharing code for attribute and element nodes.
+ *
+ * @author David Brownell 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public abstract class DomNsNode
+  extends DomNode
+{
+  
+  private String name;
+  private String namespace;
+  private String prefix;
+  private String localName;
+  
+  /**
+   * Constructs a node associated with the specified document, and
+   * with the specified namespace information.
+   *
+   * @param owner The document with which this entity is associated
+   * @param namespaceURI Combined with the local part of the name,
+   *   this identifies a type of element or attribute; may be null.
+   *  If this is the empty string, it is reassigned as null so that
+   *  applications only need to test that case.
+   * @param name Name of this node, which may include a prefix
+   */
+  // package private
+  DomNsNode(short nodeType, DomDocument owner, String namespaceURI, String name)
+  {
+    super(nodeType, owner);
+    setNodeName(name);
+    setNamespaceURI(namespaceURI);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the node's name, including any namespace prefix.
+   */
+  public final String getNodeName()
+  {
+    return name;
+  }
+
+  final void setNodeName(String name)
+  {
+    this.name = name.intern();
+    int index = name.indexOf(':');
+    if (index == -1)
+      {
+        prefix = null;
+        localName = this.name;
+      }
+    else
+      {
+        prefix = name.substring(0, index).intern();
+        localName = name.substring(index + 1).intern();
+      }
+  }
+  
+  /**
+   * <b>DOM L2</b>
+   * Returns the node's namespace URI
+   * <em>or null</em> if the node name is not namespace scoped.
+   */
+  public final String getNamespaceURI()
+  {
+    return namespace;
+  }
+
+  final void setNamespaceURI(String namespaceURI)
+  {
+    if ("".equals(namespaceURI))
+      {
+        namespaceURI = null;
+      }
+    namespace = (namespaceURI == null) ? null : namespaceURI.intern();
+  }
+  
+  /**
+   * <b>DOM L2</b>
+   * Returns any prefix part of the node's name (before any colon).
+   */
+  public final String getPrefix()
+  {
+    return prefix;
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Assigns the prefix part of the node's name (before any colon).
+   */
+  public final void setPrefix(String prefix)
+  {
+    if (readonly)
+      {
+        throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+      }
+
+    if (prefix == null)
+      {
+        name = localName;
+        return;
+      }
+    else if (namespace == null)
+      {
+        throw new DomEx(DomEx.NAMESPACE_ERR,
+                        "can't set prefix, node has no namespace URI",
+                        this, 0);
+      }
+
+    DomDocument.checkName(prefix, "1.1".equals(owner.getXmlVersion()));
+    if (prefix.indexOf (':') != -1)
+      {
+        throw new DomEx(DomEx.NAMESPACE_ERR,
+                        "illegal prefix " + prefix, this, 0);
+      }
+
+    if (XMLConstants.XML_NS_PREFIX.equals(prefix)
+        && !XMLConstants.XML_NS_URI.equals(namespace))
+      {
+        throw new DomEx(DomEx.NAMESPACE_ERR,
+                        "xml namespace is always " +
+                        XMLConstants.XML_NS_URI, this, 0);
+      }
+
+    if (XMLConstants.XMLNS_ATTRIBUTE.equals(prefix))
+      {
+        if (namespace != null || getNodeType() != ATTRIBUTE_NODE)
+          {
+            throw new DomEx(DomEx.NAMESPACE_ERR,
+                            "xmlns attribute prefix is reserved", this, 0);
+          }
+      }
+    else if (getNodeType () == ATTRIBUTE_NODE
+             && (XMLConstants.XMLNS_ATTRIBUTE.equals(name) ||
+                 name.startsWith("xmlns:")))
+      {
+        throw new DomEx(DomEx.NAMESPACE_ERR,
+                        "namespace declarations can't change names", this, 0);
+      }
+
+    this.prefix = prefix.intern();
+  }
+
+  /**
+   * <b>DOM L2</b>
+   * Returns the local part of the node's name (after any colon).
+   */
+  public final String getLocalName()
+  {
+    return localName;
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/DomPI.java b/libjava/gnu/xml/dom/DomPI.java
new file mode 100644 (file)
index 0000000..dedf375
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomPI.java
@@ -0,0 +1,145 @@
+/* DomPI.java -- 
+   Copyright (C) 1999,2000,2001,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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import org.w3c.dom.ProcessingInstruction;
+
+/**
+ * <p> "ProcessingInstruction" (PI) implementation.
+ * This is a non-core DOM class, supporting the "XML" feature. </p>
+ *
+ * <p> Unlike other DOM APIs in the "XML" feature, this one fully
+ * exposes the functionality it describes.  So there is no reason
+ * inherent in DOM to avoid using this API, unless you want to rely
+ * on NOTATION declarations to associate meaning with your PIs;
+ * there is no vendor-neutal way to record those notations in DOM.</p>
+ *
+ * <p> Also of note is that PI support is part of SAX, so that XML
+ * systems using PIs can choose among multiple APIs. </p>
+ *
+ * @see DomNotation
+ *
+ * @author David Brownell 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomPI
+  extends DomNode
+  implements ProcessingInstruction
+{
+  
+  private String target;
+  private String data;
+  
+  /**
+   * Constructs a ProcessingInstruction node associated with the
+   * specified document, with the specified data.
+   *
+   * <p>This constructor should only be invoked by a Document object as
+   * part of its createProcessingInstruction functionality, or through
+   * a subclass which is similarly used in a "Sub-DOM" style layer. 
+   */
+  protected DomPI(DomDocument owner, String target, String data)
+  {
+    super(PROCESSING_INSTRUCTION_NODE, owner);
+    this.target = target;
+    this.data = data;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the target of the processing instruction.
+   */
+  public final String getTarget()
+  {
+    return target;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the target of the processing instruction
+   * (same as getTarget).
+   */
+  public final String getNodeName()
+  {
+    return target;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the data associated with the processing instruction.
+   */
+  public final String getData()
+  {
+    return data;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the data associated with the processing instruction
+   * (same as getData).
+   */
+  public final String getNodeValue()
+  {
+    return data;
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Assigns the data associated with the processing instruction;
+   * same as setNodeValue.
+   */
+  public final void setData(String data)
+  {
+    setNodeValue(data);
+  }
+  
+  /**
+   * <b>DOM L1</b>
+   * Assigns the data associated with the processing instruction.
+   */
+  public final void setNodeValue(String data)
+  {
+    if (isReadonly())
+      {
+        throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+      }
+    this.data = data;
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/DomText.java b/libjava/gnu/xml/dom/DomText.java
new file mode 100644 (file)
index 0000000..d714655
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomText.java
@@ -0,0 +1,220 @@
+/* DomText.java -- 
+   Copyright (C) 1999, 2000, 2001, 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Text;
+
+/**
+ * <p> "Text" implementation.  </p>
+ *
+ * @author David Brownell 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomText
+  extends DomCharacterData
+  implements Text
+{
+  
+  // NOTE:  deleted unused per-instance "isIgnorable"
+  // support to reclaim its space.
+  
+  /**
+   * Constructs a text node associated with the specified
+   * document and holding the specified data.
+   *
+   * <p>This constructor should only be invoked by a Document object
+   * as part of its createTextNode functionality, or through a subclass
+   * which is similarly used in a "Sub-DOM" style layer. 
+   */
+  protected DomText(DomDocument owner, String value)
+  {
+    super(TEXT_NODE, owner, value);
+  }
+
+  protected DomText(DomDocument owner, char[] buf, int off, int len)
+  {
+    super(TEXT_NODE, owner, buf, off, len);
+  }
+
+  // Used by DomCDATA
+  DomText(short nodeType, DomDocument owner, String value)
+  {
+    super(nodeType, owner, value);
+  }
+
+  DomText(short nodeType, DomDocument owner, char[] buf, int off, int len)
+  {
+    super(nodeType, owner, buf, off, len);
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Returns the string "#text".
+   */
+  // can't be 'final' with CDATA subclassing
+  public String getNodeName()
+  {
+    return "#text";
+  }
+
+  /**
+   * <b>DOM L1</b>
+   * Splits this text node in two parts at the offset, returning
+   * the new text node (the sibling with the second part).
+   */
+  public Text splitText(int offset)
+  {
+    if (isReadonly())
+      {
+        throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+      }
+    try
+      {
+        String text = getNodeValue();
+        String before = text.substring(0, offset);
+        String after = text.substring(offset);
+        Text next;
+        
+        if (getNodeType() == TEXT_NODE)
+          {
+            next = owner.createTextNode(after);
+          }
+        else // CDATA_SECTION_NODE
+          {
+            next = owner.createCDATASection(after);
+          }
+        
+        if (this.next != null)
+          {
+            parent.insertBefore(next, this.next);
+          }
+        else
+          {
+            parent.appendChild(next);
+          }
+        setNodeValue(before);
+        return next;
+        
+      }
+    catch (IndexOutOfBoundsException x)
+      {
+        throw new DomEx(DomEx.INDEX_SIZE_ERR);
+      }
+  }
+    
+  // DOM Level 3
+  
+  public boolean isElementContentWhitespace()
+  {
+    if (parent != null)
+      {
+        DomDoctype doctype = (DomDoctype) owner.getDoctype();
+        if (doctype != null)
+          {
+            DTDElementTypeInfo info =
+              doctype.getElementTypeInfo(parent.getNodeName());
+            if (info != null)
+              {
+                if (info.model == null && info.model.indexOf("#PCDATA") != -1)
+                  {
+                    return false;
+                  }
+                return getNodeValue().trim().length() == 0;
+              }
+          }
+      }
+    return false;
+  }
+
+  public String getWholeText()
+  {
+    DomNode ref = this;
+    DomNode ctx;
+    for (ctx = previous; ctx != null &&
+         (ctx.nodeType == TEXT_NODE || ctx.nodeType == CDATA_SECTION_NODE);
+         ctx = ctx.previous)
+      {
+        ref = ctx;
+      }
+    StringBuffer buf = new StringBuffer(ref.getNodeValue());
+    for (ctx = ref.next; ctx != null &&
+         (ctx.nodeType == TEXT_NODE || ctx.nodeType == CDATA_SECTION_NODE);
+         ctx = ctx.next)
+      {
+        buf.append(ctx.getNodeValue());
+      }
+    return buf.toString ();
+  }
+
+  public Text replaceWholeText(String content)
+    throws DOMException
+  {
+    boolean isEmpty = (content == null || content.length () == 0);
+    if (!isEmpty)
+      {
+        setNodeValue(content);
+      }
+    
+    DomNode ref = this;
+    DomNode ctx;
+    for (ctx = previous; ctx != null &&
+         (ctx.nodeType == TEXT_NODE || ctx.nodeType == CDATA_SECTION_NODE);
+         ctx = ctx.previous)
+      {
+        ref = ctx;
+      }
+    ctx = ref.next;
+    if ((isEmpty || ref != this) && parent != null)
+      {
+        parent.removeChild(ref);
+      }
+    for (; ctx != null &&
+         (ctx.nodeType == TEXT_NODE || ctx.nodeType == CDATA_SECTION_NODE);
+         ctx = ref)
+      {
+        ref = ctx.next;
+        if ((isEmpty || ctx != this) && parent != null)
+          {
+            parent.removeChild(ctx);
+          }
+      }
+    return (isEmpty) ? null : this;
+  }
+    
+}
diff --git a/libjava/gnu/xml/dom/DomXPathExpression.java b/libjava/gnu/xml/dom/DomXPathExpression.java
new file mode 100644 (file)
index 0000000..d92670d
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomXPathExpression.java
@@ -0,0 +1,148 @@
+/* DomXPathExpression.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import javax.xml.namespace.QName;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Node;
+import org.w3c.dom.xpath.XPathException;
+import org.w3c.dom.xpath.XPathNSResolver;
+import org.w3c.dom.xpath.XPathResult;
+import gnu.xml.xpath.DocumentOrderComparator;
+
+/**
+ * An XPath expression.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class DomXPathExpression
+implements org.w3c.dom.xpath.XPathExpression
+{
+
+  final DomDocument doc;
+  final XPathExpression expression;
+  final XPathNSResolver resolver;
+
+  DomXPathExpression(DomDocument doc, String expression,
+                     XPathNSResolver resolver)
+    throws XPathException
+  {
+    this.doc = doc;
+    this.resolver = resolver;
+    
+               XPathFactory factory = XPathFactory.newInstance();
+               XPath xpath = factory.newXPath();
+               if (resolver != null)
+                 {
+                               xpath.setNamespaceContext(new DomNSResolverContext(resolver));
+                 }
+    try
+      {
+        this.expression = xpath.compile(expression);
+      }
+    catch (XPathExpressionException e)
+      {
+        throw new XPathException(XPathException.INVALID_EXPRESSION_ERR,
+                                                                    e.getMessage ());
+      }
+  }
+
+  public Object evaluate(Node contextNode, short type, Object result)
+    throws XPathException, DOMException
+  {
+               try
+                 {
+                               QName typeName = null;
+                               switch (type)
+                                 {
+                                               case XPathResult.BOOLEAN_TYPE:
+                                                       typeName = XPathConstants.BOOLEAN;
+                                                       break;
+                                               case XPathResult.NUMBER_TYPE:
+                                                       typeName = XPathConstants.NUMBER;
+                                                       break;
+                                               case XPathResult.STRING_TYPE:
+                                                       typeName = XPathConstants.STRING;
+                                                       break;
+                                               case XPathResult.ANY_UNORDERED_NODE_TYPE:
+                                               case XPathResult.FIRST_ORDERED_NODE_TYPE:
+                                                       typeName = XPathConstants.NODE;
+                                                       break;
+                                               case XPathResult.UNORDERED_NODE_ITERATOR_TYPE:
+                                               case XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE:
+                                               case XPathResult.ORDERED_NODE_ITERATOR_TYPE:
+                                               case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE:
+                                                       typeName = XPathConstants.NODESET;
+                                                       break;
+                                               default:
+                                                       throw new XPathException(XPathException.TYPE_ERR, null);
+                                       }
+                               Object val = expression.evaluate(contextNode, typeName);
+                               switch (type)
+                                 {
+                                               case XPathResult.ORDERED_NODE_ITERATOR_TYPE:
+                                               case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE:
+                                                       // Sort the nodes
+                                                       List ns = new ArrayList((Collection) val);
+                                                       Collections.sort(ns, new DocumentOrderComparator());
+                                                       val = ns;
+                                       }
+                               return new DomXPathResult(val, type);
+                       }
+               catch (javax.xml.xpath.XPathException e)
+                 {
+                               throw new XPathException(XPathException.TYPE_ERR, e.getMessage());
+                       }
+  }
+
+  public String toString ()
+  {
+    return getClass ().getName () + "[expression=" + expression + "]";
+  }
+  
+}
diff --git a/libjava/gnu/xml/dom/DomXPathNSResolver.java b/libjava/gnu/xml/dom/DomXPathNSResolver.java
new file mode 100644 (file)
index 0000000..467327f
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomXPathNSResolver.java
@@ -0,0 +1,64 @@
+/* DomXPathNSResolver.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.xpath.XPathNSResolver;
+
+/**
+ * Generic XPath namespace resolver using a DOM Node.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class DomXPathNSResolver
+implements XPathNSResolver
+{
+
+  Node node;
+
+  DomXPathNSResolver (Node node)
+  {
+    this.node = node;
+  }
+
+  public String lookupNamespaceURI (String prefix)
+  {
+    return node.lookupNamespaceURI (prefix);
+  }
+  
+}
diff --git a/libjava/gnu/xml/dom/DomXPathResult.java b/libjava/gnu/xml/dom/DomXPathResult.java
new file mode 100644 (file)
index 0000000..1cc49d8
--- /dev/null
+++ b/libjava/gnu/xml/dom/DomXPathResult.java
@@ -0,0 +1,235 @@
+/* DomXPathResult.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import java.util.Collection;
+import java.util.Iterator;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Node;
+import org.w3c.dom.xpath.XPathException;
+import org.w3c.dom.xpath.XPathNSResolver;
+import org.w3c.dom.xpath.XPathResult;
+
+/**
+ * An XPath result object.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class DomXPathResult
+implements XPathResult
+{
+
+  final Object value;
+  final short type;
+  Iterator iterator;
+
+  DomXPathResult (Object value, short requestedType)
+  {
+    this.value = value;
+    if (value instanceof Boolean)
+      {
+        type = XPathResult.BOOLEAN_TYPE;
+      }
+    else if (value instanceof Double)
+      {
+        type = XPathResult.NUMBER_TYPE;
+      }
+    else if (value instanceof String)
+      {
+        type = XPathResult.STRING_TYPE;
+      }
+    else if (value instanceof Collection)
+      {
+        Collection ns = (Collection) value;
+        switch (requestedType)
+          {
+          case XPathResult.ANY_TYPE:
+          case XPathResult.ANY_UNORDERED_NODE_TYPE:
+            type = (ns.size () == 1) ? XPathResult.FIRST_ORDERED_NODE_TYPE :
+              XPathResult.ORDERED_NODE_ITERATOR_TYPE;
+            break;
+          default:
+            type = requestedType;
+          }
+        iterator = ns.iterator ();
+      }
+    else
+      {
+        throw new IllegalArgumentException ();
+      }
+  }
+
+  public boolean getBooleanValue()
+  {
+    if (type == XPathResult.BOOLEAN_TYPE)
+      {
+        return ((Boolean) value).booleanValue ();
+      }
+    throw new XPathException (XPathException.TYPE_ERR, value.toString ());
+  }
+
+  public boolean getInvalidIteratorState()
+  {
+    return iterator == null;
+  }
+
+  public double getNumberValue()
+  {
+    if (type == XPathResult.NUMBER_TYPE)
+      {
+        return ((Double) value).doubleValue ();
+      }
+    throw new XPathException (XPathException.TYPE_ERR, value.toString ());
+  }
+
+  public short getResultType()
+  {
+    return type;
+  }
+
+  public Node getSingleNodeValue()
+  {
+    switch (type)
+      {
+      case XPathResult.FIRST_ORDERED_NODE_TYPE:
+      case XPathResult.ORDERED_NODE_ITERATOR_TYPE:
+      case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE:
+      case XPathResult.UNORDERED_NODE_ITERATOR_TYPE:
+      case XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE:
+        Collection ns = (Collection) value;
+        if (ns.isEmpty ())
+          {
+            return null;
+          }
+        else
+          {
+            return (Node) ns.iterator ().next ();
+          }
+      }
+    throw new XPathException (XPathException.TYPE_ERR, value.toString ());
+  }
+
+  public int getSnapshotLength()
+  {
+    switch (type)
+      {
+      case XPathResult.FIRST_ORDERED_NODE_TYPE:
+      case XPathResult.ORDERED_NODE_ITERATOR_TYPE:
+      case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE:
+      case XPathResult.UNORDERED_NODE_ITERATOR_TYPE:
+      case XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE:
+        return ((Collection) value).size ();
+      }
+    throw new XPathException (XPathException.TYPE_ERR, value.toString ());
+  }
+
+  public String getStringValue()
+  {
+    if (type == XPathResult.STRING_TYPE)
+      {
+        return (String) value;
+      }
+    throw new XPathException (XPathException.TYPE_ERR, value.toString ());
+  }
+
+  public Node iterateNext()
+  {
+    if (iterator != null)
+      {
+        if (iterator.hasNext ())
+          {
+            return (Node) iterator.next ();
+          }
+        else
+          {
+            iterator = null;
+            return null;
+          }
+      }
+    throw new XPathException (XPathException.TYPE_ERR, value.toString ());
+  }
+
+  public Node snapshotItem(int index)
+  {
+    switch (type)
+      {
+      case XPathResult.FIRST_ORDERED_NODE_TYPE:
+      case XPathResult.ORDERED_NODE_ITERATOR_TYPE:
+      case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE:
+      case XPathResult.UNORDERED_NODE_ITERATOR_TYPE:
+      case XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE:
+        Collection ns = (Collection) value;
+        Node[] nodes = new Node[ns.size ()];
+        ns.toArray (nodes);
+        return nodes[index];
+      }
+    throw new XPathException (XPathException.TYPE_ERR, value.toString ());
+  }
+
+  public String toString ()
+  {
+    return getClass ().getName () + "[type=" + typeName (type) + ",value=" +
+      value + ']';
+  }
+
+  private String typeName (short type)
+  {
+    switch (type)
+      {
+      case XPathResult.BOOLEAN_TYPE:
+        return "BOOLEAN_TYPE";
+      case XPathResult.NUMBER_TYPE:
+        return "NUMBER_TYPE";
+      case XPathResult.STRING_TYPE:
+        return "STRING_TYPE";
+      case XPathResult.FIRST_ORDERED_NODE_TYPE:
+        return "FIRST_ORDERED_NODE_TYPE";
+      case XPathResult.ORDERED_NODE_ITERATOR_TYPE:
+        return "ORDERED_NODE_ITERATOR_TYPE";
+      case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE:
+        return "ORDERED_NODE_SNAPSHOT_TYPE";
+      case XPathResult.UNORDERED_NODE_ITERATOR_TYPE:
+        return "UNORDERED_NODE_ITERATOR_TYPE";
+      case XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE:
+        return "UNORDERED_NODE_SNAPSHOT_TYPE";
+      default:
+        return "(unknown)";
+      }
+  }
+
+}
diff --git a/libjava/gnu/xml/dom/ImplementationList.java b/libjava/gnu/xml/dom/ImplementationList.java
new file mode 100644 (file)
index 0000000..0f996ba
--- /dev/null
+++ b/libjava/gnu/xml/dom/ImplementationList.java
@@ -0,0 +1,70 @@
+/* ImplementationList.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+package gnu.xml.dom;
+
+import java.util.List;
+
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.DOMImplementationList;
+
+/**
+ * Implementation list for GNU JAXP.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class ImplementationList
+  implements DOMImplementationList
+{
+
+  private List list;
+
+  ImplementationList(List list)
+  {
+    this.list = list;
+  }
+
+  public int getLength()
+  {
+    return list.size();
+  }
+
+  public DOMImplementation item(int index)
+  {
+    return (DOMImplementation) list.get(index);
+  }
+
+}
diff --git a/libjava/gnu/xml/dom/ImplementationSource.java b/libjava/gnu/xml/dom/ImplementationSource.java
new file mode 100644 (file)
index 0000000..f0c4bb5
--- /dev/null
+++ b/libjava/gnu/xml/dom/ImplementationSource.java
@@ -0,0 +1,167 @@
+/* ImplementationSource.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+package gnu.xml.dom;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.DOMImplementationList;
+import org.w3c.dom.DOMImplementationSource;
+
+/**
+ * Implementation source for GNU JAXP.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class ImplementationSource
+  implements DOMImplementationSource
+{
+
+  private static final String DIGITS = "1234567890";
+
+  /*
+   * GNU DOM implementations.
+   */
+  private static final DOMImplementation[] implementations;
+
+  static
+  {
+    List acc = new ArrayList();
+    acc.add(new gnu.xml.dom.DomImpl());
+    try
+      {
+        Class t = Class.forName("gnu.xml.libxmlj.dom.GnomeDocumentBuilder");
+        acc.add(t.newInstance());
+      }
+    catch (Exception e)
+      {
+        // libxmlj not available        
+      }
+    catch (UnsatisfiedLinkError e)
+      {
+        // libxmlj not available
+      }
+    implementations = new DOMImplementation[acc.size()];
+    acc.toArray(implementations);
+  }
+
+  public DOMImplementation getDOMImplementation(String features)
+  {
+    List available = getImplementations(features);
+    if (available.isEmpty())
+      {
+        return null;
+      }
+    return (DOMImplementation) available.get(0);
+  }
+
+  public DOMImplementationList getDOMImplementationList(String features)
+  {
+    List available = getImplementations(features);
+    return new ImplementationList(available);
+  }
+
+  /**
+   * Returns a list of the implementations that support the specified
+   * features.
+   */
+  private final List getImplementations(String features)
+  {
+    List available = new ArrayList(Arrays.asList(implementations));
+    for (Iterator i = parseFeatures(features).iterator(); i.hasNext(); )
+      {
+        String feature = (String) i.next();
+        String version = null;
+        int si = feature.indexOf(' ');
+        if (si != -1)
+          {
+            version = feature.substring(si + 1);
+            feature = feature.substring(0, si);
+          }
+        for (Iterator j = available.iterator(); j.hasNext(); )
+          {
+            DOMImplementation impl = (DOMImplementation) j.next();
+            if (!impl.hasFeature(feature, version))
+              {
+                j.remove();
+              }
+          }
+      }
+    return available;
+  }
+
+  /**
+   * Parses the feature list into feature tokens.
+   */
+  final List parseFeatures(String features)
+  {
+    List list = new ArrayList();
+    int pos = 0, start = 0;
+    int len = features.length();
+    for (; pos < len; pos++)
+      {
+        char c = features.charAt(pos);
+        if (c == ' ')
+          {
+            if (pos + 1 < len &&
+                DIGITS.indexOf(features.charAt(pos + 1)) == -1)
+              {
+                list.add(getFeature(features, start, pos));
+                start = pos + 1;
+              }
+          }
+      }
+    if (pos > start)
+      {
+        list.add(getFeature(features, start, len));
+      }
+    return list;
+  }
+
+  final String getFeature(String features, int start, int end)
+  {
+    if (features.length() > 0 && features.charAt(start) == '+')
+      {
+        return features.substring(start + 1, end);
+      }
+    return features.substring(start, end);
+  }
+
+}
diff --git a/libjava/gnu/xml/dom/JAXPFactory.java b/libjava/gnu/xml/dom/JAXPFactory.java
new file mode 100644 (file)
index 0000000..4271208
--- /dev/null
+++ b/libjava/gnu/xml/dom/JAXPFactory.java
@@ -0,0 +1,287 @@
+/* JAXPFactory.java -- 
+   Copyright (C) 2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom;
+
+import java.io.IOException;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.DOMImplementation;
+
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+
+
+/**
+ * DOM bootstrapping API, for use with JAXP.
+ *
+ * @see Consumer
+ *
+ * @author David Brownell
+ */
+public final class JAXPFactory
+  extends DocumentBuilderFactory
+{
+  
+  private static final String  PROPERTY = "http://xml.org/sax/properties/";
+  private static final String  FEATURE = "http://xml.org/sax/features/";
+  
+  private SAXParserFactory     pf;
+  
+  /**
+   * Default constructor.
+   */
+  public JAXPFactory()
+  {
+  }
+  
+  /**
+   * Constructs a JAXP document builder which uses the default
+   * JAXP SAX2 parser and the DOM implementation in this package.
+   */
+  public DocumentBuilder newDocumentBuilder()
+    throws ParserConfigurationException
+  {
+    if (pf == null)
+      {
+        // Force use of AElfred2 since not all JAXP parsers
+        // conform very well to the SAX2 API spec ...
+        pf = new gnu.xml.aelfred2.JAXPFactory();
+        // pf = SAXParserFactory.newInstance ();
+      }
+    
+    // JAXP default: false
+    pf.setValidating(isValidating());
+
+    // FIXME:  this namespace setup may cause errors in some
+    // conformant SAX2 parsers, which we CAN patch up by
+    // splicing a "NSFilter" stage up front ...
+    
+    // JAXP default: false
+    pf.setNamespaceAware(isNamespaceAware());
+
+    try
+      {
+        // undo rude "namespace-prefixes=false" default
+        pf.setFeature(FEATURE + "namespace-prefixes", true);
+
+        return new JAXPBuilder(pf.newSAXParser().getXMLReader(), this);
+      }
+    catch (SAXException e)
+      {
+        String msg = "can't create JAXP DocumentBuilder: " + e.getMessage();
+        throw new ParserConfigurationException(msg);
+      }
+  }
+  
+  /** There seems to be no useful specification for attribute names */
+  public void setAttribute(String name, Object value)
+    throws IllegalArgumentException
+  {
+    if ("http://java.sun.com/xml/jaxp/properties/schemaLanguage".equals(name))
+      {
+        // TODO
+      }
+    else
+      {
+        throw new IllegalArgumentException(name);
+      }
+  }
+
+  /** There seems to be no useful specification for attribute names */
+  public Object getAttribute(String name)
+    throws IllegalArgumentException
+  {
+    throw new IllegalArgumentException(name);
+  }
+
+  static final class JAXPBuilder
+    extends DocumentBuilder
+    implements ErrorHandler
+  {
+
+    private Consumer   consumer;
+    private XMLReader  producer;
+    private DomImpl            impl;
+    
+    JAXPBuilder(XMLReader parser, JAXPFactory factory)
+      throws ParserConfigurationException
+    {
+      impl = new DomImpl();
+      
+      // set up consumer side
+      try
+        {
+          consumer = new Consumer();
+        }
+      catch (SAXException e)
+        {
+          throw new ParserConfigurationException(e.getMessage());
+        }
+
+      // JAXP defaults: true, noise nodes are good (bleech)
+      consumer.setHidingReferences(factory.isExpandEntityReferences());
+      consumer.setHidingComments(factory.isIgnoringComments());
+      consumer.setHidingWhitespace(factory.isIgnoringElementContentWhitespace());
+      consumer.setHidingCDATA(factory.isCoalescing());
+
+      // set up producer side
+      producer = parser;
+      producer.setContentHandler(consumer.getContentHandler());
+      producer.setDTDHandler(consumer.getDTDHandler());
+
+      try
+        {
+          String       id;
+          
+          // if validating, report validity errors, and default
+          // to treating them as fatal
+          if (factory.isValidating ())
+            {
+              producer.setFeature(FEATURE + "validation", true);
+              producer.setErrorHandler(this);
+            }
+          
+          // always save prefix info, maybe do namespace processing
+          producer.setFeature(FEATURE + "namespace-prefixes", true);
+          producer.setFeature(FEATURE + "namespaces",
+                              factory.isNamespaceAware());
+
+          // set important handlers
+          id = PROPERTY + "lexical-handler";
+          producer.setProperty(id, consumer.getProperty(id));
+
+          id = PROPERTY + "declaration-handler";
+          producer.setProperty(id, consumer.getProperty(id));
+          
+        }
+      catch (SAXException e)
+        {
+          throw new ParserConfigurationException(e.getMessage());
+        }
+    }
+    
+    public Document parse(InputSource source) 
+      throws SAXException, IOException
+    {
+      producer.parse(source);
+      Document doc = consumer.getDocument();
+      // TODO inputEncoding
+      doc.setDocumentURI(source.getSystemId());
+      return doc;
+    }
+
+    public boolean isNamespaceAware()
+    {
+      try
+        {
+          return producer.getFeature(FEATURE + "namespaces");
+        }
+      catch (SAXException e)
+        {
+          // "can't happen"
+          throw new RuntimeException(e.getMessage());
+        }
+    }
+
+    public boolean isValidating()
+    {
+      try
+        {
+          return producer.getFeature(FEATURE + "validation");
+        }
+      catch (SAXException e)
+        {
+          // "can't happen"
+          throw new RuntimeException(e.getMessage());
+        }
+    }
+
+    public void setEntityResolver(EntityResolver resolver)
+    {
+      producer.setEntityResolver(resolver);
+    }
+
+    public void setErrorHandler(ErrorHandler handler)
+    {
+      producer.setErrorHandler(handler);
+      consumer.setErrorHandler(handler);
+    }
+
+    public DOMImplementation getDOMImplementation()
+    {
+      return impl;
+    }
+
+    public Document newDocument()
+    {
+      return new DomDocument();
+    }
+       
+    // implementation of error handler that's used when validating
+    public void fatalError(SAXParseException e)
+      throws SAXException
+    {
+      throw e;
+    }
+    
+    public void error(SAXParseException e)
+      throws SAXException
+    {
+      throw e;
+    }
+    
+    public void warning(SAXParseException e)
+      throws SAXException
+    {
+      /* ignore */
+    }
+ 
+  }
+
+}
+
diff --git a/libjava/gnu/xml/dom/ls/DomLSEx.java b/libjava/gnu/xml/dom/ls/DomLSEx.java
new file mode 100644 (file)
index 0000000..5bf1595
--- /dev/null
+++ b/libjava/gnu/xml/dom/ls/DomLSEx.java
@@ -0,0 +1,75 @@
+/* DomLSEx.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom.ls;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import org.w3c.dom.ls.LSException;
+
+/**
+ * A DOM LS exception incorporating a cause.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomLSEx
+  extends LSException
+{
+
+  private final Exception cause2;
+
+  public DomLSEx(short type, Exception cause)
+  {
+    super(type, cause.getMessage());
+    cause2 = cause;
+  }
+
+  public void printStackTrace(PrintStream out)
+  {
+    super.printStackTrace(out);
+    out.print("caused by ");
+    cause2.printStackTrace(out);
+  }
+  
+  public void printStackTrace(PrintWriter out)
+  {
+    super.printStackTrace(out);
+    out.print("caused by ");
+    cause2.printStackTrace(out);
+  }
+  
+}
diff --git a/libjava/gnu/xml/dom/ls/DomLSInput.java b/libjava/gnu/xml/dom/ls/DomLSInput.java
new file mode 100644 (file)
index 0000000..9b30b4f
--- /dev/null
+++ b/libjava/gnu/xml/dom/ls/DomLSInput.java
@@ -0,0 +1,158 @@
+/* DomLSInput.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom.ls;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import org.w3c.dom.ls.LSInput;
+
+/**
+ * Specification of XML input to parse.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomLSInput
+  implements LSInput
+{
+
+  private InputStream in;
+  private String systemId;
+  private String publicId;
+  private String baseURI;
+  private String encoding;
+  private boolean certifiedText;
+
+  public Reader getCharacterStream()
+  {
+    return new InputStreamReader(in);
+  }
+
+  public void setCharacterStream(Reader characterStream)
+  {
+    in = new ReaderInputStream(characterStream);
+  }
+
+  public InputStream getByteStream()
+  {
+    return in;
+  }
+
+  public void setByteStream(InputStream byteStream)
+  {
+    in = byteStream;
+  }
+
+  public String getStringData()
+  {
+    StringBuffer acc = new StringBuffer();
+    Reader reader = getCharacterStream();
+    try
+      {
+        char[] buf = new char[4096];
+        for (int len = reader.read(buf); len != -1; len = reader.read(buf))
+          {
+            acc.append(buf, 0, len);
+          }
+      }
+    catch (IOException e)
+      {
+        return null; // ?
+      }
+    return acc.toString();
+  }
+
+  public void setStringData(String stringData)
+  {
+    in = new ReaderInputStream(new StringReader(stringData));
+  }
+
+  public String getSystemId()
+  {
+    return systemId;
+  }
+
+  public void setSystemId(String systemId)
+  {
+    this.systemId = systemId;
+  }
+
+  public String getPublicId()
+  {
+    return publicId;
+  }
+
+  public void setPublicId(String publicId)
+  {
+    this.publicId = publicId;
+  }
+
+  public String getBaseURI()
+  {
+    return baseURI;
+  }
+
+  public void setBaseURI(String baseURI)
+  {
+    this.baseURI = baseURI;
+  }
+
+  public String getEncoding()
+  {
+    return encoding;
+  }
+
+  public void setEncoding(String encoding)
+  {
+    this.encoding = encoding;
+  }
+
+  public boolean getCertifiedText()
+  {
+    return certifiedText;
+  }
+
+  public void setCertifiedText(boolean certifiedText)
+  {
+    this.certifiedText = certifiedText;
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/ls/DomLSOutput.java b/libjava/gnu/xml/dom/ls/DomLSOutput.java
new file mode 100644 (file)
index 0000000..643ae7d
--- /dev/null
+++ b/libjava/gnu/xml/dom/ls/DomLSOutput.java
@@ -0,0 +1,98 @@
+/* DomLSOutput.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom.ls;
+
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import org.w3c.dom.ls.LSOutput;
+
+/**
+ * Specification of XML output to produce.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomLSOutput
+  implements LSOutput
+{
+
+  private OutputStream out;
+  private String systemId;
+  private String encoding;
+
+  public Writer getCharacterStream()
+  {
+    return new OutputStreamWriter(out);
+  }
+
+  public void setCharacterStream(Writer characterStream)
+  {
+    out = new WriterOutputStream(characterStream);
+  }
+
+  public OutputStream getByteStream()
+  {
+    return out;
+  }
+
+  public void setByteStream(OutputStream out)
+  {
+    this.out = out;
+  }
+
+  public String getSystemId()
+  {
+    return systemId;
+  }
+
+  public void setSystemId(String systemId)
+  {
+    this.systemId = systemId;
+  }
+
+  public String getEncoding()
+  {
+    return encoding;
+  }
+
+  public void setEncoding(String encoding)
+  {
+    this.encoding = encoding;
+  }
+  
+}
diff --git a/libjava/gnu/xml/dom/ls/DomLSParser.java b/libjava/gnu/xml/dom/ls/DomLSParser.java
new file mode 100644 (file)
index 0000000..b050b99
--- /dev/null
+++ b/libjava/gnu/xml/dom/ls/DomLSParser.java
@@ -0,0 +1,574 @@
+/* DomLSParser.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom.ls;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.DOMStringList;
+import org.w3c.dom.Node;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSException;
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSParser;
+import org.w3c.dom.ls.LSParserFilter;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLReader;
+import gnu.xml.dom.DomDocument;
+import gnu.xml.dom.DomEx;
+
+/**
+ * Parser implementation for GNU DOM.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomLSParser
+  implements LSParser, DOMConfiguration, DOMStringList, ErrorHandler
+{
+
+  private static final List SUPPORTED_PARAMETERS
+    = Arrays.asList(new String[] { "cdata-sections",
+                    "comments",
+                    "element-content-whitespace",
+                    "namespaces",
+                    "expand-entity-references",
+                    "coalescing",
+                    "validating",
+                    "xinclude-aware",
+                    "entity-resolver",
+                    "error-handler" });
+
+  private LSParserFilter filter;
+  private final boolean async;
+  private String schemaType;
+  private SAXEventSink eventSink;
+  private SAXParserFactory factory;
+  private XMLReader reader;
+
+  private boolean namespaceAware = true;
+  private boolean ignoreWhitespace;
+  private boolean expandEntityReferences;
+  private boolean ignoreComments;
+  private boolean coalescing;
+  private boolean validating;
+  private boolean xIncludeAware;
+  private EntityResolver entityResolver;
+  private ErrorHandler errorHandler;
+
+  public DomLSParser(short mode, String schemaType)
+    throws DOMException
+  {
+    switch (mode)
+      {
+      case DOMImplementationLS.MODE_ASYNCHRONOUS:
+        async = true;
+        break;
+      case DOMImplementationLS.MODE_SYNCHRONOUS:
+        async = false;
+        break;
+      default:
+        throw new DomEx(DOMException.NOT_SUPPORTED_ERR);
+      }
+    // TODO schemaType
+    this.schemaType = schemaType;
+    factory = SAXParserFactory.newInstance();
+  }
+
+  // -- LSParser --
+  
+  public DOMConfiguration getDomConfig()
+  {
+    return this;
+  }
+  
+  public LSParserFilter getFilter()
+  {
+    return filter;
+  }
+
+  public void setFilter(LSParserFilter filter)
+  {
+    this.filter = filter;
+  }
+
+  public boolean getAsync()
+  {
+    return async;
+  }
+
+  public boolean getBusy()
+  {
+    return eventSink != null;
+  }
+
+  public Document parse(LSInput input)
+    throws DOMException, LSException
+  {
+    if (async)
+      {
+        return doParse(input);
+      }
+    else
+      {
+        synchronized (this)
+          {
+            return doParse(input);
+          }
+      }
+  }
+
+  public Document parseURI(String uri)
+    throws DOMException, LSException
+  {
+    LSInput input = new DomLSInput();
+    input.setSystemId(uri);
+    return parse(input);
+  }
+
+  public Node parseWithContext(LSInput input, Node context, short action)
+    throws DOMException, LSException
+  {
+    Document doc = (context.getNodeType() == Node.DOCUMENT_NODE) ?
+      (Document) context : context.getOwnerDocument();
+    input.setBaseURI(doc.getDocumentURI());
+    // TODO use namespaces defined on context node
+    Document ret = parse(input);
+    Node root = ret.getDocumentElement();
+    root = doc.adoptNode(root);
+    switch (action)
+      {
+      case ACTION_APPEND_AS_CHILDREN:
+        context.appendChild(root);
+        break;
+      case ACTION_REPLACE_CHILDREN:
+        Node c1 = context.getFirstChild();
+        while (c1 != null)
+          {
+            Node next = c1.getNextSibling();
+            context.removeChild(c1);
+            c1 = next;
+          }
+        context.appendChild(root);
+        break;
+      case ACTION_INSERT_BEFORE:
+        Node p1 = context.getParentNode();
+        p1.insertBefore(root, context);
+        break;
+      case ACTION_INSERT_AFTER:
+        Node p2 = context.getParentNode();
+        Node r1 = context.getNextSibling();
+        if (r1 == null)
+          {
+            p2.appendChild(root);
+          }
+        else
+          {
+            p2.insertBefore(root, r1);
+          }
+        break;
+      case ACTION_REPLACE:
+        Node p3 = context.getParentNode();
+        Node r2 = context.getNextSibling();
+        p3.removeChild(context);
+        if (r2 == null)
+          {
+            p3.appendChild(root);
+          }
+        else
+          {
+            p3.insertBefore(root, r2);
+          }
+        break;
+      }
+    return root;
+  }
+
+  public void abort()
+  {
+    if (eventSink != null)
+      {
+        eventSink.interrupt();
+      }
+  }
+
+  private Document doParse(LSInput input)
+    throws DOMException, LSException
+  {
+    // create event sink
+    if (eventSink != null)
+      {
+        throw new LSException(LSException.PARSE_ERR, "parse in progress");
+      }
+    InputSource source = getInputSource(input);
+    eventSink = (filter == null) ? new SAXEventSink() :
+      new FilteredSAXEventSink(filter);
+    // configure sink
+    eventSink.namespaceAware = namespaceAware;
+    eventSink.ignoreWhitespace = ignoreWhitespace;
+    eventSink.expandEntityReferences = expandEntityReferences;
+    eventSink.ignoreComments = ignoreComments;
+    eventSink.coalescing = coalescing;
+    // get and configure reader
+    XMLReader reader = getXMLReader();
+    try
+      {
+        reader.setContentHandler(eventSink);
+        reader.setDTDHandler(eventSink);
+        reader.setProperty("http://xml.org/sax/properties/lexical-handler",
+                           eventSink);
+        reader.setProperty("http://xml.org/sax/properties/declaration-handler",
+                           eventSink);
+        reader.setFeature("http://xml.org/sax/features/namespaces",
+                          namespaceAware);
+        reader.setFeature("http://xml.org/sax/features/namespace-prefixes",
+                          true);
+        reader.setFeature("http://xml.org/sax/features/validation",
+                          validating);
+        try
+          {
+            reader.setFeature("http://xml.org/sax/features/use-attributes2",
+                              true);
+          }
+        catch (SAXNotRecognizedException e)
+          {
+            // ignore
+          }
+        try
+          {
+            reader.setFeature("http://xml.org/sax/features/external-general-entities",
+                              true);
+          }
+        catch (SAXNotRecognizedException e)
+          {
+            // ignore
+          }
+        reader.setEntityResolver(entityResolver);
+        reader.setErrorHandler(errorHandler);
+        // parse
+        reader.parse(source);
+      }
+    catch (DOMException e)
+      {
+        reader = null;
+        eventSink = null;
+        throw e;
+      }
+    catch (SAXException e)
+      {
+        reader = null;
+        eventSink = null;
+        throw new DomLSEx(LSException.PARSE_ERR, e);
+      }
+    catch (IOException e)
+      {
+        reader = null;
+        eventSink = null;
+        throw new DomLSEx(LSException.PARSE_ERR, e);
+      }
+    // return document
+    Document ret = eventSink.doc;
+    String systemId = input.getSystemId();
+    if (systemId != null && ret instanceof DomDocument)
+      {
+        ((DomDocument) ret).setDocumentURI(systemId);
+      }
+    eventSink = null;
+    return ret;
+  }
+
+  private XMLReader getXMLReader()
+    throws LSException
+  {
+    if (reader == null)
+      {
+        factory.setNamespaceAware(namespaceAware);
+        factory.setValidating(validating);
+        factory.setXIncludeAware(xIncludeAware);
+        try
+          {
+            SAXParser parser = factory.newSAXParser();
+            reader = parser.getXMLReader();
+          }
+        catch (ParserConfigurationException e)
+          {
+            throw new DomLSEx(LSException.PARSE_ERR, e);
+          }
+        catch (SAXException e)
+          {
+            throw new DomLSEx(LSException.PARSE_ERR, e);
+          }
+      }
+    return reader;
+  }
+
+  private InputSource getInputSource(LSInput input)
+    throws LSException
+  {
+    InputSource source = null;
+    String systemId = input.getSystemId();
+    InputStream in = input.getByteStream();
+    if (in != null)
+      {
+        source = new InputSource(in);
+        source.setSystemId(systemId);
+      }
+    if (source == null && entityResolver != null)
+      {
+        String publicId = input.getPublicId();
+        try
+          {
+            source = entityResolver.resolveEntity(publicId, systemId);
+          }
+        catch (SAXException e)
+          {
+            throw new DomLSEx(LSException.PARSE_ERR, e);
+          } 
+        catch (IOException e)
+          {
+            throw new DomLSEx(LSException.PARSE_ERR, e);
+          } 
+      }
+    if (source == null)
+      {
+        URL url = null;
+        String base = input.getBaseURI();
+        try
+          {
+            try
+              {
+                URL baseURL = (base == null) ? null : new URL(base);
+                url = (baseURL == null) ? new URL(systemId) :
+                  new URL(baseURL, systemId);
+              }
+            catch (MalformedURLException e)
+              {
+                File baseFile = (base == null) ? null : new File(base);
+                url = (baseFile == null) ? new File(systemId).toURL() :
+                  new File(baseFile, systemId).toURL();
+              }
+            in = url.openStream();
+            systemId = url.toString();
+            source = new InputSource(in);
+            source.setSystemId(systemId);
+          }
+        catch (IOException e)
+          {
+            throw new DomLSEx(LSException.PARSE_ERR, e);
+          }
+      }
+    return source;
+  }
+
+  // -- DOMConfiguration --
+
+  public void setParameter(String name, Object value)
+    throws DOMException
+  {
+    name = name.toLowerCase();
+    if ("cdata-sections".equals(name))
+      {
+        coalescing = !((Boolean) value).booleanValue();
+      }
+    else if ("comments".equals(name))
+      {
+        ignoreComments = !((Boolean) value).booleanValue();
+      }
+    else if ("element-content-whitespace".equals(name))
+      {
+        ignoreWhitespace = !((Boolean) value).booleanValue();
+      }
+    else if ("namespaces".equals(name))
+      {
+        namespaceAware = ((Boolean) value).booleanValue();
+      }
+    else if ("expand-entity-references".equals(name))
+      {
+        expandEntityReferences = ((Boolean) value).booleanValue();
+      }
+    else if ("coalescing".equals(name))
+      {
+        coalescing = ((Boolean) value).booleanValue();
+      }
+    else if ("validating".equals(name))
+      {
+        validating = ((Boolean) value).booleanValue();
+      }
+    else if ("xinclude-aware".equals(name))
+      {
+        xIncludeAware = ((Boolean) value).booleanValue();
+      }
+    else if ("entity-resolver".equals(name))
+      {
+        entityResolver = (EntityResolver) value;
+      }
+    else if ("error-handler".equals(name))
+      {
+        errorHandler = (ErrorHandler) value;
+      }
+    else
+      {
+        throw new DomEx(DomEx.NOT_SUPPORTED_ERR);
+      }
+    // invalidate reader, a new one will be created
+    reader = null;
+  }
+
+  public Object getParameter(String name)
+    throws DOMException
+  {
+    name = name.toLowerCase();
+    if ("cdata-sections".equals(name))
+      {
+        return coalescing ? Boolean.FALSE : Boolean.TRUE;
+      }
+    else if ("comments".equals(name))
+      {
+        return ignoreComments ? Boolean.FALSE : Boolean.TRUE;
+      }
+    else if ("element-content-whitespace".equals(name))
+      {
+        return ignoreWhitespace ? Boolean.FALSE : Boolean.TRUE;
+      }
+    else if ("namespaces".equals(name))
+      {
+        return namespaceAware ? Boolean.TRUE : Boolean.FALSE;
+      }
+    else if ("expand-entity-references".equals(name))
+      {
+        return expandEntityReferences ? Boolean.TRUE : Boolean.FALSE;
+      }
+    else if ("coalescing".equals(name))
+      {
+        return coalescing ? Boolean.TRUE : Boolean.FALSE;
+      }
+    else if ("validating".equals(name))
+      {
+        return validating ? Boolean.TRUE : Boolean.FALSE;
+      }
+    else if ("xinclude-aware".equals(name))
+      {
+        return xIncludeAware ? Boolean.TRUE : Boolean.FALSE;
+      }
+    else if ("entity-resolver".equals(name))
+      {
+        return entityResolver;
+      }
+    else if ("error-handler".equals(name))
+      {
+        return errorHandler;
+      }
+    else
+      {
+        throw new DomEx(DomEx.NOT_SUPPORTED_ERR);
+      }
+  }
+
+  public boolean canSetParameter(String name, Object value)
+  {
+    return contains(name);
+  }
+
+  public DOMStringList getParameterNames()
+  {
+    return this;
+  }
+
+  // -- DOMStringList --
+
+  public String item(int i)
+  {
+    return (String) SUPPORTED_PARAMETERS.get(i);
+  }
+
+  public int getLength()
+  {
+    return SUPPORTED_PARAMETERS.size();
+  }
+
+  public boolean contains(String str)
+  {
+    return SUPPORTED_PARAMETERS.contains(str);
+  }
+
+  // -- ErrorHandler --
+
+  public void warning(SAXParseException e)
+    throws SAXException
+  {
+    if (errorHandler != null)
+      {
+        errorHandler.warning(e);
+      }
+  }
+
+  public void error(SAXParseException e)
+    throws SAXException
+  {
+    if (errorHandler != null)
+      {
+        errorHandler.error(e);
+      }
+  }
+
+  public void fatalError(SAXParseException e)
+    throws SAXException
+  {
+    if (errorHandler != null)
+      {
+        errorHandler.fatalError(e);
+      }
+    abort();
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/ls/DomLSSerializer.java b/libjava/gnu/xml/dom/ls/DomLSSerializer.java
new file mode 100644 (file)
index 0000000..91a01c9
--- /dev/null
+++ b/libjava/gnu/xml/dom/ls/DomLSSerializer.java
@@ -0,0 +1,354 @@
+/* DomLSSerializer.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom.ls;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Arrays;
+import java.util.List;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.DOMStringList;
+import org.w3c.dom.Node;
+import org.w3c.dom.ls.LSException;
+import org.w3c.dom.ls.LSOutput;
+import org.w3c.dom.ls.LSSerializer;
+import org.w3c.dom.ls.LSSerializerFilter;
+import org.w3c.dom.traversal.NodeFilter;
+import gnu.xml.dom.DomEx;
+import gnu.xml.transform.StreamSerializer;
+
+/**
+ * Serialize a DOM node to a stream.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DomLSSerializer
+  extends StreamSerializer
+  implements LSSerializer, DOMConfiguration, DOMStringList
+{
+
+  private static final List SUPPORTED_PARAMETERS =
+    Arrays.asList(new String[] {"discard-default-content",
+                  "xml-declaration"});
+
+  private LSSerializerFilter filter;
+  private StreamSerializer serializer;
+
+  public DomLSSerializer()
+  {
+    super();
+    discardDefaultContent = true;
+  }
+
+  // -- LSSerializer --
+  
+  public DOMConfiguration getDomConfig()
+  {
+    return this;
+  }
+
+  public String getNewLine()
+  {
+    return eol;
+  }
+
+  public void setNewLine(String newLine)
+  {
+    if (newLine == null)
+      {
+        newLine = System.getProperty("line.separator");
+      }
+    eol = newLine;
+  }
+
+  public LSSerializerFilter getFilter()
+  {
+    return filter;
+  }
+
+  public void setFilter(LSSerializerFilter filter)
+  {
+    this.filter = filter;
+  }
+
+  public boolean write(Node node, LSOutput output)
+    throws LSException
+  {
+    OutputStream out = output.getByteStream();
+    try
+      {
+        if (out == null)
+          {
+            String systemId = output.getSystemId();
+            try
+              {
+                URL url = new URL(systemId);
+                URLConnection connection = url.openConnection();
+                connection.setDoOutput(true);
+                if (connection instanceof HttpURLConnection)
+                  {
+                    ((HttpURLConnection) connection).setRequestMethod("PUT");
+                  }
+                out = connection.getOutputStream();
+              }
+            catch (MalformedURLException e)
+              {
+                File file = new File(systemId);
+                out = new FileOutputStream(file);
+              }
+          }
+        serialize(node, out);
+        out.flush();
+        return true;
+      }
+    catch (IOException e)
+      {
+        throw new DomLSEx(LSException.SERIALIZE_ERR, e);
+      }
+  }
+
+  public boolean writeToURI(Node node, String uri)
+    throws LSException
+  {
+    LSOutput output = new DomLSOutput();
+    output.setSystemId(uri);
+    return write(node, output);
+  }
+
+  public String writeToString(Node node)
+    throws DOMException, LSException
+  {
+    Writer writer = new StringWriter();
+    LSOutput output = new DomLSOutput();
+    output.setCharacterStream(writer);
+    write(node, output);
+    return writer.toString();
+  }
+
+  public void serialize(Node node, OutputStream out)
+    throws IOException
+  {
+    if (filter == null)
+      {
+        super.serialize(node, out);
+      }
+    else
+      {
+        int wts = filter.getWhatToShow();
+        if (wts != NodeFilter.SHOW_ALL)
+          {
+            switch (node.getNodeType())
+              {
+              case Node.ATTRIBUTE_NODE:
+                if ((wts & NodeFilter.SHOW_ATTRIBUTE) == 0)
+                  {
+                    super.serialize(node, out);
+                    return;
+                  }
+                break;
+              case Node.TEXT_NODE:
+                if ((wts & NodeFilter.SHOW_TEXT) == 0)
+                  {
+                    super.serialize(node, out);
+                    return;
+                  }
+                break;
+              case Node.ELEMENT_NODE:
+                if ((wts & NodeFilter.SHOW_ELEMENT) == 0)
+                  {
+                    super.serialize(node, out);
+                    return;
+                  }
+                break;
+              case Node.CDATA_SECTION_NODE:
+                if ((wts & NodeFilter.SHOW_CDATA_SECTION) == 0)
+                  {
+                    super.serialize(node, out);
+                    return;
+                  }
+                break;
+              case Node.COMMENT_NODE:
+                if ((wts & NodeFilter.SHOW_COMMENT) == 0)
+                  {
+                    super.serialize(node, out);
+                    return;
+                  }
+                break;
+              case Node.DOCUMENT_NODE:
+                if ((wts & NodeFilter.SHOW_DOCUMENT) == 0)
+                  {
+                    super.serialize(node, out);
+                    return;
+                  }
+                break;
+              case Node.DOCUMENT_TYPE_NODE:
+                if ((wts & NodeFilter.SHOW_DOCUMENT_TYPE) == 0)
+                  {
+                    super.serialize(node, out);
+                    return;
+                  }
+                break;
+              case Node.PROCESSING_INSTRUCTION_NODE:
+                if ((wts & NodeFilter.SHOW_PROCESSING_INSTRUCTION) == 0)
+                  {
+                    super.serialize(node, out);
+                    return;
+                  }
+                break;
+              case Node.DOCUMENT_FRAGMENT_NODE:
+                if ((wts & NodeFilter.SHOW_DOCUMENT_FRAGMENT) == 0)
+                  {
+                    super.serialize(node, out);
+                    return;
+                  }
+                break;
+              case Node.ENTITY_NODE:
+                if ((wts & NodeFilter.SHOW_ENTITY) == 0)
+                  {
+                    super.serialize(node, out);
+                    return;
+                  }
+                break;
+              case Node.ENTITY_REFERENCE_NODE:
+                if ((wts & NodeFilter.SHOW_ENTITY_REFERENCE) == 0)
+                  {
+                    super.serialize(node, out);
+                    return;
+                  }
+                break;
+              case Node.NOTATION_NODE:
+                if ((wts & NodeFilter.SHOW_NOTATION) == 0)
+                  {
+                    super.serialize(node, out);
+                    return;
+                  }
+                break;
+              }
+          }
+        switch (filter.acceptNode(node))
+          {
+          case NodeFilter.FILTER_ACCEPT:
+            super.serialize(node, out);
+            break;
+          case NodeFilter.FILTER_REJECT:
+            break;
+          case NodeFilter.FILTER_SKIP:
+            Node first = node.getFirstChild();
+            if (first != null)
+              {
+                serialize(first, out);
+              }
+            break;
+          }
+      }
+  }
+
+  // -- DOMConfiguration --
+
+  public void setParameter(String name, Object value)
+    throws DOMException
+  {
+    if ("discard-default-content".equals(name))
+      {
+        discardDefaultContent = "true".equals(value.toString());
+      }
+    else if ("xml-declaration".equals(name))
+      {
+        xmlDeclaration = "false".equals(value.toString());
+      }
+    else
+      {
+        throw new DomEx(DomEx.NOT_SUPPORTED_ERR);
+      }
+  }
+
+  public Object getParameter(String name)
+    throws DOMException
+  {
+    if ("discard-default-content".equals(name))
+      {
+        return discardDefaultContent ? "true" : "false";
+      }
+    else if ("xml-declaration".equals(name))
+      {
+        return xmlDeclaration ? "true" : "false";
+      }
+    else
+      {
+        throw new DomEx(DomEx.NOT_SUPPORTED_ERR);
+      }
+  }
+
+  public boolean canSetParameter(String name, Object value)
+  {
+    return contains(name);
+  }
+
+  public DOMStringList getParameterNames()
+  {
+    return this;
+  }
+
+  // -- DOMStringList --
+
+  public String item(int i)
+  {
+    return (String) SUPPORTED_PARAMETERS.get(i);
+  }
+
+  public int getLength()
+  {
+    return SUPPORTED_PARAMETERS.size();
+  }
+
+  public boolean contains(String str)
+  {
+    return SUPPORTED_PARAMETERS.contains(str);
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/ls/FilteredSAXEventSink.java b/libjava/gnu/xml/dom/ls/FilteredSAXEventSink.java
new file mode 100644 (file)
index 0000000..63f32a8
--- /dev/null
+++ b/libjava/gnu/xml/dom/ls/FilteredSAXEventSink.java
@@ -0,0 +1,354 @@
+/* FilteredSAXEventSink.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom.ls;
+
+import java.util.LinkedList;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
+import org.w3c.dom.ls.LSParserFilter;
+import org.w3c.dom.traversal.NodeFilter;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * A SAX event sink that calls out to a parser filter in order to decide
+ * whether to insert nodes into the tree.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class FilteredSAXEventSink
+  extends SAXEventSink
+{
+
+  final LSParserFilter filter;
+  final int whatToShow;
+
+  /**
+   * Stack of elements to insert.
+   */
+  LinkedList nodes;
+  
+  /**
+   * Corresponding stack of filter decisions about the nodes.
+   */
+  LinkedList decisions;
+
+  /**
+   * True when rejecting child nodes.
+   */
+  boolean rejecting;
+
+  FilteredSAXEventSink(LSParserFilter filter)
+  {
+    this.filter = filter;
+    whatToShow = filter.getWhatToShow();
+  }
+
+  public void startDocument()
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    nodes = new LinkedList();
+    decisions = new LinkedList();
+    
+    super.startDocument();
+  }
+
+  public void endDocument()
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    super.endDocument();
+
+    switch (getDecision(ctx, false))
+      {
+      case LSParserFilter.FILTER_REJECT:
+        ctx = null;
+        doc = null;
+        break;
+      }
+    
+    nodes = null;
+    decisions = null;
+  }
+
+  public void startElement(String uri, String localName, String qName,
+                           Attributes atts)
+    throws SAXException
+  {
+    if (rejecting || interrupted)
+      {
+        return;
+      }
+    Element element = createElement(uri, localName, qName, atts);
+    ctx = element;
+    
+    short decision = getDecision(element, true);
+    nodes.addLast(element);
+    decisions.addLast(new Short(decision));
+
+    switch (decision)
+      {
+      case LSParserFilter.FILTER_REJECT:
+        rejecting = true;
+        break;
+      case LSParserFilter.FILTER_INTERRUPT:
+        interrupted = true;
+        break;
+      }
+  }
+
+  protected Attr createAttr(Attributes atts, int index)
+  {
+    Attr attr = super.createAttr(atts, index);
+    short decision = getDecision(attr, false);
+    switch (decision)
+      {
+      case LSParserFilter.FILTER_REJECT:
+        return null;
+      case LSParserFilter.FILTER_INTERRUPT:
+        interrupted = true;
+        return null;
+      }
+    return attr;
+  }
+
+  public void endElement(String uri, String localName, String qName)
+    throws SAXException
+  {
+    if (rejecting || interrupted)
+      {
+        return;
+      }
+    super.endElement(uri, localName, qName);
+    
+    Element element = (Element) nodes.removeLast();
+    Node parent = nodes.isEmpty() ? doc : (Node) nodes.getLast();
+    ctx = parent;
+    short decision = ((Short) decisions.removeLast()).shortValue();
+    switch (decision)
+      {
+      case LSParserFilter.FILTER_SKIP:
+        // Add all children of element to parent
+        for (Node child = element.getFirstChild(); child != null;
+             child = child.getNextSibling())
+          {
+            parent.insertBefore(child, element);
+          }
+        return;
+      case LSParserFilter.FILTER_REJECT:
+        rejecting = false;
+        break;
+      }
+    decision = getDecision(element, false);
+    switch (decision)
+      {
+      case LSParserFilter.FILTER_ACCEPT:
+        parent.appendChild(element);
+        break;
+      case LSParserFilter.FILTER_INTERRUPT:
+        interrupted = true;
+        break;
+      }
+  }
+
+  public void characters(char[] c, int off, int len)
+    throws SAXException
+  {
+    if (rejecting || interrupted)
+      {
+        return;
+      }
+    Text text = createText(c, off, len);
+    short decision = getDecision(text, false);
+    switch (decision)
+      {
+      case LSParserFilter.FILTER_ACCEPT:
+        ctx.appendChild(text);
+        break;
+      case LSParserFilter.FILTER_INTERRUPT:
+        interrupted = true;
+        break;
+      }
+  }
+
+  public void processingInstruction(String target, String data)
+    throws SAXException
+  {
+    if (rejecting || interrupted || inDTD)
+      {
+        return;
+      }
+    Node pi = createProcessingInstruction(target, data);
+    short decision = getDecision(pi, false);
+    switch (decision)
+      {
+      case LSParserFilter.FILTER_ACCEPT:
+        ctx.appendChild(pi);
+        break;
+      case LSParserFilter.FILTER_INTERRUPT:
+        interrupted = true;
+        break;
+      }
+  }
+
+  public void startDTD(String name, String publicId, String systemId)
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    Node doctype = createDocumentType(name, publicId, systemId);
+    ctx = doctype;
+    inDTD = true;
+    nodes.addLast(doctype);
+    decisions.addLast(new Short(LSParserFilter.FILTER_ACCEPT));
+  }
+
+  public void endDTD()
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    Node doctype = (Node) nodes.removeLast();
+    decisions.removeLast();
+    inDTD = false;
+    ctx = doc;
+    short decision = getDecision(doctype, false);
+    switch (decision)
+      {
+      case LSParserFilter.FILTER_ACCEPT:
+        ctx.appendChild(doctype);
+        break;
+      case LSParserFilter.FILTER_INTERRUPT:
+        interrupted = true;
+        break;
+      }
+  }
+
+  public void comment(char[] c, int off, int len)
+    throws SAXException
+  {
+    if (rejecting || interrupted || inDTD)
+      {
+        return;
+      }
+    Node comment = createComment(c, off, len);
+    short decision = getDecision(comment, false);
+    switch (decision)
+      {
+      case LSParserFilter.FILTER_ACCEPT:
+        ctx.appendChild(comment);
+        break;
+      case LSParserFilter.FILTER_INTERRUPT:
+        interrupted = true;
+        break;
+      }
+  }
+
+  // TODO declarations
+
+  short getDecision(Node node, boolean start)
+  {
+    boolean show = (whatToShow == NodeFilter.SHOW_ALL);
+    if (!show)
+      {
+        switch (node.getNodeType())
+          {
+          case Node.ATTRIBUTE_NODE:
+            show = ((whatToShow & NodeFilter.SHOW_ATTRIBUTE) != 0);
+            break;     
+          case Node.TEXT_NODE:
+            show = ((whatToShow & NodeFilter.SHOW_TEXT) != 0);
+            break;     
+          case Node.CDATA_SECTION_NODE:
+            show = ((whatToShow & NodeFilter.SHOW_CDATA_SECTION) != 0);
+            break;     
+          case Node.ELEMENT_NODE:
+            show = ((whatToShow & NodeFilter.SHOW_ELEMENT) != 0);
+            break;     
+          case Node.COMMENT_NODE:
+            show = ((whatToShow & NodeFilter.SHOW_COMMENT) != 0);
+            break;     
+          case Node.DOCUMENT_NODE:
+            show = ((whatToShow & NodeFilter.SHOW_DOCUMENT) != 0);
+            break;     
+          case Node.PROCESSING_INSTRUCTION_NODE:
+            show = ((whatToShow & NodeFilter.SHOW_PROCESSING_INSTRUCTION) != 0);
+            break;     
+          case Node.DOCUMENT_FRAGMENT_NODE:
+            show = ((whatToShow & NodeFilter.SHOW_DOCUMENT_FRAGMENT) != 0);
+            break;     
+          case Node.DOCUMENT_TYPE_NODE:
+            show = ((whatToShow & NodeFilter.SHOW_DOCUMENT_TYPE) != 0);
+            break;     
+          case Node.ENTITY_REFERENCE_NODE:
+            show = ((whatToShow & NodeFilter.SHOW_ENTITY_REFERENCE) != 0);
+            break;     
+          case Node.ENTITY_NODE:
+            show = ((whatToShow & NodeFilter.SHOW_ENTITY) != 0);
+            break;     
+          case Node.NOTATION_NODE:
+            show = ((whatToShow & NodeFilter.SHOW_NOTATION) != 0);
+            break;     
+          }
+      }
+    if (!show)
+      {
+        return LSParserFilter.FILTER_ACCEPT;
+      }
+    if (start)
+      {
+        return filter.startElement((Element) node);
+      }
+    return filter.acceptNode(node);
+  }
+
+}
+
diff --git a/libjava/gnu/xml/dom/ls/ReaderInputStream.java b/libjava/gnu/xml/dom/ls/ReaderInputStream.java
new file mode 100644 (file)
index 0000000..633b968
--- /dev/null
+++ b/libjava/gnu/xml/dom/ls/ReaderInputStream.java
@@ -0,0 +1,237 @@
+/* ReaderInputStream.java -- 
+   Copyright (C) 1999, 2000, 2001, 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom.ls;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.Reader;
+
+/**
+ * Character stream wrapper.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @author <a href='mailto:mark@klomp.org'>Mark Wielaard</a>
+ */
+public class ReaderInputStream
+  extends InputStream
+{
+
+  private Reader reader;
+  private String encoding;
+
+  // Holds extra spillover data if necessary
+  private byte extra[];
+  private int pos;
+
+  private byte extra_marked[];
+  private int pos_marked;
+
+  public ReaderInputStream(Reader reader)
+  {
+    this.reader = reader;
+    this.encoding = "UTF-8";
+  }
+
+  void setEncoding(String encoding)
+  {
+    this.encoding = encoding;
+  }
+
+  public int read()
+    throws IOException
+  {
+    if (extra != null)
+      {
+        int result = extra[pos];
+        pos++;
+        if (pos >= extra.length)
+          {
+            extra = null;
+          }
+        return result;
+      }
+    return reader.read();
+  }
+
+  public int read(byte[] b)
+    throws IOException
+  {
+    return read(b, 0, b.length);
+  }
+
+  public int read(byte[] b, int off, int len)
+    throws IOException
+  {
+    if (len == 0)
+      {
+        return 0;
+      }
+
+    if (extra != null)
+      {
+        int available = extra.length - pos;
+        int l = available < len ? available : len;
+        System.arraycopy(extra, 0, b, off, l);
+        pos += l;
+        if (pos >= extra.length)
+          {
+            extra = null;
+          }
+        return l;
+      }
+
+    char[] c = new char[len];
+    int l = reader.read(c, 0, len);
+    if (l == -1)
+      {
+        return -1;
+      }
+
+    String s = new String(c, 0, l);
+    byte[] d = s.getBytes(encoding);
+    
+    int available = d.length;
+    int more = d.length - len;
+    if (more > 0)
+      {
+        extra = new byte[more];
+        pos = 0;
+        System.arraycopy(d, len, extra, 0, more);
+        available -= more;
+      }
+       
+    System.arraycopy(d, 0, b, off, available);
+    return available;
+  }
+
+  public void close()
+    throws IOException
+  {
+    reader.close();
+  }
+
+  public boolean markSupported()
+  {
+    return reader.markSupported();
+  }
+
+  public void mark(int limit)
+  {
+    if (extra != null)
+      {
+        extra_marked = new byte[extra.length];
+        System.arraycopy(extra, 0, extra_marked, 0, extra.length);
+        pos_marked = pos;
+      }
+    else
+      {
+        extra_marked = null;
+      }
+
+    try
+      {
+        // Note that this might be a bit more than asked for.
+        // Because we might also have the extra_marked bytes.
+        // That is fine (and necessary for reset() to work).
+        reader.mark(limit);
+      }
+    catch (IOException ioe)
+      {
+        throw new RuntimeException(ioe);
+      }
+  }
+
+  public void reset()
+    throws IOException
+  {
+    extra = extra_marked;
+    pos = pos_marked;
+    extra_marked = null;
+
+    reader.reset();
+  }
+
+  public long skip(long n)
+    throws IOException
+  {
+    long done = 0;
+    if (extra != null)
+      {
+        int available = extra.length - pos;
+        done = available < n ? available : n;
+        pos += done;
+        if (pos >= extra.length)
+          {
+            extra = null;
+          }
+      }
+
+    n -= done;
+    if (n > 0)
+      {
+        return reader.skip(n) + done;
+      }
+    else
+      {
+        return done;
+      }
+  }
+
+  /**
+   *  Returns conservative number of bytes available without blocking.
+   *  Actual number of bytes that can be read without blocking might
+   *  be (much) bigger.
+   */
+  public int available()
+    throws IOException
+  {
+    if (extra != null)
+      {
+        return pos - extra.length;
+      }
+
+    return reader.ready() ? 1 : 0;
+  }
+
+  public String toString()
+  {
+    return getClass().getName() + "[" + reader + ", " + encoding + "]";
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/ls/SAXEventSink.java b/libjava/gnu/xml/dom/ls/SAXEventSink.java
new file mode 100644 (file)
index 0000000..24f6ccc
--- /dev/null
+++ b/libjava/gnu/xml/dom/ls/SAXEventSink.java
@@ -0,0 +1,533 @@
+/* SAXEventSink.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom.ls;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import javax.xml.XMLConstants;
+import org.w3c.dom.Attr;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Element;
+import org.w3c.dom.Entity;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
+import org.xml.sax.Attributes;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.Attributes2;
+import org.xml.sax.ext.DeclHandler;
+import org.xml.sax.ext.LexicalHandler;
+import gnu.xml.aelfred2.ContentHandler2;
+import gnu.xml.dom.DomAttr;
+import gnu.xml.dom.DomDocument;
+import gnu.xml.dom.DomDoctype;
+
+/**
+ * A SAX content and lexical handler used to construct a DOM document.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class SAXEventSink
+  implements ContentHandler2, LexicalHandler, DTDHandler, DeclHandler
+{
+
+  private static final String XMLNS_URI = XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
+  private static final String XMLNS_PREFIX = XMLConstants.XMLNS_ATTRIBUTE;
+
+  boolean namespaceAware;
+  boolean ignoreWhitespace;
+  boolean expandEntityReferences;
+  boolean ignoreComments;
+  boolean coalescing;
+  
+  DomDocument doc; // document being constructed
+  Node ctx; // current context (parent node)
+  LinkedList entityCtx; // entity context
+  List pending; // namespace nodes waiting for a declaring element
+  Locator locator;
+  boolean inCDATA;
+  boolean inDTD;
+  boolean interrupted;
+
+  void interrupt()
+  {
+    interrupted = true;
+  }
+
+  // -- ContentHandler2 --
+  
+  public void setDocumentLocator(Locator locator)
+  {
+    this.locator = locator;
+  }
+
+  public void startDocument()
+    throws SAXException
+  {
+    if (namespaceAware)
+      {
+        pending = new LinkedList();
+      }
+    doc = new DomDocument();
+    doc.setStrictErrorChecking(false);
+    doc.setBuilding(true);
+    ctx = doc;
+  }
+
+  public void xmlDecl(String version, String encoding, boolean standalone,
+                      String inputEncoding)
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    doc.setXmlVersion(version);
+    doc.setXmlEncoding(encoding);
+    doc.setXmlStandalone(standalone);
+    doc.setInputEncoding(inputEncoding);
+  }
+
+  public void endDocument()
+    throws SAXException
+  {
+    doc.setStrictErrorChecking(true);
+    doc.setBuilding(false);
+    DomDoctype doctype = (DomDoctype) doc.getDoctype();
+    if (doctype != null)
+      {
+        doctype.makeReadonly();
+      }
+    ctx = null;
+    locator = null;
+  }
+
+  public void startPrefixMapping(String prefix, String uri)
+    throws SAXException
+  {
+    if (namespaceAware)
+      {
+        String nsName = (prefix != null && prefix.length() > 0) ?
+          XMLNS_PREFIX + ":" + prefix : XMLNS_PREFIX;
+        DomAttr ns = (DomAttr) doc.createAttributeNS(XMLNS_URI, nsName);
+        ns.setNodeValue(uri);
+        if (ctx.getNodeType() == Node.ATTRIBUTE_NODE)
+          {
+            // Add to owner element
+            Node target = ((Attr) ctx).getOwnerElement();
+            target.getAttributes().setNamedItemNS(ns);
+          }
+        else
+          {
+            // Add to pending list; namespace node will be inserted when
+            // element is seen
+            pending.add(ns);
+          }
+      }
+  }
+
+  public void endPrefixMapping(String prefix)
+    throws SAXException
+  {
+  }
+
+  public void startElement(String uri, String localName, String qName,
+                           Attributes atts)
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    Element element = createElement(uri, localName, qName, atts);
+    // add element to context
+    ctx.appendChild(element);
+    ctx = element;
+  }
+
+  protected Element createElement(String uri, String localName, String qName,
+                                  Attributes atts)
+    throws SAXException
+  {
+    // create element node
+    Element element = namespaceAware ?
+      doc.createElementNS(uri, qName) :
+      doc.createElement(qName);
+    NamedNodeMap attrs = element.getAttributes();
+    if (namespaceAware && !pending.isEmpty())
+      {
+        // add pending namespace nodes
+        for (Iterator i = pending.iterator(); i.hasNext(); )
+          {
+            Node ns = (Node) i.next();
+            attrs.setNamedItemNS(ns);
+          }
+        pending.clear();
+      }
+    // add attributes
+    int len = atts.getLength();
+    for (int i = 0; i < len; i++)
+      {
+        // create attribute
+        Attr attr = createAttr(atts, i);
+        if (attr != null)
+          {
+            // add attribute to element
+            if (namespaceAware)
+              {
+                attrs.setNamedItemNS(attr);
+              }
+            else
+              {
+                attrs.setNamedItem(attr);
+              }
+          }
+      }
+    return element;
+  }
+
+  protected Attr createAttr(Attributes atts, int index)
+  {
+    DomAttr attr;
+    if (namespaceAware)
+      {
+        String a_uri = atts.getURI(index);
+        String a_qName = atts.getQName(index);
+        attr = (DomAttr) doc.createAttributeNS(a_uri, a_qName);
+      }
+    else
+      {
+        String a_qName = atts.getQName(index);
+        attr = (DomAttr) doc.createAttribute(a_qName);
+      }
+    attr.setNodeValue(atts.getValue(index));
+    if (atts instanceof Attributes2)
+      {
+        Attributes2 atts2 = (Attributes2) atts;
+        // TODO attr.setDeclared(atts2.isDeclared(index));
+        attr.setSpecified(atts2.isSpecified(index));
+      }
+    return attr;
+  }
+
+  public void endElement(String uri, String localName, String qName)
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    if (namespaceAware)
+      {
+        pending.clear();
+      }
+    ctx = ctx.getParentNode();
+  }
+
+  public void characters(char[] c, int off, int len)
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    ctx.appendChild(createText(c, off, len));
+  }
+
+  protected Text createText(char[] c, int off, int len)
+    throws SAXException
+  {
+    Text text = (inCDATA && !coalescing) ?
+      doc.createCDATASection(new String(c, off, len)) :
+      doc.createTextNode(new String(c, off, len));
+    return text;
+  }
+
+  public void ignorableWhitespace(char[] c, int off, int len)
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    if (!ignoreWhitespace)
+      {
+        characters(c, off, len);
+      }
+  }
+
+  public void processingInstruction(String target, String data)
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    if (!inDTD)
+      {
+        Node pi = createProcessingInstruction(target, data);
+        ctx.appendChild(pi);
+      }
+  }
+
+  protected Node createProcessingInstruction(String target, String data)
+  {
+    return doc.createProcessingInstruction(target, data);
+  }
+
+  public void skippedEntity(String name)
+    throws SAXException
+  {
+    // This callback is totally pointless
+  }
+
+  // -- LexicalHandler --
+  
+  public void startDTD(String name, String publicId, String systemId)
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    Node doctype = createDocumentType(name, publicId, systemId);
+    doc.appendChild(doctype);
+    ctx = doctype;
+    inDTD = true;
+  }
+
+  protected Node createDocumentType(String name, String publicId,
+                                    String systemId)
+  {
+    return new DomDoctype(doc, name, publicId, systemId);
+  }
+
+  public void endDTD()
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    inDTD = false;
+    ctx = ctx.getParentNode();
+  }
+
+  public void startEntity(String name)
+    throws SAXException
+  {
+    DocumentType doctype = doc.getDoctype();
+    if (doctype == null)
+      {
+        throw new SAXException("SAX parser error: " +
+                               "reference to entity in undeclared doctype");
+      }
+    if ("[dtd]".equals(name) || name.charAt(0) == '%')
+      {
+        // Ignore DTD and parameter entities
+        ctx = doctype;
+        return;
+      }
+    // Get entity
+    NamedNodeMap entities = doctype.getEntities();
+    Entity entity = (Entity) entities.getNamedItem(name);
+    if (entity == null)
+      {
+        throw new SAXException("SAX parser error: " +
+                               "reference to undeclared entity: " + name);
+      }
+    pushEntity(entity);
+  }
+
+  public void endEntity(String name)
+    throws SAXException
+  {
+    if ("[dtd]".equals(name) || name.charAt(0) == '%')
+      {
+        // Ignore DTD and parameter entities
+        return;
+      }
+    Entity entity = popEntity();
+    // TODO resolve external entities to ensure that entity has content
+    if (expandEntityReferences)
+      {
+        // Get entity content
+        for (Node child = entity.getFirstChild(); child != null;
+             child = child.getNextSibling())
+          {
+            ctx.appendChild(child);
+          }
+      }
+    else
+      {
+        Node entityReference = doc.createEntityReference(name);
+        ctx.appendChild(entityReference);
+      }
+  }
+
+  void pushEntity(Node entity)
+  {
+    if (entityCtx == null)
+      {
+        entityCtx = new LinkedList();
+      }
+    entityCtx.addLast(ctx);
+    ctx = entity;
+  }
+
+  Entity popEntity()
+  {
+    Entity ret = (Entity) ctx;
+    ctx = (Node) entityCtx.removeLast();
+    return ret;
+  }
+
+  public void startCDATA()
+    throws SAXException
+  {
+    inCDATA = true;
+  }
+
+  public void endCDATA()
+    throws SAXException
+  {
+    inCDATA = false;
+  }
+
+  public void comment(char[] c, int off, int len)
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    if (!inDTD)
+      {
+        Node comment = createComment(c, off, len);
+        ctx.appendChild(comment);
+      }
+  }
+
+  protected Node createComment(char[] c, int off, int len)
+  {
+    return doc.createComment(new String(c, off, len));
+  }
+
+  // -- DTDHandler --
+
+  public void notationDecl(String name, String publicId, String systemId)
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    DomDoctype doctype = (DomDoctype) ctx;
+    doctype.declareNotation(name, publicId, systemId);
+  }
+
+  public void unparsedEntityDecl(String name, String publicId, String systemId,
+                                 String notationName)
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    DomDoctype doctype = (DomDoctype) ctx;
+    Entity entity = doctype.declareEntity(name, publicId, systemId,
+                                          notationName);
+  }
+
+  // -- DeclHandler --
+  
+  public void elementDecl(String name, String model)
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    DomDoctype doctype = (DomDoctype) ctx;
+    doctype.elementDecl(name, model);
+  }
+
+  public void attributeDecl(String eName, String aName, String type,
+                            String mode, String value)
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    DomDoctype doctype = (DomDoctype) ctx;
+    doctype.attributeDecl(eName, aName, type, mode, value);
+  }
+
+  public void internalEntityDecl(String name, String value)
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    DomDoctype doctype = (DomDoctype) ctx;
+    Entity entity = doctype.declareEntity(name, null, null, null);
+    if (entity != null)
+      {
+        Node text = doc.createTextNode(value);
+        entity.appendChild(text);
+      }
+  }
+
+  public void externalEntityDecl(String name, String publicId, String systemId)
+    throws SAXException
+  {
+    if (interrupted)
+      {
+        return;
+      }
+    DomDoctype doctype = (DomDoctype) ctx;
+    Entity entity = doctype.declareEntity(name, publicId, systemId, null);
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/ls/WriterOutputStream.java b/libjava/gnu/xml/dom/ls/WriterOutputStream.java
new file mode 100644 (file)
index 0000000..7eddb2e
--- /dev/null
+++ b/libjava/gnu/xml/dom/ls/WriterOutputStream.java
@@ -0,0 +1,98 @@
+/* WriterOutputStream.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.dom.ls;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+
+/**
+ * Character stream wrapper.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class WriterOutputStream
+  extends OutputStream
+{
+
+  private Writer writer;
+  private String encoding;
+
+  public WriterOutputStream(Writer writer)
+  {
+    this.writer = writer;
+    this.encoding = "UTF-8";
+  }
+
+  void setEncoding(String encoding)
+  {
+    this.encoding = encoding;
+  }
+
+  public void write(int c)
+    throws IOException
+  {
+    writer.write(c);
+  }
+
+  public void write(byte[] b)
+    throws IOException
+  {
+    write(b, 0, b.length);
+  }
+
+  public void write(byte[] b, int off, int len)
+    throws IOException
+  {
+    writer.write(new String(b, off, len, encoding));
+  }
+
+  public void close()
+    throws IOException
+  {
+    writer.close();
+  }
+
+  public void flush()
+    throws IOException
+  {
+    writer.flush();
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/dom/package.html b/libjava/gnu/xml/dom/package.html
new file mode 100644 (file)
index 0000000..fbc864a
--- /dev/null
+++ b/libjava/gnu/xml/dom/package.html
@@ -0,0 +1,273 @@
+<html>
+<body>
+
+<p>
+This is a Free Software DOM Level 3 implementation, supporting these features:
+<ul>
+<li>"XML"</li>
+<li>"Events"</li>
+<li>"MutationEvents"</li>
+<li>"HTMLEvents" (won't generate them though)</li>
+<li>"UIEvents" (also won't generate them)</li>
+<li>"USER-Events" (a conformant extension)</li>
+<li>"Traversal" (optional)</li>
+<li>"XPath"</li>
+<li>"LS" and "LS-Async"</li>
+</ul>
+It is intended to be a reasonable base both for
+experimentation and supporting additional DOM modules as clean layers.
+</p>
+
+<p>
+Note that while DOM does not specify its behavior in the
+face of concurrent access, this implementation does.
+Specifically:
+<ul>
+<li>If only one thread at a time accesses a Document,
+of if several threads cooperate for read-only access,
+then no concurrency conflicts will occur.</li>
+<li>If several threads mutate a given document
+(or send events using it) at the same time,
+there is currently no guarantee that
+they won't interfere with each other.</li>
+</ul>
+</p>
+
+<h3>Design Goals</h3>
+
+<p>
+A number of DOM implementations are available in Java, including
+commercial ones from Sun, IBM, Oracle, and DataChannel as well as
+noncommercial ones from Docuverse, OpenXML, and Silfide.  Why have
+another?  Some of the goals of this version:
+</p>
+
+<ul>
+<li>Advanced DOM support. This was the first generally available
+implementation of DOM Level 2 in Java, and one of the first Level 3
+and XPath implementations.</li>
+
+<li> Free Software.  This one is distributed under the GPL (with
+"library exception") so it can be used with a different class of
+application.</li>
+
+<li>Second implementation syndrome.  I can do it simpler this time
+around ... and heck, writing it only takes a bit over a day once you
+know your way around.</li>
+
+<li>Sanity check the then-current Last Call DOM draft.  Best to find
+bugs early, when they're relatively fixable.  Yes, bugs were found.</li>
+
+<li>Modularity.  Most of the implementations mentioned above are part
+of huge packages; take all (including bugs, of which some have far
+too many), or take nothing.  I prefer a menu approach, when possible.
+This code is standalone, not beholden to any particular parser or XSL
+or XPath code.</li>
+
+<li>OK, I'm a hacker, I like to write code.</li>
+</ul>
+
+<p>
+This also works with the GNU Compiler for Java (GCJ).  GCJ promises
+to be quite the environment for programming Java, both directly and from
+C++ using the new CNI interfaces (which really use C++, unlike JNI). </p>
+
+
+<h3>Open Issues</h3>
+
+<p>At this writing:</p>
+<ul>
+<li>See below for some restrictions on the mutation event
+support ... some events aren't reported (and likely won't be).</li>
+
+<li>More testing and conformance work is needed.</li>
+
+<li>We need an XML Schema validator (actually we need validation in the DOM
+full stop).</li>
+</ul>
+
+<p>
+I ran a profiler a few times and remove some of the performance hotspots,
+but it's not tuned.  Reporting mutation events, in particular, is
+rather costly -- it started at about a 40% penalty for appendNode calls,
+I've got it down around 12%, but it'll be hard to shrink it much further.
+The overall code size is relatively small, though you may want to be rid of
+many of the unused DOM interface classes (HTML, CSS, and so on).
+</p>
+
+
+<h2><a name="features">Features of this Package</a></h2>
+
+<p> Starting with DOM Level 2, you can really see that DOM is constructed
+as a bunch of optional modules around a core of either XML or HTML
+functionality.  Different implementations will support different optional
+modules.  This implementation provides a set of features that should be
+useful if you're not depending on the HTML functionality (lots of convenience
+functions that mostly don't buy much except API surface area) and user
+interface support.  That is, browsers will want more -- but what they
+need should be cleanly layered over what's already here. </p>
+
+<h3> Core Feature Set:  "XML" </h3>
+
+<p> This DOM implementation supports the "XML" feature set, which basically
+gets you four things over the bare core (which you're officially not supposed
+to implement except in conjunction with the "XML" or "HTML" feature).  In
+order of decreasing utility, those four things are: </p> <ol>
+
+    <li> ProcessingInstruction nodes.  These are probably the most
+    valuable thing. Handy little buggers, in part because all the APIs
+    you need to use them are provided, and they're designed to let you
+    escape XML document structure rules in controlled ways.</li>
+
+    <li> CDATASection nodes.  These are of of limited utility since CDATA
+    is just text that prints funny. These are of use to some sorts of
+    applications, though I encourage folk to not use them. </li>
+
+    <li> DocumentType nodes, and associated Notation and Entity nodes.
+    These appear to be useless.  Briefly, these "Type" nodes expose no
+    typing information.  They're only really usable to expose some lexical
+    structure that almost every application needs to ignore.  (XML editors
+    might like to see them, but they need true typing information much more.)
+    I strongly encourage people not to use these.  </li>
+
+    <li> EntityReference nodes can show up.  These are actively annoying,
+    since they add an extra level of hierarchy, are the cause of most of
+    the complexity in attribute values, and their contents are immutable.
+    Avoid these.</li>
+
+    </ol>
+
+<h3> Optional Feature Sets:  "Events", and friends </h3>
+
+<p> Events may be one of the more interesting new features in Level 2.
+This package provides the core feature set and exposes mutation events.
+No gooey events though; if you want that, write a layered implementation! </p>
+
+<p> Three mutation events aren't currently generated:</p> <ul>
+
+    <li> <em>DOMSubtreeModified</em> is poorly specified.  Think of this
+    as generating one such event around the time of finalization, which
+    is a fully conformant implementation.  This implementation is exactly
+    as useful as that one. </li>
+
+    <li> <em>DOMNodeRemovedFromDocument</em> and
+    <em>DOMNodeInsertedIntoDocument</em> are supposed to get sent to
+    every node in a subtree that gets removed or inserted (respectively).
+    This can be <em>extremely costly</em>, and the removal and insertion
+    processing is already significantly slower due to event reporting.
+    It's much easier, and more efficient, to have a listener higher in the
+    tree watch removal and insertion events through the bubbling or capture
+    mechanisms, than it is to watch for these two events.</li>
+
+    </ul>
+
+<p> In addition, certain kinds of attribute modification aren't reported.
+A fix is known, but it couldn't report the previous value of the attribute.
+More work could fix all of this (as well as reduce the generally high cost
+of childful attributes), but that's not been done yet. </p>
+
+<p> Also, note that it is a <em>Bad Thing&#153;</em> to have the listener
+for a mutation event change the ancestry for the target of that event.
+Or to prevent mutation events from bubbling to where they're needed.
+Just don't do those, OK? </p>
+
+<p> As an experimental feature (named "USER-Events"), you can provide
+your own "user" events.  Just name them anything starting with "USER-"
+and you're set.  Dispatch them through, bubbling, capturing, or what
+ever takes your fancy.  One important thing you can't currently do is
+pass any data (like an object) with those events.  Maybe later there
+will be a "UserEvent" interface letting you get some substantial use
+out of this mechanism even if you're not "inside" of a DOM package.</p>
+
+<p> You can create and send HTML events.  Ditto UIEvents.  Since DOM
+doesn't require a UI, it's the UI's job to send them; perhaps that's
+part of your application.  </p>
+
+<p><em>This package may be built without the ability to report mutation
+events, gaining a significant speedup in DOM construction time.  However,
+if that is done then certain other features -- notably node iterators
+and getElementsByTagname -- will not be available.</em>
+
+
+<h3> Optional Feature:  "Traversal" </h3>
+
+<p> Each DOM node has all you need to walk to everything connected
+to that node.  Lightweight, efficient utilities are easily layered on
+top of just the core APIs. </p>
+
+<p> Traversal APIs are an optional part of DOM Level 2, providing
+a not-so-lightweight way to walk over DOM trees, if your application
+didn't already have such utilities for use with data represented via
+DOM.  Implementing this helped debug the (optional) event and mutation
+event subsystems, so it's provided here.  </p>
+
+<p> At this writing, the "TreeWalker" interface isn't implemented. </p>
+
+
+
+<h2><a name='avoid'>DOM Functionality to Avoid</a></h2>
+
+<p> For what appear to be a combination of historical and "committee
+logic" reasons, DOM has a number of <em>features which I strongly advise
+you to avoid using</em> in your library and application code.  These
+include the following types of DOM nodes; see the documentation for the
+implementation class for more information: <ul>
+
+    <li> CDATASection
+    (<a href='DomCDATA.html'>DomCDATA</a> class)
+    ... use normal Text nodes instead, so you don't have to make
+    every algorithm recognize multiple types of character data
+
+    <li> DocumentType
+    (<a href='DomDoctype.html'>DomDocType</a> class)
+    ... if this held actual typing information, it might be useful
+
+    <li> Entity
+    (<a href='DomEntity.html'>DomEntity</a> class)
+    ... neither parsed nor unparsed entities work well in DOM; it
+    won't even tell you which attributes identify unparsed entities
+
+    <li> EntityReference
+    (<a href='DomEntityReference.html'>DomEntityReference</a> class)
+    ... permitted implementation variances are extreme, all children
+    are readonly, and these can interact poorly with namespaces
+
+    <li> Notation
+    (<a href='DomNotation.html'>DomNotation</a> class)
+    ... only really usable with unparsed entities (which aren't well
+    supported; see above) or perhaps with PIs after the DTD, not with
+    NOTATION attributes
+
+    </ul>
+
+<p> If you really need to use unparsed entities or notations, use SAX;
+it offers better support for all DTD-related functionality.
+It also exposes actual
+document typing information (such as element content models).</p>
+
+<p> Also, when accessing attribute values, use methods that provide their
+values as single strings, rather than those which expose value substructure
+(Text and EntityReference nodes).  (See the <a href='DomAttr.html'>DomAttr</a>
+documentation for more information.) </p>
+
+<p> Note that many of these features were provided as partial support for
+editor functionality (including the incomplete DTD access).  Full editor
+functionality requires access to potentially malformed lexical structure,
+at the level of unparsed tokens and below.  Access at such levels is so
+complex that using it in non-editor applications sacrifices all the
+benefits of XML; editor aplications need extremely specialized APIs. </p>
+
+<p> (This isn't a slam against DTDs, note; only against the broken support
+for them in DOM.  Even despite inclusion of some dubious SGML legacy features
+such as notations and unparsed entities,
+and the ongoing proliferation of alternative schema and validation tools,
+DTDs are still the most widely adopted tool
+to constrain XML document structure.  
+Alternative schemes generally focus on data transfer style
+applications; open document architectures comparable to
+DocBook 4.0 don't yet exist in the schema world.
+Feel free to use DTDs; just don't expect DOM to help you.) </p>
+
+</body>
+</html>
+
diff --git a/libjava/gnu/xml/pipeline/CallFilter.java b/libjava/gnu/xml/pipeline/CallFilter.java
new file mode 100644 (file)
index 0000000..0d85859
--- /dev/null
+++ b/libjava/gnu/xml/pipeline/CallFilter.java
@@ -0,0 +1,250 @@
+/* CallFilter.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.pipeline;
+
+import java.io.*;
+import java.net.*;
+
+import org.xml.sax.*;
+import org.xml.sax.ext.*;
+import org.xml.sax.helpers.XMLReaderFactory;
+
+import gnu.xml.util.Resolver;
+import gnu.xml.util.XMLWriter;
+
+
+/**
+ * Input is sent as an XML request to given URI, and the output of this
+ * filter is the parsed response to that request.
+ * A connection is opened to the remote URI when the startDocument call is
+ * issued through this filter, and the request is finished when the
+ * endDocument call is issued.  Events should be written quickly enough to
+ * prevent the remote HTTP server from aborting the connection due to
+ * inactivity; you may want to buffer text in an earlier pipeline stage.
+ * If your application requires validity checking of such
+ * outputs, have the output pipeline include a validation stage.
+ *
+ * <p>In effect, this makes a remote procedure call to the URI, with the
+ * request and response document syntax as chosen by the application.
+ * <em>Note that all the input events must be seen, and sent to the URI,
+ * before the first output event can be seen. </em>  Clients are delayed
+ * at least by waiting for the server to respond, constraining concurrency.
+ * Services can thus be used to synchronize concurrent activities, and
+ * even to prioritize service among different clients.
+ *
+ * <p> You are advised to avoid restricting yourself to an "RPC" model
+ * for distributed computation.  With a World Wide Web, network latencies
+ * and failures (e.g. non-availability)
+ * are significant; adopting a "procedure" model, rather than a workflow
+ * model where bulk requests are sent and worked on asynchronously, is not
+ * generally an optimal system-wide architecture.  When the messages may
+ * need authentication, such as with an OpenPGP signature, or when server
+ * loads don't argue in favor of immediate responses, non-RPC models can
+ * be advantageous.  (So-called "peer to peer" computing models are one
+ * additional type of model, though too often that term is applied to
+ * systems that still have a centralized control structure.)
+ *
+ * <p> <em>Be strict in what you send, liberal in what you accept,</em> as
+ * the Internet tradition goes.  Strictly conformant data should never cause
+ * problems to its receiver; make your request pipeline be very strict, and
+ * don't compromise on that.  Make your response pipeline strict as well,
+ * but be ready to tolerate specific mild, temporary, and well-documented
+ * variations from specific communications peers.
+ *
+ * @see XmlServlet
+ *
+ * @author David Brownell
+ */
+final public class CallFilter implements EventConsumer
+{
+    private Requestor                  req;
+    private EventConsumer              next;
+    private URL                                target;
+    private URLConnection              conn;
+    private ErrorHandler               errHandler;
+
+
+    /**
+     * Initializes a call filter so that its inputs are sent to the
+     * specified URI, and its outputs are sent to the next consumer
+     * provided.
+     *
+     * @exception IOException if the URI isn't accepted as a URL
+     */
+       // constructor used by PipelineFactory
+    public CallFilter (String uri, EventConsumer next)
+    throws IOException
+    {
+       this.next = next;
+       req = new Requestor ();
+       setCallTarget (uri);
+    }
+
+    /**
+     * Assigns the URI of the call target to be used.
+     * Does not affect calls currently being made.
+     */
+    final public void setCallTarget (String uri)
+    throws IOException
+    {
+       target = new URL (uri);
+    }
+
+    /**
+     * Assigns the error handler to be used to present most fatal
+     * errors.
+     */
+    public void setErrorHandler (ErrorHandler handler)
+    {
+       req.setErrorHandler (handler);
+    }
+
+
+    /**
+     * Returns the call target's URI.
+     */
+    final public String getCallTarget ()
+    {
+       return target.toString ();
+    }
+
+    /** Returns the content handler currently in use. */
+    final public org.xml.sax.ContentHandler getContentHandler ()
+    {
+       return req;
+    }
+
+    /** Returns the DTD handler currently in use. */
+    final public DTDHandler getDTDHandler ()
+    {
+       return req;
+    }
+
+
+    /**
+     * Returns the declaration or lexical handler currently in
+     * use, or throws an exception for other properties.
+     */
+    final public Object getProperty (String id)
+    throws SAXNotRecognizedException
+    {
+       if (EventFilter.DECL_HANDLER.equals (id))
+           return req;
+       if (EventFilter.LEXICAL_HANDLER.equals (id))
+           return req;
+       throw new SAXNotRecognizedException (id);
+    }
+
+
+    // JDK 1.1 seems to need it to be done this way, sigh
+    ErrorHandler getErrorHandler () { return errHandler; }
+
+    //
+    // Takes input and echoes to server as POST input.
+    // Then sends the POST reply to the next pipeline element.
+    //
+    final class Requestor extends XMLWriter
+    {
+       Requestor ()
+       {
+           super ((Writer)null);
+       }
+
+       public synchronized void startDocument () throws SAXException
+       {
+           // Connect to remote object and set up to send it XML text
+           try {
+               if (conn != null)
+                   throw new IllegalStateException ("call is being made");
+
+               conn = target.openConnection ();
+               conn.setDoOutput (true);
+               conn.setRequestProperty ("Content-Type",
+                           "application/xml;charset=UTF-8");
+
+               setWriter (new OutputStreamWriter (
+                       conn.getOutputStream (),
+                       "UTF8"), "UTF-8");
+
+           } catch (IOException e) {
+               fatal ("can't write (POST) to URI: " + target, e);
+           }
+
+           // NOW base class can safely write that text!
+           super.startDocument ();
+       }
+
+       public void endDocument () throws SAXException
+       {
+           //
+           // Finish writing the request (for HTTP, a POST);
+           // this closes the output stream.
+           //
+           super.endDocument ();
+
+           //
+           // Receive the response.
+           // Produce events for the next stage.
+           //
+           InputSource source;
+           XMLReader   producer;
+           String      encoding;
+
+           try {
+
+               source = new InputSource (conn.getInputStream ());
+
+// FIXME if status is anything but success, report it!!  It'd be good to
+// save the request data just in case we need to deal with a forward.
+
+               encoding = Resolver.getEncoding (conn.getContentType ());
+               if (encoding != null)
+                   source.setEncoding (encoding);
+
+               producer = XMLReaderFactory.createXMLReader ();
+               producer.setErrorHandler (getErrorHandler ());
+               EventFilter.bind (producer, next);
+               producer.parse (source);
+               conn = null;
+
+           } catch (IOException e) {
+               fatal ("I/O Exception reading response, " + e.getMessage (), e);
+           }
+       }
+    }
+}
diff --git a/libjava/gnu/xml/pipeline/DomConsumer.java b/libjava/gnu/xml/pipeline/DomConsumer.java
new file mode 100644 (file)
index 0000000..17fdeeb
--- /dev/null
+++ b/libjava/gnu/xml/pipeline/DomConsumer.java
@@ -0,0 +1,969 @@
+/* DomConsumer.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.pipeline;
+
+import java.util.Hashtable;
+
+import org.w3c.dom.*;
+import org.xml.sax.*;
+import org.xml.sax.ext.DeclHandler;
+import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.helpers.AttributesImpl;
+
+import gnu.xml.aelfred2.ContentHandler2;
+import gnu.xml.util.DomParser;
+
+
+/**
+ * This consumer builds a DOM Document from its input, acting either as a
+ * pipeline terminus or as an intermediate buffer.  When a document's worth
+ * of events has been delivered to this consumer, that document is read with
+ * a {@link DomParser} and sent to the next consumer.  It is also available
+ * as a read-once property.
+ *
+ * <p>The DOM tree is constructed as faithfully as possible.  There are some
+ * complications since a DOM should expose behaviors that can't be implemented
+ * without API backdoors into that DOM, and because some SAX parsers don't
+ * report all the information that DOM permits to be exposed.  The general
+ * problem areas involve information from the Document Type Declaration (DTD).
+ * DOM only represents a limited subset, but has some behaviors that depend
+ * on much deeper knowledge of a document's DTD.  You shouldn't have much to
+ * worry about unless you change handling of "noise" nodes from its default
+ * setting (which ignores them all); note if you use JAXP to populate your
+ * DOM trees, it wants to save "noise" nodes by default.  (Such nodes include
+ * ignorable whitespace, comments, entity references and CDATA boundaries.)
+ * Otherwise, your
+ * main worry will be if you use a SAX parser that doesn't flag ignorable
+ * whitespace unless it's validating (few don't).
+ *
+ * <p> The SAX2 events used as input must contain XML Names for elements
+ * and attributes, with original prefixes.  In SAX2,
+ * this is optional unless the "namespace-prefixes" parser feature is set.
+ * Moreover, many application components won't provide completely correct
+ * structures anyway.  <em>Before you convert a DOM to an output document,
+ * you should plan to postprocess it to create or repair such namespace
+ * information.</em> The {@link NSFilter} pipeline stage does such work.
+ *
+ * <p> <em>Note:  changes late in DOM L2 process made it impractical to
+ * attempt to create the DocumentType node in any implementation-neutral way,
+ * much less to populate it (L1 didn't support even creating such nodes).
+ * To create and populate such a node, subclass the inner
+ * {@link DomConsumer.Handler} class and teach it about the backdoors into
+ * whatever DOM implementation you want.  It's possible that some revised
+ * DOM API (L3?) will make this problem solvable again. </em>
+ *
+ * @see DomParser
+ *
+ * @author David Brownell
+ */
+public class DomConsumer implements EventConsumer
+{
+    private Class              domImpl;
+
+    private boolean            hidingCDATA = true;
+    private boolean            hidingComments = true;
+    private boolean            hidingWhitespace = true;
+    private boolean            hidingReferences = true;
+
+    private Handler            handler;
+    private ErrorHandler       errHandler;
+
+    private EventConsumer      next;
+
+    // FIXME:  this can't be a generic pipeline stage just now,
+    // since its input became a Class not a String (to be turned
+    // into a class, using the right class loader)
+
+
+    /**
+     * Configures this pipeline terminus to use the specified implementation
+     * of DOM when constructing its result value.
+     *
+     * @param impl class implementing {@link org.w3c.dom.Document Document}
+     * which publicly exposes a default constructor
+     *
+     * @exception SAXException when there is a problem creating an
+     * empty DOM document using the specified implementation
+     */
+    public DomConsumer (Class impl)
+    throws SAXException
+    {
+       domImpl = impl;
+       handler = new Handler (this);
+    }
+
+    /**
+     * This is the hook through which a subclass provides a handler
+     * which knows how to access DOM extensions, specific to some
+     * implementation, to record additional data in a DOM.
+     * Treat this as part of construction; don't call it except
+     * before (or between) parses.
+     */
+    protected void setHandler (Handler h)
+    {
+       handler = h;
+    }
+
+
+    private Document emptyDocument ()
+    throws SAXException
+    {
+       try {
+           return (Document) domImpl.newInstance ();
+       } catch (IllegalAccessException e) {
+           throw new SAXException ("can't access constructor: "
+                   + e.getMessage ());
+       } catch (InstantiationException e) {
+           throw new SAXException ("can't instantiate Document: "
+                   + e.getMessage ());
+       }
+    }
+
+
+    /**
+     * Configures this consumer as a buffer/filter, using the specified
+     * DOM implementation when constructing its result value.
+     *
+     * <p> This event consumer acts as a buffer and filter, in that it
+     * builds a DOM tree and then writes it out when <em>endDocument</em>
+     * is invoked.  Because of the limitations of DOM, much information
+     * will as a rule not be seen in that replay.  To get a full fidelity
+     * copy of the input event stream, use a {@link TeeConsumer}.
+     *
+     * @param impl class implementing {@link org.w3c.dom.Document Document}
+     * which publicly exposes a default constructor
+     * @param next receives a "replayed" sequence of parse events when
+     * the <em>endDocument</em> method is invoked.
+     *
+     * @exception SAXException when there is a problem creating an
+     * empty DOM document using the specified DOM implementation
+     */
+    public DomConsumer (Class impl, EventConsumer n)
+    throws SAXException
+    {
+       this (impl);
+       next = n;
+    }
+
+
+    /**
+     * Returns the document constructed from the preceding
+     * sequence of events.  This method should not be
+     * used again until another sequence of events has been
+     * given to this EventConsumer.  
+     */
+    final public Document getDocument ()
+    {
+       return handler.clearDocument ();
+    }
+
+    public void setErrorHandler (ErrorHandler handler)
+    {
+       errHandler = handler;
+    }
+
+
+    /**
+     * Returns true if the consumer is hiding entity references nodes
+     * (the default), and false if EntityReference nodes should
+     * instead be created.  Such EntityReference nodes will normally be
+     * empty, unless an implementation arranges to populate them and then
+     * turn them back into readonly objects.
+     *
+     * @see #setHidingReferences
+     */
+    final public boolean       isHidingReferences ()
+       { return hidingReferences; }
+
+    /**
+     * Controls whether the consumer will hide entity expansions,
+     * or will instead mark them with entity reference nodes.
+     *
+     * @see #isHidingReferences
+     * @param flag False if entity reference nodes will appear
+     */
+    final public void          setHidingReferences (boolean flag)
+       { hidingReferences = flag; }
+    
+
+    /**
+     * Returns true if the consumer is hiding comments (the default),
+     * and false if they should be placed into the output document.
+     *
+     * @see #setHidingComments
+     */
+    public final boolean isHidingComments ()
+       { return hidingComments; }
+
+    /**
+     * Controls whether the consumer is hiding comments.
+     *
+     * @see #isHidingComments
+     */
+    public final void setHidingComments (boolean flag)
+       { hidingComments = flag; }
+
+
+    /**
+     * Returns true if the consumer is hiding ignorable whitespace
+     * (the default), and false if such whitespace should be placed
+     * into the output document as children of element nodes.
+     *
+     * @see #setHidingWhitespace
+     */
+    public final boolean isHidingWhitespace ()
+       { return hidingWhitespace; }
+
+    /**
+     * Controls whether the consumer hides ignorable whitespace
+     *
+     * @see #isHidingComments
+     */
+    public final void setHidingWhitespace (boolean flag)
+       { hidingWhitespace = flag; }
+
+
+    /**
+     * Returns true if the consumer is saving CDATA boundaries, or
+     * false (the default) otherwise.
+     *
+     * @see #setHidingCDATA
+     */
+    final public boolean       isHidingCDATA ()
+       { return hidingCDATA; }
+
+    /**
+     * Controls whether the consumer will save CDATA boundaries.
+     *
+     * @see #isHidingCDATA
+     * @param flag True to treat CDATA text differently from other
+     * text nodes
+     */
+    final public void          setHidingCDATA (boolean flag)
+       { hidingCDATA = flag; }
+    
+
+
+    /** Returns the document handler being used. */
+    final public ContentHandler getContentHandler ()
+       { return handler; }
+
+    /** Returns the DTD handler being used. */
+    final public DTDHandler getDTDHandler ()
+       { return handler; }
+
+    /**
+     * Returns the lexical handler being used.
+     * (DOM construction can't really use declaration handlers.)
+     */
+    final public Object getProperty (String id)
+    throws SAXNotRecognizedException
+    {
+       if ("http://xml.org/sax/properties/lexical-handler".equals (id))
+           return handler;
+       if ("http://xml.org/sax/properties/declaration-handler".equals (id))
+           return handler;
+       throw new SAXNotRecognizedException (id);
+    }
+
+    EventConsumer getNext () { return next; }
+
+    ErrorHandler getErrorHandler () { return errHandler; }
+
+    /**
+     * Class used to intercept various parsing events and use them to
+     * populate a DOM document.  Subclasses would typically know and use
+     * backdoors into specific DOM implementations, used to implement 
+     * DTD-related functionality.
+     *
+     * <p> Note that if this ever throws a DOMException (runtime exception)
+     * that will indicate a bug in the DOM (e.g. doesn't support something
+     * per specification) or the parser (e.g. emitted an illegal name, or
+     * accepted illegal input data). </p>
+     */
+    public static class Handler
+       implements ContentHandler2, LexicalHandler,
+           DTDHandler, DeclHandler
+    {
+       protected DomConsumer           consumer;
+
+       private DOMImplementation       impl;
+       private Document                document;
+       private boolean         isL2;
+
+       private Locator         locator;
+       private Node            top;
+       private boolean         inCDATA;
+       private boolean         mergeCDATA;
+       private boolean         inDTD;
+       private String          currentEntity;
+
+       private boolean         recreatedAttrs;
+       private AttributesImpl  attributes = new AttributesImpl ();
+
+       /**
+        * Subclasses may use SAX2 events to provide additional
+        * behaviors in the resulting DOM.
+        */
+       protected Handler (DomConsumer consumer)
+       throws SAXException
+       {
+           this.consumer = consumer;
+           document = consumer.emptyDocument ();
+           impl = document.getImplementation ();
+           isL2 = impl.hasFeature ("XML", "2.0");
+       }
+
+       private void fatal (String message, Exception x)
+       throws SAXException
+       {
+           SAXParseException   e;
+           ErrorHandler        errHandler = consumer.getErrorHandler ();;
+
+           if (locator == null)
+               e = new SAXParseException (message, null, null, -1, -1, x);
+           else
+               e = new SAXParseException (message, locator, x);
+           if (errHandler != null)
+               errHandler.fatalError (e);
+           throw e;
+       }
+
+       /**
+        * Returns and forgets the document produced.  If the handler is
+        * reused, a new document may be created.
+        */
+       Document clearDocument ()
+       {
+           Document retval = document;
+           document = null;
+           locator = null;
+           return retval;
+       }
+
+       /**
+        * Returns the document under construction.
+        */
+       protected Document getDocument ()
+           { return document; }
+       
+       /**
+        * Returns the current node being populated.  This is usually
+        * an Element or Document, but it might be an EntityReference
+        * node if some implementation-specific code knows how to put
+        * those into the result tree and later mark them as readonly.
+        */
+       protected Node getTop ()
+           { return top; }
+
+
+       // SAX1
+       public void setDocumentLocator (Locator locator)
+       {
+           this.locator = locator;
+       }
+
+       // SAX1
+       public void startDocument ()
+       throws SAXException
+       {
+           if (document == null)
+               try {
+                   if (isL2) {
+                       // couple to original implementation
+                       document = impl.createDocument (null, "foo", null);
+                       document.removeChild (document.getFirstChild ());
+                   } else {
+                       document = consumer.emptyDocument ();
+                   }
+               } catch (Exception e) {
+                   fatal ("DOM create document", e);
+               }
+           top = document;
+       }
+
+        // ContentHandler2
+        public void xmlDecl(String version,
+                            String encoding,
+                            boolean standalone,
+                            String inputEncoding)
+          throws SAXException
+        {
+          if (document != null)
+            {
+              document.setXmlVersion(version);
+              document.setXmlStandalone(standalone);
+            }
+        }
+
+       // SAX1
+       public void endDocument ()
+       throws SAXException
+       {
+           try {
+               if (consumer.getNext () != null && document != null) {
+                   DomParser   parser = new DomParser (document);
+
+                   EventFilter.bind (parser, consumer.getNext ());
+                   parser.parse ("ignored");
+               }
+           } finally {
+               top = null;
+           }
+       }
+
+       // SAX1
+       public void processingInstruction (String target, String data)
+       throws SAXException
+       {
+           // we can't create populated entity ref nodes using
+           // only public DOM APIs (they've got to be readonly)
+           if (currentEntity != null)
+               return;
+
+           ProcessingInstruction       pi;
+
+           if (isL2
+                   // && consumer.isUsingNamespaces ()
+                   && target.indexOf (':') != -1)
+               namespaceError (
+                   "PI target name is namespace nonconformant: "
+                       + target);
+           if (inDTD)
+               return;
+           pi = document.createProcessingInstruction (target, data);
+           top.appendChild (pi);
+       }
+
+       /**
+        * Subclasses may overrride this method to provide a more efficient
+        * way to construct text nodes.
+        * Typically, copying the text into a single character array will
+        * be more efficient than doing that as well as allocating other
+        * needed for a String, including an internal StringBuffer.
+        * Those additional memory and CPU costs can be incurred later,
+        * if ever needed.
+        * Unfortunately the standard DOM factory APIs encourage those costs
+        * to be incurred early.
+        */
+       protected Text createText (
+           boolean     isCDATA,
+           char        ch [],
+           int         start,
+           int         length
+       ) {
+           String      value = new String (ch, start, length);
+
+           if (isCDATA)
+               return document.createCDATASection (value);
+           else
+               return document.createTextNode (value);
+       }
+
+       // SAX1
+       public void characters (char ch [], int start, int length)
+       throws SAXException
+       {
+           // we can't create populated entity ref nodes using
+           // only public DOM APIs (they've got to be readonly
+           // at creation time)
+           if (currentEntity != null)
+               return;
+
+           Node        lastChild = top.getLastChild ();
+
+           // merge consecutive text or CDATA nodes if appropriate.
+           if (lastChild instanceof Text) {
+               if (consumer.isHidingCDATA ()
+                       // consecutive Text content ... always merge
+                       || (!inCDATA
+                           && !(lastChild instanceof CDATASection))
+                       // consecutive CDATASection content ... don't
+                       // merge between sections, only within them
+                       || (inCDATA && mergeCDATA
+                           && lastChild instanceof CDATASection)
+                           ) {
+                   CharacterData       last = (CharacterData) lastChild;
+                   String              value = new String (ch, start, length);
+                   
+                   last.appendData (value);
+                   return;
+               }
+           }
+           if (inCDATA && !consumer.isHidingCDATA ()) {
+               top.appendChild (createText (true, ch, start, length));
+               mergeCDATA = true;
+           } else
+               top.appendChild (createText (false, ch, start, length));
+       }
+
+       // SAX2
+       public void skippedEntity (String name)
+       throws SAXException
+       {
+           // this callback is useless except to report errors, since
+           // we can't know if the ref was in content, within an
+           // attribute, within a declaration ... only one of those
+           // cases supports more intelligent action than a panic.
+           fatal ("skipped entity: " + name, null);
+       }
+
+       // SAX2
+       public void startPrefixMapping (String prefix, String uri)
+       throws SAXException
+       {
+           // reconstruct "xmlns" attributes deleted by all
+           // SAX2 parsers without "namespace-prefixes" = true
+           if ("".equals (prefix))
+               attributes.addAttribute ("", "", "xmlns",
+                       "CDATA", uri);
+           else
+               attributes.addAttribute ("", "", "xmlns:" + prefix,
+                       "CDATA", uri);
+           recreatedAttrs = true;
+       }
+
+       // SAX2
+       public void endPrefixMapping (String prefix)
+       throws SAXException
+           { }
+
+       // SAX2
+       public void startElement (
+           String uri,
+           String localName,
+           String qName,
+           Attributes atts
+       ) throws SAXException
+       {
+           // we can't create populated entity ref nodes using
+           // only public DOM APIs (they've got to be readonly)
+           if (currentEntity != null)
+               return;
+
+           // parser discarded basic information; DOM tree isn't writable
+           // without massaging to assign prefixes to all nodes.
+           // the "NSFilter" class does that massaging.
+           if (qName.length () == 0)
+               qName = localName;
+
+
+           Element     element;
+           int         length = atts.getLength ();
+
+           if (!isL2) {
+               element = document.createElement (qName);
+
+               // first the explicit attributes ...
+               length = atts.getLength ();
+               for (int i = 0; i < length; i++)
+                   element.setAttribute (atts.getQName (i),
+                                           atts.getValue (i));
+               // ... then any recreated ones (DOM deletes duplicates)
+               if (recreatedAttrs) {
+                   recreatedAttrs = false;
+                   length = attributes.getLength ();
+                   for (int i = 0; i < length; i++)
+                       element.setAttribute (attributes.getQName (i),
+                                               attributes.getValue (i));
+                   attributes.clear ();
+               }
+
+               top.appendChild (element);
+               top = element;
+               return;
+           }
+
+           // For an L2 DOM when namespace use is enabled, use
+           // createElementNS/createAttributeNS except when
+           // (a) it's an element in the default namespace, or
+           // (b) it's an attribute with no prefix
+           String      namespace;
+           
+           if (localName.length () != 0)
+               namespace = (uri.length () == 0) ? null : uri;
+           else
+               namespace = getNamespace (getPrefix (qName), atts);
+
+           if (namespace == null)
+               element = document.createElement (qName);
+           else
+               element = document.createElementNS (namespace, qName);
+
+           populateAttributes (element, atts);
+           if (recreatedAttrs) {
+               recreatedAttrs = false;
+               // ... DOM deletes any duplicates
+               populateAttributes (element, attributes);
+               attributes.clear ();
+           }
+
+           top.appendChild (element);
+           top = element;
+       }
+
+       final static String     xmlnsURI = "http://www.w3.org/2000/xmlns/";
+
+       private void populateAttributes (Element element, Attributes attrs)
+       throws SAXParseException
+       {
+           int         length = attrs.getLength ();
+
+           for (int i = 0; i < length; i++) {
+               String  type = attrs.getType (i);
+               String  value = attrs.getValue (i);
+               String  name = attrs.getQName (i);
+               String  local = attrs.getLocalName (i);
+               String  uri = attrs.getURI (i);
+
+               // parser discarded basic information, DOM tree isn't writable
+               if (name.length () == 0)
+                   name = local;
+
+               // all attribute types other than these three may not
+               // contain scoped names... enumerated attributes get
+               // reported as NMTOKEN, except for NOTATION values
+               if (!("CDATA".equals (type)
+                       || "NMTOKEN".equals (type)
+                       || "NMTOKENS".equals (type))) {
+                   if (value.indexOf (':') != -1) {
+                       namespaceError (
+                               "namespace nonconformant attribute value: "
+                                   + "<" + element.getNodeName ()
+                                   + " " + name + "='" + value + "' ...>");
+                   }
+               }
+
+               // xmlns="" is legal (undoes default NS)
+               // xmlns:foo="" is illegal
+               String prefix = getPrefix (name);
+               String namespace;
+
+               if ("xmlns".equals (prefix)) {
+                   if ("".equals (value))
+                       namespaceError ("illegal null namespace decl, " + name);
+                   namespace = xmlnsURI;
+               } else if ("xmlns".equals (name))
+                   namespace = xmlnsURI;
+
+               else if (prefix == null)
+                   namespace = null;
+               else if (!"".equals(uri) && uri.length () != 0)
+                   namespace = uri;
+               else
+                   namespace = getNamespace (prefix, attrs);
+
+               if (namespace == null)
+                   element.setAttribute (name, value);
+               else
+                   element.setAttributeNS (namespace, name, value);
+           }
+       }
+
+       private String getPrefix (String name)
+       {
+           int         temp;
+
+           if ((temp = name.indexOf (':')) > 0)
+               return name.substring (0, temp);
+           return null;
+       }
+
+       // used with SAX1-level parser output 
+       private String getNamespace (String prefix, Attributes attrs)
+       throws SAXParseException
+       {
+           String namespace;
+           String decl;
+
+           // defaulting 
+           if (prefix == null) {
+               decl = "xmlns";
+               namespace = attrs.getValue (decl);
+               if ("".equals (namespace))
+                   return null;
+               else if (namespace != null)
+                   return namespace;
+
+           // "xmlns" is like a keyword
+           // ... according to the Namespace REC, but DOM L2 CR2+
+           // and Infoset violate that by assigning a namespace.
+           // that conflict is resolved elsewhere.
+           } else if ("xmlns".equals (prefix))
+               return null;
+
+           // "xml" prefix is fixed
+           else if ("xml".equals (prefix))
+               return "http://www.w3.org/XML/1998/namespace";
+
+           // otherwise, expect a declaration
+           else {
+               decl = "xmlns:" + prefix;
+               namespace = attrs.getValue (decl);
+           }
+           
+           // if we found a local declaration, great
+           if (namespace != null)
+               return namespace;
+
+
+           // ELSE ... search up the tree we've been building
+           for (Node n = top;
+                   n != null && n.getNodeType () != Node.DOCUMENT_NODE;
+                   n = (Node) n.getParentNode ()) {
+               if (n.getNodeType () == Node.ENTITY_REFERENCE_NODE)
+                   continue;
+               Element e = (Element) n;
+               Attr attr = e.getAttributeNode (decl);
+               if (attr != null)
+                   return attr.getNodeValue ();
+           }
+           // see above re "xmlns" as keyword
+           if ("xmlns".equals (decl))
+               return null;
+
+           namespaceError ("Undeclared namespace prefix: " + prefix);
+           return null;
+       }
+
+       // SAX2
+       public void endElement (String uri, String localName, String qName)
+       throws SAXException
+       {
+           // we can't create populated entity ref nodes using
+           // only public DOM APIs (they've got to be readonly)
+           if (currentEntity != null)
+               return;
+
+           top = top.getParentNode ();
+       }
+
+       // SAX1 (mandatory reporting if validating)
+       public void ignorableWhitespace (char ch [], int start, int length)
+       throws SAXException
+       {
+           if (consumer.isHidingWhitespace ())
+               return;
+           characters (ch, start, length);
+       }
+
+       // SAX2 lexical event
+       public void startCDATA ()
+       throws SAXException
+       {
+           inCDATA = true;
+           // true except for the first fragment of a cdata section
+           mergeCDATA = false;
+       }
+       
+       // SAX2 lexical event
+       public void endCDATA ()
+       throws SAXException
+       {
+           inCDATA = false;
+       }
+       
+       // SAX2 lexical event
+       //
+       // this SAX2 callback merges two unrelated things:
+       //      - Declaration of the root element type ... belongs with
+       //    the other DTD declaration methods, NOT HERE.
+       //      - IDs for the optional external subset ... belongs here
+       //    with other lexical information.
+       //
+       // ...and it doesn't include the internal DTD subset, desired
+       // both to support DOM L2 and to enable "pass through" processing
+       //
+       public void startDTD (String name, String publicId, String SystemId)
+       throws SAXException
+       {
+           // need to filter out comments and PIs within the DTD
+           inDTD = true;
+       }
+       
+       // SAX2 lexical event
+       public void endDTD ()
+       throws SAXException
+       {
+           inDTD = false;
+       }
+       
+       // SAX2 lexical event
+       public void comment (char ch [], int start, int length)
+       throws SAXException
+       {
+           Node        comment;
+
+           // we can't create populated entity ref nodes using
+           // only public DOM APIs (they've got to be readonly)
+           if (consumer.isHidingComments ()
+                   || inDTD
+                   || currentEntity != null)
+               return;
+           comment = document.createComment (new String (ch, start, length));
+           top.appendChild (comment);
+       }
+
+       /**
+        * May be overridden by subclasses to return true, indicating
+        * that entity reference nodes can be populated and then made
+        * read-only.
+        */
+       public boolean canPopulateEntityRefs ()
+           { return false; }
+
+       // SAX2 lexical event
+       public void startEntity (String name)
+       throws SAXException
+       {
+           // are we ignoring what would be contents of an
+           // entity ref, since we can't populate it?
+           if (currentEntity != null)
+               return;
+
+           // Are we hiding all entity boundaries?
+           if (consumer.isHidingReferences ())
+               return;
+
+           // SAX2 shows parameter entities; DOM hides them
+           if (name.charAt (0) == '%' || "[dtd]".equals (name))
+               return;
+
+           // Since we can't create a populated entity ref node in any
+           // standard way, we create an unpopulated one.
+           EntityReference ref = document.createEntityReference (name);
+           top.appendChild (ref);
+           top = ref;
+
+           // ... allowing subclasses to populate them
+           if (!canPopulateEntityRefs ())
+               currentEntity = name;
+       }
+
+       // SAX2 lexical event
+       public void endEntity (String name)
+       throws SAXException
+       {
+           if (name.charAt (0) == '%' || "[dtd]".equals (name))
+               return;
+           if (name.equals (currentEntity))
+               currentEntity = null;
+           if (!consumer.isHidingReferences ())
+               top = top.getParentNode ();
+       }
+
+
+       // SAX1 DTD event
+       public void notationDecl (
+           String name,
+           String publicId, String SystemId
+       ) throws SAXException
+       {
+           /* IGNORE -- no public DOM API lets us store these
+            * into the doctype node
+            */
+       }
+
+       // SAX1 DTD event
+       public void unparsedEntityDecl (
+           String name,
+           String publicId, String SystemId,
+           String notationName
+       ) throws SAXException
+       {
+           /* IGNORE -- no public DOM API lets us store these
+            * into the doctype node
+            */
+       }
+
+       // SAX2 declaration event
+       public void elementDecl (String name, String model)
+       throws SAXException
+       {
+           /* IGNORE -- no content model support in DOM L2 */
+       }
+
+       // SAX2 declaration event
+       public void attributeDecl (
+           String eName,
+           String aName,
+           String type,
+           String mode,
+           String value
+       ) throws SAXException
+       {
+           /* IGNORE -- no attribute model support in DOM L2 */
+       }
+
+       // SAX2 declaration event
+       public void internalEntityDecl (String name, String value)
+       throws SAXException
+       {
+           /* IGNORE -- no public DOM API lets us store these
+            * into the doctype node
+            */
+       }
+
+       // SAX2 declaration event
+       public void externalEntityDecl (
+           String name,
+           String publicId,
+           String SystemId
+       ) throws SAXException
+       {
+           /* IGNORE -- no public DOM API lets us store these
+            * into the doctype node
+            */
+       }
+
+       //
+       // These really should offer the option of nonfatal handling,
+       // like other validity errors, though that would cause major
+       // chaos in the DOM data structures.  DOM is already spec'd
+       // to treat many of these as fatal, so this is consistent.
+       //
+       private void namespaceError (String description)
+       throws SAXParseException
+       {
+           SAXParseException err;
+           
+           err = new SAXParseException (description, locator);
+           throw err;
+       }
+    }
+}
diff --git a/libjava/gnu/xml/pipeline/EventConsumer.java b/libjava/gnu/xml/pipeline/EventConsumer.java
new file mode 100644 (file)
index 0000000..5f97373
--- /dev/null
+++ b/libjava/gnu/xml/pipeline/EventConsumer.java
@@ -0,0 +1,95 @@
+/* EventConsumer.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.pipeline;
+
+import org.xml.sax.*;
+
+
+/**
+ * Collects the event consumption apparatus of a SAX pipeline stage.
+ * Consumers which permit some handlers or other characteristics to be
+ * configured will provide methods to support that configuration.
+ *
+ * <p> Two important categories of consumers include <em>filters</em>, which
+ * process events and pass them on to other consumers, and <em>terminus</em>
+ * (or <em>terminal</em>) stages, which don't pass events on.  Filters are not
+ * necessarily derived from the {@link EventFilter} class, although that
+ * class can substantially simplify their construction by automating the
+ * most common activities.
+ *
+ * <p> Event consumers which follow certain conventions for the signatures
+ * of their constructors can be automatically assembled into pipelines
+ * by the {@link PipelineFactory} class.
+ *
+ * @author David Brownell
+ */
+public interface EventConsumer
+{
+    /** Most stages process these core SAX callbacks. */
+    public ContentHandler getContentHandler ();
+
+    /** Few stages will use unparsed entities. */
+    public DTDHandler getDTDHandler ();
+
+    /**
+     * This method works like the SAX2 XMLReader method of the same name,
+     * and is used to retrieve the optional lexical and declaration handlers
+     * in a pipeline.
+     *
+     * @param id This is a URI identifying the type of property desired.
+     * @return The value of that property, if it is defined.
+     *
+     * @exception SAXNotRecognizedException Thrown if the particular
+     * pipeline stage does not understand the specified identifier.
+     */
+    public Object getProperty (String id)
+    throws SAXNotRecognizedException;
+
+    /**
+     * This method provides a filter stage with a handler that abstracts
+     * presentation of warnings and both recoverable and fatal errors.
+     * Most pipeline stages should share a single policy and mechanism
+     * for such reports, since application components require consistency
+     * in such activities.  Accordingly, typical responses to this method
+     * invocation involve saving the handler for use; filters will pass
+     * it on to any other consumers they use.
+     *
+     * @param handler encapsulates error handling policy for this stage
+     */
+    public void setErrorHandler (ErrorHandler handler);
+}
diff --git a/libjava/gnu/xml/pipeline/EventFilter.java b/libjava/gnu/xml/pipeline/EventFilter.java
new file mode 100644 (file)
index 0000000..8587808
--- /dev/null
+++ b/libjava/gnu/xml/pipeline/EventFilter.java
@@ -0,0 +1,809 @@
+/* EventFilter.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.pipeline;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.xml.sax.*;
+import org.xml.sax.ext.*;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+import gnu.xml.aelfred2.ContentHandler2;
+
+/**
+ * A customizable event consumer, used to assemble various kinds of filters
+ * using SAX handlers and an optional second consumer.  It can be constructed
+ * in two ways: <ul>
+ *
+ *  <li> To serve as a passthrough, sending all events to a second consumer.
+ *  The second consumer may be identified through {@link #getNext}.
+ *
+ *  <li> To serve as a dead end, with all handlers null;
+ *  {@link #getNext} returns null.
+ *
+ * </ul>
+ *
+ * <p> Additionally, SAX handlers may be assigned, which completely replace
+ * the "upstream" view (through {@link EventConsumer}) of handlers, initially
+ * null or the "next" consumer provided to the constructor.  To make
+ * it easier to build specialized filter classes, this class implements
+ * all the standard SAX consumer handlers, and those implementations
+ * delegate "downstream" to the consumer accessed by {@link #getNext}.
+ *
+ * <p> The simplest way to create a custom a filter class is to create a
+ * subclass which overrides one or more handler interface methods.  The
+ * constructor for that subclass then registers itself as a handler for
+ * those interfaces using a call such as <em>setContentHandler(this)</em>,
+ * so the "upstream" view of event delivery is modified from the state
+ * established in the base class constructor.  That way,
+ * the overridden methods intercept those event callbacks
+ * as they go "downstream", and
+ * all other event callbacks will pass events to any next consumer.
+ * Overridden methods may invoke superclass methods (perhaps after modifying
+ * parameters) if they wish to delegate such calls.  Such subclasses
+ * should use {@link #getErrorHandler} to report errors using the
+ * common error reporting mechanism.
+ *
+ * <p> Another important technique is to construct a filter consisting
+ * of only a few specific types of handler.  For example, one could easily
+ * prune out lexical events or various declarations by providing handlers
+ * which don't pass those events downstream, or by providing null handlers.
+ *
+ * <hr />
+ *
+ * <p> This may be viewed as the consumer oriented analogue of the SAX2
+ * {@link org.xml.sax.helpers.XMLFilterImpl XMLFilterImpl} class.
+ * Key differences include: <ul>
+ *
+ *     <li> This fully separates consumer and producer roles:  it
+ *     does not implement the producer side <em>XMLReader</em> or
+ *     <em>EntityResolver</em> interfaces, so it can only be used
+ *     in "push" mode (it has no <em>parse()</em> methods).
+ *
+ *     <li> "Extension" handlers are fully supported, enabling a
+ *     richer set of application requirements.
+ *     And it implements {@link EventConsumer}, which groups related
+ *     consumer methods together, rather than leaving them separated.
+ *
+ *     <li> The chaining which is visible is "downstream" to the next
+ *     consumer, not "upstream" to the preceding producer.
+ *     It supports "fan-in", where
+ *     a consumer can be fed by several producers.  (For "fan-out",
+ *     see the {@link TeeConsumer} class.)
+ *
+ *     <li> Event chaining is set up differently.  It is intended to
+ *     work "upstream" from terminus towards producer, during filter
+ *     construction, as described above.
+ *     This is part of an early binding model:
+ *     events don't need to pass through stages which ignore them.
+ *
+ *     <li> ErrorHandler support is separated, on the grounds that
+ *     pipeline stages need to share the same error handling policy.
+ *     For the same reason, error handler setup goes "downstream":
+ *     when error handlers get set, they are passed to subsequent
+ *     consumers.
+ *
+ *     </ul>
+ *
+ * <p> The {@link #chainTo chainTo()} convenience routine supports chaining to
+ * an XMLFilterImpl, in its role as a limited functionality event
+ * consumer.  Its event producer role ({@link XMLFilter}) is ignored.
+ *
+ * <hr />
+ *
+ * <p> The {@link #bind bind()} routine may be used associate event pipelines
+ * with any kind of {@link XMLReader} that will produce the events.
+ * Such pipelines don't necessarily need to have any members which are
+ * implemented using this class.  That routine has some intelligence
+ * which supports automatic changes to parser feature flags, letting
+ * event piplines become largely independent of the particular feature
+ * sets of parsers.
+ *
+ * @author David Brownell
+ */
+public class EventFilter
+    implements EventConsumer, ContentHandler2, DTDHandler,
+           LexicalHandler, DeclHandler
+{
+    // SAX handlers
+    private ContentHandler             docHandler, docNext;
+    private DTDHandler                 dtdHandler, dtdNext;
+    private LexicalHandler             lexHandler, lexNext;
+    private DeclHandler                        declHandler, declNext;
+    // and ideally, one more for the stuff SAX2 doesn't show
+
+    private Locator                    locator;
+    private EventConsumer              next;
+    private ErrorHandler               errHandler;
+
+    
+    /** SAX2 URI prefix for standard feature flags. */
+    public static final String         FEATURE_URI
+       = "http://xml.org/sax/features/";
+    /** SAX2 URI prefix for standard properties (mostly for handlers). */
+    public static final String         PROPERTY_URI
+       = "http://xml.org/sax/properties/";
+
+    /** SAX2 property identifier for {@link DeclHandler} events */
+    public static final String         DECL_HANDLER
+       = PROPERTY_URI + "declaration-handler";
+    /** SAX2 property identifier for {@link LexicalHandler} events */
+    public static final String         LEXICAL_HANDLER
+       = PROPERTY_URI + "lexical-handler";
+    
+    //
+    // These class objects will be null if the relevant class isn't linked.
+    // Small configurations (pJava and some kinds of embedded systems) need
+    // to facilitate smaller executables.  So "instanceof" is undesirable
+    // when bind() sees if it can remove some stages.
+    //
+    // SECURITY NOTE:  assuming all these classes are part of the same sealed
+    // package, there's no problem saving these in the instance of this class
+    // that's associated with "this" class loader.  But that wouldn't be true
+    // for classes in another package.
+    //
+    private static boolean             loaded;
+    private static Class               nsClass;
+    private static Class               validClass;
+    private static Class               wfClass;
+    private static Class               xincClass;
+
+    static ClassLoader getClassLoader ()
+    {
+        Method m = null;
+
+        try {
+            m = Thread.class.getMethod("getContextClassLoader", null);
+        } catch (NoSuchMethodException e) {
+            // Assume that we are running JDK 1.1, use the current ClassLoader
+            return EventFilter.class.getClassLoader();
+        }
+
+        try {
+            return (ClassLoader) m.invoke(Thread.currentThread(), null);
+        } catch (IllegalAccessException e) {
+            // assert(false)
+            throw new UnknownError(e.getMessage());
+        } catch (InvocationTargetException e) {
+            // assert(e.getTargetException() instanceof SecurityException)
+            throw new UnknownError(e.getMessage());
+        }
+    }
+
+    static Class loadClass (ClassLoader classLoader, String className)
+    {
+       try {
+           if (classLoader == null)
+               return Class.forName(className);
+           else
+               return classLoader.loadClass(className);
+       } catch (Exception e) {
+           return null;
+       }
+    }
+
+    static private void loadClasses ()
+    {
+       ClassLoader     loader = getClassLoader ();
+
+       nsClass = loadClass (loader, "gnu.xml.pipeline.NSFilter");
+       validClass = loadClass (loader, "gnu.xml.pipeline.ValidationConsumer");
+       wfClass = loadClass (loader, "gnu.xml.pipeline.WellFormednessFilter");
+       xincClass = loadClass (loader, "gnu.xml.pipeline.XIncludeFilter");
+       loaded = true;
+    }
+
+
+    /**
+     * Binds the standard SAX2 handlers from the specified consumer
+     * pipeline to the specified producer.  These handlers include the core
+     * {@link ContentHandler} and {@link DTDHandler}, plus the extension
+     * {@link DeclHandler} and {@link LexicalHandler}.  Any additional
+     * application-specific handlers need to be bound separately.
+     * The {@link ErrorHandler} is handled differently:  the producer's
+     * error handler is passed through to the consumer pipeline.
+     * The producer is told to include namespace prefix information if it
+     * can, since many pipeline stages need that Infoset information to
+     * work well.
+     *
+     * <p> At the head of the pipeline, certain standard event filters are
+     * recognized and handled specially.  This facilitates construction
+     * of processing pipelines that work regardless of the capabilities
+     * of the XMLReader implementation in use; for example, it permits
+     * validating output of a {@link gnu.xml.util.DomParser}. <ul>
+     *
+     * <li> {@link NSFilter} will be removed if the producer can be
+     * told not to discard namespace data, using the "namespace-prefixes"
+     * feature flag.
+     *
+     * <li> {@link ValidationConsumer} will be removed if the producer
+     * can be told to validate, using the "validation" feature flag.
+     *
+     * <li> {@link WellFormednessFilter} is always removed, on the
+     * grounds that no XMLReader is permitted to producee malformed
+     * event streams and this would just be processing overhead.
+     *
+     * <li> {@link XIncludeFilter} stops the special handling, except
+     * that it's told about the "namespace-prefixes" feature of the
+     * event producer so that the event stream is internally consistent.
+     *
+     * <li> The first consumer which is not one of those classes stops
+     * such special handling.  This means that if you want to force
+     * one of those filters to be used, you could just precede it with
+     * an instance of {@link EventFilter} configured as a pass-through.
+     * You might need to do that if you are using an {@link NSFilter}
+     * subclass to fix names found in attributes or character data.
+     *
+     * </ul>
+     *
+     * <p> Other than that, this method works with any kind of event consumer,
+     * not just event filters.  Note that in all cases, the standard handlers
+     * are assigned; any previous handler assignments for the handler will
+     * be overridden.
+     *
+     * @param producer will deliver events to the specified consumer 
+     * @param consumer pipeline supplying event handlers to be associated
+     * with the producer (may not be null)
+     */
+    public static void bind (XMLReader producer, EventConsumer consumer)
+    {
+       Class   klass = null;
+       boolean prefixes;
+
+       if (!loaded)
+           loadClasses ();
+
+       // DOM building, printing, layered validation, and other
+       // things don't work well when prefix info is discarded.
+       // Include it by default, whenever possible.
+       try {
+           producer.setFeature (FEATURE_URI + "namespace-prefixes",
+               true);
+           prefixes = true;
+       } catch (SAXException e) {
+           prefixes = false;
+       }
+
+       // NOTE:  This loop doesn't use "instanceof", since that
+       // would prevent compiling/linking without those classes
+       // being present.
+       while (consumer != null) {
+           klass = consumer.getClass ();
+
+           // we might have already changed this problematic SAX2 default.
+           if (nsClass != null && nsClass.isAssignableFrom (klass)) {
+               if (!prefixes)
+                   break;
+               consumer = ((EventFilter)consumer).getNext ();
+
+           // the parser _might_ do DTD validation by default ...
+           // if not, maybe we can change this setting.
+           } else if (validClass != null
+                   && validClass.isAssignableFrom (klass)) {
+               try {
+                   producer.setFeature (FEATURE_URI + "validation",
+                       true);
+                   consumer = ((ValidationConsumer)consumer).getNext ();
+               } catch (SAXException e) {
+                   break;
+               }
+
+           // parsers are required not to have such bugs
+           } else if (wfClass != null && wfClass.isAssignableFrom (klass)) {
+               consumer = ((WellFormednessFilter)consumer).getNext ();
+
+           // stop on the first pipeline stage we can't remove
+           } else
+               break;
+           
+           if (consumer == null)
+               klass = null;
+       }
+
+       // the actual setting here doesn't matter as much
+       // as that producer and consumer agree
+       if (xincClass != null && klass != null
+               && xincClass.isAssignableFrom (klass))
+           ((XIncludeFilter)consumer).setSavingPrefixes (prefixes);
+
+       // Some SAX parsers can't handle null handlers -- bleech
+       DefaultHandler2 h = new DefaultHandler2 ();
+
+       if (consumer != null && consumer.getContentHandler () != null)
+           producer.setContentHandler (consumer.getContentHandler ());
+       else
+           producer.setContentHandler (h);
+       if (consumer != null && consumer.getDTDHandler () != null)
+           producer.setDTDHandler (consumer.getDTDHandler ());
+       else
+           producer.setDTDHandler (h);
+
+       try {
+           Object      dh;
+           
+           if (consumer != null)
+               dh = consumer.getProperty (DECL_HANDLER);
+           else
+               dh = null;
+           if (dh == null)
+               dh = h;
+           producer.setProperty (DECL_HANDLER, dh);
+       } catch (Exception e) { /* ignore */ }
+       try {
+           Object      lh;
+           
+           if (consumer != null)
+               lh = consumer.getProperty (LEXICAL_HANDLER);
+           else
+               lh = null;
+           if (lh == null)
+               lh = h;
+           producer.setProperty (LEXICAL_HANDLER, lh);
+       } catch (Exception e) { /* ignore */ }
+
+       // this binding goes the other way around
+       if (producer.getErrorHandler () == null)
+           producer.setErrorHandler (h);
+       if (consumer != null)
+           consumer.setErrorHandler (producer.getErrorHandler ());
+    }
+    
+    /**
+     * Initializes all handlers to null.
+     */
+       // constructor used by PipelineFactory
+    public EventFilter () { }
+
+
+    /**
+     * Handlers that are not otherwise set will default to those from
+     * the specified consumer, making it easy to pass events through.
+     * If the consumer is null, all handlers are initialzed to null.
+     */
+       // constructor used by PipelineFactory
+    public EventFilter (EventConsumer consumer)
+    {
+       if (consumer == null)
+           return;
+
+       next = consumer;
+
+       // We delegate through the "xxNext" handlers, and
+       // report the "xxHandler" ones on our input side.
+
+       // Normally a subclass would both override handler
+       // methods and register itself as the "xxHandler".
+
+       docHandler = docNext = consumer.getContentHandler ();
+       dtdHandler = dtdNext = consumer.getDTDHandler ();
+       try {
+           declHandler = declNext = (DeclHandler)
+                   consumer.getProperty (DECL_HANDLER);
+       } catch (SAXException e) { /* leave value null */ }
+       try {
+           lexHandler = lexNext = (LexicalHandler)
+                   consumer.getProperty (LEXICAL_HANDLER);
+       } catch (SAXException e) { /* leave value null */ }
+    }
+
+    /**
+     * Treats the XMLFilterImpl as a limited functionality event consumer,
+     * by arranging to deliver events to it; this lets such classes be
+     * "wrapped" as pipeline stages.
+     *
+     * <p> <em>Upstream Event Setup:</em>
+     * If no handlers have been assigned to this EventFilter, then the
+     * handlers from specified XMLFilterImpl are returned from this
+     * {@link EventConsumer}: the XMLFilterImpl is just "wrapped".
+     * Otherwise the specified handlers will be returned.
+     *
+     * <p> <em>Downstream Event Setup:</em>
+     * Subclasses may chain event delivery to the specified XMLFilterImpl
+     * by invoking the appropiate superclass methods,
+     * as if their constructor passed a "next" EventConsumer to the
+     * constructor for this class.
+     * If this EventFilter has an ErrorHandler, it is assigned as
+     * the error handler for the XMLFilterImpl, just as would be
+     * done for a next stage implementing {@link EventConsumer}.
+     *
+     * @param next the next downstream component of the pipeline.
+     * @exception IllegalStateException if the "next" consumer has
+     * already been set through the constructor.
+     */
+    public void chainTo (XMLFilterImpl next)
+    {
+       if (this.next != null)
+           throw new IllegalStateException ();
+
+       docNext = next.getContentHandler ();
+       if (docHandler == null)
+           docHandler = docNext;
+       dtdNext = next.getDTDHandler ();
+       if (dtdHandler == null)
+           dtdHandler = dtdNext;
+
+       try {
+           declNext = (DeclHandler) next.getProperty (DECL_HANDLER);
+           if (declHandler == null)
+               declHandler = declNext;
+       } catch (SAXException e) { /* leave value null */ }
+       try {
+           lexNext = (LexicalHandler) next.getProperty (LEXICAL_HANDLER);
+           if (lexHandler == null)
+               lexHandler = lexNext;
+       } catch (SAXException e) { /* leave value null */ }
+
+       if (errHandler != null)
+           next.setErrorHandler (errHandler);
+    }
+
+    /**
+     * Records the error handler that should be used by this stage, and
+     * passes it "downstream" to any subsequent stage.
+     */
+    final public void setErrorHandler (ErrorHandler handler)
+    {
+       errHandler = handler;
+       if (next != null)
+           next.setErrorHandler (handler);
+    }
+
+    /**
+     * Returns the error handler assigned this filter stage, or null
+     * if no such assigment has been made.
+     */
+    final public ErrorHandler getErrorHandler ()
+    {
+       return errHandler;
+    }
+
+
+    /**
+     * Returns the next event consumer in sequence; or null if there
+     * is no such handler.
+     */
+    final public EventConsumer getNext ()
+       { return next; }
+
+
+    /**
+     * Assigns the content handler to use; a null handler indicates
+     * that these events will not be forwarded.
+     * This overrides the previous settting for this handler, which was
+     * probably pointed to the next consumer by the base class constructor.
+     */
+    final public void setContentHandler (ContentHandler h)
+    {
+       docHandler = h;
+    }
+
+    /** Returns the content handler being used. */
+    final public ContentHandler getContentHandler ()
+    {
+       return docHandler;
+    }
+
+    /**
+     * Assigns the DTD handler to use; a null handler indicates
+     * that these events will not be forwarded.
+     * This overrides the previous settting for this handler, which was
+     * probably pointed to the next consumer by the base class constructor.
+     */
+    final public void setDTDHandler (DTDHandler h)
+       { dtdHandler = h; }
+
+    /** Returns the dtd handler being used. */
+    final public DTDHandler getDTDHandler ()
+    {
+       return dtdHandler;
+    }
+
+    /**
+     * Stores the property, normally a handler; a null handler indicates
+     * that these events will not be forwarded.
+     * This overrides the previous handler settting, which was probably
+     * pointed to the next consumer by the base class constructor.
+     */
+    final public void setProperty (String id, Object o)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+    {
+       try {
+           Object      value = getProperty (id);
+
+           if (value == o)
+               return;
+           if (DECL_HANDLER.equals (id)) {
+               declHandler = (DeclHandler) o;
+               return;
+           }
+           if (LEXICAL_HANDLER.equals (id)) {
+               lexHandler = (LexicalHandler) o;
+               return;
+           }
+           throw new SAXNotSupportedException (id);
+
+       } catch (ClassCastException e) {
+           throw new SAXNotSupportedException (id);
+       }
+    }
+
+    /** Retrieves a property of unknown intent (usually a handler) */
+    final public Object getProperty (String id)
+    throws SAXNotRecognizedException
+    {
+       if (DECL_HANDLER.equals (id)) 
+           return declHandler;
+       if (LEXICAL_HANDLER.equals (id))
+           return lexHandler;
+
+       throw new SAXNotRecognizedException (id);
+    }
+
+    /**
+     * Returns any locator provided to the next consumer, if this class
+     * (or a subclass) is handling {@link ContentHandler } events.
+     */
+    public Locator getDocumentLocator ()
+       { return locator; }
+
+
+    // CONTENT HANDLER DELEGATIONS
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void setDocumentLocator (Locator locator)
+    {
+       this.locator = locator;
+       if (docNext != null)
+           docNext.setDocumentLocator (locator);
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void startDocument () throws SAXException
+    {
+       if (docNext != null)
+           docNext.startDocument ();
+    }
+
+    public void xmlDecl(String version, String encoding, boolean standalone,
+                        String inputEncoding)
+      throws SAXException
+    {
+      if (docNext != null && docNext instanceof ContentHandler2)
+        {
+          ((ContentHandler2) docNext).xmlDecl(version, encoding, standalone,
+                                              inputEncoding);
+        }
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void skippedEntity (String name) throws SAXException
+    {
+       if (docNext != null)
+           docNext.skippedEntity (name);
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void processingInstruction (String target, String data)
+    throws SAXException
+    {
+       if (docNext != null)
+           docNext.processingInstruction (target, data);
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void characters (char ch [], int start, int length)
+    throws SAXException
+    {
+       if (docNext != null)
+           docNext.characters (ch, start, length);
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void ignorableWhitespace (char ch [], int start, int length)
+    throws SAXException
+    {
+       if (docNext != null)
+           docNext.ignorableWhitespace (ch, start, length);
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void startPrefixMapping (String prefix, String uri)
+    throws SAXException
+    {
+       if (docNext != null)
+           docNext.startPrefixMapping (prefix, uri);
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void startElement (
+       String uri, String localName,
+       String qName, Attributes atts
+    ) throws SAXException
+    {
+       if (docNext != null)
+           docNext.startElement (uri, localName, qName, atts);
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void endElement (String uri, String localName, String qName)
+    throws SAXException
+    {
+       if (docNext != null)
+           docNext.endElement (uri, localName, qName);
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void endPrefixMapping (String prefix) throws SAXException
+    {
+       if (docNext != null)
+           docNext.endPrefixMapping (prefix);
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void endDocument () throws SAXException
+    {
+       if (docNext != null)
+           docNext.endDocument ();
+       locator = null;
+    }
+
+
+    // DTD HANDLER DELEGATIONS
+    
+    /** <b>SAX1:</b> passes this callback to the next consumer, if any */
+    public void unparsedEntityDecl (
+       String name,
+       String publicId,
+       String systemId,
+       String notationName
+    ) throws SAXException
+    {
+       if (dtdNext != null)
+           dtdNext.unparsedEntityDecl (name, publicId, systemId, notationName);
+    }
+    
+    /** <b>SAX1:</b> passes this callback to the next consumer, if any */
+    public void notationDecl (String name, String publicId, String systemId)
+    throws SAXException
+    {
+       if (dtdNext != null)
+           dtdNext.notationDecl (name, publicId, systemId);
+    }
+    
+
+    // LEXICAL HANDLER DELEGATIONS
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void startDTD (String name, String publicId, String systemId)
+    throws SAXException
+    {
+       if (lexNext != null)
+           lexNext.startDTD (name, publicId, systemId);
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void endDTD ()
+    throws SAXException
+    {
+       if (lexNext != null)
+           lexNext.endDTD ();
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void comment (char ch [], int start, int length)
+    throws SAXException
+    {
+       if (lexNext != null)
+           lexNext.comment (ch, start, length);
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void startCDATA ()
+    throws SAXException
+    {
+       if (lexNext != null)
+           lexNext.startCDATA ();
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void endCDATA ()
+    throws SAXException
+    {
+       if (lexNext != null)
+           lexNext.endCDATA ();
+    }
+
+    /**
+     * <b>SAX2:</b> passes this callback to the next consumer, if any.
+     */
+    public void startEntity (String name)
+    throws SAXException
+    {
+       if (lexNext != null)
+           lexNext.startEntity (name);
+    }
+
+    /**
+     * <b>SAX2:</b> passes this callback to the next consumer, if any.
+     */
+    public void endEntity (String name)
+    throws SAXException
+    {
+       if (lexNext != null)
+           lexNext.endEntity (name);
+    }
+    
+
+    // DECLARATION HANDLER DELEGATIONS
+
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void elementDecl (String name, String model)
+    throws SAXException
+    {
+       if (declNext != null)
+           declNext.elementDecl (name, model);
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void attributeDecl (String eName, String aName,
+           String type, String mode, String value)
+    throws SAXException
+    {
+       if (declNext != null)
+           declNext.attributeDecl (eName, aName, type, mode, value);
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void externalEntityDecl (String name,
+       String publicId, String systemId)
+    throws SAXException
+    {
+       if (declNext != null)
+           declNext.externalEntityDecl (name, publicId, systemId);
+    }
+
+    /** <b>SAX2:</b> passes this callback to the next consumer, if any */
+    public void internalEntityDecl (String name, String value)
+    throws SAXException
+    {
+       if (declNext != null)
+           declNext.internalEntityDecl (name, value);
+    }
+}
diff --git a/libjava/gnu/xml/pipeline/LinkFilter.java b/libjava/gnu/xml/pipeline/LinkFilter.java
new file mode 100644 (file)
index 0000000..28a4501
--- /dev/null
+++ b/libjava/gnu/xml/pipeline/LinkFilter.java
@@ -0,0 +1,243 @@
+/* LinkFilter.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.pipeline;
+
+import java.io.IOException;
+import java.net.URL; 
+import java.util.Enumeration;
+import java.util.Vector;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+
+
+/**
+ * Pipeline filter to remember XHTML links found in a document,
+ * so they can later be crawled.  Fragments are not counted, and duplicates
+ * are ignored.  Callers are responsible for filtering out URLs they aren't
+ * interested in.  Events are passed through unmodified.
+ *
+ * <p> Input MUST include a setDocumentLocator() call, as it's used to
+ * resolve relative links in the absence of a "base" element.  Input MUST
+ * also include namespace identifiers, since it is the XHTML namespace
+ * identifier which is used to identify the relevant elements.
+ *
+ * <p><em>FIXME:</em> handle xml:base attribute ... in association with
+ * a stack of base URIs.  Similarly, recognize/support XLink data.
+ *
+ * @author David Brownell
+ */
+public class LinkFilter extends EventFilter
+{
+    // for storing URIs
+    private Vector             vector = new Vector ();
+
+       // struct for "full" link record (tbd)
+       // these for troubleshooting original source:
+       //      original uri
+       //      uri as resolved (base, relative, etc)
+       //      URI of originating doc
+       //      line #
+       //      original element + attrs (img src, desc, etc)
+
+       // XLink model of the link ... for inter-site pairups ?
+
+    private String             baseURI;
+
+    private boolean            siteRestricted = false;
+
+    //
+    // XXX leverage blacklist info (like robots.txt)
+    //
+    // XXX constructor w/param ... pipeline for sending link data
+    // probably XHTML --> XLink, providing info as sketched above
+    //
+
+
+    /**
+     * Constructs a new event filter, which collects links in private data
+     * structure for later enumeration.
+     */
+       // constructor used by PipelineFactory
+    public LinkFilter ()
+    {
+       super.setContentHandler (this);
+    }
+
+
+    /**
+     * Constructs a new event filter, which collects links in private data
+     * structure for later enumeration and passes all events, unmodified,
+     * to the next consumer.
+     */
+       // constructor used by PipelineFactory
+    public LinkFilter (EventConsumer next)
+    {
+       super (next);
+       super.setContentHandler (this);
+    }
+
+
+    /**
+     * Returns an enumeration of the links found since the filter
+     * was constructed, or since removeAllLinks() was called.
+     *
+     * @return enumeration of strings.
+     */
+    public Enumeration getLinks ()
+    {
+       return vector.elements ();
+    }
+
+    /**
+     * Removes records about all links reported to the event
+     * stream, as if the filter were newly created.
+     */
+    public void removeAllLinks ()
+    {
+       vector = new Vector ();
+    }
+
+
+    /**
+     * Collects URIs for (X)HTML content from elements which hold them.
+     */
+    public void startElement (
+       String          uri,
+       String          localName,
+       String          qName,
+       Attributes      atts
+    ) throws SAXException
+    {
+       String  link;
+
+       // Recognize XHTML links.
+       if ("http://www.w3.org/1999/xhtml".equals (uri)) {
+
+           if ("a".equals (localName) || "base".equals (localName)
+                   || "area".equals (localName))
+               link = atts.getValue ("href");
+           else if ("iframe".equals (localName) || "frame".equals (localName))
+               link = atts.getValue ("src");
+           else if ("blockquote".equals (localName) || "q".equals (localName)
+                   || "ins".equals (localName) || "del".equals (localName))
+               link = atts.getValue ("cite");
+           else
+               link = null;
+           link = maybeAddLink (link);
+
+           // "base" modifies designated baseURI
+           if ("base".equals (localName) && link != null)
+               baseURI = link;
+
+           if ("iframe".equals (localName) || "img".equals (localName))
+               maybeAddLink (atts.getValue ("longdesc"));
+       }
+       
+       super.startElement (uri, localName, qName, atts);
+    }
+
+    private String maybeAddLink (String link)
+    {
+       int             index;
+
+       // ignore empty links and fragments inside docs
+       if (link == null)
+           return null;
+       if ((index = link.indexOf ("#")) >= 0)
+           link = link.substring (0, index);
+       if (link.equals (""))
+           return null;
+
+       try {
+           // get the real URI
+           URL         base = new URL ((baseURI != null)
+                                   ? baseURI
+                                   : getDocumentLocator ().getSystemId ());
+           URL         url = new URL (base, link);
+
+           link = url.toString ();
+
+           // ignore duplicates
+           if (vector.contains (link))
+               return link;
+
+           // other than what "base" does, stick to original site:
+           if (siteRestricted) {
+               // don't switch protocols
+               if (!base.getProtocol ().equals (url.getProtocol ()))
+                   return link;
+               // don't switch servers
+               if (base.getHost () != null
+                       && !base.getHost ().equals (url.getHost ()))
+                   return link;
+           }
+
+           vector.addElement (link);
+
+           return link;
+           
+       } catch (IOException e) {
+           // bad URLs we don't want
+       }
+       return null;
+    }
+
+    /**
+     * Reports an error if no Locator has been made available.
+     */
+    public void startDocument ()
+    throws SAXException
+    {
+       if (getDocumentLocator () == null)
+           throw new SAXException ("no Locator!");
+    }
+
+    /**
+     * Forgets about any base URI information that may be recorded.
+     * Applications will often want to call removeAllLinks(), likely
+     * after examining the links which were reported.
+     */
+    public void endDocument ()
+    throws SAXException
+    {
+       baseURI = null;
+       super.endDocument ();
+    }
+}
diff --git a/libjava/gnu/xml/pipeline/NSFilter.java b/libjava/gnu/xml/pipeline/NSFilter.java
new file mode 100644 (file)
index 0000000..9e8a643
--- /dev/null
+++ b/libjava/gnu/xml/pipeline/NSFilter.java
@@ -0,0 +1,340 @@
+/* NSFilter.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.pipeline;
+
+import java.util.EmptyStackException;
+import java.util.Enumeration;
+import java.util.Stack;
+
+import org.xml.sax.*;
+import org.xml.sax.ext.*;
+import org.xml.sax.helpers.AttributesImpl;
+import org.xml.sax.helpers.NamespaceSupport;
+
+
+/**
+ * This filter ensures that element and attribute names are properly prefixed,
+ * and that such prefixes are declared.  Such data is critical for operations
+ * like writing XML text, and validating against DTDs:  names or their prefixes
+ * may have been discarded, although they are essential to the exchange of
+ * information using XML.  There are various common ways that such data
+ * gets discarded: <ul>
+ *
+ *     <li> By default, SAX2 parsers must discard the "xmlns*"
+ *     attributes, and may also choose not to report properly prefixed
+ *     names for elements or attributes.  (Some parsers may support
+ *     changing the <em>namespace-prefixes</em> value from the default
+ *     to <em>true</em>, effectively eliminating the need to use this
+ *     filter on their output.)
+ *
+ *     <li> When event streams are generated from a DOM tree, they may
+ *     have never have had prefixes or declarations for namespaces; or
+ *     the existing prefixes or declarations may have been invalidated
+ *     by structural modifications to that DOM tree.
+ *
+ *     <li> Other software writing SAX event streams won't necessarily
+ *     be worrying about prefix management, and so they will need to
+ *     have a transparent solution for managing them.
+ *
+ *     </ul>
+ *
+ * <p> This filter uses a heuristic to choose the prefix to assign to any
+ * particular name which wasn't already corectly prefixed.  The associated
+ * namespace will be correct, and the prefix will be declared.  Original
+ * structures facilitating text editing, such as conventions about use of
+ * mnemonic prefix names or the scoping of prefixes, can't always be
+ * reconstructed after they are discarded, as strongly encouraged by the
+ * current SAX2 defaults.
+ *
+ * <p> Note that this can't possibly know whether values inside attribute
+ * value or document content involve prefixed names.  If your application
+ * requires using prefixed names in such locations you'll need to add some
+ * appropriate logic (perhaps adding additional heuristics in a subclass).
+ *
+ * @author David Brownell
+ */
+public class NSFilter extends EventFilter
+{
+    private NamespaceSupport   nsStack = new NamespaceSupport ();
+    private Stack              elementStack = new Stack ();
+
+    private boolean            pushedContext;
+    private String             nsTemp [] = new String [3];
+    private AttributesImpl     attributes = new AttributesImpl ();
+    private boolean            usedDefault;
+
+    // gensymmed prefixes use this root name
+    private static final String        prefixRoot = "prefix-";
+
+    
+    /**
+     * Passes events through to the specified consumer, after first
+     * processing them.
+     *
+     * @param next the next event consumer to receive events.
+     */
+       // constructor used by PipelineFactory
+    public NSFilter (EventConsumer next)
+    {
+       super (next);
+
+       setContentHandler (this);
+    }
+
+    private void fatalError (String message)
+    throws SAXException
+    {
+       SAXParseException       e;
+       ErrorHandler            handler = getErrorHandler ();
+       Locator                 locator = getDocumentLocator ();
+
+       if (locator == null)
+           e = new SAXParseException (message, null, null, -1, -1);
+       else
+           e = new SAXParseException (message, locator);
+       if (handler != null)
+           handler.fatalError (e);
+       throw e;
+    }
+
+
+    public void startDocument () throws SAXException
+    {
+       elementStack.removeAllElements ();
+       nsStack.reset ();
+       pushedContext = false;
+       super.startDocument ();
+    }
+
+    /**
+     * This call is not passed to the next consumer in the chain.
+     * Prefix declarations and scopes are only exposed in the form
+     * of attributes; this callback just records a declaration that
+     * will be exposed as an attribute.
+     */
+    public void startPrefixMapping (String prefix, String uri)
+    throws SAXException
+    {
+       if (pushedContext == false) {
+           nsStack.pushContext ();
+           pushedContext = true;
+       }
+
+       // this check is awkward, but the paranoia prevents big trouble
+       for (Enumeration e = nsStack.getDeclaredPrefixes ();
+               e.hasMoreElements ();
+               /* NOP */ ) {
+           String      declared = (String) e.nextElement ();
+
+           if (!declared.equals (prefix))
+               continue;
+           if (uri.equals (nsStack.getURI (prefix)))
+               return;
+           fatalError ("inconsistent binding for prefix '" + prefix
+               + "' ... " + uri + " (was " + nsStack.getURI (prefix) + ")");
+       }
+
+       if (!nsStack.declarePrefix (prefix, uri))
+           fatalError ("illegal prefix declared: " + prefix);
+    }
+
+    private String fixName (String ns, String l, String name, boolean isAttr)
+    throws SAXException
+    {
+       if ("".equals (name) || name == null) {
+           name = l;
+           if ("".equals (name) || name == null)
+               fatalError ("empty/null name");
+       }
+
+       // can we correctly process the name as-is?
+       // handles "element scope" attribute names here.
+       if (nsStack.processName (name, nsTemp, isAttr) != null
+               && nsTemp [0].equals (ns)
+               ) {
+           return nsTemp [2];
+       }
+
+       // nope, gotta modify the name or declare a default mapping
+       int     temp;
+
+       // get rid of any current prefix
+       if ((temp = name.indexOf (':')) >= 0) {
+           name = name.substring (temp + 1);
+
+           // ... maybe that's enough (use/prefer default namespace) ...
+           if (!isAttr && nsStack.processName (name, nsTemp, false) != null
+                   && nsTemp [0].equals (ns)
+                   ) {
+               return nsTemp [2];
+           }
+       }
+
+       // must we define and use the default/undefined prefix?
+       if ("".equals (ns)) {
+           if (isAttr)
+               fatalError ("processName bug");
+           if (attributes.getIndex ("xmlns") != -1)
+               fatalError ("need to undefine default NS, but it's bound: "
+                       + attributes.getValue ("xmlns"));
+           
+           nsStack.declarePrefix ("", "");
+           attributes.addAttribute ("", "", "xmlns", "CDATA", "");
+           return name;
+       }
+
+       // is there at least one non-null prefix we can use?
+       for (Enumeration e = nsStack.getDeclaredPrefixes ();
+               e.hasMoreElements ();
+               /* NOP */) {
+           String prefix = (String) e.nextElement ();
+           String uri = nsStack.getURI (prefix);
+
+           if (uri == null || !uri.equals (ns))
+               continue;
+           return prefix + ":" + name;
+       }
+
+       // no such luck.  create a prefix name, declare it, use it.
+       for (temp = 0; temp >= 0; temp++) {
+           String      prefix = prefixRoot + temp;
+
+           if (nsStack.getURI (prefix) == null) {
+               nsStack.declarePrefix (prefix, ns);
+               attributes.addAttribute ("", "", "xmlns:" + prefix,
+                       "CDATA", ns);
+               return prefix + ":" + name;
+           }
+       }
+       fatalError ("too many prefixes genned");
+       // NOTREACHED
+       return null;
+    }
+
+    public void startElement (
+       String uri, String localName,
+       String qName, Attributes atts
+    ) throws SAXException
+    {
+       if (!pushedContext)
+           nsStack.pushContext ();
+       pushedContext = false;
+
+       // make sure we have all NS declarations handy before we start
+       int     length = atts.getLength ();
+
+       for (int i = 0; i < length; i++) {
+           String      aName = atts.getQName (i);
+
+           if (!aName.startsWith ("xmlns"))
+               continue;
+
+           String      prefix;
+
+           if ("xmlns".equals (aName))
+               prefix = "";
+           else if (aName.indexOf (':') == 5)
+               prefix = aName.substring (6);
+           else        // "xmlnsfoo" etc.
+               continue;
+           startPrefixMapping (prefix, atts.getValue (i));
+       }
+
+       // put namespace decls at the start of our regenned attlist
+       attributes.clear ();
+       for (Enumeration e = nsStack.getDeclaredPrefixes ();
+               e.hasMoreElements ();
+               /* NOP */) {
+           String prefix = (String) e.nextElement ();
+
+           attributes.addAttribute ("", "",
+                   ("".equals (prefix)
+                       ? "xmlns"
+                       : "xmlns:" + prefix),
+                   "CDATA",
+                   nsStack.getURI (prefix));
+       }
+
+       // name fixups:  element, then attributes.
+       // fixName may declare a new prefix or, for the element,
+       // redeclare the default (if element name needs it).
+       qName = fixName (uri, localName, qName, false);
+
+       for (int i = 0; i < length; i++) {
+           String      aName = atts.getQName (i);
+           String      aNS = atts.getURI (i);
+           String      aLocal = atts.getLocalName (i);
+           String      aType = atts.getType (i);
+           String      aValue = atts.getValue (i);
+
+           if (aName.startsWith ("xmlns"))
+               continue;
+           aName = fixName (aNS, aLocal, aName, true);
+           attributes.addAttribute (aNS, aLocal, aName, aType, aValue);
+       }
+
+       elementStack.push (qName);
+
+       // pass event along, with cleaned-up names and decls.
+       super.startElement (uri, localName, qName, attributes);
+    }
+
+    public void endElement (String uri, String localName, String qName)
+    throws SAXException
+    {
+       nsStack.popContext ();
+       qName = (String) elementStack.pop ();
+       super.endElement (uri, localName, qName);
+    }
+
+    /**
+     * This call is not passed to the next consumer in the chain.
+     * Prefix declarations and scopes are only exposed in their
+     * attribute form.
+     */
+    public void endPrefixMapping (String prefix)
+    throws SAXException
+       { }
+
+    public void endDocument () throws SAXException
+    {
+       elementStack.removeAllElements ();
+       nsStack.reset ();
+       super.endDocument ();
+    }
+}
diff --git a/libjava/gnu/xml/pipeline/PipelineFactory.java b/libjava/gnu/xml/pipeline/PipelineFactory.java
new file mode 100644 (file)
index 0000000..5edca73
--- /dev/null
+++ b/libjava/gnu/xml/pipeline/PipelineFactory.java
@@ -0,0 +1,723 @@
+/* PipelineFactory.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.pipeline;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.lang.reflect.Constructor;
+import java.util.StringTokenizer;
+
+import org.xml.sax.*;
+import org.xml.sax.ext.*;
+
+
+/**
+ * This provides static factory methods for creating simple event pipelines.
+ * These pipelines are specified by strings, suitable for passing on
+ * command lines or embedding in element attributes.  For example, one way
+ * to write a pipeline that restores namespace syntax, validates (stopping
+ * the pipeline on validity errors) and then writes valid data to standard
+ * output is this: <pre>
+ *      nsfix | validate | write ( stdout )</pre>
+ *
+ * <p> In this syntax, the tokens are always separated by whitespace, and each
+ * stage of the pipeline may optionally have a parameter (which can be a
+ * pipeline) in parentheses.  Interior stages are called filters, and the
+ * rightmost end of a pipeline is called a terminus.
+ *
+ * <p> Stages are usually implemented by a single class, which may not be
+ * able to act as both a filter and a terminus; but any terminus can be
+ * automatically turned into a filter, through use of a {@link TeeConsumer}.
+ * The stage identifiers are either class names, or are one of the following
+ * short identifiers built into this class.  (Most of these identifiers are
+ * no more than aliases for classes.)  The built-in identifiers include:</p>
+ 
+ <table border="1" cellpadding="3" cellspacing="0">
+    <tr bgcolor="#ccccff" class="TableHeadingColor">
+       <th align="center" width="5%">Stage</th>
+       <th align="center" width="9%">Parameter</th>
+       <th align="center" width="1%">Terminus</th>
+       <th align="center">Description</th>
+    </tr>
+
+    <tr valign="top" align="center">
+       <td><a href="../dom/Consumer.html">dom</a></td>
+       <td><em>none</em></td>
+       <td> yes </td>
+       <td align="left"> Applications code can access a DOM Document built
+       from the input event stream.  When used as a filter, this buffers
+       data up to an <em>endDocument</em> call, and then uses a DOM parser
+       to report everything that has been recorded (which can easily be
+       less than what was reported to it).  </td>
+    </tr>
+    <tr valign="top" align="center">
+       <td><a href="NSFilter.html">nsfix</a></td>
+       <td><em>none</em></td>
+       <td>no</td>
+       <td align="left">This stage ensures that the XML element and attribute
+       names in its output use namespace prefixes and declarations correctly.
+       That is, so that they match the "Namespace plus LocalName" naming data
+       with which each XML element and attribute is already associated.  </td>
+    </tr>
+    <tr valign="top" align="center">
+       <td><a href="EventFilter.html">null</a></td>
+       <td><em>none</em></td>
+       <td>yes</td>
+       <td align="left">This stage ignores all input event data.</td>
+    </tr>
+    <tr valign="top" align="center">
+       <td><a href="CallFilter.html">server</a></td>
+       <td><em>required</em><br> server URL </td>
+       <td>no</td>
+       <td align="left">Sends its input as XML request to a remote server,
+       normally a web application server using the HTTP or HTTPS protocols.
+       The output of this stage is the parsed response from that server.</td>
+    </tr>
+    <tr valign="top" align="center">
+       <td><a href="TeeConsumer.html">tee</a></td>
+       <td><em>required</em><br> first pipeline</td>
+       <td>no</td>
+       <td align="left">This sends its events down two paths; its parameter
+       is a pipeline descriptor for the first path, and the second path
+       is the output of this stage.</td>
+    </tr>
+
+    <tr valign="top" align="center">
+       <td><a href="ValidationConsumer.html">validate</a></td>
+       <td><em>none</em></td>
+       <td>yes</td>
+       <td align="left">This checks for validity errors, and reports them
+       through its error handler.  The input must include declaration events
+       and some lexical events.  </td>
+    </tr>
+    <tr valign="top" align="center">
+       <td><a href="WellFormednessFilter.html">wf</a></td>
+       <td><em>none</em></td>
+       <td>yes</td>
+       <td align="left"> This class provides some basic "well formedness"
+       tests on the input event stream, and reports a fatal error if any
+       of them fail.  One example: start/end calls for elements must match.
+       No SAX parser is permitted to produce malformed output, but other
+       components can easily do so.</td>
+    </tr>
+    <tr valign="top" align="center">
+       <td>write</td>
+       <td><em>required</em><br> "stdout", "stderr", or filename</td>
+       <td>yes</td>
+       <td align="left"> Writes its input to the specified output, as pretty
+       printed XML text encoded using UTF-8.  Input events must be well
+       formed and "namespace fixed", else the output won't be XML (or possibly
+       namespace) conformant.  The symbolic names represent
+       <em>System.out</em> and <em>System.err</em> respectively; names must
+       correspond to files which don't yet exist.</td>
+    </tr>
+    <tr valign="top" align="center">
+       <td>xhtml</td>
+       <td><em>required</em><br> "stdout", "stderr", or filename</td>
+       <td>yes</td>
+       <td align="left"> Like <em>write</em> (above), except that XHTML rules
+       are followed.  The XHTML 1.0 Transitional document type is declared,
+       and only ASCII characters are written (for interoperability).  Other
+       characters are written as entity or character references; the text is
+       pretty printed.</td>
+    </tr>
+    <tr valign="top" align="center">
+       <td><a href="XIncludeFilter.html">xinclude</a></td>
+       <td><em>none</em></td>
+       <td>no</td>
+       <td align="left">This stage handles XInclude processing.
+       This is like entity inclusion, except that the included content
+       is declared in-line rather than in the DTD at the beginning of
+       a document.
+       </td>
+    </tr>
+    <tr valign="top" align="center">
+       <td><a href="XsltFilter.html">xslt</a></td>
+       <td><em>required</em><br> XSLT stylesheet URI</td>
+       <td>no</td>
+       <td align="left">This stage handles XSLT transformation
+       according to a stylesheet.
+       The implementation of the transformation may not actually
+       stream data, although if such an XSLT engine is in use
+       then that can happen.
+       </td>
+    </tr>
+
+ </table>
+ 
+ * <p> Note that {@link EventFilter#bind} can automatically eliminate
+ * some filters by setting SAX2 parser features appropriately.  This means
+ * that you can routinely put filters like "nsfix", "validate", or "wf" at the
+ * front of a pipeline (for components that need inputs conditioned to match
+ * that level of correctness), and know that it won't actually be used unless
+ * it's absolutely necessary.
+ *
+ * @author David Brownell
+ */
+public class PipelineFactory
+{
+    /**
+     * Creates a simple pipeline according to the description string passed in.
+     */
+    public static EventConsumer createPipeline (String description)
+    throws IOException
+    {
+       return createPipeline (description, null);
+    }
+
+    /**
+     * Extends an existing pipeline by prepending the filter pipeline to the
+     * specified consumer.  Some pipelines need more customization than can
+     * be done through this simplified syntax.  When they are set up with
+     * direct API calls, use this method to merge more complex pipeline
+     * segments with easily configured ones.
+     */
+    public static EventConsumer createPipeline (
+       String          description,
+       EventConsumer   next
+    ) throws IOException
+    {
+       // tokens are (for now) what's separated by whitespace;
+       // very easy to parse, but IDs never have spaces.
+
+       StringTokenizer         tokenizer;
+       String                  tokens [];
+
+       tokenizer = new StringTokenizer (description);
+       tokens = new String [tokenizer.countTokens ()];
+       for (int i = 0; i < tokens.length; i++)
+           tokens [i] = tokenizer.nextToken ();
+
+       PipelineFactory         factory = new PipelineFactory ();
+       Pipeline                pipeline = factory.parsePipeline (tokens, next);
+
+       return pipeline.createPipeline ();
+    }
+
+
+    private PipelineFactory () { /* NYET */ }
+
+
+    /**
+     * Extends an existing pipeline by prepending a pre-tokenized filter
+     * pipeline to the specified consumer.  Tokens are class names (or the
+     * predefined aliases) left and right parenthesis, and the vertical bar.
+     */
+    public static EventConsumer createPipeline (
+       String          tokens [],
+       EventConsumer   next
+    ) throws IOException
+    {
+       PipelineFactory         factory = new PipelineFactory ();
+       Pipeline                pipeline = factory.parsePipeline (tokens, next);
+
+       return pipeline.createPipeline ();
+    }
+
+
+    private String             tokens [];
+    private int                        index;
+
+    private Pipeline parsePipeline (String toks [], EventConsumer next)
+    {
+       tokens = toks;
+       index = 0;
+       
+       Pipeline retval = parsePipeline (next);
+
+       if (index != toks.length)
+           throw new ArrayIndexOutOfBoundsException (
+                   "extra token: " + tokens [index]);
+       return retval;
+    }
+
+    // pipeline  ::= stage | stage '|' pipeline
+    private Pipeline parsePipeline (EventConsumer next)
+    {
+       Pipeline        retval = new Pipeline (parseStage ());
+
+       // minimal pipelines:  "stage" and "... | id"
+       if (index > (tokens.length - 2)
+               || !"|".equals (tokens [index])
+               ) {
+           retval.next = next;
+           return retval;
+       }
+       index++;
+       retval.rest = parsePipeline (next);
+       return retval;
+    }
+
+    // stage     ::= id    | id '(' pipeline ')'
+    private Stage parseStage ()
+    {
+       Stage           retval = new Stage (tokens [index++]);
+
+       // minimal stages:  "id" and "id ( id )"
+       if (index > (tokens.length - 2)
+               || !"(".equals (tokens [index]) /*)*/
+               )
+           return retval;
+       
+       index++;
+       retval.param = parsePipeline (null);
+       if (index >= tokens.length)
+           throw new ArrayIndexOutOfBoundsException (
+                   "missing right paren");
+       if (/*(*/ !")".equals (tokens [index++]))
+           throw new ArrayIndexOutOfBoundsException (
+                   "required right paren, not: " + tokens [index - 1]);
+       return retval;
+    }
+
+
+    //
+    // these classes obey the conventions for constructors, so they're
+    // only built in to this table of shortnames
+    //
+    // - filter (one or two types of arglist)
+    //    * last constructor is 'next' element
+    //    * optional (first) string parameter
+    //
+    // - terminus (one or types of arglist)
+    //    * optional (only) string parameter
+    //
+    // terminus stages are transformed into filters if needed, by
+    // creating a "tee".  filter stages aren't turned to terminus
+    // stages though; either eliminate such stages, or add some
+    // terminus explicitly.
+    //
+    private static final String builtinStages [][] = {
+       { "dom",        "gnu.xml.dom.Consumer" },
+       { "nsfix",      "gnu.xml.pipeline.NSFilter" },
+       { "null",       "gnu.xml.pipeline.EventFilter" },
+       { "server",     "gnu.xml.pipeline.CallFilter" },
+       { "tee",        "gnu.xml.pipeline.TeeConsumer" },
+       { "validate",   "gnu.xml.pipeline.ValidationConsumer" },
+       { "wf",         "gnu.xml.pipeline.WellFormednessFilter" },
+       { "xinclude",   "gnu.xml.pipeline.XIncludeFilter" },
+       { "xslt",       "gnu.xml.pipeline.XsltFilter" },
+
+// XXX want:  option for validate, to preload external part of a DTD
+
+           //  xhtml, write ... nyet generic-ready
+    };
+
+    private static class Stage
+    {
+       String          id;
+       Pipeline        param;
+
+       Stage (String name)
+           {  id = name; }
+
+       public String toString ()
+       {
+           if (param == null)
+               return id;
+           return id + " ( " + param + " )";
+       }
+
+       private void fail (String message)
+       throws IOException
+       {
+           throw new IOException ("in '" + id
+                   + "' stage of pipeline, " + message);
+       }
+
+       EventConsumer createStage (EventConsumer next)
+       throws IOException
+       {
+           String       name = id;
+
+           // most builtins are just class aliases
+           for (int i = 0; i < builtinStages.length; i++) {
+               if (id.equals (builtinStages [i][0])) {
+                   name = builtinStages [i][1];
+                   break;
+               }
+           }
+
+           // Save output as XML or XHTML text
+           if ("write".equals (name) || "xhtml".equals (name)) {
+               String          filename;
+               boolean         isXhtml = "xhtml".equals (name);
+               OutputStream    out = null;
+               TextConsumer    consumer;
+
+               if (param == null)
+                   fail ("parameter is required");
+
+               filename = param.toString ();
+               if ("stdout".equals (filename))
+                   out = System.out;
+               else if ("stderr".equals (filename))
+                   out = System.err;
+               else {
+                   File f = new File (filename);
+
+/*
+                   if (!f.isAbsolute ())
+                       fail ("require absolute file paths");
+ */
+                   if (f.exists ())
+                       fail ("file already exists: " + f.getName ());
+
+// XXX this races against the existence test
+                   out = new FileOutputStream (f);
+               }
+               
+               if (!isXhtml)
+                   consumer = new TextConsumer (out);
+               else
+                   consumer = new TextConsumer (
+                       new OutputStreamWriter (out, "8859_1"),
+                       true);
+               
+               consumer.setPrettyPrinting (true);
+               if (next == null)
+                   return consumer;
+               return new TeeConsumer (consumer, next);
+
+           } else {
+               //
+               // Here go all the builtins that are just aliases for
+               // classes, and all stage IDs that started out as such
+               // class names.  The following logic relies on several
+               // documented conventions for constructor invocation.
+               //
+               String          msg = null;
+
+               try {
+                   Class       klass = Class.forName (name);
+                   Class       argTypes [] = null;
+                   Constructor constructor = null;
+                   boolean     filter = false;
+                   Object      params [] = null;
+                   Object      obj = null;
+
+                   // do we need a filter stage?
+                   if (next != null) {
+                       // "next" consumer is always passed, with
+                       // or without the optional string param
+                       if (param == null) {
+                           argTypes = new Class [1];
+                           argTypes [0] = EventConsumer.class;
+
+                           params = new Object [1];
+                           params [0] = next;
+
+                           msg = "no-param filter";
+                       } else {
+                           argTypes = new Class [2];
+                           argTypes [0] = String.class;
+                           argTypes [1] = EventConsumer.class;
+
+                           params = new Object [2];
+                           params [0] = param.toString ();
+                           params [1] = next;
+
+                           msg = "one-param filter";
+                       }
+
+
+                       try {
+                           constructor = klass.getConstructor (argTypes);
+                       } catch (NoSuchMethodException e) {
+                           // try creating a filter from a
+                           // terminus and a tee
+                           filter = true;
+                           msg += " built from ";
+                       }
+                   }
+
+                   // build from a terminus stage, with or
+                   // without the optional string param
+                   if (constructor == null) {
+                       String  tmp;
+
+                       if (param == null) {
+                           argTypes = new Class [0];
+                           params = new Object [0];
+
+                           tmp = "no-param terminus";
+                       } else {
+                           argTypes = new Class [1];
+                           argTypes [0] = String.class;
+
+                           params = new Object [1];
+                           params [0] = param.toString ();
+
+                           tmp = "one-param terminus";
+                       }
+                       if (msg == null)
+                           msg = tmp;
+                       else
+                           msg += tmp;
+                       constructor = klass.getConstructor (argTypes);
+                           // NOT creating terminus by dead-ending
+                           // filters ... users should think about
+                           // that one, something's likely wrong
+                   }
+                   
+                   obj = constructor.newInstance (params);
+
+                   // return EventConsumers directly, perhaps after
+                   // turning them into a filter
+                   if (obj instanceof EventConsumer) {
+                       if (filter)
+                           return new TeeConsumer ((EventConsumer) obj, next);
+                       return (EventConsumer) obj;
+                   }
+                   
+                   // if it's not a handler, it's an error
+                   // we can wrap handlers in a filter
+                   EventFilter         retval = new EventFilter ();
+                   boolean             updated = false;
+
+                   if (obj instanceof ContentHandler) {
+                       retval.setContentHandler ((ContentHandler) obj);
+                       updated = true;
+                   }
+                   if (obj instanceof DTDHandler) {
+                       retval.setDTDHandler ((DTDHandler) obj);
+                       updated = true;
+                   }
+                   if (obj instanceof LexicalHandler) {
+                       retval.setProperty (
+                           EventFilter.PROPERTY_URI + "lexical-handler",
+                           obj);
+                       updated = true;
+                   }
+                   if (obj instanceof DeclHandler) {
+                       retval.setProperty (
+                           EventFilter.PROPERTY_URI + "declaration-handler",
+                           obj);
+                       updated = true;
+                   }
+
+                   if (!updated)
+                       fail ("class is neither Consumer nor Handler");
+                   
+                   if (filter)
+                       return new TeeConsumer (retval, next);
+                   return retval;
+
+               } catch (IOException e) {
+                   throw e;
+
+               } catch (NoSuchMethodException e) {
+                   fail (name + " constructor missing -- " + msg);
+
+               } catch (ClassNotFoundException e) {
+                   fail (name + " class not found");
+
+               } catch (Exception e) {
+                   // e.printStackTrace ();
+                   fail ("stage not available: " + e.getMessage ());
+               }
+           }
+           // NOTREACHED
+           return null;
+       }
+    }
+
+    private static class Pipeline
+    {
+       Stage           stage;
+
+       // rest may be null
+       Pipeline        rest;
+       EventConsumer   next;
+
+       Pipeline (Stage s)
+           { stage = s; }
+
+       public String toString ()
+       {
+           if (rest == null && next == null)
+               return stage.toString ();
+           if (rest != null)
+               return stage + " | " + rest;
+           throw new IllegalArgumentException ("next");
+       }
+
+       EventConsumer createPipeline ()
+       throws IOException
+       {
+           if (next == null) {
+               if (rest == null)
+                   next = stage.createStage (null);
+               else
+                   next = stage.createStage (rest.createPipeline ());
+           }
+           return next;
+       }
+    }
+
+/*
+    public static void main (String argv [])
+    {
+       try {
+           // three basic terminus cases
+           createPipeline ("null");
+           createPipeline ("validate");
+           createPipeline ("write ( stdout )");
+
+           // four basic filters
+           createPipeline ("nsfix | write ( stderr )");
+           createPipeline ("wf | null");
+           createPipeline ("null | null");
+           createPipeline (
+"call ( http://www.example.com/services/xml-1a ) | xhtml ( stdout )");
+
+           // tee junctions
+           createPipeline ("tee ( validate ) | write ( stdout )");
+           createPipeline ("tee ( nsfix | write ( stdout ) ) | validate");
+
+           // longer pipeline
+           createPipeline ("nsfix | tee ( validate ) | write ( stdout )");
+           createPipeline (
+               "null | wf | nsfix | tee ( validate ) | write ( stdout )");
+
+           // try some parsing error cases
+           try {
+               createPipeline ("null (");              // extra token '('
+               System.err.println ("** didn't report error");
+           } catch (Exception e) {
+               System.err.println ("== err: " + e.getMessage ()); }
+
+           try {
+               createPipeline ("nsfix |");             // extra token '|'
+               System.err.println ("** didn't report error");
+           } catch (Exception e) {
+               System.err.println ("== err: " + e.getMessage ()); }
+
+           try {
+               createPipeline ("xhtml ( foo");         // missing right paren
+               System.err.println ("** didn't report error");
+           } catch (Exception e) {
+               System.err.println ("== err: " + e.getMessage ()); }
+
+           try {
+               createPipeline ("xhtml ( foo bar");     // required right paren
+               System.err.println ("** didn't report error");
+           } catch (Exception e) {
+               System.err.println ("== err: " + e.getMessage ()); }
+
+           try {
+               createPipeline ("tee ( nsfix | validate");// missing right paren
+               System.err.println ("** didn't report error");
+           } catch (Exception e) {
+               System.err.println ("== err: " + e.getMessage ()); }
+
+           // try some construction error cases
+
+           try {
+               createPipeline ("call");                // missing param
+               System.err.println ("** didn't report error");
+           } catch (Exception e) {
+               System.err.println ("== err: " + e.getMessage ()); }
+           try {
+               createPipeline ("call ( foobar )");     // broken param
+               System.err.println ("** didn't report error");
+           } catch (Exception e) {
+               System.err.println ("== err: " + e.getMessage ()); }
+           try {
+               createPipeline ("nsfix ( foobar )");    // illegal param
+               System.err.println ("** didn't report error");
+           } catch (Exception e) {
+               System.err.println ("== err: " + e.getMessage ()); }
+           try {
+               createPipeline ("null ( foobar )");     // illegal param
+               System.err.println ("** didn't report error");
+           } catch (Exception e) {
+               System.err.println ("== err: " + e.getMessage ()); }
+           try {
+               createPipeline ("wf ( foobar )");       // illegal param
+               System.err.println ("** didn't report error");
+           } catch (Exception e) {
+               System.err.println ("== err: " + e.getMessage ()); }
+           try {
+               createPipeline ("xhtml ( foobar.html )");
+               new File ("foobar.html").delete ();
+               // now supported
+           } catch (Exception e) {
+               System.err.println ("** err: " + e.getMessage ()); }
+           try {
+               createPipeline ("xhtml");               // missing param
+               System.err.println ("** didn't report error");
+           } catch (Exception e) {
+               System.err.println ("== err: " + e.getMessage ()); }
+           try {
+               createPipeline ("write ( stdout ) | null");     // nonterminal
+               System.err.println ("** didn't report error");
+           } catch (Exception e) {
+               System.err.println ("== err: " + e.getMessage ()); }
+           try {
+               createPipeline ("validate | null");
+               // now supported
+           } catch (Exception e) {
+               System.err.println ("** err: " + e.getMessage ()); }
+           try {
+               createPipeline ("validate ( foo )");    // illegal param
+               System.err.println ("** didn't report error");
+           } catch (Exception e) {
+               System.err.println ("== err: " + e.getMessage ()); }
+           try {
+               createPipeline ("tee");                 // missing param
+               System.err.println ("** didn't report error");
+           } catch (Exception e) {
+               System.err.println ("== err: " + e.getMessage ()); }
+           try {
+                   // only builtins so far
+               createPipeline ("com.example.xml.FilterClass");
+               System.err.println ("** didn't report error");
+           } catch (Exception e) {
+               System.err.println ("== err: " + e.getMessage ()); }
+
+       } catch (Exception e) {
+           e.printStackTrace ();
+       }
+    }
+/**/
+
+}
diff --git a/libjava/gnu/xml/pipeline/TeeConsumer.java b/libjava/gnu/xml/pipeline/TeeConsumer.java
new file mode 100644 (file)
index 0000000..6d3227e
--- /dev/null
+++ b/libjava/gnu/xml/pipeline/TeeConsumer.java
@@ -0,0 +1,413 @@
+/* TeeConsumer.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.pipeline;
+
+import java.io.IOException;
+import org.xml.sax.*;
+import org.xml.sax.ext.*;
+//import gnu.xml.util;
+
+
+/**
+ * Fans its events out to two other consumers, a "tee" filter stage in an
+ * event pipeline.  Networks can be assembled with multiple output points.
+ *
+ * <p> Error handling should be simple if you remember that exceptions
+ * you throw will cancel later stages in that callback's pipeline, and
+ * generally the producer will stop if it sees such an exception.  You
+ * may want to protect your pipeline against such backflows, making a
+ * kind of reverse filter (or valve?) so that certain exceptions thrown by
+ * your pipeline will caught and handled before the producer sees them.
+ * Just use a "try/catch" block, rememebering that really important
+ * cleanup tasks should be in "finally" clauses.
+ *
+ * <p> That issue isn't unique to "tee" consumers, but tee consumers have
+ * the additional twist that exceptions thrown by the first consumer
+ * will cause the second consumer not to see the callback (except for
+ * the endDocument callback, which signals state cleanup).
+ *
+ * @author David Brownell
+ */
+final public class TeeConsumer
+       implements EventConsumer,
+               ContentHandler, DTDHandler,
+               LexicalHandler,DeclHandler
+{
+    private EventConsumer      first, rest;
+
+    // cached to minimize time overhead
+    private ContentHandler     docFirst, docRest;
+    private DeclHandler                declFirst, declRest;
+    private LexicalHandler     lexFirst, lexRest;
+
+
+    /**
+     * Constructs a consumer which sends all its events to the first
+     * consumer, and then the second one.  If the first consumer throws
+     * an exception, the second one will not see the event which
+     * caused that exception to be reported.
+     *
+     * @param car The first consumer to get the events
+     * @param cdr The second consumer to get the events
+     */
+    public TeeConsumer (EventConsumer car, EventConsumer cdr)
+    {
+       if (car == null || cdr == null)
+           throw new NullPointerException ();
+       first = car;
+       rest = cdr;
+
+       //
+       // Cache the handlers.
+       //
+       docFirst = first.getContentHandler ();
+       docRest = rest.getContentHandler ();
+       // DTD handler isn't cached (rarely needed)
+
+       try {
+           declFirst = null;
+           declFirst = (DeclHandler) first.getProperty (
+                       EventFilter.DECL_HANDLER);
+       } catch (SAXException e) {}
+       try {
+           declRest = null;
+           declRest = (DeclHandler) rest.getProperty (
+                       EventFilter.DECL_HANDLER);
+       } catch (SAXException e) {}
+
+       try {
+           lexFirst = null;
+           lexFirst = (LexicalHandler) first.getProperty (
+                       EventFilter.LEXICAL_HANDLER);
+       } catch (SAXException e) {}
+       try {
+           lexRest = null;
+           lexRest = (LexicalHandler) rest.getProperty (
+                       EventFilter.LEXICAL_HANDLER);
+       } catch (SAXException e) {}
+    }
+
+/* FIXME
+    /**
+     * Constructs a pipeline, and is otherwise a shorthand for the
+     * two-consumer constructor for this class.
+     *
+     * @param first Description of the first pipeline to get events,
+     * which will be passed to {@link PipelineFactory#createPipeline}
+     * @param rest The second pipeline to get the events
+     * /
+       // constructor used by PipelineFactory
+    public TeeConsumer (String first, EventConsumer rest)
+    throws IOException
+    {
+       this (PipelineFactory.createPipeline (first), rest);
+    }
+*/
+
+    /** Returns the first pipeline to get event calls. */
+    public EventConsumer getFirst ()
+       { return first; }
+
+    /** Returns the second pipeline to get event calls. */
+    public EventConsumer getRest ()
+       { return rest; }
+
+    /** Returns the content handler being used. */
+    final public ContentHandler getContentHandler ()
+    {
+       if (docRest == null)
+           return docFirst;
+       if (docFirst == null)
+           return docRest;
+       return this;
+    }
+
+    /** Returns the dtd handler being used. */
+    final public DTDHandler getDTDHandler ()
+    {
+       // not cached (hardly used)
+       if (rest.getDTDHandler () == null)
+           return first.getDTDHandler ();
+       if (first.getDTDHandler () == null)
+           return rest.getDTDHandler ();
+       return this;
+    }
+
+    /** Returns the declaration or lexical handler being used. */
+    final public Object getProperty (String id)
+    throws SAXNotRecognizedException
+    {
+       //
+       // in degenerate cases, we have no work to do.
+       //
+       Object  firstProp = null, restProp = null;
+
+       try { firstProp = first.getProperty (id); }
+       catch (SAXNotRecognizedException e) { /* ignore */ }
+       try { restProp = rest.getProperty (id); }
+       catch (SAXNotRecognizedException e) { /* ignore */ }
+
+       if (restProp == null)
+           return firstProp;
+       if (firstProp == null)
+           return restProp;
+
+       //
+       // we've got work to do; handle two builtin cases.
+       //
+       if (EventFilter.DECL_HANDLER.equals (id))
+           return this;
+       if (EventFilter.LEXICAL_HANDLER.equals (id))
+           return this;
+
+       //
+       // non-degenerate, handled by both consumers, but we don't know
+       // how to handle this.
+       //
+       throw new SAXNotRecognizedException ("can't tee: " + id);
+    }
+
+    /**
+     * Provides the error handler to both subsequent nodes of
+     * this filter stage.
+     */
+    public void setErrorHandler (ErrorHandler handler)
+    {
+       first.setErrorHandler (handler);
+       rest.setErrorHandler (handler);
+    }
+
+
+    //
+    // ContentHandler
+    //
+    public void setDocumentLocator (Locator locator)
+    {
+       // this call is not made by all parsers
+       docFirst.setDocumentLocator (locator);
+       docRest.setDocumentLocator (locator);
+    }
+
+    public void startDocument ()
+    throws SAXException
+    {
+       docFirst.startDocument ();
+       docRest.startDocument ();
+    }
+
+    public void endDocument ()
+    throws SAXException
+    {
+       try {
+           docFirst.endDocument ();
+       } finally {
+           docRest.endDocument ();
+       }
+    }
+
+    public void startPrefixMapping (String prefix, String uri)
+    throws SAXException
+    {
+       docFirst.startPrefixMapping (prefix, uri);
+       docRest.startPrefixMapping (prefix, uri);
+    }
+
+    public void endPrefixMapping (String prefix)
+    throws SAXException
+    {
+       docFirst.endPrefixMapping (prefix);
+       docRest.endPrefixMapping (prefix);
+    }
+
+    public void skippedEntity (String name)
+    throws SAXException
+    {
+       docFirst.skippedEntity (name);
+       docRest.skippedEntity (name);
+    }
+
+    public void startElement (String uri, String localName,
+           String qName, Attributes atts)
+    throws SAXException
+    {
+       docFirst.startElement (uri, localName, qName, atts);
+       docRest.startElement (uri, localName, qName, atts);
+    }
+
+    public void endElement (String uri, String localName, String qName)
+    throws SAXException
+    {
+       docFirst.endElement (uri, localName, qName);
+       docRest.endElement (uri, localName, qName);
+    }
+
+    public void processingInstruction (String target, String data)
+    throws SAXException
+    {
+       docFirst.processingInstruction (target, data);
+       docRest.processingInstruction (target, data);
+    }
+
+    public void characters (char ch [], int start, int length)
+    throws SAXException
+    {
+       docFirst.characters (ch, start, length);
+       docRest.characters (ch, start, length);
+    }
+
+    public void ignorableWhitespace (char ch [], int start, int length)
+    throws SAXException
+    {
+       docFirst.ignorableWhitespace (ch, start, length);
+       docRest.ignorableWhitespace (ch, start, length);
+    }
+
+
+    //
+    // DTDHandler
+    //
+    public void notationDecl (String name, String publicId, String systemId)
+    throws SAXException
+    {
+       DTDHandler      l1 = first.getDTDHandler ();
+       DTDHandler      l2 = rest.getDTDHandler ();
+
+       l1.notationDecl (name, publicId, systemId);
+       l2.notationDecl (name, publicId, systemId);
+    }
+
+    public void unparsedEntityDecl (String name,
+           String publicId, String systemId,
+           String notationName
+    ) throws SAXException
+    {
+       DTDHandler      l1 = first.getDTDHandler ();
+       DTDHandler      l2 = rest.getDTDHandler ();
+
+       l1.unparsedEntityDecl (name, publicId, systemId, notationName);
+       l2.unparsedEntityDecl (name, publicId, systemId, notationName);
+    }
+
+
+    //
+    // DeclHandler
+    //
+    public void attributeDecl (String eName, String aName,
+       String type,
+       String mode, String value)
+    throws SAXException
+    {
+       declFirst.attributeDecl (eName, aName, type, mode, value);
+       declRest.attributeDecl (eName, aName, type, mode, value);
+    }
+
+    public void elementDecl (String name, String model)
+    throws SAXException
+    {
+       declFirst.elementDecl (name, model);
+       declRest.elementDecl (name, model);
+    }
+
+    public void externalEntityDecl (String name,
+       String publicId, String systemId)
+    throws SAXException
+    {
+       declFirst.externalEntityDecl (name, publicId, systemId);
+       declRest.externalEntityDecl (name, publicId, systemId);
+    }
+
+    public void internalEntityDecl (String name, String value)
+    throws SAXException
+    {
+       declFirst.internalEntityDecl (name, value);
+       declRest.internalEntityDecl (name, value);
+    }
+
+
+    //
+    // LexicalHandler
+    //
+    public void comment (char ch [], int start, int length)
+    throws SAXException
+    {
+       lexFirst.comment (ch, start, length);
+       lexRest.comment (ch, start, length);
+    }
+    
+    public void startCDATA ()
+    throws SAXException
+    {
+       lexFirst.startCDATA ();
+       lexRest.startCDATA ();
+    }
+    
+    public void endCDATA ()
+    throws SAXException
+    {
+       lexFirst.endCDATA ();
+       lexRest.endCDATA ();
+    }
+    
+    public void startEntity (String name)
+    throws SAXException
+    {
+       lexFirst.startEntity (name);
+       lexRest.startEntity (name);
+    }
+    
+    public void endEntity (String name)
+    throws SAXException
+    {
+       lexFirst.endEntity (name);
+       lexRest.endEntity (name);
+    }
+    
+    public void startDTD (String name, String publicId, String systemId)
+    throws SAXException
+    {
+       lexFirst.startDTD (name, publicId, systemId);
+       lexRest.startDTD (name, publicId, systemId);
+    }
+    
+    public void endDTD ()
+    throws SAXException
+    {
+       lexFirst.endDTD ();
+       lexRest.endDTD ();
+    }
+}
diff --git a/libjava/gnu/xml/pipeline/TextConsumer.java b/libjava/gnu/xml/pipeline/TextConsumer.java
new file mode 100644 (file)
index 0000000..1039b3b
--- /dev/null
+++ b/libjava/gnu/xml/pipeline/TextConsumer.java
@@ -0,0 +1,117 @@
+/* TextConsumer.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.pipeline;
+
+import java.io.*;
+
+import org.xml.sax.*;
+
+import gnu.xml.util.XMLWriter;
+
+
+/**
+ * Terminates a pipeline, consuming events to print them as well formed
+ * XML (or XHTML) text.
+ *
+ * <p> Input must be well formed, and must include XML names (e.g. the
+ * prefixes and prefix declarations must be present), or the output of
+ * this class is undefined.
+ *
+ * @see NSFilter
+ * @see WellFormednessFilter
+ *
+ * @author David Brownell
+ */
+public class TextConsumer extends XMLWriter implements EventConsumer
+{
+    /**
+     * Constructs an event consumer which echoes its input as text,
+     * optionally adhering to some basic XHTML formatting options
+     * which increase interoperability with old (v3) browsers.
+     *
+     * <p> For the best interoperability, when writing as XHTML only
+     * ASCII characters are emitted; other characters are turned to
+     * entity or character references as needed, and no XML declaration
+     * is provided in the document.
+     */
+    public TextConsumer (Writer w, boolean isXhtml)
+    throws IOException
+    {
+       super (w, isXhtml ? "US-ASCII" : null);
+       setXhtml (isXhtml);
+    }
+
+    /**
+     * Constructs a consumer that writes its input as XML text.
+     * XHTML rules are not followed.
+     */
+    public TextConsumer (Writer w)
+    throws IOException
+    {
+       this (w, false);
+    }
+       
+    /**
+     * Constructs a consumer that writes its input as XML text,
+     * encoded in UTF-8.  XHTML rules are not followed.
+     */
+    public TextConsumer (OutputStream out)
+    throws IOException
+    {
+       this (new OutputStreamWriter (out, "UTF8"), false);
+    }
+
+    /** <b>EventConsumer</b> Returns the document handler being used. */
+    public ContentHandler getContentHandler ()
+       { return this; }
+
+    /** <b>EventConsumer</b> Returns the dtd handler being used. */
+    public DTDHandler getDTDHandler ()
+       { return this; }
+
+    /** <b>XMLReader</b>Retrieves a property (lexical and decl handlers) */
+    public Object getProperty (String propertyId)
+    throws SAXNotRecognizedException
+    {
+       if (EventFilter.LEXICAL_HANDLER.equals (propertyId))
+           return this;
+       if (EventFilter.DECL_HANDLER.equals (propertyId))
+           return this;
+       throw new SAXNotRecognizedException (propertyId);
+    }
+}
diff --git a/libjava/gnu/xml/pipeline/ValidationConsumer.java b/libjava/gnu/xml/pipeline/ValidationConsumer.java
new file mode 100644 (file)
index 0000000..e73c0ff
--- /dev/null
+++ b/libjava/gnu/xml/pipeline/ValidationConsumer.java
@@ -0,0 +1,1922 @@
+/* ValidationConsumer.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.pipeline;
+
+import java.io.*;
+
+import java.util.EmptyStackException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Stack;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import org.xml.sax.*;
+import org.xml.sax.ext.*;
+import org.xml.sax.helpers.XMLReaderFactory;
+
+
+/**
+ * This class checks SAX2 events to report validity errors; it works as
+ * both a filter and a terminus on an event pipeline.  It relies on the
+ * producer of SAX events to:  </p> <ol>
+ *
+ *     <li> Conform to the specification of a non-validating XML parser that
+ *     reads all external entities, reported using SAX2 events. </li>
+ *
+ *     <li> Report ignorable whitespace as such (through the ContentHandler
+ *     interface).  This is, strictly speaking, optional for nonvalidating
+ *     XML processors.  </li>
+ *
+ *     <li> Make SAX2 DeclHandler callbacks, with default
+ *     attribute values already normalized (and without "&lt;").</li>
+ *
+ *     <li> Make SAX2 LexicalHandler startDTD() and endDTD ()
+ *     callbacks. </li>
+ *
+ *     <li> Act as if the <em>(URI)/namespace-prefixes</em> property were
+ *     set to true, by providing XML 1.0 names and all <code>xmlns*</code>
+ *     attributes (rather than omitting either or both). </li>
+ *
+ *     </ol>
+ *
+ * <p> At this writing, the major SAX2 parsers (such as &AElig;lfred2,
+ * Crimson, and Xerces) meet these requirements, and this validation
+ * module is used by the optional &AElig;lfred2 validation support.
+ * </p>
+ *
+ * <p> Note that because this is a layered validator, it has to duplicate some
+ * work that the parser is doing; there are also other cost to layering.
+ * However, <em>because of layering it doesn't need a parser</em> in order
+ * to work! You can use it with anything that generates SAX events, such
+ * as an application component that wants to detect invalid content in
+ * a changed area without validating an entire document, or which wants to
+ * ensure that it doesn't write invalid data to a communications partner.</p>
+ *
+ * <p> Also, note that because this is a layered validator, the line numbers
+ * reported for some errors may seem strange.  For example, if an element does
+ * not permit character content, the validator
+ * will use the locator provided to it.
+ * That might reflect the last character of a <em>characters</em> event
+ * callback, rather than the first non-whitespace character. </p>
+ *
+ * <hr />
+ *
+ * <!--
+ * <p> Of interest is the fact that unlike most currently known XML validators,
+ * this one can report some cases of non-determinism in element content models.
+ * It is a compile-time option, enabled by default.  This will only report
+ * such XML errors if they relate to content actually appearing in a document;
+ * content models aren't aggressively scanned for non-deterministic structure.
+ * Documents which trigger such non-deterministic transitions may be handled
+ * differently by different validating parsers, without losing conformance
+ * to the XML specification. </p>
+ * -->
+ *
+ * <p> Current limitations of the validation performed are in roughly three
+ * categories.  </p>
+ *
+ * <p> The first category represents constraints which demand violations
+ * of software layering:  exposing lexical details, one of the first things
+ * that <em>application</em> programming interfaces (APIs) hide.  These
+ * invariably relate to XML entity handling, and to historical oddities
+ * of the XML validation semantics.  Curiously,
+ * recent (Autumn 1999) conformance testing showed that these constraints are
+ * among those handled worst by existing XML validating parsers.  Arguments
+ * have been made that each of these VCs should be turned into WFCs (most
+ * of them) or discarded (popular for the standalone declaration); in short,
+ * that these are bugs in the XML specification (not all via SGML): </p><ul>
+ *
+ *     <li> The <em>Proper Declaration/PE Nesting</em> and
+ *     <em>Proper Group/PE Nesting</em> VCs can't be tested because they
+ *     require access to particularly low level lexical level information.
+ *     In essence, the reason XML isn't a simple thing to parse is that
+ *     it's not a context free grammar, and these constraints elevate that
+ *     SGML-derived context sensitivity to the level of a semantic rule.
+ *
+ *     <li> The <em>Standalone Document Declaration</em> VC can't be
+ *     tested.  This is for two reasons.  First, this flag isn't made
+ *     available through SAX2.  Second, it also requires breaking that
+ *     lexical layering boundary.  (If you ever wondered why classes
+ *     in compiler construction or language design barely mention the
+ *     existence of context-sensitive grammars, it's because of messy
+ *     issues like these.)
+ *
+ *     <li> The <em>Entity Declared</em> VC can't be tested, because it
+ *     also requires breaking that lexical layering boundary!  There's also
+ *     another issue: the VC wording (and seemingly intent) is ambiguous.
+ *     (This is still true in the "Second edition" XML spec.)
+ *     Since there is a WFC of the same name, everyone's life would be
+ *     easier if references to undeclared parsed entities were always well
+ *     formedness errors, regardless of whether they're parameter entities
+ *     or not.  (Note that nonvalidating parsers are not required
+ *     to report all such well formedness errors if they don't read external
+ *     parameter entities, although currently most XML parsers read them
+ *     in an attempt to avoid problems from inconsistent parser behavior.)
+ *
+ *     </ul>
+ *
+ * <p> The second category of limitations on this validation represent
+ * constraints associated with information that is not guaranteed to be
+ * available (or in one case, <em>is guaranteed not to be available</em>,
+ * through the SAX2 API: </p><ul>
+ *
+ *     <li> The <em>Unique Element Type Declaration</em> VC may not be
+ *     reportable, if the underlying parser happens not to expose
+ *     multiple declarations.   (&AElig;lfred2 reports these validity
+ *     errors directly.)</li>
+ *
+ *     <li> Similarly, the <em>Unique Notation Name</em> VC, added in the
+ *     14-January-2000 XML spec errata to restrict typing models used by
+ *     elements, may not be reportable.  (&AElig;lfred reports these
+ *     validity errors directly.) </li>
+ *
+ *     </ul>
+ *
+ * <p> A third category relates to ease of implementation.  (Think of this
+ * as "bugs".)  The most notable issue here is character handling.  Rather
+ * than attempting to implement the voluminous character tables in the XML
+ * specification (Appendix B), Unicode rules are used directly from
+ * the java.lang.Character class.  Recent JVMs have begun to diverge from
+ * the original specification for that class (Unicode 2.0), meaning that
+ * different JVMs may handle that aspect of conformance differently.
+ * </p>
+ *
+ * <p> Note that for some of the validity errors that SAX2 does not
+ * expose, a nonvalidating parser is permitted (by the XML specification)
+ * to report validity errors.  When used with a parser that does so for
+ * the validity constraints mentioned above (or any other SAX2 event
+ * stream producer that does the same thing), overall conformance is
+ * substantially improved.
+ *
+ * @see gnu.xml.aelfred2.SAXDriver
+ * @see gnu.xml.aelfred2.XmlReader
+ *
+ * @author David Brownell
+ */
+public final class ValidationConsumer extends EventFilter
+{
+    // report error if we happen to notice a non-deterministic choice?
+    // we won't report buggy content models; just buggy instances
+    private static final boolean       warnNonDeterministic = false;
+
+    // for tracking active content models
+    private String             rootName;
+    private Stack              contentStack = new Stack ();
+
+    // flags for "saved DTD" processing
+    private boolean            disableDeclarations;
+    private boolean            disableReset;
+
+    //
+    // most VCs get tested when we see element start tags.  the per-element
+    // info (including attributes) recorded here duplicates that found inside
+    // many nonvalidating parsers, hence dual lookups etc ... that's why a
+    // layered validator isn't going to be as fast as a non-layered one.
+    //
+
+    // key = element name; value = ElementInfo
+    private Hashtable          elements = new Hashtable ();
+
+    // some VCs relate to ID/IDREF/IDREFS attributes
+    // key = id; value = boolean true (defd) or false (refd)
+    private Hashtable          ids = new Hashtable ();
+
+    // we just record declared notation and unparsed entity names.
+    // the implementation here is simple/slow; these features
+    // are seldom used, one hopes they'll wither away soon
+    private Vector             notations = new Vector (5, 5);
+    private Vector             nDeferred = new Vector (5, 5);
+    private Vector             unparsed = new Vector (5, 5);
+    private Vector             uDeferred = new Vector (5, 5);
+       
+       // note: DocBk 3.1.7 XML defines over 2 dozen notations,
+       // used when defining unparsed entities for graphics
+       // (and maybe in other places)
+
+    
+
+    /**
+     * Creates a pipeline terminus which consumes all events passed to
+     * it; this will report validity errors as if they were fatal errors,
+     * unless an error handler is assigned.
+     *
+     * @see #setErrorHandler
+     */
+       // constructor used by PipelineFactory
+           // ... and want one taking system ID of an external subset
+    public ValidationConsumer ()
+    {
+       this (null);
+    }
+
+    /**
+     * Creates a pipeline filter which reports validity errors and then
+     * passes events on to the next consumer if they were not fatal.
+     *
+     * @see #setErrorHandler
+     */
+       // constructor used by PipelineFactory
+           // ... and want one taking system ID of an external subset
+           // (which won't send declaration events)
+    public ValidationConsumer (EventConsumer next)
+    {
+       super (next);
+
+       setContentHandler (this);
+       setDTDHandler (this);
+       try { setProperty (DECL_HANDLER, this); }
+       catch (Exception e) { /* "can't happen" */ }
+       try { setProperty (LEXICAL_HANDLER, this); }
+       catch (Exception e) { /* "can't happen" */ }
+    }
+
+    
+    private static final String        fakeRootName
+       = ":Nobody:in:their_Right.Mind_would:use:this-name:1x:";
+    
+    /**
+     * Creates a validation consumer which is preloaded with the DTD provided.
+     * It does this by constructing a document with that DTD, then parsing
+     * that document and recording its DTD declarations.  Then it arranges
+     * not to modify that information.
+     *
+     * <p> The resulting validation consumer will only validate against
+     * the specified DTD, regardless of whether some other DTD is found
+     * in a document being parsed.
+     *
+     * @param rootName The name of the required root element; if this is
+     * null, any root element name will be accepted.
+     * @param publicId If non-null and there is a non-null systemId, this
+     * identifier provides an alternate access identifier for the DTD's
+     * external subset.
+     * @param systemId If non-null, this is a URI (normally URL) that
+     * may be used to access the DTD's external subset.
+     * @param internalSubset If non-null, holds literal markup declarations
+     * comprising the DTD's internal subset.
+     * @param resolver If non-null, this will be provided to the parser for
+     * use when resolving parameter entities (including any external subset).
+     * @param resolver If non-null, this will be provided to the parser for
+     * use when resolving parameter entities (including any external subset).
+     * @param minimalElement If non-null, a minimal valid document.
+     *
+     * @exception SAXNotSupportedException If the default SAX parser does
+     * not support the standard lexical or declaration handlers.
+     * @exception SAXParseException If the specified DTD has either
+     * well-formedness or validity errors
+     * @exception IOException If the specified DTD can't be read for
+     * some reason
+     */
+    public ValidationConsumer (
+       String          rootName,
+       String          publicId,
+       String          systemId,
+       String          internalSubset,
+       EntityResolver  resolver,
+       String          minimalDocument
+    ) throws SAXException, IOException
+    {
+       this (null);
+
+       disableReset = true;
+       if (rootName == null)
+           rootName = fakeRootName;
+
+       //
+       // Synthesize document with that DTD; is it possible to do
+       // better for the declaration of the root element?
+       //
+       // NOTE:  can't use SAX2 to write internal subsets.
+       //
+       StringWriter    writer = new StringWriter ();
+
+       writer.write ("<!DOCTYPE ");
+       writer.write (rootName);
+       if (systemId != null) {
+           writer.write ("\n  ");
+           if (publicId != null) {
+               writer.write ("PUBLIC '");
+               writer.write (publicId);
+               writer.write ("'\n\t'");
+           } else
+               writer.write ("SYSTEM '");
+           writer.write (systemId);
+           writer.write ("'");
+       }
+       writer.write (" [ ");
+       if (rootName == fakeRootName) {
+           writer.write ("\n<!ELEMENT ");
+           writer.write (rootName);
+           writer.write (" EMPTY>");
+       }
+       if (internalSubset != null)
+           writer.write (internalSubset);
+       writer.write ("\n ]>");
+
+       if (minimalDocument != null) {
+           writer.write ("\n");
+           writer.write (minimalDocument);
+           writer.write ("\n");
+       } else {
+           writer.write (" <");
+           writer.write (rootName);
+           writer.write ("/>\n");
+       }
+       minimalDocument = writer.toString ();
+
+       //
+       // OK, load it
+       //
+       XMLReader       producer;
+
+       producer = XMLReaderFactory.createXMLReader ();
+       bind (producer, this);
+
+       if (resolver != null)
+           producer.setEntityResolver (resolver);
+
+       InputSource     in;
+       
+       in = new InputSource (new StringReader (minimalDocument));
+       producer.parse (in);
+
+       disableDeclarations = true;
+       if (rootName == fakeRootName)
+           this.rootName = null;
+    }
+
+    private void resetState ()
+    {
+       if (!disableReset) {
+           rootName = null;
+           contentStack.removeAllElements ();
+           elements.clear ();
+           ids.clear ();
+
+           notations.removeAllElements ();
+           nDeferred.removeAllElements ();
+           unparsed.removeAllElements ();
+           uDeferred.removeAllElements ();
+       }
+    }
+
+
+    private void warning (String description)
+    throws SAXException
+    {
+       ErrorHandler            errHandler = getErrorHandler ();
+       Locator                 locator = getDocumentLocator ();
+       SAXParseException       err;
+
+       if (errHandler == null)
+           return;
+
+       if (locator == null)
+           err = new SAXParseException (description, null, null, -1, -1);
+       else
+           err = new SAXParseException (description, locator);
+       errHandler.warning (err);
+    }
+
+    // package private (for ChildrenRecognizer)
+    private void error (String description)
+    throws SAXException
+    {
+       ErrorHandler            errHandler = getErrorHandler ();
+       Locator                 locator = getDocumentLocator ();
+       SAXParseException       err;
+
+       if (locator == null)
+           err = new SAXParseException (description, null, null, -1, -1);
+       else
+           err = new SAXParseException (description, locator);
+       if (errHandler != null)
+           errHandler.error (err);
+       else    // else we always treat it as fatal!
+           throw err;
+    }
+
+    private void fatalError (String description)
+    throws SAXException
+    {
+       ErrorHandler            errHandler = getErrorHandler ();
+       Locator                 locator = getDocumentLocator ();
+       SAXParseException       err;
+
+       if (locator != null)
+           err = new SAXParseException (description, locator);
+       else
+           err = new SAXParseException (description, null, null, -1, -1);
+       if (errHandler != null)
+           errHandler.fatalError (err);
+       // we always treat this as fatal, regardless of the handler
+       throw err;
+    }
+
+
+    private static boolean isExtender (char c)
+    {
+       // [88] Extender ::= ...
+       return c == 0x00b7 || c == 0x02d0 || c == 0x02d1 || c == 0x0387
+              || c == 0x0640 || c == 0x0e46 || c == 0x0ec6 || c == 0x3005
+              || (c >= 0x3031 && c <= 0x3035)
+              || (c >= 0x309d && c <= 0x309e)
+              || (c >= 0x30fc && c <= 0x30fe);
+    }
+
+
+    // use augmented Unicode rules, not full XML rules
+    private boolean isName (String name, String context, String id)
+    throws SAXException
+    {
+       char    buf [] = name.toCharArray ();
+       boolean pass = true;
+
+       if (!Character.isUnicodeIdentifierStart (buf [0])
+               && ":_".indexOf (buf [0]) == -1)
+           pass = false;
+       else {
+           int max = buf.length;
+           for (int i = 1; pass && i < max; i++) {
+               char c = buf [i];
+               if (!Character.isUnicodeIdentifierPart (c)
+                       && ":-_.".indexOf (c) == -1
+                       && !isExtender (c))
+                   pass = false;
+           }
+       }
+
+       if (!pass)
+           error ("In " + context + " for " + id
+               + ", '" + name + "' is not a name");
+       return pass;    // true == OK
+    }
+
+    // use augmented Unicode rules, not full XML rules
+    private boolean isNmtoken (String nmtoken, String context, String id)
+    throws SAXException
+    {
+       char    buf [] = nmtoken.toCharArray ();
+       boolean pass = true;
+       int     max = buf.length;
+
+       // XXX make this share code with isName
+
+       for (int i = 0; pass && i < max; i++) {
+               char c = buf [i];
+           if (!Character.isUnicodeIdentifierPart (c)
+                   && ":-_.".indexOf (c) == -1
+                   && !isExtender (c))
+               pass = false;
+       }
+
+       if (!pass)
+           error ("In " + context + " for " + id
+               + ", '" + nmtoken + "' is not a name token");
+       return pass;    // true == OK
+    }
+
+    private void checkEnumeration (String value, String type, String name)
+    throws SAXException
+    {
+       if (!hasMatch (value, type))
+           // VC: Enumeration
+           error ("Value '" + value
+               + "' for attribute '" + name
+               + "' is not permitted: " + type);
+    }
+
+    // used to test enumerated attributes and mixed content models
+    // package private
+    static boolean hasMatch (String value, String orList)
+    {
+       int len = value.length ();
+       int max = orList.length () - len;
+
+       for (int start = 0;
+               (start = orList.indexOf (value, start)) != -1;
+               start++) {
+           char c;
+
+           if (start > max)
+               break;
+           c = orList.charAt (start - 1);
+           if (c != '|' && c != '('/*)*/)
+               continue;
+           c = orList.charAt (start + len);
+           if (c != '|' && /*(*/ c != ')')
+               continue;
+           return true;
+       }
+       return false;
+    }
+
+    /**
+     * <b>LexicalHandler</b> Records the declaration of the root
+     * element, so it can be verified later.
+     * Passed to the next consumer, unless this one was
+     * preloaded with a particular DTD.
+     */
+    public void startDTD (String name, String publicId, String systemId)
+    throws SAXException
+    {
+       if (disableDeclarations)
+           return;
+
+       rootName = name;
+       super.startDTD (name, publicId, systemId);
+    }
+
+    /**
+     * <b>LexicalHandler</b> Verifies that all referenced notations
+     * and unparsed entities have been declared.
+     * Passed to the next consumer, unless this one was
+     * preloaded with a particular DTD.
+     */
+    public void endDTD ()
+    throws SAXException
+    {
+       if (disableDeclarations)
+           return;
+
+       // this is a convenient hook for end-of-dtd checks, but we
+       // could also trigger it in the first startElement call.
+       // locator info is more appropriate here though.
+
+       // VC: Notation Declared (NDATA can refer to them before decls,
+       //      as can NOTATION attribute enumerations and defaults)
+       int length = nDeferred.size ();
+       for (int i = 0; i < length; i++) {
+           String notation = (String) nDeferred.elementAt (i);
+           if (!notations.contains (notation)) {
+               error ("A declaration referred to notation '" + notation
+                       + "' which was never declared");
+           }
+       }
+       nDeferred.removeAllElements ();
+
+       // VC: Entity Name (attribute values can refer to them
+       //      before they're declared); VC Attribute Default Legal
+       length = uDeferred.size ();
+       for (int i = 0; i < length; i++) {
+           String entity = (String) uDeferred.elementAt (i);
+           if (!unparsed.contains (entity)) {
+               error ("An attribute default referred to entity '" + entity
+                       + "' which was never declared");
+           }
+       }
+       uDeferred.removeAllElements ();
+       super.endDTD ();
+    }
+
+
+    // These are interned, so we can rely on "==" to find the type of
+    // all attributes except enumerations ...
+    // "(this|or|that|...)" and "NOTATION (this|or|that|...)"
+    static final String types [] = {
+       "CDATA",
+       "ID", "IDREF", "IDREFS",
+       "NMTOKEN", "NMTOKENS",
+       "ENTITY", "ENTITIES"
+    };
+
+
+    /**
+     * <b>DecllHandler</b> Records attribute declaration for later use
+     * in validating document content, and checks validity constraints
+     * that are applicable to attribute declarations.
+     * Passed to the next consumer, unless this one was
+     * preloaded with a particular DTD.
+     */
+    public void attributeDecl (
+       String eName,
+       String aName,
+       String type,
+       String mode,
+       String value
+    ) throws SAXException
+    {
+       if (disableDeclarations)
+           return;
+
+       ElementInfo     info = (ElementInfo) elements.get (eName);
+       AttributeInfo   ainfo = new AttributeInfo ();
+       boolean         checkOne = false;
+       boolean         interned = false;
+
+       // cheap interning of type names and #FIXED, #REQUIRED
+       // for faster startElement (we can use "==")
+       for (int i = 0; i < types.length; i++) {
+           if (types [i].equals (type)) {
+               type = types [i];
+               interned = true;
+               break;
+           }
+       }
+       if ("#FIXED".equals (mode))
+           mode = "#FIXED";
+       else if ("#REQUIRED".equals (mode))
+           mode = "#REQUIRED";
+
+       ainfo.type = type;
+       ainfo.mode = mode;
+       ainfo.value = value;
+
+       // we might not have seen the content model yet
+       if (info == null) {
+           info = new ElementInfo (eName);
+           elements.put (eName, info);
+       }
+       if ("ID" == type) {
+           checkOne = true;
+           if (!("#REQUIRED" == mode || "#IMPLIED".equals (mode))) {
+               // VC: ID Attribute Default
+               error ("ID attribute '" + aName
+                   + "' must be #IMPLIED or #REQUIRED");
+           }
+
+       } else if (!interned && type.startsWith ("NOTATION ")) {
+           checkOne = true;
+
+           // VC: Notation Attributes (notations must be declared)
+           StringTokenizer     tokens = new StringTokenizer (
+               type.substring (10, type.lastIndexOf (')')),
+               "|");
+           while (tokens.hasMoreTokens ()) {
+               String  token = tokens.nextToken ();
+               if (!notations.contains (token))
+                   nDeferred.addElement (token);
+           }
+       }
+       if (checkOne) {
+           for (Enumeration e = info.attributes.keys ();
+                   e.hasMoreElements ();
+                   /* NOP */) {
+               String          name;
+               AttributeInfo   ainfo2;
+
+               name = (String) e.nextElement ();
+               ainfo2 = (AttributeInfo) info.attributes.get (name);
+               if (type == ainfo2.type || !interned /* NOTATION */) {
+                   // VC: One ID per Element Type
+                   // VC: One Notation per Element TYpe
+                   error ("Element '" + eName
+                       + "' already has an attribute of type "
+                       + (interned ? "NOTATION" : type)
+                       + " ('" + name
+                       + "') so '" + aName 
+                       + "' is a validity error");
+               }
+           }
+       }
+
+       // VC: Attribute Default Legal
+       if (value != null) {
+
+           if ("CDATA" == type) {
+               // event source rejected '<'
+
+           } else if ("NMTOKEN" == type) {
+               // VC: Name Token (is a nmtoken)
+               isNmtoken (value, "attribute default", aName);
+
+           } else if ("NMTOKENS" == type) {
+               // VC: Name Token (is a nmtoken; at least one value)
+               StringTokenizer tokens = new StringTokenizer (value);
+               if (!tokens.hasMoreTokens ())
+                   error ("Default for attribute '" + aName
+                       + "' must have at least one name token.");
+               else do {
+                   String token = tokens.nextToken ();
+                   isNmtoken (token, "attribute default", aName);
+               } while (tokens.hasMoreTokens ());
+
+           } else if ("IDREF" == type || "ENTITY" == type) {
+               // VC: Entity Name (is a name)
+               // VC: IDREF (is a name) (is declared)
+               isName (value, "attribute default", aName);
+               if ("ENTITY" == type && !unparsed.contains (value))
+                   uDeferred.addElement (value);
+
+           } else if ("IDREFS" == type || "ENTITIES" == type) {
+               // VC: Entity Name (is a name; at least one value)
+               // VC: IDREF (is a name; at least one value)
+               StringTokenizer names = new StringTokenizer (value);
+               if (!names.hasMoreTokens ())
+                   error ("Default for attribute '" + aName
+                       + "' must have at least one name.");
+               else do {
+                   String name = names.nextToken ();
+                   isName (name, "attribute default", aName);
+                   if ("ENTITIES" == type && !unparsed.contains (name))
+                       uDeferred.addElement (value);
+               } while (names.hasMoreTokens ());
+           
+           } else if (type.charAt (0) == '(' /*)*/ ) {
+               // VC: Enumeration (must match)
+               checkEnumeration (value, type, aName);
+
+           } else if (!interned && checkOne) { /* NOTATION */
+               // VC: Notation attributes (must be names)
+               isName (value, "attribute default", aName);
+
+               // VC: Notation attributes (must be declared)
+               if (!notations.contains (value))
+                   nDeferred.addElement (value);
+               
+               // VC: Enumeration (must match)
+               checkEnumeration (value, type, aName);
+
+           } else if ("ID" != type)
+               throw new RuntimeException ("illegal attribute type: " + type);
+       }
+
+       if (info.attributes.get (aName) == null)
+           info.attributes.put (aName, ainfo);
+       /*
+       else
+           warning ("Element '" + eName
+               + "' already has an attribute named '" + aName + "'");
+       */
+
+       if ("xml:space".equals (aName)) {
+           if (!("(default|preserve)".equals (type)
+                   || "(preserve|default)".equals (type)
+                       // these next two are arguable; XHTML's DTD doesn't
+                       // deserve errors.  After all, it's not like any
+                       // illegal _value_ could pass ...
+                   || "(preserve)".equals (type)
+                   || "(default)".equals (type)
+                   ))
+               error (
+                   "xml:space attribute type must be like '(default|preserve)'"
+                   + " not '" + type + "'"
+                   );
+
+       }
+       super.attributeDecl (eName, aName, type, mode, value);
+    }
+
+    /**
+     * <b>DecllHandler</b> Records the element declaration for later use
+     * when checking document content, and checks validity constraints that
+     * apply to element declarations.  Passed to the next consumer, unless
+     * this one was preloaded with a particular DTD.
+     */
+    public void elementDecl (String name, String model)
+    throws SAXException
+    {
+       if (disableDeclarations)
+           return;
+
+       ElementInfo     info = (ElementInfo) elements.get (name);
+
+       // we might have seen an attribute decl already
+       if (info == null) {
+           info = new ElementInfo (name);
+           elements.put (name, info);
+       }
+       if (info.model != null) {
+           // NOTE:  not all parsers can report such duplicates.
+           // VC: Unique Element Type Declaration
+           error ("Element type '" + name
+               + "' was already declared.");
+       } else {
+           info.model = model;
+
+           // VC: No Duplicate Types (in mixed content models)
+           if (model.charAt (1) == '#')        // (#PCDATA...
+               info.getRecognizer (this);
+       }
+       super.elementDecl (name, model);
+    }
+
+    /**
+     * <b>DecllHandler</b> passed to the next consumer, unless this
+     * one was preloaded with a particular DTD
+     */
+    public void internalEntityDecl (String name, String value)
+    throws SAXException
+    {
+       if (!disableDeclarations)
+           super.internalEntityDecl (name, value);
+    }
+
+    /**
+     * <b>DecllHandler</b> passed to the next consumer, unless this
+     * one was preloaded with a particular DTD
+     */
+    public void externalEntityDecl (String name,
+       String publicId, String systemId)
+    throws SAXException
+    {
+       if (!disableDeclarations)
+           super.externalEntityDecl (name, publicId, systemId);
+    }
+
+
+    /**
+     * <b>DTDHandler</b> Records the notation name, for checking
+     * NOTATIONS attribute values and declararations of unparsed
+     * entities.  Passed to the next consumer, unless this one was
+     * preloaded with a particular DTD.
+     */
+    public void notationDecl (String name, String publicId, String systemId)
+    throws SAXException
+    {
+       if (disableDeclarations)
+           return;
+
+       notations.addElement (name);
+       super.notationDecl (name, publicId, systemId);
+    }
+
+    /**
+     * <b>DTDHandler</b> Records the entity name, for checking
+     * ENTITY and ENTITIES attribute values; records the notation
+     * name if it hasn't yet been declared.  Passed to the next consumer,
+     * unless this one was preloaded with a particular DTD.
+     */
+    public void unparsedEntityDecl (
+       String name,
+       String publicId,
+       String systemId,
+       String notationName
+    ) throws SAXException
+    {
+       if (disableDeclarations)
+           return;
+
+       unparsed.addElement (name);
+       if (!notations.contains (notationName))
+           nDeferred.addElement (notationName);
+       super.unparsedEntityDecl (name, publicId, systemId, notationName);
+    }
+    
+    
+    /**
+     * <b>ContentHandler</b> Ensures that state from any previous parse
+     * has been deleted.
+     * Passed to the next consumer.
+     */
+    public void startDocument ()
+    throws SAXException
+    {
+       resetState ();
+       super.startDocument ();
+    }
+
+
+    private static boolean isAsciiLetter (char c)
+    {
+       return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+    }
+
+
+    /**
+     * <b>ContentHandler</b> Reports a fatal exception.  Validating
+     * XML processors may not skip any entities.
+     */
+    public void skippedEntity (String name)
+    throws SAXException
+    {
+       fatalError ("may not skip entities");
+    }
+
+    /*
+     * SAX2 doesn't expand non-PE refs in attribute defaults...
+     */
+    private String expandDefaultRefs (String s)
+    throws SAXException
+    {
+       if (s.indexOf ('&') < 0)
+           return s;
+       
+// FIXME: handle &#nn; &#xnn; &name;
+       String message = "Can't expand refs in attribute default: " + s;
+       warning (message);
+
+       return s;
+    }
+
+    /**
+     * <b>ContentHandler</b> Performs validity checks against element
+     * (and document) content models, and attribute values.
+     * Passed to the next consumer.
+     */
+    public void startElement (
+       String          uri,
+       String          localName,
+       String          qName,
+       Attributes      atts
+    ) throws SAXException
+    {
+       //
+       // First check content model for the enclosing scope.
+       //
+       if (contentStack.isEmpty ()) {
+           // VC:  Root Element Type
+           if (!qName.equals (rootName)) {
+               if (rootName == null)
+                   warning ("This document has no DTD, can't be valid");
+               else
+                   error ("Root element type '" + qName
+                       + "' was declared to be '" + rootName + "'");
+           }
+       } else {
+           Recognizer state = (Recognizer) contentStack.peek ();
+
+           if (state != null) {
+               Recognizer newstate = state.acceptElement (qName);
+
+               if (newstate == null)
+                   error ("Element type '" + qName
+                       + "' in element '" + state.type.name
+                       + "' violates content model " + state.type.model
+                       );
+               if (newstate != state) {
+                   contentStack.pop ();
+                   contentStack.push (newstate);
+               }
+           }
+       }
+
+       //
+       // Then check that this element was declared, and push the
+       // object used to validate its content model onto our stack.
+       //
+       // This is where the recognizer gets created, if needed; if
+       // it's a "children" (elements) content model, an NDFA is
+       // created.  (One recognizer is used per content type, no
+       // matter how complex that recognizer is.)
+       //
+       ElementInfo             info;
+
+       info = (ElementInfo) elements.get (qName);
+       if (info == null || info.model == null) {
+           // VC: Element Valid (base clause)
+           error ("Element type '" + qName + "' was not declared");
+           contentStack.push (null);
+
+           // for less diagnostic noise, fake a declaration.
+           elementDecl (qName, "ANY");
+       } else
+           contentStack.push (info.getRecognizer (this));
+
+       //
+       // Then check each attribute present
+       //
+       int                     len;
+       String                  aname;
+       AttributeInfo           ainfo;
+
+       if (atts != null)
+           len = atts.getLength ();
+       else
+           len = 0;
+       
+       for (int i = 0; i < len; i++) {
+           aname = atts.getQName (i);
+
+           if (info == null
+                   || (ainfo = (AttributeInfo) info.attributes.get (aname))
+                           == null) {
+               // VC: Attribute Value Type
+               error ("Attribute '" + aname
+                   + "' was not declared for element type " + qName);
+               continue;
+           }
+
+           String value = atts.getValue (i);
+
+           // note that "==" for type names and "#FIXED" is correct
+           // (and fast) since we've interned those literals.
+
+           if ("#FIXED" == ainfo.mode) {
+               String expanded = expandDefaultRefs (ainfo.value);
+
+               // VC: Fixed Attribute Default
+               if (!value.equals (expanded)) {
+                   error ("Attribute '" + aname
+                       + "' must match " + expanded
+                       );
+                   continue;
+               }
+           }
+
+           if ("CDATA" == ainfo.type)
+               continue;
+           
+           //
+           // For all other attribute types, there are various
+           // rules to follow.
+           //
+           
+           if ("ID" == ainfo.type) {
+               // VC: ID (must be a name)
+               if (isName (value, "ID attribute", aname)) {
+                   if (Boolean.TRUE == ids.get (value))
+                       // VC: ID (appears once)
+                       error ("ID attribute " + aname
+                           + " uses an ID value '" + value
+                           + "' which was already declared.");
+                   else
+                       // any forward refs are no longer problems
+                       ids.put (value, Boolean.TRUE);
+               }
+               continue;
+           } 
+
+           if ("IDREF" == ainfo.type) {
+               // VC: IDREF (value must be a name)
+               if (isName (value, "IDREF attribute", aname)) {
+                   // VC: IDREF (must match some ID attribute)
+                   if (ids.get (value) == null)
+                       // new -- assume it's a forward ref
+                       ids.put (value, Boolean.FALSE);
+               }
+               continue;
+           } 
+
+           if ("IDREFS" == ainfo.type) {
+               StringTokenizer tokens = new StringTokenizer (value, " ");
+
+               if (!tokens.hasMoreTokens ()) {
+                   // VC: IDREF (one or more values)
+                   error ("IDREFS attribute " + aname
+                       + " must have at least one ID ref");
+               } else do {
+                   String id = tokens.nextToken ();
+
+                   // VC: IDREF (value must be a name)
+                   if (isName (id, "IDREFS attribute", aname)) {
+                       // VC: IDREF (must match some ID attribute)
+                       if (ids.get (id) == null)
+                           // new -- assume it's a forward ref
+                           ids.put (id, Boolean.FALSE);
+                   }
+               } while (tokens.hasMoreTokens ());
+               continue;
+           }
+
+           if ("NMTOKEN" == ainfo.type) {
+               // VC: Name Token (is a name token)
+               isNmtoken (value, "NMTOKEN attribute", aname);
+               continue;
+           }
+
+           if ("NMTOKENS" == ainfo.type) {
+               StringTokenizer tokens = new StringTokenizer (value, " ");
+
+               if (!tokens.hasMoreTokens ()) {
+                   // VC: Name Token (one or more values)
+                   error ("NMTOKENS attribute " + aname
+                       + " must have at least one name token");
+               } else do {
+                   String token = tokens.nextToken ();
+
+                   // VC: Name Token (is a name token)
+                   isNmtoken (token, "NMTOKENS attribute", aname);
+               } while (tokens.hasMoreTokens ());
+               continue;
+           }
+
+           if ("ENTITY" == ainfo.type) {
+               if (!unparsed.contains (value))
+                   // VC: Entity Name
+                   error ("Value of attribute '" + aname
+                       + "' refers to unparsed entity '" + value
+                       + "' which was not declared.");
+               continue;
+           }
+
+           if ("ENTITIES" == ainfo.type) {
+               StringTokenizer tokens = new StringTokenizer (value, " ");
+
+               if (!tokens.hasMoreTokens ()) {
+                   // VC: Entity Name (one or more values)
+                   error ("ENTITIES attribute " + aname
+                       + " must have at least one name token");
+               } else do {
+                   String entity = tokens.nextToken ();
+
+                   if (!unparsed.contains (entity))
+                       // VC: Entity Name
+                       error ("Value of attribute '" + aname
+                           + "' refers to unparsed entity '" + entity
+                           + "' which was not declared.");
+               } while (tokens.hasMoreTokens ());
+               continue;
+           }
+
+           //
+           // check for enumerations last; more expensive
+           //
+           if (ainfo.type.charAt (0) == '(' /*)*/      
+                   || ainfo.type.startsWith ("NOTATION ")
+                   ) {
+               // VC: Enumeration (value must be defined)
+               checkEnumeration (value, ainfo.type, aname);
+               continue;
+           }
+       }
+
+       //
+       // Last, check that all #REQUIRED attributes were provided
+       //
+       if (info != null) {
+           Hashtable   table = info.attributes;
+
+           if (table.size () != 0) {
+               Enumeration     e = table.keys ();
+
+               // XXX table.keys uses the heap, bleech -- slows things
+
+               while (e.hasMoreElements ()) {
+                   aname = (String) e.nextElement ();
+                   ainfo = (AttributeInfo) table.get (aname);
+
+                   // "#REQUIRED" mode was interned in attributeDecl
+                   if ("#REQUIRED" == ainfo.mode
+                           && atts.getValue (aname) == null) {
+                       // VC: Required Attribute
+                       error ("Attribute '" + aname + "' must be specified "
+                           + "for element type " + qName);
+                   }
+               }
+           }
+       }
+       super.startElement (uri, localName, qName, atts);
+    }
+
+    /**
+     * <b>ContentHandler</b> Reports a validity error if the element's content
+     * model does not permit character data.
+     * Passed to the next consumer.
+     */
+    public void characters (char ch [], int start, int length)
+    throws SAXException
+    {
+       Recognizer state;
+
+       if (contentStack.empty ())
+           state = null;
+       else
+           state = (Recognizer) contentStack.peek ();
+
+       // NOTE:  if this ever supports with SAX parsers that don't
+       // report ignorable whitespace as such (only XP?), this class
+       // needs to morph it into ignorableWhitespace() as needed ...
+
+       if (state != null && !state.acceptCharacters ())
+           // VC: Element Valid (clauses three, four -- see recognizer)
+           error ("Character content not allowed in element "
+               + state.type.name);
+       
+       super.characters (ch, start, length);
+    }
+       
+
+    /**
+     * <b>ContentHandler</b> Reports a validity error if the element's content
+     * model does not permit end-of-element yet, or a well formedness error
+     * if there was no matching startElement call.
+     * Passed to the next consumer.
+     */
+    public void endElement (String uri, String localName, String qName)
+    throws SAXException
+    {
+       try {
+           Recognizer state = (Recognizer) contentStack.pop ();
+
+           if (state != null && !state.completed ())
+               // VC: Element valid (clauses two, three, four; see Recognizer)
+               error ("Premature end for element '"
+                   + state.type.name
+                   + "', content model "
+                   + state.type.model);
+           
+           // could insist on match of start element, but that's
+           // something the input stream must to guarantee.
+
+       } catch (EmptyStackException e) {
+           fatalError ("endElement without startElement: " + qName
+               + ((uri == null)
+                   ? ""
+                   : ( " { '" + uri + "', " + localName + " }")));
+       }
+       super.endElement (uri, localName, qName);
+    }
+
+    /**
+     * <b>ContentHandler</b> Checks whether all ID values that were
+     * referenced have been declared, and releases all resources. 
+     * Passed to the next consumer.
+     * 
+     * @see #setDocumentLocator
+     */
+    public void endDocument ()
+    throws SAXException
+    {
+       for (Enumeration idNames = ids.keys ();
+               idNames.hasMoreElements ();
+               /* NOP */) {
+           String id = (String) idNames.nextElement ();
+           
+           if (Boolean.FALSE == ids.get (id)) {
+               // VC: IDREF (must match ID)
+               error ("Undeclared ID value '" + id
+                   + "' was referred to by an IDREF/IDREFS attribute");
+           }
+       }
+
+       resetState ();
+       super.endDocument ();
+    }
+
+
+    /** Holds per-element declarations */
+    static private final class ElementInfo
+    {
+       String                  name;
+       String                  model;
+
+       // key = attribute name; value = AttributeInfo
+       Hashtable               attributes = new Hashtable (11);
+
+       ElementInfo (String n) { name = n; }
+
+       private Recognizer      recognizer;
+
+       // for validating content models:  one per type, shared,
+       // and constructed only on demand ... so unused elements do
+       // not need to consume resources.
+       Recognizer      getRecognizer (ValidationConsumer consumer)
+       throws SAXException
+       {
+           if (recognizer == null) {
+               if ("ANY".equals (model))
+                   recognizer = ANY;
+               else if ("EMPTY".equals (model))
+                   recognizer = new EmptyRecognizer (this);
+               else if ('#' == model.charAt (1))
+                   // n.b. this constructor does a validity check
+                   recognizer = new MixedRecognizer (this, consumer);
+               else
+                   recognizer = new ChildrenRecognizer (this, consumer);
+           }
+           return recognizer;
+       }
+    }
+
+    /** Holds per-attribute declarations */
+    static private final class AttributeInfo
+    {
+       String  type;
+       String  mode;           // #REQUIRED, etc (or null)
+       String  value;          // or null
+    }
+
+
+    //
+    // Content model validation
+    //
+
+    static private final Recognizer    ANY = new Recognizer (null);
+
+
+    // Base class defines the calls used to validate content,
+    // and supports the "ANY" content model
+    static private class Recognizer
+    {
+       final ElementInfo       type;
+
+       Recognizer (ElementInfo t) { type = t; }
+
+       // return true iff character data is legal here
+       boolean acceptCharacters ()
+       throws SAXException
+           // VC: Element Valid (third and fourth clauses)
+           { return true; }
+
+       // null return = failure
+       // otherwise, next state (like an FSM)
+       // prerequisite: tested that name was declared
+       Recognizer acceptElement (String name)
+       throws SAXException
+           // VC: Element Valid (fourth clause)
+           { return this; }
+
+       // return true iff model is completed, can finish
+       boolean completed ()
+       throws SAXException
+           // VC: Element Valid (fourth clause)
+           { return true; }
+       
+       public String toString ()
+           // n.b. "children" is the interesting case!
+           { return (type == null) ? "ANY" : type.model; }
+    }
+
+    // "EMPTY" content model -- no characters or elements
+    private static final class EmptyRecognizer extends Recognizer
+    {
+       public EmptyRecognizer (ElementInfo type)
+           { super (type); }
+
+       // VC: Element Valid (first clause)
+       boolean acceptCharacters ()
+           { return false; }
+
+       // VC: Element Valid (first clause)
+       Recognizer acceptElement (String name)
+           { return null; }
+    }
+
+    // "Mixed" content model -- ANY, but restricts elements
+    private static final class MixedRecognizer extends Recognizer
+    {
+       private String  permitted [];
+
+       // N.B. constructor tests for duplicated element names (VC)
+       public MixedRecognizer (ElementInfo t, ValidationConsumer v)
+       throws SAXException
+       {
+           super (t);
+
+           // (#PCDATA...)* or (#PCDATA) ==> ... or empty
+           // with the "..." being "|elname|..."
+           StringTokenizer     tokens = new StringTokenizer (
+               t.model.substring (8, t.model.lastIndexOf (')')),
+               "|");
+           Vector              vec = new Vector ();
+
+           while (tokens.hasMoreTokens ()) {
+               String token = tokens.nextToken ();
+
+               if (vec.contains (token))
+                   v.error ("element " + token
+                       + " is repeated in mixed content model: "
+                       + t.model);
+               else
+                   vec.addElement (token.intern ());
+           }
+           permitted = new String [vec.size ()];
+           for (int i = 0; i < permitted.length; i++)
+               permitted [i] = (String) vec.elementAt (i);
+           
+           // in one large machine-derived DTD sample, most of about
+           // 250 mixed content models were empty, and 25 had ten or
+           // more entries.  2 had over a hundred elements.  Linear
+           // search isn't obviously wrong.
+       }
+
+       // VC: Element Valid (third clause)
+       Recognizer acceptElement (String name)
+       {
+           int         length = permitted.length;
+
+           // first pass -- optimistic w.r.t. event source interning
+           // (and document validity)
+           for (int i = 0; i < length; i++)
+               if (permitted [i] == name)
+                   return this;
+           // second pass -- pessimistic w.r.t. event source interning
+           for (int i = 0; i < length; i++)
+               if (permitted [i].equals (name))
+                   return this;
+           return null;
+       }
+    }
+
+
+    // recognizer loop flags, see later
+    private static final int           F_LOOPHEAD = 0x01;
+    private static final int           F_LOOPNEXT = 0x02;
+
+    // for debugging -- used to label/count nodes in toString()
+    private static int                 nodeCount;
+
+    /**
+     * "Children" content model -- these are nodes in NDFA state graphs.
+     * They work in fixed space.  Note that these graphs commonly have
+     * cycles, handling features such as zero-or-more and one-or-more.
+     *
+     * <p>It's readonly, so only one copy is ever needed.  The content model
+     * stack may have any number of pointers into each graph, when a model
+     * happens to be needed more than once due to element nesting.  Since
+     * traversing the graph just moves to another node, and never changes
+     * it, traversals never interfere with each other.
+     *
+     * <p>There is an option to report non-deterministic models.  These are
+     * always XML errors, but ones which are not often reported despite the
+     * fact that they can lead to different validating parsers giving
+     * different results for the same input.  (The XML spec doesn't require
+     * them to be reported.)
+     *
+     * <p><b>FIXME</b> There's currently at least one known bug here, in that
+     * it's not actually detecting the non-determinism it tries to detect.
+     * (Of the "optional.xml" test, the once-or-twice-2* tests are all non-D;
+     * maybe some others.)  This may relate to the issue flagged below as
+     * "should not" happen (but it was), which showed up when patching the
+     * graph to have one exit node (or more EMPTY nodes).
+     */
+    private static final class ChildrenRecognizer extends Recognizer
+       implements Cloneable
+    {
+       // for reporting non-deterministic content models
+       // ... a waste of space if we're not reporting those!
+       // ... along with the 'model' member (in base class)
+       private ValidationConsumer      consumer;
+
+       // for CHOICE nodes -- each component is an arc that
+       // accepts a different NAME (or is EMPTY indicating
+       // NDFA termination).
+       private Recognizer              components [];
+
+       // for NAME/SEQUENCE nodes -- accepts that NAME and
+       // then goes to the next node (CHOICE, NAME, EMPTY).
+       private String                  name;
+       private Recognizer              next;
+
+       // loops always point back to a CHOICE node. we mark such choice
+       // nodes (F_LOOPHEAD) for diagnostics and faster deep cloning.
+       // We also mark nodes before back pointers (F_LOOPNEXT), to ensure
+       // termination when we patch sequences and loops.
+       private int                     flags;
+
+
+       // prevent a needless indirection between 'this' and 'node'
+       private void copyIn (ChildrenRecognizer node)
+       {
+           // model & consumer are already set
+           components = node.components;
+           name = node.name;
+           next = node.next;
+           flags = node.flags;
+       }
+
+       // used to construct top level "children" content models,
+       public ChildrenRecognizer (ElementInfo type, ValidationConsumer vc)
+       {
+           this (vc, type);
+           populate (type.model.toCharArray (), 0);
+           patchNext (new EmptyRecognizer (type), null);
+       }
+
+       // used internally; populating is separate
+       private ChildrenRecognizer (ValidationConsumer vc, ElementInfo type)
+       {
+           super (type);
+           consumer = vc;
+       }
+
+
+       //
+       // When rewriting some graph nodes we need deep clones in one case;
+       // mostly shallow clones (what the JVM handles for us) are fine.
+       //
+       private ChildrenRecognizer shallowClone ()
+       {
+           try {
+               return (ChildrenRecognizer) clone ();
+           } catch (CloneNotSupportedException e) {
+               throw new Error ("clone");
+           }
+       }
+
+       private ChildrenRecognizer deepClone ()
+       {
+           return deepClone (new Hashtable (37));
+       }
+
+       private ChildrenRecognizer deepClone (Hashtable table)
+       {
+           ChildrenRecognizer retval;
+
+           if ((flags & F_LOOPHEAD) != 0) {
+               retval = (ChildrenRecognizer) table.get (this);
+               if (retval != null)
+                   return this;
+
+               retval = shallowClone ();
+               table.put (this, retval);
+           } else
+               retval = shallowClone ();
+
+           if (next != null) {
+               if (next instanceof ChildrenRecognizer)
+                   retval.next = ((ChildrenRecognizer)next)
+                           .deepClone (table);
+               else if (!(next instanceof EmptyRecognizer))
+                   throw new RuntimeException ("deepClone");
+           }
+
+           if (components != null) {
+               retval.components = new Recognizer [components.length];
+               for (int i = 0; i < components.length; i++) {
+                   Recognizer temp = components [i];
+
+                   if (temp == null)
+                       retval.components [i] = null;
+                   else if (temp instanceof ChildrenRecognizer)
+                       retval.components [i] = ((ChildrenRecognizer)temp)
+                               .deepClone (table);
+                   else if (!(temp instanceof EmptyRecognizer))
+                       throw new RuntimeException ("deepClone");
+               }
+           }
+
+           return retval;
+       }
+
+       // connect subgraphs, first to next (sequencing)
+       private void patchNext (Recognizer theNext, Hashtable table)
+       {
+           // backpointers must not be repatched or followed
+           if ((flags & F_LOOPNEXT) != 0)
+               return;
+
+           // XXX this table "shouldn't" be needed, right?
+           // but some choice nodes looped if it isn't there.
+           if (table != null && table.get (this) != null)
+               return;
+           if (table == null)
+               table = new Hashtable ();
+
+           // NAME/SEQUENCE
+           if (name != null) {
+               if (next == null)
+                   next = theNext;
+               else if (next instanceof ChildrenRecognizer) {
+                   ((ChildrenRecognizer)next).patchNext (theNext, table);
+               } else if (!(next instanceof EmptyRecognizer))
+                   throw new RuntimeException ("patchNext");
+               return;
+           }
+
+           // CHOICE
+           for (int i = 0; i < components.length; i++) {
+               if (components [i] == null)
+                   components [i] = theNext;
+               else if (components [i] instanceof ChildrenRecognizer) {
+                   ((ChildrenRecognizer)components [i])
+                           .patchNext (theNext, table);
+               } else if (!(components [i] instanceof EmptyRecognizer))
+                   throw new RuntimeException ("patchNext");
+           }
+
+           if (table != null && (flags | F_LOOPHEAD) != 0)
+               table.put (this, this);
+       }
+
+       /**
+        * Parses a 'children' spec (or recursively 'cp') and makes this
+        * become a regular graph node.
+        *
+        * @return index after this particle
+        */
+       private int populate (char parseBuf [], int startPos)
+       {
+           int         nextPos = startPos + 1;
+           char        c;
+
+           if (nextPos < 0 || nextPos >= parseBuf.length)
+               throw new IndexOutOfBoundsException ();
+
+           // Grammar of the string is from the XML spec, but
+           // with whitespace removed by the SAX parser.
+
+           // children ::= (choice | seq) ('?' | '*' | '+')?
+           // cp ::= (Name | choice | seq) ('?' | '*' | '+')?
+           // choice ::= '(' cp ('|' choice)* ')'
+           // seq ::= '(' cp (',' choice)* ')'
+
+           // interior nodes only
+           //   cp ::= name ...
+           if (parseBuf [startPos] != '('/*)*/) {
+               boolean         done = false;
+               do {
+                   switch (c = parseBuf [nextPos]) {
+                       case '?': case '*': case '+':
+                       case '|': case ',':
+                       case /*(*/ ')':
+                           done = true;
+                           continue;
+                       default:
+                           nextPos++;
+                           continue;
+                   }
+               } while (!done);
+               name = new String (parseBuf, startPos, nextPos - startPos);
+
+           // interior OR toplevel nodes
+           //   cp ::= choice ..
+           //   cp ::= seq ..
+           } else {
+               // collect everything as a separate list, and merge it
+               // into "this" later if we can (SEQUENCE or singleton)
+               ChildrenRecognizer      first;
+              
+               first = new ChildrenRecognizer (consumer, type);
+               nextPos = first.populate (parseBuf, nextPos);
+               c = parseBuf [nextPos++];
+
+               if (c == ',' || c == '|') {
+                   ChildrenRecognizer  current = first;
+                   char                separator = c;
+                   Vector              v = null;
+
+                   if (separator == '|') {
+                       v = new Vector ();
+                       v.addElement (first);
+                   }
+
+                   do {
+                       ChildrenRecognizer link;
+
+                       link = new ChildrenRecognizer (consumer, type);
+                       nextPos = link.populate (parseBuf, nextPos);
+
+                       if (separator == ',') {
+                           current.patchNext (link, null);
+                           current = link;
+                       } else
+                           v.addElement (link);
+
+                       c = parseBuf [nextPos++];
+                   } while (c == separator);
+
+                   // choice ... collect everything into one array.
+                   if (separator == '|') {
+                       // assert v.size() > 1
+                       components = new Recognizer [v.size ()];
+                       for (int i = 0; i < components.length; i++) {
+                           components [i] = (Recognizer)
+                                   v.elementAt (i);
+                       }
+                       // assert flags == 0
+
+                   // sequence ... merge into "this" to be smaller.
+                   } else
+                       copyIn (first);
+
+               // treat singletons like one-node sequences.
+               } else
+                   copyIn (first);
+
+               if (c != /*(*/ ')')
+                   throw new RuntimeException ("corrupt content model");
+           }
+
+           //
+           // Arity is optional, and the root of all fun.  We keep the
+           // FSM state graph simple by only having NAME/SEQUENCE and
+           // CHOICE nodes (or EMPTY to terminate a model), easily
+           // evaluated.  So we rewrite each node that has arity, using
+           // those primitives.  We create loops here, if needed.
+           //
+           if (nextPos < parseBuf.length) {
+               c = parseBuf [nextPos];
+               if (c == '?' || c == '*' || c == '+') {
+                   nextPos++;
+
+                   // Rewrite 'zero-or-one' "?" arity to a CHOICE:
+                   //   - SEQUENCE (clone, what's next)
+                   //   - or, what's next
+                   // Size cost: N --> N + 1
+                   if (c == '?') {
+                       Recognizer              once = shallowClone ();
+
+                       components = new Recognizer [2];
+                       components [0] = once;
+                       // components [1] initted to null
+                       name = null;
+                       next = null;
+                       flags = 0;
+
+                           
+                   // Rewrite 'zero-or-more' "*" arity to a CHOICE.
+                   //   - LOOP (clone, back to this CHOICE)
+                   //   - or, what's next
+                   // Size cost: N --> N + 1
+                   } else if (c == '*') {
+                       ChildrenRecognizer      loop = shallowClone ();
+
+                       loop.patchNext (this, null);
+                       loop.flags |= F_LOOPNEXT;
+                       flags = F_LOOPHEAD;
+
+                       components = new Recognizer [2];
+                       components [0] = loop;
+                       // components [1] initted to null
+                       name = null;
+                       next = null;
+
+
+                   // Rewrite 'one-or-more' "+" arity to a SEQUENCE.
+                   // Basically (a)+ --> ((a),(a)*).
+                   //   - this
+                   //   - CHOICE
+                   //      * LOOP (clone, back to the CHOICE)
+                   //      * or, whatever's next
+                   // Size cost: N --> 2N + 1
+                   } else if (c == '+') {
+                       ChildrenRecognizer loop = deepClone ();
+                       ChildrenRecognizer choice;
+
+                       choice = new ChildrenRecognizer (consumer, type);
+                       loop.patchNext (choice, null);
+                       loop.flags |= F_LOOPNEXT;
+                       choice.flags = F_LOOPHEAD;
+
+                       choice.components = new Recognizer [2];
+                       choice.components [0] = loop;
+                       // choice.components [1] initted to null
+                       // choice.name, choice.next initted to null
+
+                       patchNext (choice, null);
+                   }
+               }
+           }
+
+           return nextPos;
+       }
+
+       // VC: Element Valid (second clause)
+       boolean acceptCharacters ()
+           { return false; }
+
+       // VC: Element Valid (second clause)
+       Recognizer acceptElement (String type)
+       throws SAXException
+       {
+           // NAME/SEQUENCE
+           if (name != null) {
+               if (name.equals (type))
+                   return next;
+               return null;
+           }
+
+           // CHOICE ... optionally reporting nondeterminism we
+           // run across.  we won't check out every transition
+           // for nondeterminism; only the ones we follow.
+           Recognizer  retval = null;
+
+           for (int i = 0; i < components.length; i++) {
+               Recognizer temp = components [i].acceptElement (type);
+
+               if (temp == null)
+                   continue;
+               else if (!warnNonDeterministic)
+                   return temp;
+               else if (retval == null)
+                   retval = temp;
+               else if (retval != temp)
+                   consumer.error ("Content model " + this.type.model
+                       + " is non-deterministic for " + type);
+           }
+           return retval;
+       }
+
+       // VC: Element Valid (second clause)
+       boolean completed ()
+       throws SAXException
+       {
+           // expecting a specific element
+           if (name != null)
+               return false;
+           
+           // choice, some sequences
+           for (int i = 0; i < components.length; i++) {
+               if (components [i].completed ())
+                   return true;
+           }
+
+           return false;
+       }
+
+/** /
+       // FOR DEBUGGING ... flattens the graph for printing.
+
+       public String toString ()
+       {
+           StringBuffer buf = new StringBuffer ();
+
+           // only one set of loop labels can be generated
+           // at a time...
+           synchronized (ANY) {
+               nodeCount = 0;
+
+               toString (buf, new Hashtable ());
+               return buf.toString ();
+           }
+       }
+
+       private void toString (StringBuffer buf, Hashtable table)
+       {
+           // When we visit a node, label and count it.
+           // Nodes are never visited/counted more than once.
+           // For small models labels waste space, but if arity
+           // mappings were used the savings are substantial.
+           // (Plus, the output can be more readily understood.)
+           String temp = (String) table.get (this);
+
+           if (temp != null) {
+               buf.append ('{');
+               buf.append (temp);
+               buf.append ('}');
+               return;
+           } else {
+               StringBuffer scratch = new StringBuffer (15);
+
+               if ((flags & F_LOOPHEAD) != 0)
+                   scratch.append ("loop");
+               else
+                   scratch.append ("node");
+               scratch.append ('-');
+               scratch.append (++nodeCount);
+               temp = scratch.toString ();
+
+               table.put (this, temp);
+               buf.append ('[');
+               buf.append (temp);
+               buf.append (']');
+               buf.append (':');
+           }
+
+           // NAME/SEQUENCE
+           if (name != null) {
+               // n.b. some output encodings turn some name chars into '?'
+               // e.g. with Japanese names and ASCII output
+               buf.append (name);
+               if (components != null)         // bug!
+                   buf.append ('$');
+               if (next == null)
+                   buf.append (",*");
+               else if (next instanceof EmptyRecognizer) // patch-to-next
+                   buf.append (",{}");
+               else if (next instanceof ChildrenRecognizer) {
+                   buf.append (',');
+                   ((ChildrenRecognizer)next).toString (buf, table);
+               } else                          // bug!
+                   buf.append (",+");
+               return;
+           }
+
+           // CHOICE
+           buf.append ("<");
+           for (int i = 0; i < components.length; i++) {
+               if (i != 0)
+                   buf.append ("|");
+               if (components [i] instanceof EmptyRecognizer) {
+                   buf.append ("{}");
+               } else if (components [i] == null) {    // patch-to-next
+                   buf.append ('*');
+               } else {
+                   ChildrenRecognizer r;
+
+                   r = (ChildrenRecognizer) components [i];
+                   r.toString (buf, table);
+               }
+           }
+           buf.append (">");
+       }
+/**/
+    }
+}
diff --git a/libjava/gnu/xml/pipeline/WellFormednessFilter.java b/libjava/gnu/xml/pipeline/WellFormednessFilter.java
new file mode 100644 (file)
index 0000000..3047ae3
--- /dev/null
+++ b/libjava/gnu/xml/pipeline/WellFormednessFilter.java
@@ -0,0 +1,362 @@
+/* WellFormednessFilter.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.pipeline;
+
+import java.util.EmptyStackException;
+import java.util.Stack;
+
+import gnu.xml.aelfred2.SAXDriver;
+import org.xml.sax.*;
+import org.xml.sax.ext.*;
+
+
+/**
+ * This filter reports fatal exceptions in the case of event streams that
+ * are not well formed.  The rules currently tested include: <ul>
+ *
+ *     <li>setDocumentLocator ... may be called only before startDocument
+ *
+ *     <li>startDocument/endDocument ... must be paired, and all other
+ *     calls (except setDocumentLocator) must be nested within these.
+ *
+ *     <li>startElement/endElement ... must be correctly paired, and
+ *     may never appear within CDATA sections.
+ *
+ *     <li>comment ... can't contain "--"
+ *
+ *     <li>character data ... can't contain "]]&gt;"
+ *
+ *     <li>whitespace ... can't contain CR
+ *
+ *     <li>whitespace and character data must be within an element
+ *
+ *     <li>processing instruction ... can't contain "?&gt;" or CR
+ *
+ *     <li>startCDATA/endCDATA ... must be correctly paired.
+ *
+ *     </ul>
+ *
+ * <p> Other checks for event stream correctness may be provided in
+ * the future.  For example, insisting that
+ * entity boundaries nest correctly,
+ * namespace scopes nest correctly,
+ * namespace values never contain relative URIs,
+ * attributes don't have "&lt;" characters;
+ * and more.
+ *
+ * @author David Brownell
+ */
+public final class WellFormednessFilter extends EventFilter
+{
+    private boolean            startedDoc;
+    private Stack              elementStack = new Stack ();
+    private boolean            startedCDATA;
+    private String             dtdState = "before";
+
+    
+    /**
+     * Swallows all events after performing well formedness checks.
+     */
+       // constructor used by PipelineFactory
+    public WellFormednessFilter ()
+       { this (null); }
+
+
+    /**
+     * Passes events through to the specified consumer, after first
+     * processing them.
+     */
+       // constructor used by PipelineFactory
+    public WellFormednessFilter (EventConsumer consumer)
+    {
+       super (consumer);
+
+       setContentHandler (this);
+       setDTDHandler (this);
+       
+       try {
+           setProperty (LEXICAL_HANDLER, this);
+       } catch (SAXException e) { /* can't happen */ }
+    }
+
+    /**
+     * Resets state as if any preceding event stream was well formed.
+     * Particularly useful if it ended through some sort of error,
+     * and the endDocument call wasn't made.
+     */
+    public void reset ()
+    {
+       startedDoc = false;
+       startedCDATA = false;
+       elementStack.removeAllElements ();
+    }
+
+
+    private SAXParseException getException (String message)
+    {
+       SAXParseException       e;
+       Locator                 locator = getDocumentLocator ();
+
+       if (locator == null)
+           return new SAXParseException (message, null, null, -1, -1);
+       else
+           return new SAXParseException (message, locator);
+    }
+
+    private void fatalError (String message)
+    throws SAXException
+    {
+       SAXParseException       e = getException (message);
+       ErrorHandler            handler = getErrorHandler ();
+
+       if (handler != null)
+           handler.fatalError (e);
+       throw e;
+    }
+
+    /**
+     * Throws an exception when called after startDocument.
+     *
+     * @param locator the locator, to be used in error reporting or relative
+     * URI resolution.
+     *
+     * @exception IllegalStateException when called after the document
+     * has already been started
+     */
+    public void setDocumentLocator (Locator locator)
+    {
+       if (startedDoc)
+           throw new IllegalStateException (
+                   "setDocumentLocator called after startDocument");
+       super.setDocumentLocator (locator);
+    }
+
+    public void startDocument () throws SAXException
+    {
+       if (startedDoc)
+           fatalError ("startDocument called more than once");
+       startedDoc = true;
+       startedCDATA = false;
+       elementStack.removeAllElements ();
+       super.startDocument ();
+    }
+
+    public void startElement (
+       String uri, String localName,
+       String qName, Attributes atts
+    ) throws SAXException
+    {
+       if (!startedDoc)
+           fatalError ("callback outside of document?");
+       if ("inside".equals (dtdState))
+           fatalError ("element inside DTD?");
+       else
+           dtdState = "after";
+       if (startedCDATA)
+           fatalError ("element inside CDATA section");
+       if (qName == null || "".equals (qName))
+           fatalError ("startElement name missing");
+       elementStack.push (qName);
+       super.startElement (uri, localName, qName, atts);
+    }
+
+    public void endElement (String uri, String localName, String qName)
+    throws SAXException
+    {
+       if (!startedDoc)
+           fatalError ("callback outside of document?");
+       if (startedCDATA)
+           fatalError ("element inside CDATA section");
+       if (qName == null || "".equals (qName))
+           fatalError ("endElement name missing");
+       
+       try {
+           String      top = (String) elementStack.pop ();
+
+           if (!qName.equals (top))
+               fatalError ("<" + top + " ...>...</" + qName + ">");
+           // XXX could record/test namespace info
+       } catch (EmptyStackException e) {
+           fatalError ("endElement without startElement:  </" + qName + ">");
+       }
+       super.endElement (uri, localName, qName);
+    }
+
+    public void endDocument () throws SAXException
+    {
+       if (!startedDoc)
+           fatalError ("callback outside of document?");
+       dtdState = "before";
+       startedDoc = false;
+       super.endDocument ();
+    }
+
+
+    public void startDTD (String root, String publicId, String systemId)
+    throws SAXException
+    {
+       if (!startedDoc)
+           fatalError ("callback outside of document?");
+    if ("before" != dtdState)
+           fatalError ("two DTDs?");
+       if (!elementStack.empty ())
+           fatalError ("DTD must precede root element");
+       dtdState = "inside";
+       super.startDTD (root, publicId, systemId);
+    }
+
+    public void notationDecl (String name, String publicId, String systemId)
+    throws SAXException
+    {
+// FIXME: not all parsers will report startDTD() ...
+// we'd rather insist we're "inside".
+    if ("after" == dtdState)
+           fatalError ("not inside DTD");
+       super.notationDecl (name, publicId, systemId);
+    }
+
+    public void unparsedEntityDecl (String name,
+       String publicId, String systemId, String notationName)
+    throws SAXException
+    {
+// FIXME: not all parsers will report startDTD() ...
+// we'd rather insist we're "inside".
+    if ("after" == dtdState)
+           fatalError ("not inside DTD");
+       super.unparsedEntityDecl (name, publicId, systemId, notationName);
+    }
+
+    // FIXME:  add the four DeclHandler calls too
+
+    public void endDTD ()
+    throws SAXException
+    {
+       if (!startedDoc)
+           fatalError ("callback outside of document?");
+       if ("inside" != dtdState)
+           fatalError ("DTD ends without start?");
+       dtdState = "after";
+       super.endDTD ();
+    }
+
+    public void characters (char ch [], int start, int length)
+    throws SAXException
+    {
+       int here = start, end = start + length;
+       if (elementStack.empty ())
+           fatalError ("characters must be in an element");
+       while (here < end) {
+           if (ch [here++] != ']')
+               continue;
+           if (here == end)    // potential problem ...
+               continue;
+           if (ch [here++] != ']')
+               continue;
+           if (here == end)    // potential problem ...
+               continue;
+           if (ch [here++] == '>')
+               fatalError ("character data can't contain \"]]>\"");
+       }
+       super.characters (ch, start, length);
+    }
+
+    public void ignorableWhitespace (char ch [], int start, int length)
+    throws SAXException
+    {
+       int here = start, end = start + length;
+       if (elementStack.empty ())
+           fatalError ("characters must be in an element");
+       while (here < end) {
+           if (ch [here++] == '\r')
+               fatalError ("whitespace can't contain CR");
+       }
+       super.ignorableWhitespace (ch, start, length);
+    }
+
+    public void processingInstruction (String target, String data)
+    throws SAXException
+    {
+       if (data.indexOf ('\r') > 0)
+           fatalError ("PIs can't contain CR");
+       if (data.indexOf ("?>") > 0)
+           fatalError ("PIs can't contain \"?>\"");
+    }
+
+    public void comment (char ch [], int start, int length)
+    throws SAXException
+    {
+       if (!startedDoc)
+           fatalError ("callback outside of document?");
+       if (startedCDATA)
+           fatalError ("comments can't nest in CDATA");
+       int here = start, end = start + length;
+       while (here < end) {
+           if (ch [here] == '\r')
+               fatalError ("comments can't contain CR");
+           if (ch [here++] != '-')
+               continue;
+           if (here == end)
+               fatalError ("comments can't end with \"--->\"");
+           if (ch [here++] == '-')
+               fatalError ("comments can't contain \"--\"");
+       }
+       super.comment (ch, start, length);
+    }
+
+    public void startCDATA ()
+    throws SAXException
+    {
+       if (!startedDoc)
+           fatalError ("callback outside of document?");
+       if (startedCDATA)
+           fatalError ("CDATA starts can't nest");
+       startedCDATA = true;
+       super.startCDATA ();
+    }
+
+    public void endCDATA ()
+    throws SAXException
+    {
+       if (!startedDoc)
+           fatalError ("callback outside of document?");
+       if (!startedCDATA)
+           fatalError ("CDATA end without start?");
+       startedCDATA = false;
+       super.endCDATA ();
+    }
+}
diff --git a/libjava/gnu/xml/pipeline/XIncludeFilter.java b/libjava/gnu/xml/pipeline/XIncludeFilter.java
new file mode 100644 (file)
index 0000000..efa05d9
--- /dev/null
+++ b/libjava/gnu/xml/pipeline/XIncludeFilter.java
@@ -0,0 +1,580 @@
+/* XIncludeFilter.java -- 
+   Copyright (C) 2001,2002 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.pipeline;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL; 
+import java.net.URLConnection; 
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Stack;
+import java.util.Vector;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
+
+import gnu.xml.util.Resolver;
+
+
+
+/**
+ * Filter to process an XPointer-free subset of
+ * <a href="http://www.w3.org/TR/xinclude">XInclude</a>, supporting its
+ * use as a kind of replacement for parsed general entities.
+ * XInclude works much like the <code>#include</code> of C/C++ but
+ * works for XML documents as well as unparsed text files.
+ * Restrictions from the 17-Sept-2002 CR draft of XInclude are as follows:
+ *
+ * <ul>
+ *
+ * <li> URIs must not include fragment identifiers.
+ * The CR specifies support for XPointer <em>element()</em> fragment IDs,
+ * which is not currently implemented here.
+ *
+ * <li> <em>xi:fallback</em> handling of resource errors is not
+ * currently supported.
+ *
+ * <li> DTDs are not supported in included files, since the SAX DTD events
+ * must have completely preceded any included file. 
+ * The CR explicitly allows the DTD related portions of the infoset to
+ * grow as an effect of including XML documents.
+ *
+ * <li> <em>xml:base</em> fixup isn't done.
+ *
+ * </ul>
+ *
+ * <p> XML documents that are included will normally be processed using
+ * the default SAX namespace rules, meaning that prefix information may
+ * be discarded.  This may be changed with {@link #setSavingPrefixes
+ * setSavingPrefixes()}.  <em>You are strongly advised to do this.</em>
+ *
+ * <p> Note that XInclude allows highly incompatible implementations, which
+ * are specialized to handle application-specific infoset extensions.  Some
+ * such implementations can be implemented by subclassing this one, but
+ * they may only be substituted in applications at "user option".
+ *
+ * <p>TBD: "IURI" handling.
+ *
+ * @author David Brownell
+ */
+public class XIncludeFilter extends EventFilter implements Locator
+{
+    private Hashtable          extEntities = new Hashtable (5, 5);
+    private int                        ignoreCount;
+    private Stack              uris = new Stack ();
+    private Locator            locator;
+    private Vector             inclusions = new Vector (5, 5);
+    private boolean            savingPrefixes;
+
+    /**
+     */
+    public XIncludeFilter (EventConsumer next)
+    throws SAXException
+    {
+       super (next);
+       setContentHandler (this);
+       // DTDHandler callbacks pass straight through
+       setProperty (DECL_HANDLER, this);
+       setProperty (LEXICAL_HANDLER, this);
+    }
+
+    private void fatal (SAXParseException e) throws SAXException
+    {
+       ErrorHandler            eh;
+       
+       eh = getErrorHandler ();
+       if (eh != null)
+           eh.fatalError (e);
+       throw e;
+    }
+
+    /**
+     * Passes "this" down the filter chain as a proxy locator.
+     */
+    public void setDocumentLocator (Locator locator)
+    {
+       this.locator = locator;
+       super.setDocumentLocator (this);
+    }
+
+    /** Used for proxy locator; do not call directly. */
+    public String getSystemId ()
+       { return (locator == null) ? null : locator.getSystemId (); }
+    /** Used for proxy locator; do not call directly. */
+    public String getPublicId ()
+       { return (locator == null) ? null : locator.getPublicId (); }
+    /** Used for proxy locator; do not call directly. */
+    public int getLineNumber ()
+       { return (locator == null) ? -1 : locator.getLineNumber (); }
+    /** Used for proxy locator; do not call directly. */
+    public int getColumnNumber ()
+       { return (locator == null) ? -1 : locator.getColumnNumber (); }
+
+    /**
+     * Assigns the flag controlling the setting of the SAX2
+     * <em>namespace-prefixes</em> flag.
+     */
+    public void setSavingPrefixes (boolean flag)
+       { savingPrefixes = flag; }
+
+    /**
+     * Returns the flag controlling the setting of the SAX2
+     * <em>namespace-prefixes</em> flag when parsing included documents.
+     * The default value is the SAX2 default (false), which discards
+     * information that can be useful.
+     */
+    public boolean isSavingPrefixes ()
+       { return savingPrefixes; }
+
+    //
+    // Two mechanisms are interacting here.
+    // 
+    // - XML Base implies a stack of base URIs, updated both by
+    //   "real entity" boundaries and element boundaries.
+    //
+    // - Active "Real Entities" (for document and general entities,
+    //   and by xincluded files) are tracked to prevent circular
+    //   inclusions.
+    //
+    private String addMarker (String uri)
+    throws SAXException
+    {
+       if (locator != null && locator.getSystemId () != null)
+           uri = locator.getSystemId ();
+
+       // guard against InputSource objects without system IDs
+       if (uri == null)
+           fatal (new SAXParseException ("Entity URI is unknown", locator));
+
+       try {
+           URL url = new URL (uri);
+
+           uri = url.toString ();
+           if (inclusions.contains (uri))
+               fatal (new SAXParseException (
+                       "XInclude, circular inclusion", locator));
+           inclusions.addElement (uri);
+           uris.push (url);
+       } catch (IOException e) {
+           // guard against illegal relative URIs (Xerces)
+           fatal (new SAXParseException ("parser bug: relative URI",
+               locator, e));
+       }
+       return uri;
+    }
+
+    private void pop (String uri)
+    {
+       inclusions.removeElement (uri);
+       uris.pop ();
+    }
+
+    //
+    // Document entity boundaries get both treatments.
+    //
+    public void startDocument () throws SAXException
+    {
+       ignoreCount = 0;
+       addMarker (null);
+       super.startDocument ();
+    }
+
+    public void endDocument () throws SAXException
+    {
+       inclusions.setSize (0);
+       extEntities.clear ();
+       uris.setSize (0);
+       super.endDocument ();
+    }
+
+    //
+    // External general entity boundaries get both treatments.
+    //
+    public void externalEntityDecl (String name,
+       String publicId, String systemId)
+    throws SAXException
+    {
+       if (name.charAt (0) == '%')
+           return;
+       try {
+           URL url = new URL (locator.getSystemId ());
+           systemId = new URL (url, systemId).toString ();
+       } catch (IOException e) {
+           // what could we do?
+       }
+       extEntities.put (name, systemId);
+    }
+
+    public void startEntity (String name)
+    throws SAXException
+    {
+       if (ignoreCount != 0) {
+           ignoreCount++;
+           return;
+       }
+
+       String  uri = (String) extEntities.get (name);
+       if (uri != null)
+           addMarker (uri);
+       super.startEntity (name);
+    }
+
+    public void endEntity (String name)
+    throws SAXException
+    {
+       if (ignoreCount != 0) {
+           if (--ignoreCount != 0)
+               return;
+       }
+
+       String  uri = (String) extEntities.get (name);
+
+       if (uri != null)
+           pop (uri);
+       super.endEntity (name);
+    }
+    
+    //
+    // element boundaries only affect the base URI stack,
+    // unless they're XInclude elements.
+    //
+    public void
+    startElement (String uri, String localName, String qName, Attributes atts)
+    throws SAXException
+    {
+       if (ignoreCount != 0) {
+           ignoreCount++;
+           return;
+       }
+
+       URL     baseURI = (URL) uris.peek ();
+       String  base;
+
+       base = atts.getValue ("http://www.w3.org/XML/1998/namespace", "base");
+       if (base == null)
+           uris.push (baseURI);
+       else {
+           URL         url;
+
+           if (base.indexOf ('#') != -1)
+               fatal (new SAXParseException (
+                   "xml:base with fragment: " + base,
+                   locator));
+
+           try {
+               baseURI = new URL (baseURI, base);
+               uris.push (baseURI);
+           } catch (Exception e) {
+               fatal (new SAXParseException (
+                   "xml:base with illegal uri: " + base,
+                   locator, e));
+           }
+       }
+
+       if (!"http://www.w3.org/2001/XInclude".equals (uri)) {
+           super.startElement (uri, localName, qName, atts);
+           return;
+       }
+
+       if ("include".equals (localName)) {
+           String      href = atts.getValue ("href");
+           String      parse = atts.getValue ("parse");
+           String      encoding = atts.getValue ("encoding");
+           URL         url = (URL) uris.peek ();
+           SAXParseException   x = null;
+
+           if (href == null)
+               fatal (new SAXParseException (
+                   "XInclude missing href",
+                   locator));
+           if (href.indexOf ('#') != -1)
+               fatal (new SAXParseException (
+                   "XInclude with fragment: " + href,
+                   locator));
+
+           if (parse == null || "xml".equals (parse))
+               x = xinclude (url, href);
+           else if ("text".equals (parse))
+               x = readText (url, href, encoding);
+           else
+               fatal (new SAXParseException (
+                   "unknown XInclude parsing mode: " + parse,
+                   locator));
+           if (x == null) {
+               // strip out all child content
+               ignoreCount++;
+               return;
+           }
+
+           // FIXME the 17-Sept-2002 CR of XInclude says we "must"
+           // use xi:fallback elements to handle resource errors,
+           // if they exist.
+           fatal (x);
+
+       } else if ("fallback".equals (localName)) {
+           fatal (new SAXParseException (
+               "illegal top level XInclude 'fallback' element",
+               locator));
+       } else {
+           ErrorHandler        eh = getErrorHandler ();
+
+           // CR doesn't say this is an error
+           if (eh != null)
+               eh.warning (new SAXParseException (
+                   "unrecognized toplevel XInclude element: " + localName,
+                   locator));
+           super.startElement (uri, localName, qName, atts);
+       }
+    }
+
+    public void endElement (String uri, String localName, String qName)
+    throws SAXException
+    {
+       if (ignoreCount != 0) {
+           if (--ignoreCount != 0)
+               return;
+       }
+
+       uris.pop ();
+       if (!("http://www.w3.org/2001/XInclude".equals (uri)
+               && "include".equals (localName)))
+           super.endElement (uri, localName, qName);
+    }
+
+    //
+    // ignore all content within non-empty xi:include elements
+    //
+    public void characters (char ch [], int start, int length)
+    throws SAXException
+    {
+       if (ignoreCount == 0)
+           super.characters (ch, start, length);
+    }
+
+    public void processingInstruction (String target, String value)
+    throws SAXException
+    {
+       if (ignoreCount == 0)
+           super.processingInstruction (target, value);
+    }
+
+    public void ignorableWhitespace (char ch [], int start, int length)
+    throws SAXException
+    {
+       if (ignoreCount == 0)
+           super.ignorableWhitespace (ch, start, length);
+    }
+
+    public void comment (char ch [], int start, int length)
+    throws SAXException
+    {
+       if (ignoreCount == 0)
+           super.comment (ch, start, length);
+    }
+
+    public void startCDATA () throws SAXException
+    {
+       if (ignoreCount == 0)
+           super.startCDATA ();
+    }
+
+    public void endCDATA () throws SAXException
+    {
+       if (ignoreCount == 0)
+           super.endCDATA ();
+    }
+
+    public void startPrefixMapping (String prefix, String uri)
+    throws SAXException
+    {
+       if (ignoreCount == 0)
+           super.startPrefixMapping (prefix, uri);
+    }
+
+    public void endPrefixMapping (String prefix) throws SAXException
+    {
+       if (ignoreCount == 0)
+           super.endPrefixMapping (prefix);
+    }
+
+    public void skippedEntity (String name) throws SAXException
+    {
+       if (ignoreCount == 0)
+           super.skippedEntity (name);
+    }
+
+    // JDK 1.1 seems to need it to be done this way, sigh
+    void setLocator (Locator l) { locator = l; }
+    Locator getLocator () { return locator; }
+    
+
+    //
+    // for XIncluded entities, manage the current locator and
+    // filter out events that would be incorrect to report
+    //
+    private class Scrubber extends EventFilter
+    {
+       Scrubber (EventFilter f)
+       throws SAXException
+       {
+           // delegation passes to next in chain
+           super (f);
+
+           // process all content events
+           super.setContentHandler (this);
+           super.setProperty (LEXICAL_HANDLER, this);
+
+           // drop all DTD events
+           super.setDTDHandler (null);
+           super.setProperty (DECL_HANDLER, null);
+       }
+
+       // maintain proxy locator
+       // only one startDocument()/endDocument() pair per event stream
+       public void setDocumentLocator (Locator l)
+           { setLocator (l); }
+       public void startDocument ()
+           { }
+       public void endDocument ()
+           { }
+       
+       private void reject (String message) throws SAXException
+           { fatal (new SAXParseException (message, getLocator ())); }
+       
+       // only the DTD from the "base document" gets reported
+       public void startDTD (String root, String publicId, String systemId)
+       throws SAXException
+           { reject ("XIncluded DTD: " + systemId); }
+       public void endDTD ()
+       throws SAXException
+           { reject ("XIncluded DTD"); }
+       // ... so this should never happen
+       public void skippedEntity (String name) throws SAXException
+           { reject ("XInclude skipped entity: " + name); }
+
+       // since we rejected DTDs, only builtin entities can be reported
+    }
+
+    // <xi:include parse='xml' ...>
+    // relative to the base URI passed
+    private SAXParseException xinclude (URL url, String href)
+    throws SAXException
+    {
+       XMLReader       helper;
+       Scrubber        scrubber;
+       Locator         savedLocator = locator;
+
+       // start with a parser acting just like our input
+       // modulo DTD-ish stuff (validation flag, entity resolver)
+       helper = XMLReaderFactory.createXMLReader ();
+       helper.setErrorHandler (getErrorHandler ());
+       helper.setFeature (FEATURE_URI + "namespace-prefixes", true);
+
+       // Set up the proxy locator and event filter.
+       scrubber = new Scrubber (this);
+       locator = null;
+       bind (helper, scrubber);
+
+       // Merge the included document, except its DTD
+       try {
+           url = new URL (url, href);
+           href = url.toString ();
+
+           if (inclusions.contains (href))
+               fatal (new SAXParseException (
+                       "XInclude, circular inclusion", locator));
+
+           inclusions.addElement (href);
+           uris.push (url);
+           helper.parse (new InputSource (href));
+           return null;
+       } catch (java.io.IOException e) {
+           return new SAXParseException (href, locator, e);
+       } finally {
+           pop (href);
+           locator = savedLocator;
+       }
+    }
+
+    // <xi:include parse='text' ...>
+    // relative to the base URI passed
+    private SAXParseException readText (URL url, String href, String encoding)
+    throws SAXException
+    {
+       InputStream     in = null;
+
+       try {
+           URLConnection       conn;
+           InputStreamReader   reader;
+           char                buf [] = new char [4096];
+           int                 count;
+
+           url = new URL (url, href);
+           conn = url.openConnection ();
+           in = conn.getInputStream ();
+           if (encoding == null)
+               encoding = Resolver.getEncoding (conn.getContentType ());
+           if (encoding == null) {
+               ErrorHandler    eh = getErrorHandler ();
+               if (eh != null)
+                   eh.warning (new SAXParseException (
+                       "guessing text encoding for URL: " + url,
+                       locator));
+               reader = new InputStreamReader (in);
+           } else
+               reader = new InputStreamReader (in, encoding);
+
+           while ((count = reader.read (buf, 0, buf.length)) != -1)
+               super.characters (buf, 0, count);
+           in.close ();
+           return null;
+       } catch (IOException e) {
+           return new SAXParseException (
+               "can't XInclude text",
+               locator, e);
+       }
+    }
+}
diff --git a/libjava/gnu/xml/pipeline/XsltFilter.java b/libjava/gnu/xml/pipeline/XsltFilter.java
new file mode 100644 (file)
index 0000000..b1bebbe
--- /dev/null
+++ b/libjava/gnu/xml/pipeline/XsltFilter.java
@@ -0,0 +1,131 @@
+/* XsltFilter.java -- 
+   Copyright (C) 2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.pipeline;
+
+import java.io.IOException;
+
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.sax.*;
+import javax.xml.transform.stream.StreamSource;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
+
+
+/**
+ * Packages an XSLT transform as a pipeline component. 
+ * Note that all DTD events (callbacks to DeclHandler and DTDHandler 
+ * interfaces) are discarded, although XSLT transforms may be set up to
+ * use the LexicalHandler to write DTDs with only an external subset.
+ * Not every XSLT engine will necessarily be usable with this filter,
+ * but current versions of
+ * <a href="http://saxon.sourceforge.net">SAXON</a> and
+ * <a href="http://xml.apache.org/xalan-j">Xalan</a> should work well.
+ *
+ * @see TransformerFactory
+ *
+ * @author David Brownell
+ */
+final public class XsltFilter extends EventFilter
+{
+    /**
+     * Creates a filter that performs the specified transform.
+     * Uses the JAXP 1.1 interfaces to access the default XSLT
+     * engine configured for in the current execution context,
+     * and parses the stylesheet without custom EntityResolver
+     * or ErrorHandler support.
+     *
+     * @param stylesheet URI for the stylesheet specifying the
+     * XSLT transform
+     * @param next provides the ContentHandler and LexicalHandler
+     * to receive XSLT output.
+     * @exception SAXException if the stylesheet can't be parsed
+     * @exception IOException if there are difficulties
+     * bootstrapping the XSLT engine, such as it not supporting
+     * SAX well enough to use this way.
+     */
+    public XsltFilter (String stylesheet, EventConsumer next)
+    throws SAXException, IOException
+    {
+       // First, get a transformer with the stylesheet preloaded
+       TransformerFactory      tf = null;
+       TransformerHandler      th;
+
+       try {
+           SAXTransformerFactory       stf;
+
+           tf = TransformerFactory.newInstance ();
+           if (!tf.getFeature (SAXTransformerFactory.FEATURE)  // sax inputs
+                   || !tf.getFeature (SAXResult.FEATURE)       // sax outputs
+                   || !tf.getFeature (StreamSource.FEATURE)    // stylesheet
+                   )
+               throw new IOException ("XSLT factory ("
+                   + tf.getClass ().getName ()
+                   + ") does not support SAX");
+           stf = (SAXTransformerFactory) tf;
+           th = stf.newTransformerHandler (new StreamSource (stylesheet));
+       } catch (TransformerConfigurationException e) {
+           throw new IOException ("XSLT factory ("
+               + (tf == null
+                       ? "none available"
+                       : tf.getClass ().getName ())
+               + ") configuration error, "
+               + e.getMessage ()
+               );
+       }
+
+       // Hook its outputs up to the pipeline ...
+       SAXResult               out = new SAXResult ();
+
+       out.setHandler (next.getContentHandler ());
+       try {
+           LexicalHandler      lh;
+           lh = (LexicalHandler) next.getProperty (LEXICAL_HANDLER);
+           out.setLexicalHandler (lh);
+       } catch (Exception e) {
+           // ignore
+       }
+       th.setResult (out);
+
+       // ... and make sure its inputs look like ours.
+       setContentHandler (th);
+       setProperty (LEXICAL_HANDLER, th);
+    }
+}
diff --git a/libjava/gnu/xml/pipeline/package.html b/libjava/gnu/xml/pipeline/package.html
new file mode 100644 (file)
index 0000000..352f4c8
--- /dev/null
+++ b/libjava/gnu/xml/pipeline/package.html
@@ -0,0 +1,255 @@
+<html><head><title>
+blah
+<!--
+/*
+ * Copyright (C) 1999-2001 The Free Software Foundation, Inc.
+ */
+-->
+</title></head><body>
+
+<p>This package exposes a kind of XML processing pipeline, based on sending
+SAX events, which can be used as components of application architectures.
+Pipelines are used to convey streams of processing events from a producer
+to one or more consumers, and to let each consumer control the data seen by
+later consumers.
+
+<p> There is a <a href="PipelineFactory.html">PipelineFactory</a> class which
+accepts a syntax describing how to construct some simple pipelines.  Strings
+describing such pipelines can be used in command line tools (see the
+<a href="../util/DoParse.html">DoParse</a> class)
+and in other places that it is
+useful to let processing be easily reconfigured.  Pipelines can of course
+be constructed programmatically, providing access to options that the
+factory won't.
+
+<p> Web applications are supported by making it easy for servlets (or
+non-Java web application components) to be part of a pipeline.  They can
+originate XML (or XHTML) data through an <em>InputSource</em> or in
+response to XML messages sent from clients using <em>CallFilter</em>
+pipeline stages.  Such facilities are available using the simple syntax
+for pipeline construction.
+
+
+<h2> Programming Models </h2>
+
+<p> Pipelines should be simple to understand.
+
+<ul>
+    <li> XML content, typically entire documents,
+    is pushed through consumers by producers.
+
+    <li> Pipelines are basically about consuming SAX2 callback events,
+    where the events encapsulate XML infoset-level data.<ul>
+
+       <li> Pipelines are constructed by taking one or more consumer
+       stages and combining them to produce a composite consumer.
+
+       <li> A pipeline is presumed to have pending tasks and state from
+       the beginning of its ContentHandler.startDocument() callback until
+       it's returned from its ContentHandler.doneDocument() callback.
+
+       <li> Pipelines may have multiple output stages ("fan-out")
+       or multiple input stages ("fan-in") when appropriate.
+
+       <li> Pipelines may be long-lived, but need not be.
+
+       </ul>
+
+    <li> There is flexibility about event production. <ul>
+
+       <li> SAX2 XMLReader objects are producers, which
+       provide a high level "pull" model: documents (text or DOM) are parsed,
+       and the parser pushes individual events through the pipeline.
+
+       <li> Events can be pushed directly to event consumer components
+       by application modules, if they invoke SAX2 callbacks directly.
+       That is, application modules use the XML Infoset as exposed
+       through SAX2 event callbacks.
+
+       </ul>
+    
+    <li> Multiple producer threads may concurrently access a pipeline,
+    if they coordinate appropriately.
+
+    <li> Pipeline processing is not the only framework applications
+    will use.
+
+    </ul>
+
+
+<h3> Producers: XMLReader or Custom </h3>
+
+<p> Many producers will be SAX2 XMLReader objects, and
+will read (pull) data which is then written (pushed) as events.
+Typically these will parse XML text (acquired from
+<code>org.xml.sax.helpers.XMLReaderFactory</code>) or a DOM tree
+(using a <code><a href="../util/DomParser.html">DomParser</a></code>)
+These may be bound to event consumer using a convenience routine,
+<em><a href="EventFilter.html">EventFilter</a>.bind()</em>.
+Once bound, these producers may be given additional documents to
+sent through its pipeline.
+
+<p> In other cases, you will write producers yourself.  For example, some
+data structures might know how to write themselves out using one or
+more XML models, expressed as sequences of SAX2 event callbacks.
+An application module might
+itself be a producer, issuing startDocument and endDocument events
+and then asking those data structures to write themselves out to a
+given EventConsumer, or walking data structures (such as JDBC query
+results) and applying its own conversion rules.  WAP format XML
+(WBMXL) can be directly converted to producer output.
+
+<p> SAX2 introduced an "XMLFilter" interface, which is a kind of XMLReader.
+It is most useful in conjunction with its XMLFilterImpl helper class;
+see the <em><a href="EventFilter.html">EventFilter</a></em> javadoc
+for information contrasting that XMLFilterImpl approach with the
+relevant parts of this pipeline framework.  Briefly, such XMLFilterImpl
+children can be either producers or consumers, and are more limited in
+configuration flexibility.  In this framework, the focus of filters is
+on the EventConsumer side; see the section on
+<a href="#fitting">pipe fitting</a> below.
+
+
+<h3> Consume to Standard or Custom Data Representations </h3>
+
+<p> Many consumers will be used to create standard representations of XML
+data.  The <a href="TextConsumer.html">TextConsumer</a> takes its events
+and writes them as text for a single XML document,
+using an internal <a href="../util/XMLWriter.html">XMLWriter</a>.
+The <a href="DomConsumer.html">DomConsumer</a> takes its events and uses
+them to create and populate a DOM Document.
+
+<p> In other cases, you will write consumers yourself.  For example,
+you might use a particular unmarshaling filter to produce objects
+that fit your application's requirements, instead of using DOM.
+Such consumers work at the level of XML data models, rather than with
+specific representations such as XML text or a DOM tree.  You could
+convert your output directly to WAP format data (WBXML).
+
+
+<h3><a name="fitting">Pipe Fitting</a></h3>
+
+<p> Pipelines are composite event consumers, with each stage having
+the opportunity to transform the data before delivering it to any
+subsequent stages.
+
+<p> The <a href="PipelineFactory.html">PipelineFactory</a> class
+provides access to much of this functionality through a simple syntax.
+See the table in that class's javadoc describing a number of standard
+components.  Direct API calls are still needed for many of the most
+interesting pipeline configurations, including ones leveraging actual
+or logical concurrency.
+
+<p> Four basic types of pipe fitting are directly supported.  These may
+be used to construct complex pipeline networks.  <ul>
+
+    <li> <a href="TeeConsumer.html">TeeConsumer</a> objects split event
+    flow so it goes to two two different consumers, one before the other.
+    This is a basic form of event fan-out; you can use this class to
+    copy events to any number of output pipelines.
+
+    <li> Clients can call remote components through HTTP or HTTPS using
+    the <a href="CallFilter.html">CallFilter</a> component, and Servlets
+    can implement such components by extending the
+    <a href="XmlServlet.html">XmlServlet</a> component.  Java is not
+    required on either end, and transport protocols other than HTTP may
+    also be used.
+
+    <li> <a href="EventFilter.html">EventFilter</a> objects selectively
+    provide handling for callbacks, and can pass unhandled ones to a
+    subsequent stage.  They are often subclassed, since much of the
+    basic filtering machinery is already in place in the base class.
+
+    <li> Applications can merge two event flows by just using the same
+    consumer in each one.  If multiple threads are in use, synchronization
+    needs to be addressed by the appropriate application level policy.
+
+    </ul>
+
+<p> Note that filters can be as complex as
+<a href="XsltFilter.html">XSLT transforms</a>
+available) on input data, or as simple as removing simple syntax data
+such as ignorable whitespace, comments, and CDATA delimiters.
+Some simple "built-in" filters are part of this package.
+
+
+<h3> Coding Conventions:  Filter and Terminus Stages</h3>
+
+<p> If you follow these coding conventions, your classes may be used
+directly (give the full class name) in pipeline descriptions as understood
+by the PipelineFactory.  There are four constructors the factory may
+try to use; in order of decreasing numbers of parameters, these are: <ul>
+
+    <li> Filters that need a single String setup parameter should have
+    a public constructor with two parameters:  that string, then the
+    EventConsumer holding the "next" consumer to get events.
+
+    <li> Filters that don't need setup parameters should have a public
+    constructor that accepts a single EventConsumer holding the "next"
+    consumer to get events when they are done.
+
+    <li> Terminus stages may have a public constructor taking a single
+    paramter:  the string value of that parameter.
+
+    <li> Terminus stages may have a public no-parameters constructor.
+
+    </ul>
+
+<p> Of course, classes may support more than one such usage convention;
+if they do, they can automatically be used in multiple modes.  If you
+try to use a terminus class as a filter, and that terminus has a constructor
+with the appropriate number of arguments, it is automatically wrapped in
+a "tee" filter.
+
+
+<h2> Debugging Tip: "Tee" Joints can Snapshot Data</h2>
+
+<p> It can sometimes be hard to see what's happening, when something
+goes wrong.  Easily fixed:  just snapshot the data.  Then you can find
+out where things start to go wrong.
+
+<p> If you're using pipeline descriptors so that they're easily
+administered, just stick a <em>write&nbsp;(&nbsp;filename&nbsp;)</em>
+filter into the pipeline at an appropriate point.
+
+<p> Inside your programs, you can do the same thing directly: perhaps
+by saving a Writer (perhaps a StringWriter) in a variable, using that
+to create a TextConsumer, and making that the first part of a tee --
+splicing that into your pipeline at a convenient location.
+
+<p> You can also use a DomConsumer to buffer the data, but remember
+that DOM doesn't save all the information that XML provides, so that DOM
+snapshots are relatively low fidelity.  They also are substantially more
+expensive in terms of memory than a StringWriter holding similar data.
+
+<h2> Debugging Tip: Non-XML Producers</h2>
+
+<p> Producers in pipelines don't need to start from XML
+data structures, such as text in XML syntax (likely coming
+from some <em>XMLReader</em> that parses XML) or a
+DOM representation (perhaps with a
+<a href="../util/DomParser.html">DomParser</a>).
+
+<p> One common type of event producer will instead make
+direct calls to SAX event handlers returned from an
+<a href="EventConsumer.html">EventConsumer</a>.
+For example, making <em>ContentHandler.startElement</em>
+calls and matching <em>ContentHandler.endElement</em> calls.
+
+<p> Applications making such calls can catch certain
+common "syntax errors" by using a
+<a href="WellFormednessFilter.html">WellFormednessFilter</a>.
+That filter will detect (and report) erroneous input data
+such as mismatched document, element, or CDATA start/end calls.
+Use such a filter near the head of the pipeline that your
+producer feeds, at least while debugging, to help ensure that
+you're providing legal XML Infoset data.
+
+<p> You can also arrange to validate data on the fly.
+For DTD validation, you can configure a
+<a href="ValidationConsumer.html">ValidationConsumer</a>
+to work as a filter, using any DTD you choose.
+Other validation schemes can be handled with other
+validation filters.
+
+</body></html>
diff --git a/libjava/gnu/xml/transform/AbstractNumberNode.java b/libjava/gnu/xml/transform/AbstractNumberNode.java
new file mode 100644 (file)
index 0000000..097637e
--- /dev/null
+++ b/libjava/gnu/xml/transform/AbstractNumberNode.java
@@ -0,0 +1,321 @@
+/* AbstractNumberNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
+import gnu.xml.xpath.Expr;
+
+/**
+ * A template node representing the XSL <code>number</code> instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+abstract class AbstractNumberNode
+  extends TemplateNode
+{
+
+  static final int ALPHABETIC = 0;
+  static final int TRADITIONAL = 1;
+
+  final TemplateNode format;
+  final String lang;
+  final int letterValue;
+  final String groupingSeparator;
+  final int groupingSize;
+
+  AbstractNumberNode(TemplateNode children, TemplateNode next,
+                     TemplateNode format, String lang,
+                     int letterValue, String groupingSeparator,
+                     int groupingSize)
+  {
+    super(children, next);
+    this.format = format;
+    this.lang = lang;
+    this.letterValue = letterValue;
+    this.groupingSeparator = groupingSeparator;
+    this.groupingSize = groupingSize;
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+               Node context, int pos, int len,
+               Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    Document doc = (parent instanceof Document) ? (Document) parent :
+      parent.getOwnerDocument();
+    DocumentFragment fragment = doc.createDocumentFragment();
+    format.apply(stylesheet, mode, context, pos, len, fragment, null);
+    String f = Expr._string(context, Collections.singleton(fragment));
+    String value = format(f, compute(stylesheet, context, pos, len));
+    Text text = doc.createTextNode(value);
+    if (nextSibling != null)
+      {
+        parent.insertBefore(text, nextSibling);
+      }
+    else
+      {
+        parent.appendChild(text);
+      }
+    // xsl:number doesn't process children
+    if (next != null)
+      {
+        next.apply(stylesheet, mode, 
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+
+  String format(String format, int[] number)
+  {
+    if (number.length == 0)
+      {
+        return "";
+      }
+    int start = 0, end = 0, len = format.length(); // region of format
+    // Tokenize
+    List tokens = new ArrayList((number.length * 2) + 1);
+    List types = new ArrayList(tokens.size());
+    while (end < len)
+      {
+        while (end < len && !isAlphanumeric(format.charAt(end)))
+          {
+            end++;
+          }
+        if (end > start)
+          {
+            tokens.add(format.substring(start, end));
+            types.add(Boolean.FALSE);
+          }
+        start = end;
+        while (end < len && isAlphanumeric(format.charAt(end)))
+          {
+            end++;
+          }
+        if (end > start)
+          {
+            tokens.add(format.substring(start, end));
+            types.add(Boolean.TRUE);
+          }
+        start = end;
+      }
+    // Process tokens
+    StringBuffer buf = new StringBuffer();
+    len = tokens.size();
+    int pos = 0;
+    for (int i = 0; i < len; i++)
+      {
+        String token = (i < 0) ? "." : (String) tokens.get(i);
+        boolean alpha = (i < 0) ? true : 
+          ((Boolean) types.get(i)).booleanValue();
+        if (!alpha)
+          {
+            buf.append(token);
+          }
+        else
+          {
+            if (pos < number.length)
+              {
+                format(buf, number[pos++], token);
+                if (((i + 1 == len) || (i + 2 == len)) &&
+                    (pos < number.length))
+                  {
+                    // More numbers than tokens, reuse last token
+                    i -= 2;
+                  }
+              }
+            if (pos == number.length && i < (len - 2))
+              {
+                // No more numbers. Skip to the end...
+                i = len - 2;
+                if (((Boolean) types.get(i + 1)).booleanValue())
+                  {
+                    // number formatting token, ignore
+                    i++;
+                  }
+              }
+          }
+      }
+    //System.err.println("format: '"+format+"' "+asList(number)+" = '"+buf.toString()+"'");
+    return buf.toString();
+  }
+
+  /*List asList(int[] number)
+    {
+      List l = new ArrayList();
+      for (int i = 0; i < number.length; i++)
+        l.add(new Integer(number[i]));
+      return l;
+    }*/
+
+  void format(StringBuffer buf, int number, String formatToken)
+  {
+    int len = formatToken.length();
+    char c = formatToken.charAt(len - 1);
+    if (Character.digit(c, 10) == 1)
+      {
+        // Check preceding characters
+        for (int i = len - 2; i >= 0; i--)
+          {
+            if (formatToken.charAt(i) != (c - 1))
+              {
+                format(buf, number, "1");
+                return;
+              }
+          }
+        // Decimal representation
+        String val = Integer.toString(number);
+        for (int d = len - val.length(); d > 0; d--)
+          {
+            buf.append('0');
+          }
+        buf.append(val);
+      }
+    else if ("A".equals(formatToken))
+      {
+        buf.append(alphabetic('@', number));
+      }
+    else if ("a".equals(formatToken))
+      {
+        buf.append(alphabetic('`', number));
+      }
+    else if ("i".equals(formatToken))
+      {
+        buf.append(roman(false, number));
+      }
+    else if ("I".equals(formatToken))
+      {
+        buf.append(roman(true, number));
+      }
+    else
+      {
+        // Unknown numbering sequence
+        format(buf, number, "1");
+      }
+  }
+
+  static final boolean isAlphanumeric(char c)
+  {
+    switch (Character.getType(c))
+      {
+      case Character.DECIMAL_DIGIT_NUMBER: // Nd
+      case Character.LETTER_NUMBER: // Nl
+      case Character.OTHER_NUMBER: // No
+      case Character.UPPERCASE_LETTER: // Lu
+      case Character.LOWERCASE_LETTER: // Ll
+      case Character.TITLECASE_LETTER: // Lt
+      case Character.MODIFIER_LETTER: // Lm
+      case Character.OTHER_LETTER: // Lo
+        return true;
+      default:
+        return false;
+      }
+  }
+
+  static final String alphabetic(char offset, int number)
+  {
+    StringBuffer buf = new StringBuffer();
+    while (number > 0)
+      {
+        int r = number % 26;
+        number = number / 26;
+        buf.insert(0, (char) (offset + r));
+      }
+    return buf.toString();
+  }
+
+  static final int[] roman_numbers = {1, 5, 10, 50, 100, 500, 1000};
+  static final char[] roman_chars = {'i', 'v', 'x', 'l', 'c', 'd', 'm'};
+
+  static final String roman(boolean upper, int number)
+  {
+    StringBuffer buf = new StringBuffer();
+    for (int pos = roman_numbers.length - 1; pos >= 0; pos -= 2)
+      {
+        int f = number / roman_numbers[pos];
+        if (f != 0)
+          {
+            number = number % (f * roman_numbers[pos]);
+          }
+        if (f > 4 && f < 9)
+          {
+            buf.append(roman_chars[pos + 1]);
+            f -= 5;
+          }
+        if (f == 4)
+          {
+            buf.append(roman_chars[pos]);
+            buf.append(roman_chars[pos + 1]);
+          }
+        else if (f == 9)
+          {
+            buf.append(roman_chars[pos]);
+            buf.append(roman_chars[pos + 2]);
+          }
+        else
+          {
+            for (; f > 0; f--)
+              {
+                buf.append(roman_chars[pos]);
+              }
+          }
+      }
+    return upper ? buf.toString().toUpperCase() : buf.toString();
+  }
+  
+  abstract int[] compute(Stylesheet stylesheet, Node context, int pos, int len)
+    throws TransformerException;
+
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    buf.append("format=");
+    buf.append(format);
+    buf.append(']');
+    return buf.toString();
+  }
+
+}
diff --git a/libjava/gnu/xml/transform/ApplyImportsNode.java b/libjava/gnu/xml/transform/ApplyImportsNode.java
new file mode 100644 (file)
index 0000000..2b28655
--- /dev/null
+++ b/libjava/gnu/xml/transform/ApplyImportsNode.java
@@ -0,0 +1,91 @@
+/* ApplyImportsNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.text.DecimalFormat;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
+import gnu.xml.xpath.Expr;
+
+/**
+ * A template node representing an XSLT <code>apply-imports</code> instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class ApplyImportsNode
+  extends TemplateNode
+{
+
+  ApplyImportsNode(TemplateNode children, TemplateNode next)
+  {
+    super(children, next);
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new ApplyImportsNode((children == null) ? null :
+                                children.clone(stylesheet),
+                                (next == null) ? null :
+                                next.clone(stylesheet));
+  }
+  
+  void doApply(Stylesheet stylesheet, QName mode,
+             Node context, int pos, int len,
+             Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    TemplateNode t = stylesheet.getTemplate(mode, context, true);
+    if (t != null)
+      {
+        t.apply(stylesheet, mode, context, pos, len,
+                parent, nextSibling);
+      }
+    if (next != null)
+      {
+        next.apply(stylesheet, mode, context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/transform/ApplyTemplatesNode.java b/libjava/gnu/xml/transform/ApplyTemplatesNode.java
new file mode 100644 (file)
index 0000000..83e7c55
--- /dev/null
+++ b/libjava/gnu/xml/transform/ApplyTemplatesNode.java
@@ -0,0 +1,193 @@
+/* ApplyTemplatesNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+
+/**
+ * A template node representing the XSL <code>apply-templates</code>
+ * instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class ApplyTemplatesNode
+  extends TemplateNode
+{
+
+  final Expr select;
+  final QName mode;
+  final List sortKeys;
+  final List withParams;
+  final boolean isDefault;
+
+  ApplyTemplatesNode(TemplateNode children, TemplateNode next,
+                     Expr select, QName mode,
+                     List sortKeys, List withParams, boolean isDefault)
+  {
+    super(children, next);
+    this.select = select;
+    this.mode = mode;
+    this.sortKeys = sortKeys;
+    this.withParams = withParams;
+    this.isDefault = isDefault;
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    int len = sortKeys.size();
+    List sortKeys2 = new ArrayList(len);
+    for (int i = 0; i < len; i++)
+      {
+        sortKeys2.add(((Key) sortKeys.get(i)).clone(stylesheet));
+      }
+    len = withParams.size();
+    List withParams2 = new ArrayList(len);
+    for (int i = 0; i < len; i++)
+      {
+        withParams2.add(((WithParam) withParams.get(i)).clone(stylesheet));
+      }
+    return new ApplyTemplatesNode((children == null) ? null :
+                                  children.clone(stylesheet),
+                                  (next == null) ? null :
+                                  next.clone(stylesheet),
+                                  select.clone(stylesheet),
+                                  mode, sortKeys2, withParams2, isDefault);
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+               Node context, int pos, int len,
+               Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    Object ret = select.evaluate(context, pos, len);
+    if (ret != null && ret instanceof Collection)
+      {
+        if (withParams != null)
+          {
+            // push the parameter context
+            stylesheet.bindings.push(false);
+            // set the parameters
+            for (Iterator i = withParams.iterator(); i.hasNext(); )
+              {
+                WithParam p = (WithParam) i.next();
+                Object value = p.getValue(stylesheet, mode, context, pos, len);
+                stylesheet.bindings.set(p.name, value, false);
+              }
+          }
+        Collection ns = (Collection) ret;
+        List nodes = new ArrayList(ns);
+        if (sortKeys != null)
+          {
+            for (Iterator i = sortKeys.iterator(); i.hasNext(); )
+              {
+                SortKey sortKey = (SortKey) i.next();
+                sortKey.init(stylesheet, mode, context, pos, len, parent,
+                             nextSibling);
+              }
+            Collections.sort(nodes, new XSLComparator(sortKeys));
+          }
+        else
+          {
+            Collections.sort(nodes, documentOrderComparator);
+          }
+        int l = nodes.size();
+        QName effectiveMode = isDefault ? mode : this.mode;
+        for (int i = 0; i < l; i++)
+          {
+            Node node = (Node) nodes.get(i);
+            TemplateNode t = stylesheet.getTemplate(effectiveMode, node,
+                                                    false);
+            if (t != null)
+              {
+                if (stylesheet.debug)
+                  {
+                    System.err.println("Applying " + t);
+                  }
+                stylesheet.current = node;
+                t.apply(stylesheet, effectiveMode, node, i + 1, l,
+                        parent, nextSibling);
+              }
+          }
+        if (withParams != null)
+          {
+            // pop the variable context
+            stylesheet.bindings.pop(false);
+          }
+      }
+    // apply-templates doesn't have processable children
+    if (next != null)
+      {
+        next.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+  
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    boolean o = false;
+    if (select != null)
+      {
+        buf.append("select=");
+        buf.append(select);
+        o = true;
+      }
+    if (mode != null)
+      {
+        if (o)
+          {
+            buf.append(',');
+          }
+        buf.append("mode=");
+        buf.append(mode);
+      }
+    buf.append(']');
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/AttributeNode.java b/libjava/gnu/xml/transform/AttributeNode.java
new file mode 100644 (file)
index 0000000..c4409db
--- /dev/null
+++ b/libjava/gnu/xml/transform/AttributeNode.java
@@ -0,0 +1,246 @@
+/* AttributeNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Attr;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+
+/**
+ * A template node representing an XSL <code>attribute</code> instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class AttributeNode
+  extends TemplateNode
+{
+
+  final TemplateNode name;
+  final TemplateNode namespace;
+  final Node source;
+  
+  AttributeNode(TemplateNode children, TemplateNode next, TemplateNode name,
+                TemplateNode namespace, Node source)
+  {
+    super(children, next);
+    this.name = name;
+    this.namespace = namespace;
+    this.source = source;
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new AttributeNode((children == null) ? null :
+                             children.clone(stylesheet),
+                             (next == null) ? null : next.clone(stylesheet),
+                             name.clone(stylesheet),
+                             (namespace == null) ? null : 
+                             namespace.clone(stylesheet),
+                             source);
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+               Node context, int pos, int len,
+               Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    Document doc = (parent instanceof Document) ? (Document) parent :
+      parent.getOwnerDocument();
+    // Create a document fragment to hold the name
+    DocumentFragment fragment = doc.createDocumentFragment();
+    // Apply name to the fragment
+    name.apply(stylesheet, mode,
+               context, pos, len,
+               fragment, null);
+    // Use XPath string-value of fragment
+    String nameValue = Expr.stringValue(fragment);
+  
+    String namespaceValue = null;
+    if (namespace != null)
+      {  
+        // Create a document fragment to hold the namespace
+        fragment = doc.createDocumentFragment();
+        // Apply namespace to the fragment
+        namespace.apply(stylesheet, mode,
+                        context, pos, len,
+                        fragment, null);
+        // Use XPath string-value of fragment
+        namespaceValue = Expr.stringValue(fragment);
+        if (namespaceValue.length() == 0)
+          {
+            namespaceValue = null;
+          }
+      }
+    
+    String prefix = getPrefix(nameValue);
+    if (namespaceValue == null)
+      {
+        if (prefix != null)
+          {
+            if (XMLConstants.XML_NS_PREFIX.equals(prefix))
+              {
+                namespaceValue = XMLConstants.XML_NS_URI;
+              }
+            else
+              {
+                // Resolve namespace for this prefix
+                namespaceValue = source.lookupNamespaceURI(prefix);
+              }
+          }
+      }
+    else
+      {
+        if (prefix != null)
+          {
+            String ns2 = source.lookupNamespaceURI(prefix);
+            if (ns2 != null && !ns2.equals(namespaceValue))
+              {
+                // prefix clashes, reset it
+                prefix = null;
+                int ci = nameValue.indexOf(':');
+                nameValue = nameValue.substring(ci + 1);
+              }
+          }
+      }
+    if (prefix == null)
+      {
+        // Resolve prefix for this namespace
+        prefix = source.lookupPrefix(namespaceValue);
+        if (prefix != null)
+          {
+            nameValue = prefix + ":" + nameValue;
+          }
+        else
+          {
+            if (namespaceValue != null)
+              {
+                // Must invent a prefix
+                prefix = inventPrefix(parent);
+                nameValue = prefix + ":" + nameValue;
+              }
+          }
+      }
+    NamedNodeMap attrs = parent.getAttributes();
+    boolean insert = true;
+    if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceValue) ||
+        XMLConstants.XMLNS_ATTRIBUTE.equals(nameValue) ||
+        nameValue.startsWith("xmlns:"))
+      {
+        // Namespace declaration, do not output
+        insert = false;
+      }
+    if (prefix != null && namespaceValue == null)
+      {
+        // Not a QName
+        insert = false;
+      }
+    if (parent.getNodeType() == Node.ELEMENT_NODE &&
+        parent.getFirstChild() != null)
+      {
+        // XSLT 7.1.3 Adding an attribute to an element after children have
+        // been added to it is an error
+        insert = false;
+      }
+    if (insert)
+      {
+        // Insert attribute
+        Attr attr = (namespaceValue != null) ?
+          doc.createAttributeNS(namespaceValue, nameValue) :
+              doc.createAttribute(nameValue);
+        if (attrs != null)
+          {
+            if (namespace != null)
+              {
+                attrs.setNamedItemNS(attr);
+              }
+            else
+              {
+                attrs.setNamedItem(attr);
+              }
+          }
+        if (children != null)
+          {
+            children.apply(stylesheet, mode,
+                           context, pos, len,
+                           attr, null);
+          }
+      }
+    if (next != null)
+      {
+        next.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+
+  final String getPrefix(String name)
+  {
+    int ci = name.indexOf(':');
+    return (ci == -1) ? null : name.substring(0, ci);
+  }
+
+  final String inventPrefix(Node parent)
+  {
+    String base = "ns";
+    int count = 0;
+    String ret = base + Integer.toString(count);
+    while (parent.lookupNamespaceURI(ret) != null)
+      {
+        count++;
+        ret = base + Integer.toString(count);
+      }
+    return ret;
+  }
+  
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    buf.append("name=");
+    buf.append(name);
+    buf.append(']');
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/AttributeSet.java b/libjava/gnu/xml/transform/AttributeSet.java
new file mode 100644 (file)
index 0000000..92869d1
--- /dev/null
+++ b/libjava/gnu/xml/transform/AttributeSet.java
@@ -0,0 +1,67 @@
+/* AttributeSet.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+/**
+ * An attribute-set entry in a stylesheet.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class AttributeSet
+{
+
+  final TemplateNode children;
+  final String name;
+  final String uas;
+
+  AttributeSet(TemplateNode children, String name, String uas)
+  {
+    this.children = children;
+    this.name = name;
+    this.uas = uas;
+  }
+
+  AttributeSet clone(Stylesheet stylesheet)
+  {
+    return new AttributeSet((children == null) ? null :
+                            children.clone(stylesheet),
+                            name, uas);
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/transform/Bindings.java b/libjava/gnu/xml/transform/Bindings.java
new file mode 100644 (file)
index 0000000..f898a72
--- /dev/null
+++ b/libjava/gnu/xml/transform/Bindings.java
@@ -0,0 +1,246 @@
+/* Bindings.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPathVariableResolver;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+
+/**
+ * The set of variable bindings in effect for a stylesheet.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class Bindings
+  implements XPathVariableResolver, Cloneable
+{
+
+  final Stylesheet stylesheet;
+
+  /**
+   * Global variables.
+   */
+  final LinkedList variables;
+
+  /**
+   * Parameter value stack.
+   */
+  final LinkedList parameters;
+
+  Bindings(Stylesheet stylesheet)
+  {
+    this.stylesheet = stylesheet;
+    variables = new LinkedList();
+    parameters = new LinkedList();
+    push(true);
+    push(false);
+  }
+
+  public Object clone()
+  {
+    try
+      {
+        return (Bindings) super.clone();
+      }
+    catch (CloneNotSupportedException e)
+      {
+        throw new Error(e.getMessage());
+      }
+  }
+
+  void push(boolean global)
+  {
+    if (global)
+      {
+        variables.addFirst(new HashMap());
+      }
+    else
+      {
+        parameters.addFirst(new HashMap());
+      }
+  }
+
+  void pop(boolean global)
+  {
+    if (global)
+      {
+        variables.removeFirst();
+      }
+    else
+      {
+        parameters.removeFirst();
+      }
+  }
+
+  public boolean containsKey(String name, boolean global)
+  {
+    Iterator i = global ? variables.iterator() : parameters.iterator();
+    while (i.hasNext())
+      {
+        Map ctx = (Map) i.next();
+        if (ctx.containsKey(name))
+          {
+            return true;
+          }
+      }
+    return false;
+  }
+
+  public Object get(String name, Node context, int pos, int len)
+  {
+    //System.err.println("bindings.get: "+name);
+    //System.err.println("\t"+toString());
+    Object ret = null;
+    for (Iterator i = variables.iterator(); i.hasNext() && ret == null; )
+      {
+        Map vctx = (Map) i.next();
+        ret = vctx.get(name);
+      }
+    if (ret == null)
+      {
+        for (Iterator i = parameters.iterator(); i.hasNext() && ret == null; )
+          {
+            Map pctx = (Map) i.next();
+            ret = pctx.get(name);
+          }
+      }
+    /*if (ret instanceof Expr && context != null)
+      {
+        Expr expr = (Expr) ret;
+        ret = expr.evaluate(context, 1, 1);
+      }*/
+    if (ret instanceof Node)
+      {
+        ret = Collections.singleton(ret);
+      }
+    if (ret == null)
+      {
+        ret = "";
+      }
+    //System.err.println("\tret="+ret);
+    return ret;
+  }
+
+  void set(String name, Object value, boolean global)
+  {
+    if (global)
+      {
+        Map context = (Map) variables.getFirst();
+        context.put(name, value);
+      }
+    else
+      {
+        Map context = (Map) parameters.getFirst();
+        context.put(name, value);
+      }
+  }
+
+  public Object resolveVariable(QName qName)
+  {
+    return get(qName.toString(), null, 1, 1);
+  }
+  
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer();
+    boolean next = false;
+    Collection seen = new HashSet();
+    buf.append('{');
+    for (Iterator i = variables.iterator(); i.hasNext(); )
+      {
+        Map ctx = (Map) i.next();
+        for (Iterator j = ctx.entrySet().iterator(); j.hasNext(); )
+          {
+            if (next)
+              {
+                buf.append(',');
+              }
+            else
+              {
+                next = true;
+              }
+            Map.Entry entry = (Map.Entry) j.next();
+            Object key = entry.getKey();
+            if (!seen.contains(key))
+              {
+                buf.append(key);
+                buf.append('=');
+                buf.append(entry.getValue());
+                seen.add(key);
+              }
+          } 
+      }
+    for (Iterator i = parameters.iterator(); i.hasNext(); )
+      {
+        Map ctx = (Map) i.next();
+        for (Iterator j = ctx.entrySet().iterator(); j.hasNext(); )
+          {
+            if (next)
+              {
+                buf.append(',');
+              }
+            else
+              {
+                next = true;
+              }
+            Map.Entry entry = (Map.Entry) j.next();
+            Object key = entry.getKey();
+            if (!seen.contains(key))
+              {
+                buf.append(key);
+                buf.append('=');
+                buf.append(entry.getValue());
+                seen.add(key);
+              }
+          } 
+      }
+    buf.append('}');
+    return buf.toString();
+  }
+}
diff --git a/libjava/gnu/xml/transform/CallTemplateNode.java b/libjava/gnu/xml/transform/CallTemplateNode.java
new file mode 100644 (file)
index 0000000..ee64e2e
--- /dev/null
+++ b/libjava/gnu/xml/transform/CallTemplateNode.java
@@ -0,0 +1,130 @@
+/* CallTemplateNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Node;
+
+/**
+ * A template node representing the XSL <code>call-template</code>
+ * instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class CallTemplateNode
+  extends TemplateNode
+{
+
+  final QName name;
+  final List withParams;
+
+  CallTemplateNode(TemplateNode children, TemplateNode next,
+                   QName name, List withParams)
+  {
+    super(children, next);
+    this.name = name;
+    this.withParams = withParams;
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    int len = withParams.size();
+    List withParams2 = new ArrayList(len);
+    for (int i = 0; i < len; i++)
+      {
+        withParams2.add(((WithParam) withParams.get(i)).clone(stylesheet));
+      }
+    return new CallTemplateNode((children == null) ? null :
+                                children.clone(stylesheet),
+                                (next == null) ? null :
+                                next.clone(stylesheet),
+                                name, withParams2);
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+               Node context, int pos, int len,
+               Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    if (withParams != null)
+      {
+        // push the parameter context
+        stylesheet.bindings.push(false);
+        // set the parameters
+        for (Iterator i = withParams.iterator(); i.hasNext(); )
+          {
+            WithParam p = (WithParam) i.next();
+            Object value = p.getValue(stylesheet, mode, context, pos, len);
+            stylesheet.bindings.set(p.name, value, false);
+          }
+      }
+    TemplateNode t = stylesheet.getTemplate(mode, name);
+    if (t != null)
+      {
+        t.apply(stylesheet, mode, context, pos, len,
+                parent, nextSibling);
+      }
+    if (withParams != null)
+      {
+        // pop the variable context
+        stylesheet.bindings.pop(false);
+      }
+    // call-template doesn't have processable children
+    if (next != null)
+      {
+        next.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+  
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    buf.append("name=");
+    buf.append(name);
+    buf.append(']');
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/ChooseNode.java b/libjava/gnu/xml/transform/ChooseNode.java
new file mode 100644 (file)
index 0000000..76b0d8d
--- /dev/null
+++ b/libjava/gnu/xml/transform/ChooseNode.java
@@ -0,0 +1,93 @@
+/* ChooseNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Node;
+
+/**
+ * A template node representing an XSL <code>choose</code> instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class ChooseNode
+  extends TemplateNode
+{
+
+  ChooseNode(TemplateNode children, TemplateNode next)
+  {
+    super(children, next);
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new ChooseNode((children == null) ? null :
+                          children.clone(stylesheet),
+                          (next == null) ? null :
+                          next.clone(stylesheet));
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+               Node context, int pos, int len,
+               Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    if (children != null)
+      {
+        children.apply(stylesheet, mode,
+                       context, pos, len,
+                       parent, nextSibling);
+      }
+    if (next != null)
+      {
+        next.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+  
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    buf.append(']');
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/CommentNode.java b/libjava/gnu/xml/transform/CommentNode.java
new file mode 100644 (file)
index 0000000..99870cd
--- /dev/null
+++ b/libjava/gnu/xml/transform/CommentNode.java
@@ -0,0 +1,115 @@
+/* CommentNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Comment;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+
+/**
+ * A template node representing the XSL <code>comment</code> instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class CommentNode
+  extends TemplateNode
+{
+
+  CommentNode(TemplateNode children, TemplateNode next)
+  {
+    super(children, next);
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new CommentNode((children == null) ? null :
+                           children.clone(stylesheet),
+                           (next == null) ? null :
+                           next.clone(stylesheet));
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+               Node context, int pos, int len,
+               Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    String value = "";
+    Document doc = (parent instanceof Document) ? (Document) parent :
+      parent.getOwnerDocument();
+    if (children != null)
+      {
+        // Create a document fragment to hold the text
+        DocumentFragment fragment = doc.createDocumentFragment();
+        // Apply children to the fragment
+        children.apply(stylesheet, mode,
+                       context, pos, len,
+                       fragment, null);
+        // Use XPath string-value of fragment
+        value = Expr.stringValue(fragment);
+      }
+    Comment comment = doc.createComment(value);
+    // Insert into result tree
+    if (nextSibling != null)
+      {
+        parent.insertBefore(comment, nextSibling);
+      }
+    else
+      {
+        parent.appendChild(comment);
+      }
+    if (next != null)
+      {
+        next.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+  
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    buf.append(']');
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/CopyNode.java b/libjava/gnu/xml/transform/CopyNode.java
new file mode 100644 (file)
index 0000000..d06a0af
--- /dev/null
+++ b/libjava/gnu/xml/transform/CopyNode.java
@@ -0,0 +1,179 @@
+/* CopyNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.Iterator;
+import java.util.StringTokenizer;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+/**
+ * A template node representing the XSL <code>copy</code> instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class CopyNode
+  extends TemplateNode
+{
+
+  final String uas;
+
+  CopyNode(TemplateNode children, TemplateNode next, String uas)
+  {
+    super(children, next);
+    this.uas = uas;
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new CopyNode((children == null) ? null :
+                        children.clone(stylesheet),
+                        (next == null) ? null :
+                        next.clone(stylesheet),
+                        uas);
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+               Node context, int pos, int len,
+               Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    Node copy = parent;
+    switch (context.getNodeType())
+      {
+      case Node.TEXT_NODE:
+      case Node.ATTRIBUTE_NODE:
+      case Node.ELEMENT_NODE:
+      case Node.PROCESSING_INSTRUCTION_NODE:
+      case Node.COMMENT_NODE:
+        Document doc = (parent instanceof Document) ? (Document) parent :
+          parent.getOwnerDocument();
+        copy = context.cloneNode(false);
+        copy = doc.adoptNode(copy);
+        if (copy.getNodeType() == Node.ATTRIBUTE_NODE)
+          {
+            if (parent.getFirstChild() != null)
+              {
+                // Ignore attempt to add attribute after children
+              }
+            else
+              {
+                NamedNodeMap attrs = parent.getAttributes();
+                if (attrs != null)
+                  {
+                    attrs.setNamedItemNS(copy);
+                  }
+              }
+          }
+        else
+          {
+            if (nextSibling != null)
+              {
+                parent.insertBefore(copy, nextSibling);
+              }
+            else
+              {
+                parent.appendChild(copy);
+              }
+          }
+      }
+    if (uas != null)
+      {
+        StringTokenizer st = new StringTokenizer(uas, " ");
+        while (st.hasMoreTokens())
+          {
+            addAttributeSet(stylesheet, mode, context, pos, len,
+                            copy, null, st.nextToken());
+          }
+      }
+    if (children != null)
+      {
+        children.apply(stylesheet, mode,
+                       context, pos, len,
+                       copy, null);
+      }
+    if (next != null)
+      {
+        next.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+  
+  void addAttributeSet(Stylesheet stylesheet, QName mode,
+                       Node context, int pos, int len,
+                       Node parent, Node nextSibling, String attributeSet)
+    throws TransformerException
+  {
+    for (Iterator i = stylesheet.attributeSets.iterator(); i.hasNext(); )
+      {
+        AttributeSet as = (AttributeSet) i.next();
+        if (!as.name.equals(attributeSet))
+          {
+            continue;
+          }
+        if (as.uas != null)
+          {
+            StringTokenizer st = new StringTokenizer(as.uas, " ");
+            while (st.hasMoreTokens())
+              {
+                addAttributeSet(stylesheet, mode, context, pos, len,
+                                parent, nextSibling, st.nextToken());
+              }
+          }
+        if (as.children != null)
+          {
+            as.children.apply(stylesheet, mode,
+                              context, pos, len,
+                              parent, nextSibling);
+          }
+      }
+  }
+
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    buf.append(']');
+    return buf.toString();
+  }
+
+}
diff --git a/libjava/gnu/xml/transform/CopyOfNode.java b/libjava/gnu/xml/transform/CopyOfNode.java
new file mode 100644 (file)
index 0000000..7ca1006
--- /dev/null
+++ b/libjava/gnu/xml/transform/CopyOfNode.java
@@ -0,0 +1,179 @@
+/* CopyOfNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
+import gnu.xml.xpath.Expr;
+
+/**
+ * A template node representing an XSLT <code>copy-of</code> instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class CopyOfNode
+  extends TemplateNode
+{
+
+  final Expr select;
+
+  CopyOfNode(TemplateNode children, TemplateNode next, Expr select)
+  {
+    super(children, next);
+    this.select = select;
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new CopyOfNode((children == null) ? null :
+                          children.clone(stylesheet),
+                          (next == null) ? null :
+                          next.clone(stylesheet),
+                          select.clone(stylesheet));
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+               Node context, int pos, int len,
+               Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    Object ret = select.evaluate(context, pos, len);
+    Document doc = (parent instanceof Document) ? (Document) parent :
+      parent.getOwnerDocument();
+    if (ret instanceof Collection)
+      {
+        Collection ns = (Collection) ret;
+        List list = new ArrayList(ns);
+        Collections.sort(list, documentOrderComparator);
+        for (Iterator i = list.iterator(); i.hasNext(); )
+          {
+            Node src = (Node) i.next();
+            short nodeType = src.getNodeType();
+            if (nodeType == Node.DOCUMENT_NODE)
+              {
+                // Use document element
+                src = ((Document) src).getDocumentElement();
+                if (src == null)
+                  {
+                    continue;
+                  }
+                nodeType = Node.ELEMENT_NODE;
+              }
+            else if (nodeType == Node.ATTRIBUTE_NODE)
+              {
+                if (parent.getFirstChild() != null)
+                  {
+                    // Ignore attempt to add attribute after children
+                    continue;
+                  }
+              }
+            if (parent.getNodeType() == Node.ATTRIBUTE_NODE &&
+                nodeType != Node.TEXT_NODE &&
+                nodeType != Node.ENTITY_REFERENCE_NODE)
+              {
+                // Ignore
+                continue;
+              }
+            Node node = src.cloneNode(true);
+            node = doc.adoptNode(node);
+            if (nodeType == Node.ATTRIBUTE_NODE)
+              {
+                NamedNodeMap attrs = parent.getAttributes();
+                if (attrs != null)
+                  {
+                    attrs.setNamedItemNS(node);
+                  }
+              }
+            else
+              {
+                if (nextSibling != null)
+                  {
+                    parent.insertBefore(node, nextSibling);
+                  }
+                else
+                  {
+                    parent.appendChild(node);
+                  }
+              }
+          }
+      }
+    else
+      {
+        String value = Expr._string(context, ret);
+        if (value != null && value.length() > 0)
+          {
+            Text textNode = doc.createTextNode(value);
+            if (nextSibling != null)
+              {
+                parent.insertBefore(textNode, nextSibling);
+              }
+            else
+              {
+                parent.appendChild(textNode);
+              }
+          }
+      }
+    // copy-of doesn't process children
+    if (next != null)
+      {
+        next.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+  
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    buf.append("select=");
+    buf.append(select);
+    buf.append(']');
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/CurrentFunction.java b/libjava/gnu/xml/transform/CurrentFunction.java
new file mode 100644 (file)
index 0000000..0c901be
--- /dev/null
+++ b/libjava/gnu/xml/transform/CurrentFunction.java
@@ -0,0 +1,98 @@
+/* CurrentFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.Collections;
+import java.util.List;
+import javax.xml.xpath.XPathFunction;
+import javax.xml.xpath.XPathFunctionException;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+import gnu.xml.xpath.Function;
+
+/**
+ * The XSLT <code>current()</code>function.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class CurrentFunction
+  extends Expr
+  implements Function, XPathFunction
+{
+
+  final Stylesheet stylesheet;
+
+  CurrentFunction(Stylesheet stylesheet)
+  {
+    this.stylesheet = stylesheet;
+  }
+
+  public Object evaluate(List args)
+    throws XPathFunctionException
+  {
+    // We can't do anything useful here.
+    // So much for the JAXP API...
+    return Collections.EMPTY_SET;
+  }
+
+  public void setArguments(List args)
+  {
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    return Collections.singleton(stylesheet.current);
+  }
+
+  public Expr clone(Object context)
+  {
+    Stylesheet s = stylesheet;
+    if (context instanceof Stylesheet)
+      {
+        s = (Stylesheet) context;
+      }
+    return new CurrentFunction(s);
+  }
+
+  public String toString()
+  {
+    return "current()";
+  }
+
+}
+
diff --git a/libjava/gnu/xml/transform/DOMSourceLocator.java b/libjava/gnu/xml/transform/DOMSourceLocator.java
new file mode 100644 (file)
index 0000000..b9ef705
--- /dev/null
+++ b/libjava/gnu/xml/transform/DOMSourceLocator.java
@@ -0,0 +1,84 @@
+/* DOMSourceLocator.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import javax.xml.transform.dom.DOMLocator;
+import org.w3c.dom.Node;
+
+/**
+ * Simple DOMLocator implementation.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class DOMSourceLocator
+  implements DOMLocator
+{
+
+  final Node node;
+
+  DOMSourceLocator(Node node)
+  {
+    this.node = node;
+  }
+
+  public Node getOriginatingNode()
+  {
+    return node;
+  }
+
+  public String getPublicId()
+  {
+    return null;
+  }
+
+  public String getSystemId()
+  {
+    return null;
+  }
+
+  public int getLineNumber()
+  {
+    return -1;
+  }
+
+  public int getColumnNumber()
+  {
+    return -1;
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/DocumentFunction.java b/libjava/gnu/xml/transform/DocumentFunction.java
new file mode 100644 (file)
index 0000000..03f22b4
--- /dev/null
+++ b/libjava/gnu/xml/transform/DocumentFunction.java
@@ -0,0 +1,249 @@
+/* DocumentFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.TreeSet;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.xpath.XPathFunction;
+import javax.xml.xpath.XPathFunctionException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Constant;
+import gnu.xml.xpath.Expr;
+import gnu.xml.xpath.Function;
+import gnu.xml.xpath.IdFunction;
+
+/**
+ * The XSLT <code>document()</code>function.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class DocumentFunction
+  extends Expr
+  implements Function, XPathFunction
+{
+
+  final Stylesheet stylesheet;
+  final Node base;
+  List args;
+  List values;
+
+  DocumentFunction(Stylesheet stylesheet, Node base)
+  {
+    this.stylesheet = stylesheet;
+    this.base = base;
+  }
+
+  public Object evaluate(List args)
+    throws XPathFunctionException
+  {
+    values = args;
+    return evaluate(null, 1, 1);
+  }
+
+  public void setArguments(List args)
+  {
+    this.args = args;
+  }
+  
+  public Object evaluate(Node context, int pos, int len)
+  {
+    int arity = args.size();
+    if (values == null)
+      {
+        values = new ArrayList(arity);
+        for (int i = 0; i < arity; i++)
+          {
+            Expr arg = (Expr) args.get(i);
+            values.add(arg.evaluate(context, pos, len));
+          }
+      }
+    Object ret;
+    switch (arity)
+      {
+      case 1:
+        Object arg = values.get(0);
+        if (arg instanceof Collection)
+          {
+            Collection ns = (Collection) arg;
+            Collection acc = new TreeSet();
+            for (Iterator i = ns.iterator(); i.hasNext(); )
+              {
+                Node node = (Node) i.next();
+                String s = Expr.stringValue(node);
+                acc.addAll(document(s, node.getBaseURI()));
+              }
+            ret = acc;
+          }
+        else
+          {
+            String s = Expr._string(context, arg);
+            ret = document(s, base.getBaseURI());
+          }
+        break;
+      case 2:
+        Object arg1 = values.get(0);
+        Object arg2 = values.get(1);
+        if (!(arg2 instanceof Collection))
+          {
+            throw new RuntimeException("second argument is not a node-set");
+          }
+        Collection arg2ns = (Collection) arg2;
+        String base2 = arg2ns.isEmpty() ? null :
+          ((Node) arg2ns.iterator().next()).getBaseURI();
+        if (arg1 instanceof Collection)
+          {
+            Collection arg1ns = (Collection) arg1;
+            Collection acc = new TreeSet();
+            for (Iterator i = arg1ns.iterator(); i.hasNext(); )
+              {
+                Node node = (Node) i.next();
+                String s = Expr.stringValue(node);
+                acc.addAll(document(s, base2));
+              }
+            ret = acc;
+          }
+        else
+          {
+            String s = Expr._string(context, arg1);
+            ret = document(s, base2);
+          }
+        break;
+      default:
+        throw new RuntimeException("invalid arity");
+      }
+    values = null;
+    return ret;
+  }
+
+  /**
+   * The XSL <code>document</code> function.
+   * @see XSLT 12.1
+   * @param uri the URI from which to retrieve nodes
+   * @param base the base URI for relative URIs
+   */
+  Collection document(String uri, String base)
+  {
+    if ("".equals(uri) || uri == null)
+      {
+        uri = this.base.getBaseURI();
+      }
+    
+    // Get fragment
+    Expr fragment = null;
+    int hi = uri.indexOf('#');
+    if (hi != -1)
+      {
+        String f = uri.substring(hi + 1);
+        uri = uri.substring(0, hi);
+        // TODO handle xpointer() here
+        // this only handles IDs
+        fragment = new IdFunction(new Constant(f));
+      }
+
+    // Get document source
+    try
+      {
+        DOMSource source;
+        XSLURIResolver resolver = stylesheet.factory.resolver;
+        synchronized (resolver)
+          {
+            if (stylesheet.transformer != null)
+              {
+                resolver.setUserResolver(stylesheet.transformer.uriResolver);
+                resolver.setUserListener(stylesheet.transformer.errorListener);
+              }
+            source = resolver.resolveDOM(null, base, uri);
+          }
+        Node node = source.getNode();
+        if (fragment == null)
+          {
+            return Collections.singleton(node);
+          }
+        else
+          {
+            Object ret = fragment.evaluate(node, 1, 1);
+            if (!(ret instanceof Collection))
+              {
+                // XXX Report error?
+                return Collections.EMPTY_SET;
+              }
+            return (Collection) ret;
+          }
+      }
+    catch (TransformerException e)
+      {
+        String msg = "can't open " + uri;
+        if (base != null)
+          {
+            msg += " with base " + base;
+          }
+        throw new RuntimeException(msg);
+      }
+  }
+
+  public Expr clone(Object context)
+  {
+    Stylesheet s = stylesheet;
+    if (context instanceof Stylesheet)
+      {
+        s = (Stylesheet) context;
+      }
+    DocumentFunction f = new DocumentFunction(s, base);
+    int len = args.size();
+    List args2 = new ArrayList(len);
+    for (int i = 0; i < len; i++)
+      {
+        args2.add(((Expr) args.get(i)).clone(context));
+      }
+    f.setArguments(args2);
+    return f;
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/ElementAvailableFunction.java b/libjava/gnu/xml/transform/ElementAvailableFunction.java
new file mode 100644 (file)
index 0000000..0c9ce44
--- /dev/null
+++ b/libjava/gnu/xml/transform/ElementAvailableFunction.java
@@ -0,0 +1,169 @@
+/* ElementAvailableFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.TreeSet;
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.xpath.XPathFunction;
+import javax.xml.xpath.XPathFunctionException;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+import gnu.xml.xpath.Function;
+
+/**
+ * The XSLT <code>element-available</code> function.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class ElementAvailableFunction
+  extends Expr
+  implements Function, XPathFunction
+{
+
+  static final Collection elements;
+  static
+  {
+    TreeSet acc = new TreeSet();
+    acc.add("stylesheet");
+    acc.add("template");
+    acc.add("param");
+    acc.add("variable");
+    acc.add("include");
+    acc.add("import");
+    acc.add("output");
+    acc.add("preserve-space");
+    acc.add("strip-space");
+    acc.add("key");
+    acc.add("decimal-format");
+    acc.add("namespace-alias");
+    acc.add("attribute-set");
+    acc.add("apply-templates");
+    acc.add("call-template");
+    acc.add("value-of");
+    acc.add("for-each");
+    acc.add("if");
+    acc.add("choose");
+    acc.add("when");
+    acc.add("otherwise");
+    acc.add("element");
+    acc.add("attribute");
+    acc.add("text");
+    acc.add("copy");
+    acc.add("processing-instruction");
+    acc.add("comment");
+    acc.add("number");
+    acc.add("copy-of");
+    acc.add("message");
+    acc.add("sort");
+    acc.add("with-param");
+    acc.add("fallback");
+    acc.add("apply-imports");
+    elements = Collections.unmodifiableSet(acc);
+  }
+
+  final NamespaceContext nsctx;
+  List args;
+
+  ElementAvailableFunction(NamespaceContext nsctx)
+  {
+    this.nsctx = nsctx;
+  }
+
+  public Object evaluate(List args)
+    throws XPathFunctionException
+  {
+    // Useless...
+    return Collections.EMPTY_SET;
+  }
+
+  public void setArguments(List args)
+  {
+    this.args = args;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Expr arg = (Expr) args.get(0);
+    Object val = arg.evaluate(context, pos, len);
+    String name = _string(context, val);
+    String prefix, localName, uri;
+    int ci = name.indexOf(':');
+    if (ci == -1)
+      {
+        prefix = null;
+        localName = name;
+      }
+    else
+      {
+        prefix = name.substring(0, ci);
+        localName = name.substring(ci + 1);
+      }
+    uri = nsctx.getNamespaceURI(prefix);
+    if (Stylesheet.XSL_NS.equals(uri))
+      {
+        return elements.contains(localName) ?
+          Boolean.TRUE : Boolean.FALSE;
+        // TODO extension elements
+      }
+    return Boolean.FALSE;
+  }
+  
+  public Expr clone(Object context)
+  {
+    NamespaceContext n = nsctx;
+    if (context instanceof NamespaceContext)
+      {
+        n = (NamespaceContext) context;
+      }
+    ElementAvailableFunction f = new ElementAvailableFunction(n);
+    int len = args.size();
+    List args2 = new ArrayList(len);
+    for (int i = 0; i < len; i++)
+      {
+        args2.add(((Expr) args.get(i)).clone(context));
+      }
+    f.setArguments(args2);
+    return f;
+  }
+
+}
+
diff --git a/libjava/gnu/xml/transform/ElementNode.java b/libjava/gnu/xml/transform/ElementNode.java
new file mode 100644 (file)
index 0000000..305989c
--- /dev/null
+++ b/libjava/gnu/xml/transform/ElementNode.java
@@ -0,0 +1,279 @@
+/* ElementNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+
+/**
+ * A template node representing an XSL <code>element</code> instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class ElementNode
+  extends TemplateNode
+{
+
+  final TemplateNode name;
+  final TemplateNode namespace;
+  final String uas;
+  final Node source;
+  final Collection elementExcludeResultPrefixes;
+  
+  ElementNode(TemplateNode children, TemplateNode next, TemplateNode name,
+              TemplateNode namespace, String uas, Node source)
+  {
+    super(children, next);
+    this.name = name;
+    this.namespace = namespace;
+    this.uas = uas;
+    this.source = source;
+    NamedNodeMap attrs = source.getAttributes();
+    Node attr = attrs.getNamedItemNS(Stylesheet.XSL_NS,
+                                     "exclude-result-prefixes");
+    if (attr != null)
+      {
+        elementExcludeResultPrefixes = new HashSet();
+        StringTokenizer st = new StringTokenizer(attr.getNodeValue());
+        while (st.hasMoreTokens())
+          {
+            elementExcludeResultPrefixes.add(st.nextToken());
+          }
+      }
+    else
+      {
+        elementExcludeResultPrefixes = Collections.EMPTY_SET;
+      }
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new ElementNode((children == null) ? null :
+                           children.clone(stylesheet),
+                           (next == null) ? null :
+                           next.clone(stylesheet),
+                           name.clone(stylesheet),
+                           (namespace == null) ? null :
+                           namespace.clone(stylesheet),
+                           uas, source);
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+             Node context, int pos, int len,
+             Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    Document doc = (parent instanceof Document) ? (Document) parent :
+      parent.getOwnerDocument();
+    // Create a document fragment to hold the name
+    DocumentFragment fragment = doc.createDocumentFragment();
+    // Apply name to the fragment
+    name.apply(stylesheet, mode,
+               context, pos, len,
+               fragment, null);
+    // Use XPath string-value of fragment
+    String nameValue = Expr.stringValue(fragment);
+
+    String namespaceValue = null;
+    if (namespace != null)
+      {
+        // Create a document fragment to hold the namespace
+        fragment = doc.createDocumentFragment();
+        // Apply namespace to the fragment
+        namespace.apply(stylesheet, mode,
+                        context, pos, len,
+                        fragment, null);
+        // Use XPath string-value of fragment
+        namespaceValue = Expr.stringValue(fragment);
+        if (namespaceValue.length() == 0)
+          {
+            namespaceValue = null;
+          }
+      }
+    
+    String prefix = getPrefix(nameValue);
+    if (XMLConstants.XMLNS_ATTRIBUTE.equals(prefix))
+      {
+        int ci = nameValue.indexOf(':');
+        nameValue = nameValue.substring(ci + 1);
+      }
+    else
+      {
+        // Namespace aliasing
+        if (prefix == null)
+          {
+            prefix = "#default";
+          }
+        String resultPrefix =
+          (String) stylesheet.namespaceAliases.get(prefix);
+        if (resultPrefix != null)
+          {
+            if ("#default".equals(resultPrefix))
+              {
+                resultPrefix = null;
+              }
+            namespaceValue = source.lookupNamespaceURI(resultPrefix);
+          }
+        if (prefix == "#default")
+          {
+            prefix = null;
+          }
+        // Look up ordinary namespace for this prefix
+        if (namespaceValue == null)
+          {
+            if (XMLConstants.XML_NS_PREFIX.equals(prefix))
+              {
+                namespaceValue = XMLConstants.XML_NS_URI;
+              }
+            else
+              {
+                // Resolve namespace for this prefix
+                namespaceValue = source.lookupNamespaceURI(prefix);
+              }
+          }
+        /*if (prefix == null)
+          {
+            // Resolve prefix for this namespace
+            prefix = parent.lookupPrefix(namespaceValue);
+            if (prefix != null)
+              {
+                nameValue = prefix + ":" + nameValue;
+              }
+          }*/
+      }
+    // Create element
+    Element element = (namespaceValue != null) ?
+      doc.createElementNS(namespaceValue, nameValue) :
+          doc.createElement(nameValue);
+    if (nextSibling != null)
+      {
+        parent.insertBefore(element, nextSibling);
+      }
+    else
+      {
+        parent.appendChild(element);
+      }
+    stylesheet.addNamespaceNodes(source, element, doc,
+                                 elementExcludeResultPrefixes);
+    if (uas != null)
+      {
+        StringTokenizer st = new StringTokenizer(uas, " ");
+        while (st.hasMoreTokens())
+          {
+            addAttributeSet(stylesheet, mode, context, pos, len,
+                            element, null, st.nextToken());
+          }
+      }
+    if (children != null)
+      {
+        children.apply(stylesheet, mode,
+                       context, pos, len,
+                       element, null);
+      }
+    if (next != null)
+      {
+        next.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+
+  final String getPrefix(String name)
+  {
+    int ci = name.indexOf(':');
+    return (ci == -1) ? null : name.substring(0, ci);
+  }
+
+  void addAttributeSet(Stylesheet stylesheet, QName mode,
+                       Node context, int pos, int len,
+                       Node parent, Node nextSibling, String attributeSet)
+    throws TransformerException
+  {
+    for (Iterator i = stylesheet.attributeSets.iterator(); i.hasNext(); )
+      {
+        AttributeSet as = (AttributeSet) i.next();
+        if (!as.name.equals(attributeSet))
+          {
+            continue;
+          }
+        if (as.uas != null)
+          {
+            StringTokenizer st = new StringTokenizer(as.uas, " ");
+            while (st.hasMoreTokens())
+              {
+                addAttributeSet(stylesheet, mode, context, pos, len,
+                                parent, nextSibling, st.nextToken());
+              }
+          }
+        if (as.children != null)
+          {
+            as.children.apply(stylesheet, mode,
+                              context, pos, len,
+                              parent, nextSibling);
+          }
+      }
+  }
+
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    buf.append("name=");
+    buf.append(name);
+    if (uas != null)
+      {
+        buf.append(",uas=");
+        buf.append(uas);
+      }
+    buf.append(']');
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/ErrorListenerErrorHandler.java b/libjava/gnu/xml/transform/ErrorListenerErrorHandler.java
new file mode 100644 (file)
index 0000000..929f7f0
--- /dev/null
+++ b/libjava/gnu/xml/transform/ErrorListenerErrorHandler.java
@@ -0,0 +1,101 @@
+/* ErrorListenerErrorHandler.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.TransformerException;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+/**
+ * An ErrorHandler that wraps an ErrorListener.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class ErrorListenerErrorHandler
+  implements ErrorHandler
+{
+
+  final ErrorListener listener;
+
+  ErrorListenerErrorHandler(ErrorListener listener)
+  {
+    this.listener = listener;
+  }
+
+  public void warning(SAXParseException e)
+    throws SAXException
+  {
+    try
+      {
+        listener.warning(new TransformerException(e));
+      }
+    catch (TransformerException e2)
+      {
+        throw new SAXException(e2);
+      }
+  }
+  
+  public void error(SAXParseException e)
+    throws SAXException
+  {
+    try
+      {
+        listener.error(new TransformerException(e));
+      }
+    catch (TransformerException e2)
+      {
+        throw new SAXException(e2);
+      }
+  }
+  
+  public void fatalError(SAXParseException e)
+    throws SAXException
+  {
+    try
+      {
+        listener.fatalError(new TransformerException(e));
+      }
+    catch (TransformerException e2)
+      {
+        throw new SAXException(e2);
+      }
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/ForEachNode.java b/libjava/gnu/xml/transform/ForEachNode.java
new file mode 100644 (file)
index 0000000..af96628
--- /dev/null
+++ b/libjava/gnu/xml/transform/ForEachNode.java
@@ -0,0 +1,149 @@
+/* ForEachNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+
+/**
+ * A template node representing an XSLT <code>for-each</code> instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class ForEachNode
+  extends TemplateNode
+{
+
+  final Expr select;
+  final List sortKeys;
+
+  ForEachNode(TemplateNode children, TemplateNode next, Expr select,
+              List sortKeys)
+  {
+    super(children, next);
+    this.select = select;
+    this.sortKeys = sortKeys;
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    int len = sortKeys.size();
+    List sortKeys2 = new ArrayList(len);
+    for (int i = 0; i < len; i++)
+      {
+        sortKeys2.add(((Key) sortKeys.get(i)).clone(stylesheet));
+      }
+    return new ForEachNode((children == null) ? null :
+                           children.clone(stylesheet),
+                           (next == null) ? null :
+                           next.clone(stylesheet),
+                           select.clone(stylesheet),
+                           sortKeys2);
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+             Node context, int pos, int len,
+             Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    if (children != null)
+      {
+        // Set current template to null
+        Template saved = stylesheet.currentTemplate;
+        stylesheet.currentTemplate = null;
+        Object ret = select.evaluate(context, pos, len);
+        //System.err.println(toString() + ": " + context+" -> "+ret);
+        if (ret instanceof Collection)
+          {
+            Collection ns = (Collection) ret;
+            List list = new ArrayList(ns);
+            if (sortKeys != null)
+              {
+                for (Iterator i = sortKeys.iterator(); i.hasNext(); )
+                  {
+                    SortKey sortKey = (SortKey) i.next();
+                    sortKey.init(stylesheet, mode, context, pos, len, parent,
+                                 nextSibling);
+                  }
+                Collections.sort(list, new XSLComparator(sortKeys));
+              }
+            else
+              {
+                Collections.sort(list, documentOrderComparator);
+              }
+            // Perform children for each node
+            int l = list.size();
+            int p = 1;
+            for (Iterator i = list.iterator(); i.hasNext(); )
+              {
+                Node node = (Node) i.next();
+                stylesheet.current = node;
+                children.apply(stylesheet, mode,
+                               node, p++, l,
+                               parent, nextSibling);
+              }
+          }
+        // Restore current template
+        stylesheet.currentTemplate = saved;
+      }
+    if (next != null)
+      {
+        next.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    buf.append("select=");
+    buf.append(select);
+    buf.append(']');
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/FormatNumberFunction.java b/libjava/gnu/xml/transform/FormatNumberFunction.java
new file mode 100644 (file)
index 0000000..73c5af4
--- /dev/null
+++ b/libjava/gnu/xml/transform/FormatNumberFunction.java
@@ -0,0 +1,133 @@
+/* FormatNumberFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.xml.xpath.XPathFunction;
+import javax.xml.xpath.XPathFunctionException;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+import gnu.xml.xpath.Function;
+
+/**
+ * The XSLT <code>format-number()</code>function.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class FormatNumberFunction
+  extends Expr
+  implements XPathFunction, Function
+{
+
+  final Stylesheet stylesheet;
+  List args;
+
+  FormatNumberFunction(Stylesheet stylesheet)
+  {
+    this.stylesheet = stylesheet;
+  }
+
+  public Object evaluate(List args)
+    throws XPathFunctionException
+  {
+    // Useless...
+    return Collections.EMPTY_SET;
+  }
+
+  public void setArguments(List args)
+  {
+    this.args = args;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    int arity = args.size();
+    List values = new ArrayList(arity);
+    for (int i = 0; i < arity; i++)
+      {
+        Expr arg = (Expr) args.get(i);
+        values.add(arg.evaluate(context, pos, len));
+      }
+    double number = _number(context, values.get(0));
+    String pattern = _string(context, values.get(1));
+    // Currency symbol &#x00a4; is not supposed to be present
+    if (pattern.indexOf('\u00a4') != -1)
+      {
+        // Replace with $ (Xalan does this)
+        pattern = pattern.replace('\u00a4', '$');
+      }
+    String dfName = null;
+    if (arity > 2)
+      {
+        dfName = _string(context, values.get(2));
+        // otherwise the default decimal-format will be used
+      }
+    DecimalFormat df = (DecimalFormat) stylesheet.decimalFormats.get(dfName);
+    if (df == null)
+      {
+        throw new IllegalArgumentException("No such decimal-format: " +
+                                           dfName);
+      }
+    df.applyLocalizedPattern(pattern);
+    return df.format(number);
+  }
+
+  public Expr clone(Object context)
+  {
+    Stylesheet s = stylesheet;
+    if (context instanceof Stylesheet)
+      {
+        s = (Stylesheet) context;
+      }
+    FormatNumberFunction f = new FormatNumberFunction(s);
+    int len = args.size();
+    List args2 = new ArrayList(len);
+    for (int i = 0; i < len; i++)
+      {
+        args2.add(((Expr) args.get(i)).clone(context));
+      }
+    f.setArguments(args2);
+    return f;
+  }
+
+}
+
diff --git a/libjava/gnu/xml/transform/FunctionAvailableFunction.java b/libjava/gnu/xml/transform/FunctionAvailableFunction.java
new file mode 100644 (file)
index 0000000..2931082
--- /dev/null
+++ b/libjava/gnu/xml/transform/FunctionAvailableFunction.java
@@ -0,0 +1,175 @@
+/* FunctionAvailableFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.TreeSet;
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.xpath.XPathFunction;
+import javax.xml.xpath.XPathFunctionException;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+import gnu.xml.xpath.Function;
+
+/**
+ * The XSLT <code>function-available</code> function.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class FunctionAvailableFunction
+  extends Expr
+  implements Function, XPathFunction
+{
+
+  static final Collection xsltFunctions;
+  static final Collection xpathFunctions;
+  static
+  {
+    TreeSet acc = new TreeSet();
+    acc.add("document");
+    acc.add("key");
+    acc.add("format-number");
+    acc.add("current");
+    acc.add("unparsed-entity-uri");
+    acc.add("generate-id");
+    acc.add("system-property");
+    acc.add("element-available");
+    acc.add("function-available");
+    xsltFunctions = Collections.unmodifiableSet(acc);
+    acc = new TreeSet();
+    acc.add("boolean");
+    acc.add("ceiling");
+    acc.add("concat");
+    acc.add("contains");
+    acc.add("count");
+    acc.add("false");
+    acc.add("floor");
+    acc.add("id");
+    acc.add("lang");
+    acc.add("last");
+    acc.add("local-name");
+    acc.add("name");
+    acc.add("namespace-uri");
+    acc.add("normalize-space");
+    acc.add("not");
+    acc.add("number");
+    acc.add("position");
+    acc.add("round");
+    acc.add("starts-with");
+    acc.add("string");
+    acc.add("string-length");
+    acc.add("substring-after");
+    acc.add("substring-before");
+    acc.add("substring");
+    acc.add("sum");
+    acc.add("translate");
+    acc.add("true");
+    xpathFunctions = Collections.unmodifiableSet(acc);
+  }
+
+  final NamespaceContext nsctx;
+  List args;
+
+  FunctionAvailableFunction(NamespaceContext nsctx)
+  {
+    this.nsctx = nsctx;
+  }
+
+  public Object evaluate(List args)
+    throws XPathFunctionException
+  {
+    // Useless...
+    return Collections.EMPTY_SET;
+  }
+
+  public void setArguments(List args)
+  {
+    this.args = args;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Expr arg = (Expr) args.get(0);
+    Object val = arg.evaluate(context, pos, len);
+    String name = _string(context, val);
+    String prefix, localName, uri;
+    int ci = name.indexOf(':');
+    if (ci == -1)
+      {
+        prefix = null;
+        localName = name;
+      }
+    else
+      {
+        prefix = name.substring(0, ci);
+        localName = name.substring(ci + 1);
+      }
+    uri = nsctx.getNamespaceURI(prefix);
+    if (uri == null)
+      {
+        return xsltFunctions.contains(localName) ||
+          xpathFunctions.contains(localName) ?
+          Boolean.TRUE : Boolean.FALSE;
+        // TODO extension functions
+      }
+    return Boolean.FALSE;
+  }
+  
+  public Expr clone(Object context)
+  {
+    NamespaceContext n = nsctx;
+    if (context instanceof NamespaceContext)
+      {
+        n = (NamespaceContext) context;
+      }
+    FunctionAvailableFunction f = new FunctionAvailableFunction(n);
+    int len = args.size();
+    List args2 = new ArrayList(len);
+    for (int i = 0; i < len; i++)
+      {
+        args2.add(((Expr) args.get(i)).clone(context));
+      }
+    f.setArguments(args2);
+    return f;
+  }
+
+}
+
diff --git a/libjava/gnu/xml/transform/GenerateIdFunction.java b/libjava/gnu/xml/transform/GenerateIdFunction.java
new file mode 100644 (file)
index 0000000..9e48f79
--- /dev/null
+++ b/libjava/gnu/xml/transform/GenerateIdFunction.java
@@ -0,0 +1,126 @@
+/* GenerateIdFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import javax.xml.xpath.XPathFunction;
+import javax.xml.xpath.XPathFunctionException;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+import gnu.xml.xpath.Function;
+
+/**
+ * The XSLT <code>generate-id()</code>function.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class GenerateIdFunction
+  extends Expr
+  implements XPathFunction, Function
+{
+
+  List args;
+
+  public Object evaluate(List args)
+    throws XPathFunctionException
+  {
+    // Useless...
+    return Collections.EMPTY_SET;
+  }
+
+  public void setArguments(List args)
+  {
+    this.args = args;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    int arity = args.size();
+    List values = new ArrayList(arity);
+    for (int i = 0; i < arity; i++)
+      {
+        Expr arg = (Expr) args.get(i);
+        values.add(arg.evaluate(context, pos, len));
+      }
+    Node node;
+    Collection ns = (arity == 0) ? Collections.EMPTY_SET :
+      (Collection) values.get(0);
+    if (ns.isEmpty())
+      {
+        node = context;
+      }
+    else
+      {
+        List list = new ArrayList(ns);
+        Collections.sort(list, documentOrderComparator);
+        node = (Node) list.get(0);
+      }
+
+    String name = node.getNodeName();
+    int index = 0, depth = 0;
+    for (Node ctx = node.getPreviousSibling(); ctx != null;
+         ctx = ctx.getPreviousSibling())
+      {
+        index++;
+      }
+    for (Node ctx = node.getParentNode(); ctx != null;
+         ctx = ctx.getParentNode())
+      {
+        depth++;
+      }
+    return name + "-" + index + "-" + depth;
+  }
+
+  public Expr clone(Object context)
+  {
+    GenerateIdFunction f = new GenerateIdFunction();
+    int len = args.size();
+    List args2 = new ArrayList(len);
+    for (int i = 0; i < len; i++)
+      {
+        args2.add(((Expr) args.get(i)).clone(context));
+      }
+    f.setArguments(args2);
+    return f;
+  }
+
+}
+
diff --git a/libjava/gnu/xml/transform/IfNode.java b/libjava/gnu/xml/transform/IfNode.java
new file mode 100644 (file)
index 0000000..c977348
--- /dev/null
+++ b/libjava/gnu/xml/transform/IfNode.java
@@ -0,0 +1,107 @@
+/* IfNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+
+/**
+ * A template node representing an XSL <code>if</code> instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class IfNode
+  extends TemplateNode
+{
+
+  final Expr test;
+
+  IfNode(TemplateNode children, TemplateNode next, Expr test)
+  {
+    super(children, next);
+    this.test = test;
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new IfNode((children == null) ? null :
+                      children.clone(stylesheet),
+                      (next == null) ? null :
+                      next.clone(stylesheet),
+                      test.clone(stylesheet));
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+             Node context, int pos, int len,
+             Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    Object ret = test.evaluate(context, pos, len);
+    boolean success = (ret instanceof Boolean) ?
+      ((Boolean) ret).booleanValue() :
+      Expr._boolean(context, ret);
+    if (success)
+      {
+        if (children != null)
+          {
+            children.apply(stylesheet, mode,
+                           context, pos, len,
+                           parent, nextSibling);
+          }
+      }
+    if (next != null)
+      {
+        next.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+  
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    buf.append("test=");
+    buf.append(test);
+    buf.append(']');
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/Key.java b/libjava/gnu/xml/transform/Key.java
new file mode 100644 (file)
index 0000000..008400f
--- /dev/null
+++ b/libjava/gnu/xml/transform/Key.java
@@ -0,0 +1,71 @@
+/* Key.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import javax.xml.namespace.QName;
+import gnu.xml.xpath.Expr;
+import gnu.xml.xpath.Pattern;
+
+/**
+ * An XSL key.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class Key
+{
+
+  final QName name;
+  final Pattern match;
+  final Expr use;
+
+  Key(QName name, Pattern match, Expr use)
+  {
+    this.name = name;
+    this.match = match;
+    this.use = use;
+  }
+
+  Key clone(Stylesheet stylesheet)
+  {
+    return new Key(name,
+                   (Pattern) match.clone(stylesheet),
+                   use.clone(stylesheet));
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/transform/KeyFunction.java b/libjava/gnu/xml/transform/KeyFunction.java
new file mode 100644 (file)
index 0000000..233c12f
--- /dev/null
+++ b/libjava/gnu/xml/transform/KeyFunction.java
@@ -0,0 +1,216 @@
+/* KeyFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import javax.xml.namespace.QName;
+import javax.xml.xpath.XPathFunction;
+import javax.xml.xpath.XPathFunctionException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+import gnu.xml.xpath.Function;
+import gnu.xml.xpath.Pattern;
+
+/**
+ * The XSLT <code>key()</code>function.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class KeyFunction
+  extends Pattern
+  implements XPathFunction, Function
+{
+
+  final Stylesheet stylesheet;
+  List args;
+
+  KeyFunction(Stylesheet stylesheet)
+  {
+    this.stylesheet = stylesheet;
+  }
+
+  public Object evaluate(List args)
+    throws XPathFunctionException
+  {
+    // Useless...
+    return Collections.EMPTY_SET;
+  }
+
+  public void setArguments(List args)
+  {
+    this.args = args;
+  }
+
+  public boolean matches(Node context)
+  {
+    Object ret = evaluate(context, 1, 1);
+    return !((Collection) ret).isEmpty();
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    // Evaluate arguments
+    int arity = args.size();
+    List values = new ArrayList(arity);
+    for (int i = 0; i < arity; i++)
+      {
+        Expr arg = (Expr) args.get(i);
+        values.add(arg.evaluate(context, pos, len));
+      }
+    // Get key name
+    QName keyName = QName.valueOf(_string(context, values.get(0)));
+    // Expand qualified name
+    String uri = keyName.getNamespaceURI();
+    String prefix = keyName.getPrefix();
+    if ((uri == null || uri.length() == 0) && 
+        (prefix != null && prefix.length() > 0))
+      {
+        uri = stylesheet.getNamespaceURI(prefix);
+        if (uri != null && uri.length() > 0)
+          {
+            String localName = keyName.getLocalPart();
+            keyName = new QName(uri, localName, prefix);
+          }
+      }
+    // Compute matching key set
+    Collection keySet = new LinkedList();
+    for (Iterator i = stylesheet.keys.iterator(); i.hasNext(); )
+      {
+        Key key = (Key) i.next();
+        if (key.name.equals(keyName))
+          {
+            keySet.add(key);
+          }
+      }
+    // Get target
+    Object target = values.get(1);
+    Collection acc = new LinkedHashSet();
+    Document doc = (context instanceof Document) ? (Document) context :
+      context.getOwnerDocument();
+    if (target instanceof Collection)
+      {
+        for (Iterator i = ((Collection) target).iterator(); i.hasNext(); )
+          {
+            String val = Expr.stringValue((Node) i.next());
+            addKeyNodes(doc, keySet, val, acc);
+          }
+      }
+    else
+      {
+        String val = Expr._string(context, target);
+        addKeyNodes(doc, keySet, val, acc);
+      }
+    List ret = new ArrayList(acc);
+    Collections.sort(ret, documentOrderComparator);
+    return ret;
+  }
+
+  final void addKeyNodes(Node node, Collection keySet,
+                         String value, Collection acc)
+  {
+    addKeyNodeIfMatch(node, keySet, value, acc);
+    // Apply children
+    for (Node ctx = node.getFirstChild(); ctx != null;
+         ctx = ctx.getNextSibling())
+      {
+        addKeyNodes(ctx, keySet, value, acc);
+      }
+  }
+  
+  final void addKeyNodeIfMatch(Node node, Collection keySet,
+                               String value, Collection acc)
+  {
+    for (Iterator i = keySet.iterator(); i.hasNext(); )
+      {
+        Key key = (Key) i.next();
+        if (key.match.matches(node))
+          {
+            Object eval = key.use.evaluate(node, 1, 1);
+            if (eval instanceof Collection)
+              {
+                for (Iterator j = ((Collection) eval).iterator();
+                     j.hasNext(); )
+                  {
+                    String keyValue = Expr.stringValue((Node) j.next());
+                    if (value.equals(keyValue))
+                      {
+                        acc.add(node);
+                        return;
+                      }
+                  }
+              }
+            else
+              {
+                String keyValue = Expr._string(node, eval);
+                if (value.equals(keyValue))
+                  {
+                    acc.add(node);
+                    return;
+                  }
+              }
+          }
+      }
+  }
+
+  public Expr clone(Object context)
+  {
+    Stylesheet s = stylesheet;
+    if (context instanceof Stylesheet)
+      {
+        s = (Stylesheet) context;
+      }
+    KeyFunction f = new KeyFunction(s);
+    int len = args.size();
+    List args2 = new ArrayList(len);
+    for (int i = 0; i < len; i++)
+      {
+        args2.add(((Expr) args.get(i)).clone(context));
+      }
+    f.setArguments(args2);
+    return f;
+  }
+
+}
+
diff --git a/libjava/gnu/xml/transform/LiteralNode.java b/libjava/gnu/xml/transform/LiteralNode.java
new file mode 100644 (file)
index 0000000..1b5af1a
--- /dev/null
+++ b/libjava/gnu/xml/transform/LiteralNode.java
@@ -0,0 +1,225 @@
+/* LiteralNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.StringTokenizer;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+/**
+ * A template node that copies a DOM node in the template to the result
+ * tree.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class LiteralNode
+  extends TemplateNode
+{
+
+  /**
+   * The source node in the XSL template.
+   */
+  final Node source;
+
+  final Collection elementExcludeResultPrefixes;
+
+  LiteralNode(TemplateNode children, TemplateNode next, Node source)
+  {
+    super(children, next);
+    this.source = source;
+    if (source.getNodeType() == Node.ELEMENT_NODE)
+      {
+        NamedNodeMap attrs = source.getAttributes();
+        Node attr = attrs.getNamedItemNS(Stylesheet.XSL_NS,
+                                         "exclude-result-prefixes");
+        if (attr != null)
+          {
+            elementExcludeResultPrefixes = new HashSet();
+            StringTokenizer st = new StringTokenizer(attr.getNodeValue());
+            while (st.hasMoreTokens())
+              {
+                elementExcludeResultPrefixes.add(st.nextToken());
+              }
+          }
+        else
+          {
+            elementExcludeResultPrefixes = Collections.EMPTY_SET;
+          }
+      }
+    else
+      {
+        elementExcludeResultPrefixes = null;
+      }
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new LiteralNode((children == null) ? null :
+                           children.clone(stylesheet),
+                           (next == null) ? null :
+                           next.clone(stylesheet),
+                           source);
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+             Node context, int pos, int len,
+             Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    Node result = null;
+    Document doc = (parent instanceof Document) ? (Document) parent :
+      parent.getOwnerDocument();
+    short nodeType = source.getNodeType();
+    if (nodeType == Node.ATTRIBUTE_NODE &&
+        parent.getFirstChild() != null)
+      {
+        // Ignore attributes added after child elements
+      }
+    else
+      {
+        // Namespace aliasing
+        if (nodeType == Node.ELEMENT_NODE)
+          {
+            String prefix = source.getPrefix();
+            if (prefix == null)
+              {
+                prefix = "#default";
+              }
+            String resultPrefix =
+              (String) stylesheet.namespaceAliases.get(prefix);
+            if (resultPrefix != null)
+              {
+                if ("#default".equals(resultPrefix))
+                  {
+                    resultPrefix = null;
+                  }
+                String uri = source.lookupNamespaceURI(resultPrefix);
+                String name = source.getNodeName();
+                // Create a new element node in the result document
+                result = doc.createElementNS(uri, name);
+                // copy attributes
+                NamedNodeMap srcAttrs = source.getAttributes();
+                NamedNodeMap dstAttrs = result.getAttributes();
+                int l = srcAttrs.getLength();
+                for (int i = 0; i < l; i++)
+                  {
+                    Node attr = srcAttrs.item(i);
+                    if (!Stylesheet.XSL_NS.equals(attr.getNamespaceURI()))
+                      {
+                        attr = attr.cloneNode(true);
+                        attr = doc.adoptNode(attr);
+                        dstAttrs.setNamedItemNS(attr);
+                      }
+                  }
+              }
+          }
+        if (result == null)
+          {
+            // Create result node
+            result = source.cloneNode(false);
+            // Remove any XSL attributes
+            NamedNodeMap attrs = result.getAttributes();
+            if (attrs != null)
+              {
+                int l = attrs.getLength();
+                for (int i = 0; i < l; i++)
+                  {
+                    Node attr = attrs.item(i);
+                    if (Stylesheet.XSL_NS.equals(attr.getNamespaceURI()))
+                      {
+                        attrs.removeNamedItem(attr.getNodeName());
+                        i--;
+                        l--;
+                      }
+                  }
+              }
+            result = doc.adoptNode(result);
+            if (result == null)
+              {
+                String msg = "Error adopting node to result tree";
+                DOMSourceLocator l = new DOMSourceLocator(context);
+                throw new TransformerException(msg, l);
+              }
+          }
+        if (nextSibling != null)
+          {
+            parent.insertBefore(result, nextSibling);
+          }
+        else
+          {
+            parent.appendChild(result);
+          }
+        if (nodeType == Node.ELEMENT_NODE)
+          {
+            stylesheet.addNamespaceNodes(source, result, doc,
+                                         elementExcludeResultPrefixes);
+          }
+        // children
+        if (children != null)
+          {
+            children.apply(stylesheet, mode,
+                           context, pos, len,
+                           result, null);
+          }
+      }
+    // next sibling
+    if (next != null)
+      {
+        next.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    buf.append("source=");
+    buf.append(source);
+    buf.append(']');
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/MessageNode.java b/libjava/gnu/xml/transform/MessageNode.java
new file mode 100644 (file)
index 0000000..c79060a
--- /dev/null
+++ b/libjava/gnu/xml/transform/MessageNode.java
@@ -0,0 +1,97 @@
+/* MessageNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+
+/**
+ * An XSL <code>message</code> instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class MessageNode
+  extends TemplateNode
+{
+
+  final boolean terminate;
+
+  MessageNode(TemplateNode children, TemplateNode next, boolean terminate)
+  {
+    super(children, next);
+    this.terminate = terminate;
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new MessageNode((children == null) ? null :
+                           children.clone(stylesheet),
+                           (next == null) ? null :
+                           next.clone(stylesheet),
+                           terminate);
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+               Node context, int pos, int len,
+               Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    if (children != null)
+      {
+        Document doc = (parent instanceof Document) ? (Document) parent :
+          parent.getOwnerDocument();
+        DocumentFragment fragment = doc.createDocumentFragment();
+        children.apply(stylesheet, mode, context, pos, len, fragment, null);
+        String message = Expr.stringValue(fragment);
+        System.err.println(message);
+        if (terminate)
+          {
+            stylesheet.terminated = true;
+          }
+      }
+    if (next != null && !terminate)
+      {
+        next.apply(stylesheet, mode, context, pos, len, parent, nextSibling);
+      }
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/NodeNumberNode.java b/libjava/gnu/xml/transform/NodeNumberNode.java
new file mode 100644 (file)
index 0000000..76f8d7e
--- /dev/null
+++ b/libjava/gnu/xml/transform/NodeNumberNode.java
@@ -0,0 +1,261 @@
+/* NodeNumberNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+import gnu.xml.xpath.NodeTypeTest;
+import gnu.xml.xpath.Pattern;
+import gnu.xml.xpath.Selector;
+import gnu.xml.xpath.Test;
+import gnu.xml.xpath.UnionExpr;
+
+/**
+ * A template node representing the XSL <code>number</code> instruction
+ * with no <code>value</code> expression, i.e. the value is computed from
+ * the document position of the context node.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class NodeNumberNode
+  extends AbstractNumberNode
+{
+
+  static final int SINGLE = 0;
+  static final int MULTIPLE = 1;
+  static final int ANY = 2;
+
+  final int level;
+  final Pattern count;
+  final Pattern from;
+
+  NodeNumberNode(TemplateNode children, TemplateNode next,
+                 int level, Pattern count, Pattern from,
+                 TemplateNode format, String lang,
+                 int letterValue, String groupingSeparator, int groupingSize)
+  {
+    super(children, next, format, lang, letterValue, groupingSeparator,
+          groupingSize);
+    this.level = level;
+    this.count = count;
+    this.from = from;
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new NodeNumberNode((children == null) ? null :
+                              children.clone(stylesheet),
+                              (next == null) ? null :
+                              next.clone(stylesheet),
+                              level,
+                              (count == null) ? null :
+                              (Pattern) count.clone(stylesheet),
+                              (from == null) ? from :
+                              (Pattern) from.clone(stylesheet),
+                              format, lang, letterValue,
+                              groupingSeparator, groupingSize);
+  }
+
+  int[] compute(Stylesheet stylesheet, Node context, int pos, int len)
+    throws TransformerException
+  {
+    /*if (from != null)
+      {
+        Object ret = from.evaluate(context, pos, len);
+        if (ret instanceof Collection)
+          {
+            Collection ns = (Collection) ret;
+            if (ns.size() > 0)
+              {
+                List list = new ArrayList(ns);
+                Collections.sort(list, documentOrderComparator);
+                context = (Node) list.get(0);
+              }
+            else
+              {
+                return new int[0];
+              }
+          }
+        else
+          {
+            return new int[0];
+          }
+      }*/
+    Node current = context;
+    switch (level)
+      {
+      case SINGLE:
+        if (from == null)
+          {
+            while (context != null && !countMatches(current, context))
+              {
+                context = context.getParentNode();
+              }
+          }
+        else
+          {
+            while (context != null && !countMatches(current, context) &&
+                   !fromMatches(context))
+              {
+                context = context.getParentNode();
+              }
+          }
+        return (context == null) ? new int[0] :
+          new int[] { (context == current) ? pos : getIndex(current, context) };
+      case MULTIPLE:
+        List ancestors = new ArrayList();
+        while (context != null)
+          {
+            if (countMatches(current, context))
+              {
+                if (from == null || fromMatches(context))
+                  {
+                    ancestors.add(context);
+                  }
+              }
+            context = context.getParentNode();
+          }
+        Collections.sort(ancestors, documentOrderComparator);
+        int[] ret = new int[ancestors.size()];
+        for (int i = 0; i < ret.length; i++)
+          {
+            ret[i] = getIndex(current, (Node) ancestors.get(i));
+          }
+        return ret;
+      case ANY:
+        Expr preceding = new Selector(Selector.PRECEDING,
+                                      Collections.EMPTY_LIST);
+        Expr ancestorOrSelf = new Selector(Selector.ANCESTOR_OR_SELF,
+                                           Collections.EMPTY_LIST);
+        Expr any = new UnionExpr(preceding, ancestorOrSelf);
+        Object eval = any.evaluate(context, pos, len);
+        if (eval instanceof Collection)
+          {
+            Collection ns = (Collection) eval;
+            List candidates = new ArrayList();
+            for (Iterator i = ns.iterator(); i.hasNext(); )
+              {
+                Node candidate = (Node) i.next();
+                if (countMatches(current, candidate))
+                  {
+                    candidates.add(candidate);
+                    if (from != null && from.matches(candidate))
+                      {
+                        break;
+                      }
+                  }
+              }
+            return new int[] { candidates.size() };
+          }
+        return new int[0];
+      default:
+        throw new TransformerException("invalid level");
+      }
+  }
+
+  boolean countMatches(Node current, Node node)
+  {
+    if (count == null)
+      {
+        int cnt = current.getNodeType();
+        int nnt = node.getNodeType();
+        if (cnt != nnt)
+          {
+            return false;
+          }
+        if (nnt == Node.ELEMENT_NODE || nnt == Node.ATTRIBUTE_NODE)
+          {
+            String curi = current.getNamespaceURI();
+            String nuri = node.getNamespaceURI();
+            if ((curi == null && nuri != null) ||
+                (curi != null && !curi.equals(nuri)))
+              {
+                return false;
+              }
+            String cn = current.getLocalName();
+            String nn = current.getLocalName();
+            if (!cn.equals(nn))
+              {
+                return false;
+              }
+          }
+        return true;
+      }
+    else
+      {
+        return count.matches(node);
+      }
+  }
+
+  boolean fromMatches(Node node)
+  {
+    for (Node ctx = node.getParentNode(); ctx != null;
+         ctx = ctx.getParentNode())
+      {
+        if (from.matches(ctx))
+          {
+            return true;
+          }
+      }
+    return false;
+  }
+
+  int getIndex(Node current, Node node)
+  {
+    int index = 0;
+    do
+      {
+        do
+          {
+            node = node.getPreviousSibling();
+          }
+        while (node != null && !countMatches(current, node));
+        index++;
+      }
+    while (node != null);
+    return index;
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/NumberNode.java b/libjava/gnu/xml/transform/NumberNode.java
new file mode 100644 (file)
index 0000000..0970ac9
--- /dev/null
+++ b/libjava/gnu/xml/transform/NumberNode.java
@@ -0,0 +1,86 @@
+/* NumberNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+
+/**
+ * A template node representing the XSL <code>number</code> instruction
+ * with a <code>value</code> expression.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class NumberNode
+  extends AbstractNumberNode
+{
+
+  final Expr value;
+
+  NumberNode(TemplateNode children, TemplateNode next,
+             Expr value, TemplateNode format, String lang,
+             int letterValue, String groupingSeparator, int groupingSize)
+  {
+    super(children, next, format, lang, letterValue, groupingSeparator,
+          groupingSize);
+    this.value = value;
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new NumberNode((children == null) ? null :
+                          children.clone(stylesheet),
+                          (next == null) ? null :
+                          next.clone(stylesheet),
+                          value.clone(stylesheet),
+                          format, lang, letterValue,
+                          groupingSeparator, groupingSize);
+  }
+
+  int[] compute(Stylesheet stylesheet, Node context, int pos, int len)
+    throws TransformerException
+  {
+    Object ret = value.evaluate(context, pos, len);
+    Double d = (ret instanceof Double) ? ((Double) ret) :
+      new Double(Expr._number(context, ret));
+    return new int[] { d.intValue() };
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/OtherwiseNode.java b/libjava/gnu/xml/transform/OtherwiseNode.java
new file mode 100644 (file)
index 0000000..1d9590e
--- /dev/null
+++ b/libjava/gnu/xml/transform/OtherwiseNode.java
@@ -0,0 +1,93 @@
+/* OtherwiseNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Node;
+
+/**
+ * A template node representing an XSL <code>otherwise</code> instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class OtherwiseNode
+  extends TemplateNode
+{
+
+  OtherwiseNode(TemplateNode children, TemplateNode next)
+  {
+    super(children, next);
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new OtherwiseNode((children == null) ? null :
+                             children.clone(stylesheet),
+                             (next == null) ? null :
+                             next.clone(stylesheet));
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+             Node context, int pos, int len,
+             Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    if (children != null)
+      {
+        children.apply(stylesheet, mode,
+                       context, pos, len,
+                       parent, nextSibling);
+      }
+    if (next != null)
+      {
+        next.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+  
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    buf.append(']');
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/ParameterNode.java b/libjava/gnu/xml/transform/ParameterNode.java
new file mode 100644 (file)
index 0000000..5b766d5
--- /dev/null
+++ b/libjava/gnu/xml/transform/ParameterNode.java
@@ -0,0 +1,156 @@
+/* ParameterNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.Collections;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+
+/**
+ * A template node that sets a variable or parameter during template
+ * processing.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class ParameterNode
+  extends TemplateNode
+{
+
+  final String name;
+  final Expr select;
+  final boolean global;
+
+  ParameterNode(TemplateNode children, TemplateNode next,
+                String name, Expr select, boolean global)
+  {
+    super(children, next);
+    this.name = name;
+    this.select = select;
+    this.global = global;
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new ParameterNode((children == null) ? null :
+                             children.clone(stylesheet),
+                             (next == null) ? null :
+                             next.clone(stylesheet),
+                             name,
+                             select.clone(stylesheet),
+                             global);
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+             Node context, int pos, int len,
+             Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    boolean apply = global || !stylesheet.bindings.containsKey(name, global);
+    if (apply)
+      {
+        // push the variable context
+        stylesheet.bindings.push(global);
+        // set the variable
+        Object value = getValue(stylesheet, mode, context, pos, len);
+        if (value != null)
+          {
+            stylesheet.bindings.set(name, value, global);
+          }
+      }
+    // variable and param don't process children as such
+    // all subsequent instructions are processed with that variable context
+    if (next != null)
+      {
+        next.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+    if (apply)
+      {
+        // pop the variable context
+        stylesheet.bindings.pop(global);
+      }
+  }
+  
+  Object getValue(Stylesheet stylesheet, QName mode,
+                  Node context, int pos, int len)
+    throws TransformerException
+  {
+    if (select != null)
+      {
+        return select.evaluate(context, pos, len);
+      }
+    else if (children != null)
+      {
+        Document doc = (context instanceof Document) ? (Document) context :
+          context.getOwnerDocument();
+        DocumentFragment fragment = doc.createDocumentFragment();
+        children.apply(stylesheet, mode, context, pos, len, fragment, null);
+        return Collections.singleton(fragment);
+      }
+    else
+      {
+        return null;
+      }
+  }
+  
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    buf.append("name=");
+    buf.append(name);
+    if (select != null)
+      {
+        buf.append(",select=");
+        buf.append(select);
+      }
+    if (global)
+      {
+        buf.append(",global");
+      }
+    buf.append(']');
+    return buf.toString();
+  }
+
+}
+
diff --git a/libjava/gnu/xml/transform/ProcessingInstructionNode.java b/libjava/gnu/xml/transform/ProcessingInstructionNode.java
new file mode 100644 (file)
index 0000000..1eb2bd6
--- /dev/null
+++ b/libjava/gnu/xml/transform/ProcessingInstructionNode.java
@@ -0,0 +1,123 @@
+/* ProcessingInstructionNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Node;
+import org.w3c.dom.ProcessingInstruction;
+import gnu.xml.xpath.Expr;
+
+/**
+ * A template node representing the XSL <code>processing-instruction</code>
+ * instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class ProcessingInstructionNode
+  extends TemplateNode
+{
+
+  final String name;
+
+  ProcessingInstructionNode(TemplateNode children, TemplateNode next,
+                            String name)
+  {
+    super(children, next);
+    this.name = name;
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new ProcessingInstructionNode((children == null) ? null :
+                                         children.clone(stylesheet),
+                                         (next == null) ? null :
+                                         next.clone(stylesheet),
+                                         name);
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+             Node context, int pos, int len,
+             Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    String data = null;
+    Document doc = (parent instanceof Document) ? (Document) parent :
+      parent.getOwnerDocument();
+    if (children != null)
+      {
+        // Create a document fragment to hold the text
+        DocumentFragment fragment = doc.createDocumentFragment();
+        // Apply children to the fragment
+        children.apply(stylesheet, mode,
+                       context, pos, len,
+                       fragment, null);
+        // Use XPath string-value of fragment
+        data = Expr.stringValue(fragment);
+      }
+    ProcessingInstruction pi = doc.createProcessingInstruction(name, data);
+    // Insert into result tree
+    if (nextSibling != null)
+      {
+        parent.insertBefore(pi, nextSibling);
+      }
+    else
+      {
+        parent.appendChild(pi);
+      }
+    if (next != null)
+      {
+        next.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+  
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    buf.append("name=");
+    buf.append(name);
+    buf.append(']');
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/SAXSerializer.java b/libjava/gnu/xml/transform/SAXSerializer.java
new file mode 100644 (file)
index 0000000..c5e3820
--- /dev/null
+++ b/libjava/gnu/xml/transform/SAXSerializer.java
@@ -0,0 +1,305 @@
+/* SAXSerializer.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import org.w3c.dom.Attr;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
+
+/**
+ * Serializes a DOM node to a sequence of SAX events.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class SAXSerializer
+  implements Attributes
+{
+
+  transient NamedNodeMap attrs;
+  transient LinkedList namespaces = new LinkedList();
+
+  boolean isDefined(String prefix, String uri)
+  {
+    for (Iterator i = namespaces.iterator(); i.hasNext(); )
+      {
+        HashMap ctx = (HashMap) i.next();
+        if (uri.equals(ctx.get(prefix)))
+          {
+            return true;
+          }
+      }
+    return false;
+  }
+
+  void define(String prefix, String uri)
+  {
+    for (Iterator i = namespaces.iterator(); i.hasNext(); )
+      {
+        HashMap ctx = (HashMap) i.next();
+        if (ctx.containsKey(prefix))
+          {
+            HashMap newCtx = new HashMap();
+            newCtx.put(prefix, uri);
+            namespaces.addFirst(newCtx);
+            return;
+          }
+      }
+    HashMap ctx;
+    if (namespaces.isEmpty())
+      {
+        ctx = new HashMap();
+        namespaces.add(ctx);
+      }
+    else
+      {
+        ctx = (HashMap) namespaces.getFirst();
+      }
+    ctx.put(prefix, uri);
+  }
+
+  void undefine(String prefix, String uri)
+  {
+    for (Iterator i = namespaces.iterator(); i.hasNext(); )
+      {
+        HashMap ctx = (HashMap) i.next();
+        if (uri.equals(ctx.get(prefix)))
+          {
+            ctx.remove(prefix);
+            if (ctx.isEmpty())
+              {
+                namespaces.remove(ctx);
+              }
+            return;
+          }
+      }
+  }
+
+  public int getLength()
+  {
+    return attrs.getLength();
+  }
+
+  public String getURI(int index)
+  {
+    return attrs.item(index).getNamespaceURI();
+  }
+
+  public String getLocalName(int index)
+  {
+    return attrs.item(index).getLocalName();
+  }
+
+  public String getQName(int index)
+  {
+    return attrs.item(index).getNodeName();
+  }
+
+  public String getType(int index)
+  {
+    Attr attr = (Attr) attrs.item(index);
+    return attr.isId() ? "ID" : "CDATA";
+  }
+
+  public String getValue(int index)
+  {
+    return attrs.item(index).getNodeValue();
+  }
+
+  public int getIndex(String uri, String localName)
+  {
+    int len = attrs.getLength();
+    for (int i = 0; i < len; i++)
+      {
+        Node attr = attrs.item(i);
+        String a_uri = attr.getNamespaceURI();
+        String a_localName = attr.getLocalName();
+        if (((a_uri == null && uri == null) ||
+             (a_uri != null && a_uri.equals(uri))) &&
+            a_localName.equals(localName))
+          {
+            return i;
+          }
+      }
+    return -1;
+  }
+
+  public int getIndex(String qName)
+  {
+    int len = attrs.getLength();
+    for (int i = 0; i < len; i++)
+      {
+        Node attr = attrs.item(i);
+        String a_name = attr.getNodeName();
+        if (a_name.equals(qName))
+          {
+            return i;
+          }
+      }
+    return -1;
+  }
+
+  public String getType(String uri, String localName)
+  {
+    Attr attr = (Attr) attrs.getNamedItemNS(uri, localName);
+    return attr.isId() ? "ID" : "CDATA";
+  }
+
+  public String getType(String qName)
+  {
+    Attr attr = (Attr) attrs.getNamedItem(qName);
+    return attr.isId() ? "ID" : "CDATA";
+  }
+
+  public String getValue(String uri, String localName)
+  {
+    return attrs.getNamedItemNS(uri, localName).getNodeValue();
+  }
+
+  public String getValue(String qName)
+  {
+    return attrs.getNamedItem(qName).getNodeValue();
+  }
+
+  void serialize(Node node, ContentHandler ch, LexicalHandler lh)
+    throws SAXException
+  {
+    attrs = node.getAttributes();
+    Node children;
+    Node next = node.getNextSibling();
+    switch (node.getNodeType())
+      {
+      case Node.ELEMENT_NODE:
+        String uri = node.getNamespaceURI();
+        String prefix = node.getPrefix();
+        boolean defined = isDefined(prefix, uri);
+        if (!defined)
+          {
+            define(prefix, uri);
+            ch.startPrefixMapping(prefix, uri);
+          }
+        String localName = node.getLocalName();
+        String qName = node.getNodeName();
+        ch.startElement(uri, localName, qName, this);
+        children = node.getFirstChild();
+        if (children != null)
+          {
+            serialize(children, ch, lh);
+          }
+        ch.endElement(uri, localName, qName);
+        if (!defined)
+          {
+            ch.endPrefixMapping(prefix);
+            undefine(prefix, uri);
+          }
+        break;
+      case Node.TEXT_NODE:
+        char[] chars = node.getNodeValue().toCharArray();
+        ch.characters(chars, 0, chars.length);
+        break;
+      case Node.CDATA_SECTION_NODE:
+        char[] cdata = node.getNodeValue().toCharArray();
+        if (lh != null)
+          {
+            lh.startCDATA();
+            ch.characters(cdata, 0, cdata.length);
+            lh.endCDATA();
+          }
+        else
+          {
+            ch.characters(cdata, 0, cdata.length);
+          }
+        break;
+      case Node.COMMENT_NODE:
+        if (lh != null)
+          {
+            char[] comment = node.getNodeValue().toCharArray();
+            lh.comment(comment, 0, comment.length);
+          }
+        break;
+      case Node.DOCUMENT_NODE:
+      case Node.DOCUMENT_FRAGMENT_NODE:
+        ch.startDocument();
+        children = node.getFirstChild();
+        if (children != null)
+          {
+            serialize(children, ch, lh);
+          }
+        ch.endDocument();
+        break;
+      case Node.DOCUMENT_TYPE_NODE:
+        if (lh != null)
+          {
+            DocumentType doctype = (DocumentType) node;
+            String publicId = doctype.getPublicId();
+            String systemId = doctype.getSystemId();
+            lh.startDTD(node.getNodeName(), publicId, systemId);
+            NamedNodeMap entities = doctype.getEntities();
+            int len = entities.getLength();
+            for (int i = 0; i < len; i++)
+              {
+                Node entity = entities.item(i);
+                String entityName = entity.getNodeName();
+                lh.startEntity(entityName);
+                lh.endEntity(entityName);
+              }
+            lh.endDTD();
+          }
+        break;
+      case Node.PROCESSING_INSTRUCTION_NODE:
+        ch.processingInstruction(node.getNodeName(), node.getNodeValue());
+        break;
+      case Node.ENTITY_REFERENCE_NODE:
+        ch.skippedEntity(node.getNodeName());
+        break;
+      }
+    attrs = null;
+    if (next != null)
+      {
+        serialize(next, ch, lh);
+      }
+  }
+
+}
diff --git a/libjava/gnu/xml/transform/SortKey.java b/libjava/gnu/xml/transform/SortKey.java
new file mode 100644 (file)
index 0000000..9ecc919
--- /dev/null
+++ b/libjava/gnu/xml/transform/SortKey.java
@@ -0,0 +1,154 @@
+/* SortKey.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+
+/**
+ * An XSL sort key.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class SortKey
+{
+
+  static final int DEFAULT = 0;
+  static final int UPPER_FIRST = 1;
+  static final int LOWER_FIRST = 2;
+
+  final Expr select;
+  final TemplateNode langTemplate;
+  final TemplateNode dataTypeTemplate;
+  final TemplateNode orderTemplate;
+  final TemplateNode caseOrderTemplate;
+
+  transient String lang;
+  transient String dataType;
+  transient boolean descending;
+  transient int caseOrder;
+
+  SortKey(Expr select, TemplateNode lang, TemplateNode dataType,
+          TemplateNode order, TemplateNode caseOrder)
+  {
+    this.select = select;
+    this.langTemplate = lang;
+    this.dataTypeTemplate = dataType;
+    this.orderTemplate = order;
+    this.caseOrderTemplate = caseOrder;
+  }
+
+  String key(Node node)
+  {
+    Object ret = select.evaluate(node, 1, 1);
+    if (ret instanceof String)
+      {
+        return (String) ret;
+      }
+    else
+      {
+        return Expr._string(node, ret);
+      }
+  }
+
+  /**
+   * Prepare for a sort.
+   * This sets all transient variables from their AVTs.
+   */
+  void init(Stylesheet stylesheet, QName mode,
+            Node context, int pos, int len,
+            Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    Document doc = (context instanceof Document) ? (Document) context :
+      context.getOwnerDocument();
+    if (langTemplate == null)
+      {
+        lang = null;
+      }
+    else
+      {
+        DocumentFragment fragment = doc.createDocumentFragment();
+        langTemplate.apply(stylesheet, mode, context, pos, len,
+                           fragment, null);
+        lang = Expr.stringValue(fragment);
+      }
+    if (dataTypeTemplate == null)
+      {
+        dataType = "text";
+      }
+    else
+      {
+        DocumentFragment fragment = doc.createDocumentFragment();
+        dataTypeTemplate.apply(stylesheet, mode, context, pos, len,
+                               fragment, null);
+        dataType = Expr.stringValue(fragment);
+      }
+    if (orderTemplate == null)
+      {
+        descending = false;
+      }
+    else
+      {
+        DocumentFragment fragment = doc.createDocumentFragment();
+        orderTemplate.apply(stylesheet, mode, context, pos, len,
+                            fragment, null);
+        String order = Expr.stringValue(fragment);
+        descending = "descending".equals(order);
+      }
+    if (caseOrderTemplate == null)
+      {
+        caseOrder = DEFAULT;
+      }
+    else
+      {
+        DocumentFragment fragment = doc.createDocumentFragment();
+        caseOrderTemplate.apply(stylesheet, mode, context, pos, len,
+                                fragment, null);
+        String co = Expr.stringValue(fragment);
+        caseOrder = "upper-first".equals(co) ? UPPER_FIRST :
+          "lower-first".equals(co) ? LOWER_FIRST :
+          DEFAULT;
+      }
+  }
+
+}
diff --git a/libjava/gnu/xml/transform/StreamSerializer.java b/libjava/gnu/xml/transform/StreamSerializer.java
new file mode 100644 (file)
index 0000000..136105a
--- /dev/null
+++ b/libjava/gnu/xml/transform/StreamSerializer.java
@@ -0,0 +1,632 @@
+/* StreamSerializer.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import javax.xml.XMLConstants;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+/**
+ * Serializes a DOM node to an output stream.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class StreamSerializer
+{
+  
+  static final int SPACE = 0x20;
+  static final int BANG = 0x21; // !
+  static final int APOS = 0x27; // '
+  static final int SLASH = 0x2f; // /
+  static final int BRA = 0x3c; // <
+  static final int KET = 0x3e; // >
+  static final int EQ = 0x3d; // =
+
+  protected String encoding;
+  boolean compatibilityMode;
+  final int mode;
+  final Map namespaces;
+  protected String eol;
+  Collection cdataSectionElements = Collections.EMPTY_SET;
+
+  protected boolean discardDefaultContent;
+  protected boolean xmlDeclaration = true;
+
+  public StreamSerializer()
+  {
+    this(Stylesheet.OUTPUT_XML, null, null);
+  }
+
+  public StreamSerializer(String encoding)
+  {
+    this(Stylesheet.OUTPUT_XML, encoding, null);
+  }
+
+  public StreamSerializer(int mode, String encoding, String eol)
+  {
+    this.mode = mode;
+    if (encoding == null)
+      {
+        encoding = "UTF-8";
+      }
+    this.encoding = encoding.intern();
+    compatibilityMode = true;
+    if (encoding.length() > 3)
+      {
+        String p = encoding.substring(0, 3);
+        if (p.equalsIgnoreCase("UTF") ||
+            p.equalsIgnoreCase("UCS"))
+          {
+            compatibilityMode = false;
+          }
+      }
+    this.eol = (eol != null) ? eol : System.getProperty("line.separator");
+    namespaces = new HashMap();
+  }
+
+  void setCdataSectionElements(Collection c)
+  {
+    cdataSectionElements = c;
+  }
+
+  public void serialize(final Node node, final OutputStream out)
+    throws IOException
+  {
+    serialize(node, out, false);
+  }
+  
+  void serialize(final Node node, final OutputStream out,
+                 boolean convertToCdata)
+    throws IOException
+  {
+    if (out == null)
+      {
+        throw new NullPointerException("no output stream");
+      }
+    String value, prefix;
+    Node children;
+    Node next = node.getNextSibling();
+    String uri = node.getNamespaceURI();
+    boolean defined = false;
+    short nt = node.getNodeType();
+    if (convertToCdata && nt == Node.TEXT_NODE)
+      {
+        nt = Node.CDATA_SECTION_NODE;
+      }
+    switch (nt)
+      {
+      case Node.ATTRIBUTE_NODE:
+        prefix = node.getPrefix();
+        if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(uri) ||
+            XMLConstants.XMLNS_ATTRIBUTE.equals(prefix) ||
+            (prefix != null && prefix.startsWith("xmlns:")))
+          {
+            String nsuri = node.getNodeValue();
+            if (isDefined(nsuri))
+              {
+                break;
+              }
+            define(nsuri, node.getLocalName());
+          }
+        else if (uri != null && !isDefined(uri))
+          {
+            prefix = define(uri, prefix);
+            String nsname = (prefix == null) ? "xmlns" : "xmlns:" + prefix;
+            out.write(SPACE);
+            out.write(encodeText(nsname));
+            out.write(EQ);
+            String nsvalue = "'" + encode(uri, true, true) + "'";
+            out.write(nsvalue.getBytes(encoding));
+            defined = true;
+          }
+        out.write(SPACE);
+        String a_nodeName = node.getNodeName();
+        out.write(encodeText(a_nodeName));
+        String a_nodeValue = node.getNodeValue();
+        if (mode == Stylesheet.OUTPUT_HTML &&
+            a_nodeName.equals(a_nodeValue))
+          {
+            break;
+          }
+        out.write(EQ);
+        value = "'" + encode(a_nodeValue, true, true) + "'";
+        out.write(encodeText(value));
+        break;
+      case Node.ELEMENT_NODE:
+        value = node.getNodeName();
+        out.write(BRA);
+        out.write(encodeText(value));
+        if (uri != null && !isDefined(uri))
+          {
+            prefix = define(uri, node.getPrefix());
+            String nsname = (prefix == null) ? "xmlns" : "xmlns:" + prefix;
+            out.write(SPACE);
+            out.write(encodeText(nsname));
+            out.write(EQ);
+            String nsvalue = "'" + encode(uri, true, true) + "'";
+            out.write(encodeText(nsvalue));
+            defined = true;
+          }
+        NamedNodeMap attrs = node.getAttributes();
+        if (attrs != null)
+          {
+            int len = attrs.getLength();
+            for (int i = 0; i < len; i++)
+              {
+                Attr attr = (Attr) attrs.item(i);
+                if (discardDefaultContent && !attr.getSpecified())
+                  {
+                    // NOOP
+                  }
+                else
+                  {
+                    serialize(attr, out, false);
+                  }
+              }
+          }
+        convertToCdata = cdataSectionElements.contains(value);
+        children = node.getFirstChild();
+        if (children == null)
+          {
+            out.write(SLASH);
+            out.write(KET);
+          }
+        else
+          {
+            out.write(KET);
+            serialize(children, out, convertToCdata);
+            out.write(BRA);
+            out.write(SLASH);
+            out.write(encodeText(value));
+            out.write(KET);
+          }
+        break;
+      case Node.TEXT_NODE:
+        value = node.getNodeValue();
+        if (!"yes".equals(node.getUserData("disable-output-escaping")))
+          {
+            value = encode(value, false, false);
+          }
+        out.write(encodeText(value));
+        break;
+      case Node.CDATA_SECTION_NODE:
+        value = "<![CDATA[" + node.getNodeValue() + "]]>";
+        out.write(encodeText(value));
+        break;
+      case Node.COMMENT_NODE:
+        value = "<!--" + node.getNodeValue() + "-->";
+        out.write(encodeText(value));
+        Node cp = node.getParentNode();
+        if (cp != null && cp.getNodeType() == Node.DOCUMENT_NODE)
+          {
+            out.write(encodeText(eol));
+          }
+        break;
+      case Node.DOCUMENT_NODE:
+      case Node.DOCUMENT_FRAGMENT_NODE:
+        if (mode == Stylesheet.OUTPUT_XML)
+          {
+            if ("UTF-16".equalsIgnoreCase(encoding))
+              {
+                out.write(0xfe);
+                out.write(0xff);
+              }
+            if (!"yes".equals(node.getUserData("omit-xml-declaration")) &&
+                xmlDeclaration)
+              {
+                Document doc = (node instanceof Document) ?
+                  (Document) node : null;
+                String version = (doc != null) ? doc.getXmlVersion() : null;
+                if (version == null)
+                  {
+                    version = (String) node.getUserData("version");
+                  }
+                if (version == null)
+                  {
+                    version = "1.0";
+                  }
+                out.write(BRA);
+                out.write(0x3f);
+                out.write("xml version='".getBytes("US-ASCII"));
+                out.write(version.getBytes("US-ASCII"));
+                out.write(APOS);
+                if (!("UTF-8".equalsIgnoreCase(encoding)))
+                  {
+                    out.write(" encoding='".getBytes("US-ASCII"));
+                    out.write(encoding.getBytes("US-ASCII"));
+                    out.write(APOS);
+                  }
+                if ((doc != null && doc.getXmlStandalone()) ||
+                    "yes".equals(node.getUserData("standalone")))
+                  {
+                    out.write(" standalone='yes'".getBytes("US-ASCII"));
+                  }
+                out.write(0x3f);
+                out.write(KET);
+                out.write(encodeText(eol));
+              }
+            // TODO warn if not outputting the declaration would be a
+            // problem
+          }
+        else if (mode == Stylesheet.OUTPUT_HTML)
+          {
+            // Ensure that encoding is accessible
+            String mediaType = (String) node.getUserData("media-type");
+            if (mediaType == null)
+              {
+                mediaType = "text/html";
+              }
+            String contentType = mediaType + "; charset=" +
+              ((encoding.indexOf(' ') != -1) ?
+                "\"" + encoding + "\"" :
+                encoding);
+            Document doc = (node instanceof Document) ? (Document) node :
+              node.getOwnerDocument();
+            Node html = null;
+            for (Node ctx = node.getFirstChild(); ctx != null;
+                 ctx = ctx.getNextSibling())
+              {
+                if (ctx.getNodeType() == Node.ELEMENT_NODE)
+                  {
+                    html = ctx;
+                    break;
+                  }
+              }
+            if (html == null)
+              {
+                html = doc.createElement("html");
+                node.appendChild(html);
+              }
+            Node head = null;
+            for (Node ctx = html.getFirstChild(); ctx != null;
+                 ctx = ctx.getNextSibling())
+              {
+                if (ctx.getNodeType() == Node.ELEMENT_NODE &&
+                    "head".equalsIgnoreCase(ctx.getLocalName()))
+                  {
+                    head = ctx;
+                    break;
+                  }
+              }
+            if (head == null)
+              {
+                head = doc.createElement("head");
+                Node c1 = null;
+                for (Node ctx = html.getFirstChild(); ctx != null;
+                     ctx = ctx.getNextSibling())
+                  {
+                    if (ctx.getNodeType() == Node.ELEMENT_NODE)
+                      {
+                        c1 = ctx;
+                        break;
+                      }
+                  }
+                if (c1 != null)
+                  {
+                    html.insertBefore(head, c1);
+                  }
+                else
+                  {
+                    html.appendChild(head);
+                  }
+              }
+            Node meta = null;
+            Node metaContent = null;
+            for (Node ctx = head.getFirstChild(); ctx != null;
+                 ctx = ctx.getNextSibling())
+              {
+                if (ctx.getNodeType() == Node.ELEMENT_NODE &&
+                    "meta".equalsIgnoreCase(ctx.getLocalName()))
+                  {
+                    NamedNodeMap metaAttrs = ctx.getAttributes();
+                    int len = metaAttrs.getLength();
+                    String httpEquiv = null;
+                    Node content = null;
+                    for (int i = 0; i < len; i++)
+                      {
+                        Node attr = metaAttrs.item(i);
+                        String attrName = attr.getNodeName();
+                        if ("http-equiv".equalsIgnoreCase(attrName))
+                          {
+                            httpEquiv = attr.getNodeValue();
+                          }
+                        else if ("content".equalsIgnoreCase(attrName))
+                          {
+                            content = attr;
+                          }
+                      }
+                    if ("Content-Type".equalsIgnoreCase(httpEquiv))
+                      {
+                        meta = ctx;
+                        metaContent = content;
+                        break;
+                      }
+                  }
+              }
+            if (meta == null)
+              {
+                meta = doc.createElement("meta");
+                // Insert first
+                Node first = head.getFirstChild();
+                if (first == null)
+                  {
+                    head.appendChild(meta);
+                  }
+                else
+                  {
+                    head.insertBefore(meta, first);
+                  }
+                Node metaHttpEquiv = doc.createAttribute("http-equiv");
+                meta.getAttributes().setNamedItem(metaHttpEquiv);
+                metaHttpEquiv.setNodeValue("Content-Type");
+              }
+            if (metaContent == null)
+              {
+                metaContent = doc.createAttribute("content");
+                meta.getAttributes().setNamedItem(metaContent);
+              }
+            metaContent.setNodeValue(contentType);
+            // phew
+          }
+        children = node.getFirstChild();
+        if (children != null)
+          {
+            serialize(children, out, convertToCdata);
+          }
+        break;
+      case Node.DOCUMENT_TYPE_NODE:
+        DocumentType doctype = (DocumentType) node;
+        out.write(BRA);
+        out.write(BANG);
+        value = doctype.getNodeName();
+        out.write(encodeText(value));
+        String publicId = doctype.getPublicId();
+        if (publicId != null)
+          {
+            out.write(encodeText(" PUBLIC "));
+            out.write(APOS);
+            out.write(encodeText(publicId));
+            out.write(APOS);
+          }
+        String systemId = doctype.getSystemId();
+        if (systemId != null)
+          {
+            out.write(encodeText(" SYSTEM "));
+            out.write(APOS);
+            out.write(encodeText(systemId));
+            out.write(APOS);
+          }
+        String internalSubset = doctype.getInternalSubset();
+        if (internalSubset != null)
+          {
+            out.write(encodeText(internalSubset));
+          }
+        out.write(KET);
+        out.write(eol.getBytes(encoding));
+        break;
+      case Node.ENTITY_REFERENCE_NODE:
+        value = "&" + node.getNodeValue() + ";";
+        out.write(encodeText(value));
+        break;
+      case Node.PROCESSING_INSTRUCTION_NODE:
+        value = "<?" + node.getNodeName() + " " + node.getNodeValue() + "?>";
+        out.write(encodeText(value));
+        Node pp = node.getParentNode();
+        if (pp != null && pp.getNodeType() == Node.DOCUMENT_NODE)
+          {
+            out.write(encodeText(eol));
+          }
+        break;
+      }
+    if (defined)
+      {
+        undefine(uri);
+      }
+    if (next != null)
+      {
+        serialize(next, out, convertToCdata);
+      }
+  }
+
+  boolean isDefined(String uri)
+  {
+    return XMLConstants.XML_NS_URI.equals(uri) ||
+      XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(uri) ||
+      namespaces.containsKey(uri);
+  }
+
+  String define(String uri, String prefix)
+  {
+    while (namespaces.containsValue(prefix))
+      {
+        // Fabricate new prefix
+        prefix = prefix + "_";
+      }
+    namespaces.put(uri, prefix);
+    return prefix;
+  }
+
+  void undefine(String uri)
+  {
+    namespaces.remove(uri);
+  }
+
+  final byte[] encodeText(String text)
+    throws UnsupportedEncodingException
+  {
+    if (compatibilityMode)
+      {
+        int len = text.length();
+        StringBuffer buf = null;
+        for (int i = 0; i < len; i++)
+          {
+            char c = text.charAt(i);
+            if (c >= 127)
+              {
+                if (buf == null)
+                  {
+                    buf = new StringBuffer(text.substring(0, i));
+                  }
+                buf.append('&');
+                buf.append('#');
+                buf.append((int) c);
+                buf.append(';');
+              }
+            else if (buf != null)
+              {
+                buf.append(c);
+              }
+          }
+        if (buf != null)
+          {
+            text = buf.toString();
+          }
+      }
+    return text.getBytes(encoding);
+  }
+
+  String encode(String text, boolean encodeCtl, boolean inAttr)
+  {
+    int len = text.length();
+    StringBuffer buf = null;
+    for (int i = 0; i < len; i++)
+      {
+        char c = text.charAt(i);
+        if (c == '<')
+          {
+            if (buf == null)
+              {
+                buf = new StringBuffer(text.substring(0, i));
+              }
+            buf.append("&lt;");
+          }
+        else if (c == '>')
+          {
+            if (buf == null)
+              {
+                buf = new StringBuffer(text.substring(0, i));
+              }
+            buf.append("&gt;");
+          }
+        else if (c == '&')
+          {
+            if (mode == Stylesheet.OUTPUT_HTML && (i + 1) < len &&
+                text.charAt(i + 1) == '{')
+              {
+                if (buf != null)
+                  {
+                    buf.append(c);
+                  }
+              }
+            else
+              {
+                if (buf == null)
+                  {
+                    buf = new StringBuffer(text.substring(0, i));
+                  }
+                buf.append("&amp;");
+              }
+          }
+        else if (c == '\'' && inAttr)
+          {
+            if (buf == null)
+              {
+                buf = new StringBuffer(text.substring(0, i));
+              }
+            buf.append("&apos;");
+          }
+        else if (c == '"' && inAttr)
+          {
+            if (buf == null)
+              {
+                buf = new StringBuffer(text.substring(0, i));
+              }
+            buf.append("&quot;");
+          }
+        else if (encodeCtl)
+          {
+            if (c < 0x20)
+              {
+                if (buf == null)
+                  {
+                    buf = new StringBuffer(text.substring(0, i));
+                  }
+                buf.append('&');
+                buf.append('#');
+                buf.append((int) c);
+                buf.append(';');
+              }
+            else if (buf != null)
+              {
+                buf.append(c);
+              }
+          }
+        else if (buf != null)
+          {
+            buf.append(c);
+          }
+      }
+    return (buf == null) ? text : buf.toString();
+  }
+
+  String toString(Node node)
+  {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    try
+      {
+        serialize(node, out);
+        return new String(out.toByteArray(), encoding);
+      }
+    catch (IOException e)
+      {
+        throw new RuntimeException(e.getMessage());
+      }
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/Stylesheet.java b/libjava/gnu/xml/transform/Stylesheet.java
new file mode 100644 (file)
index 0000000..80f5781
--- /dev/null
+++ b/libjava/gnu/xml/transform/Stylesheet.java
@@ -0,0 +1,1730 @@
+/* Stylesheet.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.TreeSet;
+import javax.xml.XMLConstants;
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFunction;
+import javax.xml.xpath.XPathFunctionResolver;
+import javax.xml.xpath.XPathExpressionException;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+import org.w3c.dom.UserDataHandler;
+import gnu.xml.xpath.Expr;
+import gnu.xml.xpath.NameTest;
+import gnu.xml.xpath.NodeTypeTest;
+import gnu.xml.xpath.Pattern;
+import gnu.xml.xpath.Selector;
+import gnu.xml.xpath.Root;
+import gnu.xml.xpath.Test;
+import gnu.xml.xpath.XPathImpl;
+
+/**
+ * An XSL stylesheet.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class Stylesheet
+  implements NamespaceContext, XPathFunctionResolver, UserDataHandler, Cloneable
+{
+
+  static final String XSL_NS = "http://www.w3.org/1999/XSL/Transform";
+  
+  static final int OUTPUT_XML = 0;
+  static final int OUTPUT_HTML = 1;
+  static final int OUTPUT_TEXT = 2;
+
+  final TransformerFactoryImpl factory;
+  TransformerImpl transformer;
+  Stylesheet parent;
+  final XPathImpl xpath;
+  final String systemId;
+  final int precedence;
+
+  final boolean debug;
+
+  /**
+   * Version of XSLT.
+   */
+  String version;
+
+  Collection extensionElementPrefixes;
+  Collection excludeResultPrefixes;
+
+  /**
+   * Set of element names for which we should strip whitespace.
+   */
+  Set stripSpace;
+
+  /**
+   * Set of element names for which we should preserve whitespace.
+   */
+  Set preserveSpace;
+
+  /**
+   * Output options.
+   */
+  int outputMethod;
+  String outputVersion;
+  String outputEncoding;
+  boolean outputOmitXmlDeclaration;
+  boolean outputStandalone;
+  String outputPublicId;
+  String outputSystemId;
+  Collection outputCdataSectionElements;
+  boolean outputIndent;
+  String outputMediaType;
+
+  /**
+   * Keys.
+   */
+  Collection keys;
+
+  /**
+   * Decimal formats.
+   */
+  Map decimalFormats;
+  
+  /**
+   * Namespace aliases.
+   */
+  Map namespaceAliases;
+
+  /**
+   * Attribute-sets.
+   */
+  List attributeSets;
+
+  /**
+   * Variables.
+   */
+  List variables;
+
+  /**
+   * Variable and parameter bindings.
+   */
+  Bindings bindings;
+
+  /**
+   * Templates.
+   */
+  LinkedList templates;
+
+  TemplateNode builtInNodeTemplate;
+  TemplateNode builtInTextTemplate;
+
+  /**
+   * Holds the current node while parsing.
+   * Necessary to associate the document function with its declaring node,
+   * to resolve namespaces, and to maintain the current node for the
+   * current() function.
+   */
+  Node current;
+
+  /**
+   * Set by a terminating message.
+   */
+  transient boolean terminated;
+
+  /**
+   * Current template in force.
+   */
+  transient Template currentTemplate;
+
+  Stylesheet(TransformerFactoryImpl factory,
+             Stylesheet parent,
+             Document doc,
+             String systemId,
+             int precedence)
+    throws TransformerConfigurationException
+  {
+    this.factory = factory;
+    this.systemId = systemId;
+    this.precedence = precedence;
+    this.parent = parent;
+    extensionElementPrefixes = new HashSet();
+    excludeResultPrefixes = new HashSet();
+    stripSpace = new LinkedHashSet();
+    preserveSpace = new LinkedHashSet();
+    outputCdataSectionElements = new LinkedHashSet();
+    xpath = (XPathImpl) factory.xpathFactory.newXPath();
+    if (parent == null)
+      {
+        bindings = new Bindings(this);
+        attributeSets = new LinkedList();
+        variables = new LinkedList();
+        namespaceAliases = new LinkedHashMap();
+        templates = new LinkedList();
+        keys = new LinkedList();
+        decimalFormats = new LinkedHashMap();
+        initDefaultDecimalFormat();
+        xpath.setNamespaceContext(this);
+        xpath.setXPathFunctionResolver(this);
+      }
+    else
+      {
+        /* Test for import circularity */
+        for (Stylesheet ctx = this; ctx.parent != null; ctx = ctx.parent)
+          {
+            if (systemId != null && systemId.equals(ctx.parent.systemId))
+              {
+                String msg = "circularity importing " + systemId;
+                throw new TransformerConfigurationException(msg);
+              }
+          }
+        /* OK */
+        Stylesheet root = getRootStylesheet();
+        bindings = root.bindings;
+        attributeSets = root.attributeSets;
+        variables = root.variables;
+        namespaceAliases = root.namespaceAliases;
+        templates = root.templates;
+        keys = root.keys;
+        decimalFormats = root.decimalFormats;
+        xpath.setNamespaceContext(root);
+        xpath.setXPathFunctionResolver(root);
+      }
+    xpath.setXPathVariableResolver(bindings);
+
+    Test anyNode = new NodeTypeTest((short) 0);
+    List tests = Collections.singletonList(anyNode);
+    builtInNodeTemplate =
+      new ApplyTemplatesNode(null, null,
+                             new Selector(Selector.CHILD, tests),
+                             null, null, null, true);
+    builtInTextTemplate =
+      new ValueOfNode(null, null,
+                      new Selector(Selector.SELF, tests),
+                      false);
+    
+    parse(doc.getDocumentElement(), true);
+    current = doc; // Alow namespace resolution during processing
+    
+    debug = ("yes".equals(System.getProperty("xsl.debug")));
+
+    if (debug)
+      {
+        System.err.println("Stylesheet: " + doc.getDocumentURI());
+        for (Iterator i = templates.iterator(); i.hasNext(); )
+          {
+            Template t = (Template) i.next();
+            t.list(System.err);
+            System.err.println("--------------------");
+          }
+      }
+  }
+
+  Stylesheet getRootStylesheet()
+  {
+    Stylesheet stylesheet = this;
+    while (stylesheet.parent != null)
+      {
+        stylesheet = stylesheet.parent;
+      }
+    return stylesheet;
+  }
+  
+  void initDefaultDecimalFormat()
+  {
+    DecimalFormat defaultDecimalFormat = new DecimalFormat();
+    DecimalFormatSymbols symbols = new DecimalFormatSymbols();
+    symbols.setDecimalSeparator('.');
+    symbols.setGroupingSeparator(',');
+    symbols.setPercent('%');
+    symbols.setPerMill('\u2030');
+    symbols.setZeroDigit('0');
+    symbols.setDigit('#');
+    symbols.setPatternSeparator(';');
+    symbols.setInfinity("Infinity");
+    symbols.setNaN("NaN");
+    symbols.setMinusSign('-');
+    defaultDecimalFormat.setDecimalFormatSymbols(symbols);
+    decimalFormats.put(null, defaultDecimalFormat);
+  }
+  
+  // -- Cloneable --
+
+  public Object clone()
+  {
+    try
+      {
+        Stylesheet clone = (Stylesheet) super.clone();
+        clone.bindings = (Bindings) bindings.clone();
+
+        LinkedList templates2 = new LinkedList();
+        for (Iterator i = templates.iterator(); i.hasNext(); )
+          {
+            Template t = (Template) i.next();
+            templates2.add(t.clone(clone));
+          }
+        clone.templates = templates2;
+
+        LinkedList attributeSets2 = new LinkedList();
+        for (Iterator i = attributeSets.iterator(); i.hasNext(); )
+          {
+            AttributeSet as = (AttributeSet) i.next();
+            attributeSets2.add(as.clone(clone));
+          }
+        clone.attributeSets = attributeSets2;
+
+        LinkedList variables2 = new LinkedList();
+        for (Iterator i = variables.iterator(); i.hasNext(); )
+          {
+            ParameterNode var = (ParameterNode) i.next();
+            variables2.add(var.clone(clone));
+          }
+        clone.variables = variables2;
+
+        LinkedList keys2 = new LinkedList();
+        for (Iterator i = keys.iterator(); i.hasNext(); )
+          {
+            Key k = (Key) i.next();
+            keys2.add(k.clone(clone));
+          }
+        clone.keys = keys2;
+        
+        return clone;
+      }
+    catch (CloneNotSupportedException e)
+      {
+        throw new Error(e.getMessage());
+      }
+  }
+
+  // -- Variable evaluation --
+
+  void initTopLevelVariables(Node context)
+    throws TransformerException
+  {
+    for (Iterator i = variables.iterator(); i.hasNext(); )
+      {
+        ParameterNode var = (ParameterNode) i.next();
+        bindings.set(var.name,
+                     var.getValue(this, null, context, 1, 1),
+                     var.global);
+      }
+  }
+
+  // -- NamespaceContext --
+
+  public String getNamespaceURI(String prefix)
+  {
+    return (current == null) ? null : current.lookupNamespaceURI(prefix);
+  }
+
+  public String getPrefix(String namespaceURI)
+  {
+    return (current == null) ? null : current.lookupPrefix(namespaceURI);
+  }
+
+  public Iterator getPrefixes(String namespaceURI)
+  {
+    // TODO
+    return Collections.singleton(getPrefix(namespaceURI)).iterator();
+  }
+  
+  // -- Template selection --
+  
+  TemplateNode getTemplate(QName mode, Node context, boolean applyImports)
+    throws TransformerException
+  {
+    //System.err.println("getTemplate: mode="+mode+" context="+context);
+    Set candidates = new TreeSet();
+    for (Iterator j = templates.iterator(); j.hasNext(); )
+      {
+        Template t = (Template) j.next();
+        boolean isMatch = t.matches(mode, context);
+        if (applyImports)
+          {
+            if (currentTemplate == null)
+              {
+                String msg = "current template may not be null " +
+                  "during apply-imports";
+                throw new TransformerException(msg);
+              }
+            if (!currentTemplate.imports(t))
+              {
+                isMatch = false;
+              }
+          }
+        //System.err.println("\t"+context+" "+t+"="+isMatch);
+        if (isMatch)
+          {
+            candidates.add(t);
+          }
+      }
+    //System.err.println("\tcandidates="+candidates);
+    if (candidates.isEmpty())
+      {
+        // Apply built-in template
+        // Current template is unchanged
+        //System.err.println("\tbuiltInTemplate context="+context);
+        switch (context.getNodeType())
+          {
+          case Node.ELEMENT_NODE:
+          case Node.DOCUMENT_NODE:
+          case Node.DOCUMENT_FRAGMENT_NODE:
+          case Node.PROCESSING_INSTRUCTION_NODE:
+          case Node.COMMENT_NODE:
+            return builtInNodeTemplate;
+          case Node.TEXT_NODE:
+          case Node.ATTRIBUTE_NODE:
+            return builtInTextTemplate;
+          default:
+            return null;
+          }
+      }
+    else
+      {
+        Template t = (Template) candidates.iterator().next();
+        // Set current template
+        currentTemplate = t;
+        //System.err.println("\ttemplate="+t+" context="+context);
+        return t.node;
+      }
+  }
+
+  TemplateNode getTemplate(QName mode, QName name)
+    throws TransformerException
+  {
+    //System.err.println("getTemplate: mode="+mode+" name="+name);
+    Set candidates = new TreeSet();
+    for (Iterator j = templates.iterator(); j.hasNext(); )
+      {
+        Template t = (Template) j.next();
+        boolean isMatch = t.matches(name);
+        //System.err.println("\t"+name+" "+t+"="+isMatch);
+        if (isMatch)
+          {
+            candidates.add(t);
+          }
+      }
+    if (candidates.isEmpty())
+      {
+        return null;
+        //throw new TransformerException("template '" + name + "' not found");
+      }
+    Template t = (Template) candidates.iterator().next();
+    //System.err.println("\ttemplate="+t+" context="+context);
+    return t.node;
+  }
+
+  /**
+   * template
+   */
+  final Template parseTemplate(Node node, NamedNodeMap attrs)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    String n = getAttribute(attrs, "name");
+    QName name = (n == null) ? null : getQName(n);
+    String m = getAttribute(attrs, "match");
+    Pattern match = null;
+    if (m != null)
+      {
+        try
+          {
+            match = (Pattern) xpath.compile(m);
+          }
+        catch (ClassCastException e)
+          {
+            String msg = "illegal pattern: " + m;
+            throw new TransformerConfigurationException(msg);
+          }
+      }
+    String p = getAttribute(attrs, "priority");
+    String mm = getAttribute(attrs, "mode");
+    QName mode = (mm == null) ? null : getQName(mm);
+    double priority = (p == null) ? Template.DEFAULT_PRIORITY :
+      Double.parseDouble(p);
+    return new Template(this, name, match, parse(node.getFirstChild()),
+                        precedence, priority, mode);
+  }
+
+  /**
+   * output
+   */
+  final void parseOutput(Node node, NamedNodeMap attrs)
+    throws TransformerConfigurationException
+  {
+    String method = getAttribute(attrs, "method");
+    if ("xml".equals(method) || method == null)
+      {
+        outputMethod = OUTPUT_XML;
+      }
+    else if ("html".equals(method))
+      {
+        outputMethod = OUTPUT_HTML;
+      }
+    else if ("text".equals(method))
+      {
+        outputMethod = OUTPUT_TEXT;
+      }
+    else
+      {
+        String msg = "unsupported output method: " + method;
+        DOMSourceLocator l = new DOMSourceLocator(node);
+        throw new TransformerConfigurationException(msg, l);
+      }
+    outputPublicId = getAttribute(attrs, "public-id");
+    outputSystemId = getAttribute(attrs, "system-id");
+    outputEncoding = getAttribute(attrs, "encoding");
+    String indent = getAttribute(attrs, "indent");
+    if (indent != null)
+      {
+        outputIndent = "yes".equals(indent);
+      }
+    outputVersion = getAttribute(attrs, "version");
+    String omitXmlDecl = getAttribute(attrs, "omit-xml-declaration");
+    if (omitXmlDecl != null)
+      {
+        outputOmitXmlDeclaration = "yes".equals(omitXmlDecl);
+      }
+    String standalone = getAttribute(attrs, "standalone");
+    if (standalone != null)
+      {
+        outputStandalone = "yes".equals(standalone);
+      }
+    outputMediaType = getAttribute(attrs, "media-type");
+    String cdataSectionElements =
+      getAttribute(attrs, "cdata-section-elements");
+    if (cdataSectionElements != null)
+      {
+        StringTokenizer st = new StringTokenizer(cdataSectionElements, " ");
+        while (st.hasMoreTokens())
+          {
+            outputCdataSectionElements.add(st.nextToken());
+          }
+      }
+  }
+
+  /**
+   * key
+   */
+  final void parseKey(Node node, NamedNodeMap attrs)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    String n = getRequiredAttribute(attrs, "name", node);
+    String m = getRequiredAttribute(attrs, "match", node);
+    String u = getRequiredAttribute(attrs, "use", node);
+    QName name = getQName(n);
+    Expr use = (Expr) xpath.compile(u);
+    try
+      {
+        Pattern match = (Pattern) xpath.compile(m);
+        Key key = new Key(name, match, use);
+        keys.add(key);
+      }
+    catch (ClassCastException e)
+      {
+        throw new TransformerConfigurationException("invalid pattern: " + m);
+      }
+  }
+
+  /**
+   * decimal-format
+   */
+  final void parseDecimalFormat(Node node, NamedNodeMap attrs)
+    throws TransformerConfigurationException
+  {
+    String dfName = getAttribute(attrs, "name");
+    DecimalFormat df = new DecimalFormat();
+    DecimalFormatSymbols symbols = new DecimalFormatSymbols();
+    symbols.setDecimalSeparator(parseDFChar(attrs, "decimal-separator", '.'));
+    symbols.setGroupingSeparator(parseDFChar(attrs, "grouping-separator", ','));
+    symbols.setInfinity(parseDFString(attrs, "infinity", "Infinity"));
+    symbols.setMinusSign(parseDFChar(attrs, "minus-sign", '-'));
+    symbols.setNaN(parseDFString(attrs, "NaN", "NaN"));
+    symbols.setPercent(parseDFChar(attrs, "percent", '%'));
+    symbols.setPerMill(parseDFChar(attrs, "per-mille", '\u2030'));
+    symbols.setZeroDigit(parseDFChar(attrs, "zero-digit", '0'));
+    symbols.setDigit(parseDFChar(attrs, "digit", '#'));
+    symbols.setPatternSeparator(parseDFChar(attrs, "pattern-separator", ';'));
+    df.setDecimalFormatSymbols(symbols);
+    decimalFormats.put(dfName, df);
+  }
+
+  private final char parseDFChar(NamedNodeMap attrs, String name, char def)
+    throws TransformerConfigurationException
+  {
+    Node attr = attrs.getNamedItem(name);
+    try
+      {
+        return (attr == null) ? def : attr.getNodeValue().charAt(0);
+      }
+    catch (StringIndexOutOfBoundsException e)
+      {
+        throw new TransformerConfigurationException("empty attribute '" +
+                                                    name +
+                                                    "' in decimal-format", e);
+      }
+  }
+
+  private final String parseDFString(NamedNodeMap attrs, String name,
+                                     String def)
+  {
+    Node attr = attrs.getNamedItem(name);
+    return (attr == null) ? def : attr.getNodeValue();
+  }
+  
+  /**
+   * namespace-alias
+   */
+  final void parseNamespaceAlias(Node node, NamedNodeMap attrs)
+    throws TransformerConfigurationException
+  {
+    String sp = getRequiredAttribute(attrs, "stylesheet-prefix", node);
+    String rp = getRequiredAttribute(attrs, "result-prefix", node);
+    namespaceAliases.put(sp, rp);
+  }
+
+  /**
+   * attribute-set
+   */
+  final void parseAttributeSet(Node node, NamedNodeMap attrs)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    TemplateNode children = parse(node.getFirstChild());
+    String name = getRequiredAttribute(attrs, "name", node);
+    String uas = getAttribute(attrs, "use-attribute-sets");
+    attributeSets.add(new AttributeSet(children, name, uas));
+  }
+
+  /**
+   * Parse top-level elements.
+   */
+  void parse(Node node, boolean root)
+    throws TransformerConfigurationException
+  {
+    if (node == null)
+      {
+        return;
+      }
+    current = node;
+    try
+      {
+        String namespaceUri = node.getNamespaceURI();
+        if (XSL_NS.equals(namespaceUri) &&
+            node.getNodeType() == Node.ELEMENT_NODE)
+          {
+            String name = node.getLocalName();
+            NamedNodeMap attrs = node.getAttributes();
+            if ("stylesheet".equals(name))
+              {
+                version = getAttribute(attrs, "version");
+                String eep = getAttribute(attrs, "extension-element-prefixes");
+                if (eep != null)
+                  {
+                    StringTokenizer st = new StringTokenizer(eep);
+                    while (st.hasMoreTokens())
+                      {
+                        extensionElementPrefixes.add(st.nextToken());
+                      }
+                  }
+                String erp = getAttribute(attrs, "exclude-result-prefixes");
+                if (erp != null)
+                  {
+                    StringTokenizer st = new StringTokenizer(erp);
+                    while (st.hasMoreTokens())
+                      {
+                        excludeResultPrefixes.add(st.nextToken());
+                      }
+                  }
+                parse(node.getFirstChild(), false);
+                return;
+              }
+            else if ("template".equals(name))
+              {
+                templates.addFirst(parseTemplate(node, attrs));
+              }
+            else if ("param".equals(name) ||
+                     "variable".equals(name))
+              {
+                boolean global = "variable".equals(name);
+                TemplateNode content = parse(node.getFirstChild());
+                String paramName = getRequiredAttribute(attrs, "name", node);
+                String select = getAttribute(attrs, "select");
+                if (select != null && select.length() > 0)
+                  {
+                    if (content != null)
+                      {
+                        String msg = "parameter '" + paramName +
+                          "' has both select and content";
+                        DOMSourceLocator l = new DOMSourceLocator(node);
+                        throw new TransformerConfigurationException(msg, l);
+                      }
+                    Expr expr = (Expr) xpath.compile(select);
+                    variables.add(new ParameterNode(null, null,
+                                                    paramName,
+                                                    expr, global));
+                  }
+                else
+                  {
+                    variables.add(new ParameterNode(content, null,
+                                                    paramName,
+                                                    null, global));
+                  }
+                bindings.set(paramName, content, global);
+              }
+            else if ("include".equals(name) || "import".equals(name))
+              {
+                int delta = "import".equals(name) ? -1 : 0;
+                String href = getRequiredAttribute(attrs, "href", node);
+                Source source;
+                synchronized (factory.resolver)
+                  {
+                    if (transformer != null)
+                      {
+                        factory.resolver
+                          .setUserResolver(transformer.getURIResolver());
+                        factory.resolver
+                          .setUserListener(transformer.getErrorListener());
+                      }
+                    source = factory.resolver.resolve(systemId, href);
+                  }
+                factory.newStylesheet(source, precedence + delta, this);
+              }
+            else if ("output".equals(name))
+              {
+                parseOutput(node, attrs);
+              }
+            else if ("preserve-space".equals(name))
+              {
+                String elements =
+                  getRequiredAttribute(attrs, "elements", node);
+                StringTokenizer st = new StringTokenizer(elements,
+                                                         " \t\n\r");
+                while (st.hasMoreTokens())
+                  {
+                    preserveSpace.add(parseNameTest(st.nextToken()));
+                  }
+              }
+            else if ("strip-space".equals(name))
+              {
+                String elements =
+                  getRequiredAttribute(attrs, "elements", node);
+                StringTokenizer st = new StringTokenizer(elements,
+                                                         " \t\n\r");
+                while (st.hasMoreTokens())
+                  {
+                    stripSpace.add(parseNameTest(st.nextToken()));
+                  }
+              }
+            else if ("key".equals(name))
+              {
+                parseKey(node, attrs);
+              }
+            else if ("decimal-format".equals(name))
+              {
+                parseDecimalFormat(node, attrs);
+              }
+            else if ("namespace-alias".equals(name))
+              {
+                parseNamespaceAlias(node, attrs);
+              }
+            else if ("attribute-set".equals(name))
+              {
+                parseAttributeSet(node, attrs);
+              }
+            parse(node.getNextSibling(), false);
+          }
+        else if (root)
+          {
+            // Literal document element
+            Attr versionNode =
+              ((Element)node).getAttributeNodeNS(XSL_NS, "version");
+            if (versionNode == null)
+              {
+                String msg = "no xsl:version attribute on literal result node";
+                DOMSourceLocator l = new DOMSourceLocator(node);
+                throw new TransformerConfigurationException(msg, l);
+              }
+            version = versionNode.getValue();
+            Node rootClone = node.cloneNode(true);
+            NamedNodeMap attrs = rootClone.getAttributes();
+            attrs.removeNamedItemNS(XSL_NS, "version");
+            templates.add(new Template(this, null, new Root(),
+                                       parse(rootClone),
+                                       precedence,
+                                       Template.DEFAULT_PRIORITY,
+                                       null));
+          }
+        else
+          {
+            // Skip unknown elements, text, comments, etc
+            parse(node.getNextSibling(), false);
+          }
+      }
+    catch (TransformerException e)
+      {
+        DOMSourceLocator l = new DOMSourceLocator(node);
+        throw new TransformerConfigurationException(e.getMessage(), l, e);
+      }
+    catch (DOMException e)
+      {
+        DOMSourceLocator l = new DOMSourceLocator(node);
+        throw new TransformerConfigurationException(e.getMessage(), l, e);
+      }
+    catch (XPathExpressionException e)
+      {
+        DOMSourceLocator l = new DOMSourceLocator(node);
+        throw new TransformerConfigurationException(e.getMessage(), l, e);
+      }
+  }
+
+  final NameTest parseNameTest(String token)
+  {
+    if ("*".equals(token))
+      {
+        return new NameTest(null, true, true);
+      }
+    else if (token.endsWith(":*"))
+      {
+        QName qName = getQName(token.substring(0, token.length() - 2));
+        return new NameTest(qName, true, false);
+      }
+    else
+      {
+        QName qName = getQName(token);
+        return new NameTest(qName, false, false);
+      }
+  }
+
+  final QName getQName(String name)
+  {
+    QName qName = QName.valueOf(name);
+    String prefix = qName.getPrefix();
+    String uri = qName.getNamespaceURI();
+    if (prefix != null && (uri == null || uri.length() == 0))
+      {
+        uri = getNamespaceURI(prefix);
+        String localName = qName.getLocalPart();
+        qName = new QName(uri, localName, prefix);
+      }
+    return qName;
+  }
+
+  final TemplateNode parseAttributeValueTemplate(String value, Node source)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    current = source;
+    // Tokenize
+    int len = value.length();
+    int off = 0;
+    List tokens = new ArrayList(); // text tokens
+    List types = new ArrayList(); // literal or expression
+    int depth = 0;
+    for (int i = 0; i < len; i++)
+      {
+        char c = value.charAt(i);
+        if (c == '{')
+          {
+            if (i < (len - 1) && value.charAt(i + 1) == '{')
+              {
+                tokens.add(value.substring(off, i + 1));
+                types.add(Boolean.FALSE);
+                i++;
+                off = i + 1;
+                continue;
+              }
+            if (depth == 0)
+              {
+                if (i - off > 0)
+                  {
+                    tokens.add(value.substring(off, i));
+                    types.add(Boolean.FALSE);
+                  }
+                off = i + 1;
+              }
+            depth++;
+          }
+        else if (c == '}')
+          {
+            if (i < (len - 1) && value.charAt(i + 1) == '}')
+              {
+                tokens.add(value.substring(off, i + 1));
+                types.add(Boolean.FALSE);
+                i++;
+                off = i + 1;
+                continue;
+              }
+            if (depth == 1)
+              {
+                if (i - off > 0)
+                  {
+                    tokens.add(value.substring(off, i));
+                    types.add(Boolean.TRUE);
+                  }
+                else
+                  {
+                    String msg = "attribute value template " +
+                      "must contain expression: " + value;
+                    DOMSourceLocator l = new DOMSourceLocator(source);
+                    throw new TransformerConfigurationException(msg, l);
+                  }
+                off = i + 1;
+              }
+            depth--;
+          }
+      }
+    if (depth > 0)
+      {
+        String msg = "invalid attribute value template: " + value;
+        throw new TransformerConfigurationException(msg);
+      }
+    if (len - off > 0)
+      {
+        // Trailing text
+        tokens.add(value.substring(off));
+        types.add(Boolean.FALSE);
+      }
+    
+    // Construct template node tree
+    TemplateNode ret = null;
+    Document doc = source.getOwnerDocument();
+    len = tokens.size();
+    for (int i = len - 1; i >= 0; i--)
+      {
+        String token = (String) tokens.get(i);
+        Boolean type = (Boolean) types.get(i);
+        if (type == Boolean.TRUE)
+          {
+            // Expression text
+            Expr select = (Expr) xpath.compile(token);
+            ret = new ValueOfNode(null, ret, select, false);
+          }
+        else
+          {
+            // Verbatim text
+            ret = new LiteralNode(null, ret, doc.createTextNode(token));
+          }
+      }
+    return ret;
+  }
+
+  boolean isPreserved(Text text)
+    throws TransformerConfigurationException
+  {
+    // Check characters in text
+    String value = text.getData();
+    if (value != null)
+      {
+        int len = value.length();
+        for (int i = 0; i < len; i++)
+          {
+            char c = value.charAt(i);
+            if (c != 0x20 && c != 0x09 && c != 0x0a && c != 0x0d)
+              {
+                return true;
+              }
+          }
+      }
+    // Check parent node
+    Node ctx = text.getParentNode();
+    if (!preserveSpace.isEmpty())
+      {
+        for (Iterator i = preserveSpace.iterator(); i.hasNext(); )
+          {
+            NameTest preserveTest = (NameTest) i.next();
+            if (preserveTest.matches(ctx, 1, 1))
+              {
+                boolean override = false;
+                if (!stripSpace.isEmpty())
+                  {
+                    for (Iterator j = stripSpace.iterator(); j.hasNext(); )
+                      {
+                        NameTest stripTest = (NameTest) j.next();
+                        if (stripTest.matches(ctx, 1, 1))
+                          {
+                            override = true;
+                            break;
+                          }
+                      }
+                  }
+                if (!override)
+                  {
+                    return true;
+                  }
+              }
+          }
+      }
+    // Check whether any ancestor specified xml:space
+    while (ctx != null)
+      {
+        if (ctx.getNodeType() == Node.ELEMENT_NODE)
+          {
+            Element element = (Element) ctx;
+            String xmlSpace = element.getAttribute("xml:space");
+            if ("default".equals(xmlSpace))
+              {
+                break;
+              }
+            else if ("preserve".equals(xmlSpace))
+              {
+                return true;
+              }
+            else if (xmlSpace.length() > 0)
+              {
+                String msg = "Illegal value for xml:space: " + xmlSpace;
+                throw new TransformerConfigurationException(msg);
+              }
+            else if ("text".equals(ctx.getLocalName()) &&
+                     XSL_NS.equals(ctx.getNamespaceURI()))
+              {
+                // xsl:text implies xml:space='preserve'
+                return true;
+              }
+          }
+        ctx = ctx.getParentNode();
+      }
+    return false;
+  }
+
+  public XPathFunction resolveFunction(QName name, int arity)
+  {
+    String uri = name.getNamespaceURI();
+    if (XSL_NS.equals(uri) || uri == null || uri.length() == 0)
+      {
+        String localName = name.getLocalPart();
+        if ("document".equals(localName) && (arity == 1 || arity == 2))
+          {
+            if (current == null)
+              {
+                throw new RuntimeException("current is null");
+              }
+            return new DocumentFunction(getRootStylesheet(), current);
+          }
+        else if ("key".equals(localName) && (arity == 2))
+          {
+            return new KeyFunction(getRootStylesheet());
+          }
+        else if ("format-number".equals(localName) &&
+                 (arity == 2 || arity == 3))
+          {
+            return new FormatNumberFunction(getRootStylesheet());
+          }
+        else if ("current".equals(localName) && (arity == 0))
+          {
+            return new CurrentFunction(getRootStylesheet());
+          }
+        else if ("unparsed-entity-uri".equals(localName) && (arity == 1))
+          {
+            return new UnparsedEntityUriFunction();
+          }
+        else if ("generate-id".equals(localName) &&
+                 (arity == 1 || arity == 0))
+          {
+            return new GenerateIdFunction();
+          }
+        else if ("system-property".equals(localName) && (arity == 1))
+          {
+            return new SystemPropertyFunction();
+          }
+        else if ("element-available".equals(localName) && (arity == 1))
+          {
+            return new ElementAvailableFunction(this);
+          }
+        else if ("function-available".equals(localName) && (arity == 1))
+          {
+            return new FunctionAvailableFunction(this);
+          }
+      }
+    return null;
+  }
+  
+  // -- Parsing --
+
+  /**
+   * apply-templates
+   */
+  final TemplateNode parseApplyTemplates(Node node, Node children, Node next)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    NamedNodeMap attrs = node.getAttributes();
+    String m = getAttribute(attrs, "mode");
+    QName mode = (m == null) ? null : getQName(m);
+    String s = getAttribute(attrs, "select");
+    if (s == null)
+      {
+        s = "child::node()";
+      }
+    List sortKeys = parseSortKeys(children);
+    List withParams = parseWithParams(children);
+    Expr select = (Expr) xpath.compile(s);
+    return new ApplyTemplatesNode(null, parse(next),
+                                  select, mode,
+                                  sortKeys, withParams, false);
+  }
+
+  /**
+   * call-template
+   */
+  final TemplateNode parseCallTemplate(Node node, Node children, Node next)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    NamedNodeMap attrs = node.getAttributes();
+    String n = getRequiredAttribute(attrs, "name", node);
+    QName name = getQName(n);
+    List withParams = parseWithParams(children);
+    return new CallTemplateNode(null, parse(next), name,
+                                withParams);
+  }
+  
+  /**
+   * value-of
+   */
+  final TemplateNode parseValueOf(Node node, Node children, Node next)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    NamedNodeMap attrs = node.getAttributes();
+    String s = getRequiredAttribute(attrs, "select", node);
+    String doe = getAttribute(attrs, "disable-output-escaping");
+    boolean d = "yes".equals(doe);
+    Expr select = (Expr) xpath.compile(s);
+    return new ValueOfNode(null, parse(next), select, d);
+  }
+  
+  /**
+   * for-each
+   */
+  final TemplateNode parseForEach(Node node, Node children, Node next)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    NamedNodeMap attrs = node.getAttributes();
+    String s = getRequiredAttribute(attrs, "select", node);
+    List sortKeys = parseSortKeys(children);
+    Expr select = (Expr) xpath.compile(s);
+    return new ForEachNode(parse(children), parse(next), select, sortKeys);
+  }
+  
+  /**
+   * if
+   */
+  final TemplateNode parseIf(Node node, Node children, Node next)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    NamedNodeMap attrs = node.getAttributes();
+    String t = getRequiredAttribute(attrs, "test", node);
+    Expr test = (Expr) xpath.compile(t);
+    return new IfNode(parse(children), parse(next), test);
+  }
+  
+  /**
+   * when
+   */
+  final TemplateNode parseWhen(Node node, Node children, Node next)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    NamedNodeMap attrs = node.getAttributes();
+    String t = getRequiredAttribute(attrs, "test", node);
+    Expr test = (Expr) xpath.compile(t);
+    return new WhenNode(parse(children), parse(next), test);
+  }
+  
+  /**
+   * element
+   */
+  final TemplateNode parseElement(Node node, Node children, Node next)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    NamedNodeMap attrs = node.getAttributes();
+    String name = getRequiredAttribute(attrs, "name", node);
+    String namespace = getAttribute(attrs, "namespace");
+    String uas = getAttribute(attrs, "use-attribute-sets");
+    TemplateNode n = parseAttributeValueTemplate(name, node);
+    TemplateNode ns = (namespace == null) ? null :
+      parseAttributeValueTemplate(namespace, node);
+    return new ElementNode(parse(children), parse(next), n, ns, uas, node);
+  }
+
+  /**
+   * attribute
+   */
+  final TemplateNode parseAttribute(Node node, Node children, Node next)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    NamedNodeMap attrs = node.getAttributes();
+    String name = getRequiredAttribute(attrs, "name", node);
+    String namespace = getAttribute(attrs, "namespace");
+    TemplateNode n = parseAttributeValueTemplate(name, node);
+    TemplateNode ns = (namespace == null) ? null :
+      parseAttributeValueTemplate(namespace, node);
+    return new AttributeNode(parse(children), parse(next), n, ns, node);
+  }
+  
+  /**
+   * text
+   */
+  final TemplateNode parseText(Node node, Node children, Node next)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    NamedNodeMap attrs = node.getAttributes();
+    String doe = getAttribute(attrs, "disable-output-escaping");
+    boolean d = "yes".equals(doe);
+    return new TextNode(parse(children), parse(next), d);
+  }
+  
+  /**
+   * copy
+   */
+  final TemplateNode parseCopy(Node node, Node children, Node next)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    NamedNodeMap attrs = node.getAttributes();
+    String uas = getAttribute(attrs, "use-attribute-sets");
+    return new CopyNode(parse(children), parse(next), uas);
+  }
+  
+  /**
+   * processing-instruction
+   */
+  final TemplateNode parseProcessingInstruction(Node node, Node children,
+                                                Node next)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    NamedNodeMap attrs = node.getAttributes();
+    String name = getRequiredAttribute(attrs, "name", node);
+    return new ProcessingInstructionNode(parse(children),
+                                         parse(next), name);
+  }
+  
+  /**
+   * number
+   */
+  final TemplateNode parseNumber(Node node, Node children, Node next)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    NamedNodeMap attrs = node.getAttributes();
+    String v = getAttribute(attrs, "value");
+    String ff = getAttribute(attrs, "format");
+    if (ff == null)
+      {
+        ff = "1";
+      }
+    TemplateNode format = parseAttributeValueTemplate(ff, node);
+    String lang = getAttribute(attrs, "lang");
+    String lv = getAttribute(attrs, "letter-value");
+    int letterValue = "traditional".equals(lv) ?
+      AbstractNumberNode.TRADITIONAL :
+      AbstractNumberNode.ALPHABETIC;
+    String gs = getAttribute(attrs, "grouping-separator");
+    String gz = getAttribute(attrs, "grouping-size");
+    int gz2 = (gz != null && gz.length() > 0) ?
+      Integer.parseInt(gz) : 1;
+    if (v != null && v.length() > 0)
+      {
+        Expr value = (Expr) xpath.compile(v);
+        return new NumberNode(parse(children), parse(next),
+                              value, format, lang,
+                              letterValue, gs, gz2);
+      }
+    else
+      {
+        String l = getAttribute(attrs, "level");
+        int level =
+          "multiple".equals(l) ? NodeNumberNode.MULTIPLE :
+                      "any".equals(l) ? NodeNumberNode.ANY :
+                      NodeNumberNode.SINGLE;
+        String c = getAttribute(attrs, "count");
+        String f = getAttribute(attrs, "from");
+        Pattern count = null;
+        Pattern from = null;
+        if (c != null)
+          {
+            try
+              {
+                count = (Pattern) xpath.compile(c);
+              }
+            catch (ClassCastException e)
+              {
+                String msg = "invalid pattern: " + c;
+                throw new TransformerConfigurationException(msg);
+              }
+          }
+        if (f != null)
+          {
+            try
+              {
+                from = (Pattern) xpath.compile(f);
+              }
+            catch (ClassCastException e)
+              {
+                String msg = "invalid pattern: " + f;
+                throw new TransformerConfigurationException(msg);
+              }
+          }
+        return new NodeNumberNode(parse(children), parse(next),
+                                  level, count, from,
+                                  format, lang,
+                                  letterValue, gs, gz2);
+      }
+  }
+  
+  /**
+   * copy-of
+   */
+  final TemplateNode parseCopyOf(Node node, Node children, Node next)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    NamedNodeMap attrs = node.getAttributes();
+    String s = getRequiredAttribute(attrs, "select", node);
+    Expr select = (Expr) xpath.compile(s);
+    return new CopyOfNode(parse(children), parse(next), select);
+  }
+  
+  /**
+   * message
+   */
+  final TemplateNode parseMessage(Node node, Node children, Node next)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    NamedNodeMap attrs = node.getAttributes();
+    String t = getAttribute(attrs, "terminate");
+    boolean terminate = "yes".equals(t);
+    return new MessageNode(parse(children), parse(next), terminate);
+  }
+  
+  /**
+   * Parse template-level elements.
+   */
+  final TemplateNode parse(Node node)
+    throws TransformerConfigurationException
+  {
+    if (node == null)
+      {
+        return null;
+      }
+    // Hack to associate the document function with its declaring node
+    current = node;
+    Node children = node.getFirstChild();
+    Node next = node.getNextSibling();
+    try
+      {
+        String namespaceUri = node.getNamespaceURI();
+        if (Stylesheet.XSL_NS.equals(namespaceUri) &&
+            Node.ELEMENT_NODE == node.getNodeType())
+          {
+            String name = node.getLocalName();
+            if ("apply-templates".equals(name))
+              {
+                return parseApplyTemplates(node, children, next);
+              }
+            else if ("call-template".equals(name))
+              {
+                return parseCallTemplate(node, children, next);
+              }
+            else if ("value-of".equals(name))
+              {
+                return parseValueOf(node, children, next);
+              }
+            else if ("for-each".equals(name))
+              {
+                return parseForEach(node, children, next);
+              }
+            else if ("if".equals(name))
+              {
+                return parseIf(node, children, next);
+              }
+            else if ("choose".equals(name))
+              {
+                return new ChooseNode(parse(children), parse(next));
+              }
+            else if ("when".equals(name))
+              {
+                return parseWhen(node, children, next);
+              }
+            else if ("otherwise".equals(name))
+              {
+                return new OtherwiseNode(parse(children), parse(next));
+              }
+            else if ("element".equals(name))
+              {
+                return parseElement(node, children, next);
+              }
+            else if ("attribute".equals(name))
+              {
+                return parseAttribute(node, children, next);
+              }
+            else if ("text".equals(name))
+              {
+                return parseText(node, children, next);
+              }
+            else if ("copy".equals(name))
+              {
+                return parseCopy(node, children, next);
+              }
+            else if ("processing-instruction".equals(name))
+              {
+                return parseProcessingInstruction(node, children, next);
+              }
+            else if ("comment".equals(name))
+              {
+                return new CommentNode(parse(children), parse(next));
+              }
+            else if ("number".equals(name))
+              {
+                return parseNumber(node, children, next);
+              }
+            else if ("param".equals(name) ||
+                     "variable".equals(name))
+              {
+                boolean global = "variable".equals(name);
+                NamedNodeMap attrs = node.getAttributes();
+                TemplateNode content = parse(children);
+                String paramName = getRequiredAttribute(attrs, "name", node);
+                String select = getAttribute(attrs, "select");
+                if (select != null)
+                  {
+                    if (content != null)
+                      {
+                        String msg = "parameter '" + paramName +
+                          "' has both select and content";
+                        DOMSourceLocator l = new DOMSourceLocator(node);
+                        throw new TransformerConfigurationException(msg, l);
+                      }
+                    Expr expr = (Expr) xpath.compile(select);
+                    return new ParameterNode(null, parse(next),
+                                             paramName, expr, global);
+                  }
+                else
+                  {
+                    return new ParameterNode(content, parse(next),
+                                             paramName, null, global);
+                  }
+              }
+            else if ("copy-of".equals(name))
+              {
+                return parseCopyOf(node, children, next);
+              }
+            else if ("message".equals(name))
+              {
+                return parseMessage(node, children, next);
+              }
+            else if ("apply-imports".equals(name))
+              {
+                return new ApplyImportsNode(parse(children), parse(next));
+              }
+            else
+              {
+                // xsl:fallback
+                // Pass over any other XSLT nodes
+                return parse(next);
+              }
+          }
+        String prefix = node.getPrefix();
+        if (extensionElementPrefixes.contains(prefix))
+          {
+            // Pass over extension elements
+            return parse(next);
+          }
+        switch (node.getNodeType())
+          {
+          case Node.TEXT_NODE:
+            // Determine whether to strip whitespace
+            Text text = (Text) node;
+            if (!isPreserved(text))
+              {
+                // Strip
+                text.getParentNode().removeChild(text);
+                return parse(next);
+              }
+            break;
+          case Node.COMMENT_NODE:
+            // Ignore comments
+            return parse(next);
+          case Node.ELEMENT_NODE:
+            // Check for attribute value templates and use-attribute-sets
+            NamedNodeMap attrs = node.getAttributes();
+            boolean convert = false;
+            String useAttributeSets = null;
+            int len = attrs.getLength();
+            for (int i = 0; i < len; i++)
+              {
+                Node attr = attrs.item(i);
+                String value = attr.getNodeValue();
+                if (Stylesheet.XSL_NS.equals(attr.getNamespaceURI()) &&
+                    "use-attribute-sets".equals(attr.getLocalName()))
+                  {
+                    useAttributeSets = value;
+                    convert = true;
+                    break;
+                  }
+                int start = value.indexOf('{');
+                int end = value.indexOf('}');
+                if (start != -1 || end != -1)
+                  {
+                    convert = true;
+                    break;
+                  }
+              }
+            if (convert)
+              {
+                // Create an element-producing template node instead
+                // with appropriate attribute-producing child template nodes
+                TemplateNode child = parse(children);
+                for (int i = 0; i < len; i++)
+                  {
+                    Node attr = attrs.item(i);
+                    String ans = attr.getNamespaceURI();
+                    String aname = attr.getNodeName();
+                    if (Stylesheet.XSL_NS.equals(ans) &&
+                        "use-attribute-sets".equals(attr.getLocalName()))
+                      {
+                        continue;
+                      }
+                    String value = attr.getNodeValue();
+                    TemplateNode grandchild =
+                      parseAttributeValueTemplate(value, node);
+                    TemplateNode n =
+                      parseAttributeValueTemplate(aname, node);
+                    TemplateNode ns = (ans == null) ? null :
+                      parseAttributeValueTemplate(ans, node);
+                    child = new AttributeNode(grandchild, child, n, ns, attr);
+                  }
+                String ename = node.getNodeName();
+                TemplateNode n = parseAttributeValueTemplate(ename, node);
+                TemplateNode ns = (namespaceUri == null) ? null :
+                  parseAttributeValueTemplate(namespaceUri, node);
+                return new ElementNode(child, parse(next),
+                                       n, ns, useAttributeSets,
+                                       node);
+              }
+            // Otherwise fall through
+            break;
+          }
+      }
+    catch (XPathExpressionException e)
+      {
+        DOMSourceLocator l = new DOMSourceLocator(node);
+        throw new TransformerConfigurationException(e.getMessage(), l, e);
+      }
+    return new LiteralNode(parse(children), parse(next), node);
+  }
+
+  final List parseSortKeys(Node node)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    List ret = new LinkedList();
+    while (node != null)
+      {
+        String namespaceUri = node.getNamespaceURI();
+        if (Stylesheet.XSL_NS.equals(namespaceUri) &&
+            Node.ELEMENT_NODE == node.getNodeType() &&
+            "sort".equals(node.getLocalName()))
+          {
+            NamedNodeMap attrs = node.getAttributes();
+            String s = getAttribute(attrs, "select");
+            if (s == null)
+              {
+                s = ".";
+              }
+            Expr select = (Expr) xpath.compile(s);
+            String l = getAttribute(attrs, "lang");
+            TemplateNode lang = (l == null) ? null :
+              parseAttributeValueTemplate(l, node);
+            String dt = getAttribute(attrs, "data-type");
+            TemplateNode dataType = (dt == null) ? null :
+              parseAttributeValueTemplate(dt, node);
+            String o = getAttribute(attrs, "order");
+            TemplateNode order = (o == null) ? null :
+              parseAttributeValueTemplate(o, node);
+            String co = getAttribute(attrs, "case-order");
+            TemplateNode caseOrder = (co == null) ? null :
+              parseAttributeValueTemplate(co, node);
+            ret.add(new SortKey(select, lang, dataType, order, caseOrder));
+          }
+        node = node.getNextSibling();
+      }
+    return ret.isEmpty() ? null : ret;
+  }
+
+  final List parseWithParams(Node node)
+    throws TransformerConfigurationException, XPathExpressionException
+  {
+    List ret = new LinkedList();
+    while (node != null)
+      {
+        String namespaceUri = node.getNamespaceURI();
+        if (Stylesheet.XSL_NS.equals(namespaceUri) &&
+            Node.ELEMENT_NODE == node.getNodeType() &&
+            "with-param".equals(node.getLocalName()))
+          {
+            NamedNodeMap attrs = node.getAttributes();
+            TemplateNode content = parse(node.getFirstChild());
+            String name = getRequiredAttribute(attrs, "name", node);
+            String select = getAttribute(attrs, "select");
+            if (select != null)
+              {
+                if (content != null)
+                  {
+                    String msg = "parameter '" + name +
+                      "' has both select and content";
+                    DOMSourceLocator l = new DOMSourceLocator(node);
+                    throw new TransformerConfigurationException(msg, l);
+                  }
+                Expr expr = (Expr) xpath.compile(select);
+                ret.add(new WithParam(name, expr));
+              }
+            else
+              {
+                ret.add(new WithParam(name, content));
+              }
+          }
+        node = node.getNextSibling();
+      }
+    return ret.isEmpty() ? null : ret;
+  }
+
+  /**
+   * Created element nodes have a copy of the namespace nodes in the
+   * stylesheet, except the XSLT namespace, extension namespaces, and
+   * exclude-result-prefixes.
+   */
+  final void addNamespaceNodes(Node source, Node target, Document doc,
+                               Collection elementExcludeResultPrefixes)
+  {
+    NamedNodeMap attrs = source.getAttributes();
+    if (attrs != null)
+      {
+        int len = attrs.getLength();
+        for (int i = 0; i < len; i++)
+          {
+            Node attr = attrs.item(i);
+            String uri = attr.getNamespaceURI();
+            if (uri == XMLConstants.XMLNS_ATTRIBUTE_NS_URI)
+              {
+                String prefix = attr.getLocalName();
+                if (XMLConstants.XMLNS_ATTRIBUTE.equals(prefix))
+                  {
+                    prefix = "#default";
+                  }
+                String ns = attr.getNodeValue();
+                // Should the namespace be excluded?
+                if (XSL_NS.equals(ns) ||
+                    extensionElementPrefixes.contains(prefix) ||
+                    elementExcludeResultPrefixes.contains(prefix) ||
+                    excludeResultPrefixes.contains(prefix))
+                  {
+                    continue;
+                  }
+                // Is the namespace already defined on the target?
+                if (prefix == "#default")
+                  {
+                    prefix = null;
+                  }
+                if (target.lookupNamespaceURI(prefix) != null)
+                  {
+                    continue;
+                  }
+                attr = attr.cloneNode(true);
+                attr = doc.adoptNode(attr);
+                target.getAttributes().setNamedItemNS(attr);
+              }
+          }
+      }
+    Node parent = source.getParentNode();
+    if (parent != null)
+      {
+        addNamespaceNodes(parent, target, doc, elementExcludeResultPrefixes);
+      }
+  }
+
+  static final String getAttribute(NamedNodeMap attrs, String name)
+  {
+    Node attr = attrs.getNamedItem(name);
+    if (attr == null)
+      {
+        return null;
+      }
+    String ret = attr.getNodeValue();
+    if (ret.length() == 0)
+      {
+        return null;
+      }
+    return ret;
+  }
+
+  static final String getRequiredAttribute(NamedNodeMap attrs, String name,
+                                           Node source)
+    throws TransformerConfigurationException
+  {
+    String value = getAttribute(attrs, name);
+    if (value == null || value.length() == 0)
+      {
+        String msg =
+          name + " attribute is required on " + source.getNodeName();
+        DOMSourceLocator l = new DOMSourceLocator(source);
+        throw new TransformerConfigurationException(msg, l);
+      }
+    return value;
+  }
+
+  // Handle user data changes when nodes are cloned etc
+
+  public void handle(short op, String key, Object data, Node src, Node dst)
+  {
+    dst.setUserData(key, data, this);
+  }
+
+}
+
diff --git a/libjava/gnu/xml/transform/SystemPropertyFunction.java b/libjava/gnu/xml/transform/SystemPropertyFunction.java
new file mode 100644 (file)
index 0000000..3d95d21
--- /dev/null
+++ b/libjava/gnu/xml/transform/SystemPropertyFunction.java
@@ -0,0 +1,129 @@
+/* SystemPropertyFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.xml.namespace.QName;
+import javax.xml.xpath.XPathFunction;
+import javax.xml.xpath.XPathFunctionException;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+import gnu.xml.xpath.Function;
+
+/**
+ * The XSLT <code>system-property()</code>function.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class SystemPropertyFunction
+  extends Expr
+  implements XPathFunction, Function
+{
+
+  List args;
+
+  public Object evaluate(List args)
+    throws XPathFunctionException
+  {
+    String name = (String) args.get(0);
+    return systemProperty(QName.valueOf(name));
+  }
+
+  public void setArguments(List args)
+  {
+    this.args = args;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    int arity = args.size();
+    List values = new ArrayList(arity);
+    for (int i = 0; i < arity; i++)
+      {
+        Expr arg = (Expr) args.get(i);
+        values.add(arg.evaluate(context, pos, len));
+      }
+    String name = _string(context, values.get(0));
+    return systemProperty(QName.valueOf(name));
+  }
+
+  Object systemProperty(QName name)
+  {
+    String localName = name.getLocalPart();
+    String prefix = name.getPrefix();
+    String uri = name.getNamespaceURI();
+    if (Stylesheet.XSL_NS.equals(uri) ||
+        "xsl".equals(prefix))
+      {
+        if ("version".equals(localName))
+          {
+            return new Double(1.0d);
+          }
+        else if ("vendor".equals(localName))
+          {
+            return "The Free Software Foundation";
+          }
+        else if ("vendor-url".equals(localName))
+          {
+            return "http://www.gnu.org/";
+          }
+        else
+          {
+            return "";
+          }
+      }
+    return System.getProperty(localName);
+  }
+
+  public Expr clone(Object context)
+  {
+    SystemPropertyFunction f = new SystemPropertyFunction();
+    int len = args.size();
+    List args2 = new ArrayList(len);
+    for (int i = 0; i < len; i++)
+      {
+        args2.add(((Expr) args.get(i)).clone(context));
+      }
+    f.setArguments(args2);
+    return f;
+  }
+
+}
+
diff --git a/libjava/gnu/xml/transform/Template.java b/libjava/gnu/xml/transform/Template.java
new file mode 100644 (file)
index 0000000..6aaa4c1
--- /dev/null
+++ b/libjava/gnu/xml/transform/Template.java
@@ -0,0 +1,254 @@
+/* Template.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.io.PrintStream;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPathExpressionException;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+import gnu.xml.xpath.NameTest;
+import gnu.xml.xpath.NodeTypeTest;
+import gnu.xml.xpath.Pattern;
+import gnu.xml.xpath.Selector;
+import gnu.xml.xpath.Test;
+
+/**
+ * A template in an XSL stylesheet.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class Template
+  implements Comparable
+{
+
+  static final double DEFAULT_PRIORITY = 0.5d;
+
+  final Stylesheet stylesheet;
+  final QName name;
+  final Pattern match;
+  final TemplateNode node;
+  final double priority;
+  final int precedence;
+  final QName mode;
+
+  Template(Stylesheet stylesheet, 
+           QName name, Pattern match, TemplateNode node,
+           int precedence, double priority, QName mode)
+  {
+    this.stylesheet = stylesheet;
+    this.name = name;
+    this.match = match;
+    this.node = node;
+    // adjust priority if necessary
+    // see XSLT section 5.5
+    Test test = getNodeTest(match);
+    if (test != null)
+      {
+        if (test instanceof NameTest)
+          {
+            NameTest nameTest = (NameTest) test;
+            if (nameTest.matchesAny() ||
+                nameTest.matchesAnyLocalName())
+              {
+                priority = -0.25d;
+              }
+            else
+              {
+                priority = 0.0d;
+              }
+          }
+        else
+          {
+            NodeTypeTest nodeTypeTest = (NodeTypeTest) test;
+            if (nodeTypeTest.getNodeType() ==
+                Node.PROCESSING_INSTRUCTION_NODE &&
+                nodeTypeTest.getData() != null)
+              {
+                priority = 0.0d;
+              }
+            else
+              {
+                priority = -0.5d;
+              }
+          }
+      }
+    this.precedence = precedence;
+    this.priority = priority;
+    this.mode = mode;
+  }
+
+  Template clone(Stylesheet stylesheet)
+  {
+    // FIXME by cloning we lose the imports() functionality, so
+    // apply-imports will be broken.
+    return new Template(stylesheet,
+                        name,
+                        (match == null) ? null :
+                        (Pattern) match.clone(stylesheet),
+                        (node == null) ? null : node.clone(stylesheet),
+                        precedence,
+                        priority,
+                        mode);
+  }
+  
+  public int compareTo(Object other)
+  {
+    if (other instanceof Template)
+      {
+        Template t = (Template) other;
+        int d = t.precedence - precedence;
+        if (d != 0)
+          {
+            return d;
+          }
+        double d2 = t.priority - priority;
+        if (d2 != 0.0d)
+          {
+            return (int) Math.round(d2 * 1000.0d);
+          }
+      }
+    return 0;
+  }
+
+  Test getNodeTest(Expr expr)
+  {
+    if (expr instanceof Selector)
+      {
+        Selector selector = (Selector) expr;
+        Test[] tests = selector.getTests();
+        if (tests.length > 0)
+          {
+            return tests[0];
+          }
+      }
+    return null;
+  }
+
+  boolean matches(QName mode, Node node)
+  {
+    if ((mode == null && this.mode != null) ||
+        (mode != null && !mode.equals(this.mode)))
+      {
+        return false;
+      }
+    if (match == null)
+      {
+        return false;
+      }
+    return match.matches(node);
+  }
+
+  boolean matches(QName name)
+  {
+    return name.equals(this.name);
+  }
+
+  boolean imports(Template other)
+  {
+    for (Stylesheet ctx = other.stylesheet.parent;
+         ctx != null;
+         ctx = ctx.parent)
+      {
+        if (ctx == stylesheet)
+          {
+            return true;
+          }
+      }
+    return false;
+  }
+
+  /**
+   * @param stylesheet the stylesheet
+   * @param parent the parent of result nodes
+   * @param context the context node in the source document
+   * @param pos the context position
+   * @param len the context size
+   * @param nextSibling if non-null, add result nodes before this node
+   */
+  void apply(Stylesheet stylesheet, QName mode,
+             Node context, int pos, int len,
+             Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    //System.err.println("...applying " + toString() + " to " + context);
+    if (node != null)
+      {
+        node.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    if (name != null)
+      {
+        buf.append("name=");
+        buf.append(name);
+      }
+    else if (match != null)
+      {
+        buf.append("match=");
+        buf.append(match);
+      }
+    if (mode != null)
+      {
+        buf.append(",mode=");
+        buf.append(mode);
+      }
+    buf.append(']');
+    return buf.toString();
+    
+    //return (name != null) ? name.toString() : match.toString();
+  }
+
+  void list(PrintStream out)
+  {
+    out.println(toString());
+    if (node != null)
+      {
+        node.list(1, out, true);
+      }
+  }
+
+}
diff --git a/libjava/gnu/xml/transform/TemplateNode.java b/libjava/gnu/xml/transform/TemplateNode.java
new file mode 100644 (file)
index 0000000..1fe37c2
--- /dev/null
+++ b/libjava/gnu/xml/transform/TemplateNode.java
@@ -0,0 +1,115 @@
+/* TemplateNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.io.PrintStream;
+import java.util.Comparator;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.DocumentOrderComparator;
+
+/**
+ * Wrapper for a source node in a template.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+abstract class TemplateNode
+{
+
+  static final Comparator documentOrderComparator =
+    new DocumentOrderComparator();
+
+  final TemplateNode children;
+  final TemplateNode next;
+
+  TemplateNode(TemplateNode children, TemplateNode next)
+  {
+    this.children = children;
+    this.next = next;
+  }
+
+  final void apply(Stylesheet stylesheet, QName mode,
+                   Node context, int pos, int len,
+                   Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    if (stylesheet.terminated)
+      {
+        return;
+      }
+    if (Thread.currentThread().isInterrupted())
+      {
+        // Try to head off any infinite loops at the pass
+        return;
+      }
+    if (stylesheet.debug)
+      {
+        System.err.println("Applying " + toString());
+      }
+    doApply(stylesheet, mode, context, pos, len, parent, nextSibling);
+  }
+
+  abstract void doApply(Stylesheet stylesheet, QName mode,
+                        Node context, int pos, int len,
+                        Node parent, Node nextSibling)
+    throws TransformerException;
+
+  abstract TemplateNode clone(Stylesheet stylesheet);
+
+  /**
+   * Debugging
+   */
+  void list(int depth, PrintStream out, boolean listNext)
+  {
+    for (int i = 0; i < depth; i++)
+      {
+        out.print("  ");
+      }
+    out.println(toString());
+    if (children != null)
+      {
+        children.list(depth + 1, out, true);
+      }
+    if (listNext && next != null)
+      {
+        next.list(depth, out, listNext);
+      }
+  }
+
+}
diff --git a/libjava/gnu/xml/transform/TemplatesImpl.java b/libjava/gnu/xml/transform/TemplatesImpl.java
new file mode 100644 (file)
index 0000000..a7403e9
--- /dev/null
+++ b/libjava/gnu/xml/transform/TemplatesImpl.java
@@ -0,0 +1,83 @@
+/* TemplatesImpl.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.Properties;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.URIResolver;
+
+/**
+ * GNU precompiled stylesheet implementation.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class TemplatesImpl
+  implements Templates
+{
+
+  final TransformerFactoryImpl factory;
+  final Stylesheet stylesheet;
+  final Properties outputProperties;
+
+  TemplatesImpl(TransformerFactoryImpl factory, Stylesheet stylesheet)
+  {
+    this.factory = factory;
+    this.stylesheet = stylesheet;
+    outputProperties = new TransformerOutputProperties(stylesheet);
+  }
+
+  public Transformer newTransformer()
+    throws TransformerConfigurationException
+  {
+    Stylesheet stylesheet = (Stylesheet) this.stylesheet.clone();
+    TransformerImpl transformer =
+      new TransformerImpl(factory, stylesheet, outputProperties);
+    stylesheet.transformer = transformer;
+    return transformer;
+  }
+
+  public Properties getOutputProperties()
+  {
+    return (Properties) outputProperties.clone();
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/TextNode.java b/libjava/gnu/xml/transform/TextNode.java
new file mode 100644 (file)
index 0000000..70a8ce4
--- /dev/null
+++ b/libjava/gnu/xml/transform/TextNode.java
@@ -0,0 +1,116 @@
+/* TextNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
+import gnu.xml.xpath.Expr;
+
+/**
+ * A template node representing the XSL <code>text</code> instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class TextNode
+  extends TemplateNode
+{
+
+  final boolean disableOutputEscaping;
+
+  TextNode(TemplateNode children, TemplateNode next,
+           boolean disableOutputEscaping)
+  {
+    super(children, next);
+    this.disableOutputEscaping = disableOutputEscaping;
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new TextNode((children == null) ? null :
+                        children.clone(stylesheet),
+                        (next == null) ? null :
+                        next.clone(stylesheet),
+                        disableOutputEscaping);
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+             Node context, int pos, int len,
+             Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    String value = "";
+    Document doc = (parent instanceof Document) ? (Document) parent :
+      parent.getOwnerDocument();
+    if (children != null)
+      {
+        // Create a document fragment to hold the text
+        DocumentFragment fragment = doc.createDocumentFragment();
+        // Apply children to the fragment
+        children.apply(stylesheet, mode,
+                       context, pos, len,
+                       fragment, null);
+        // Use XPath string-value of fragment
+        value = Expr.stringValue(fragment);
+      }
+    Text text = doc.createTextNode(value);
+    if (disableOutputEscaping)
+      {
+        text.setUserData("disable-output-escaping", "yes", stylesheet);
+      }
+    // Insert into result tree
+    if (nextSibling != null)
+      {
+        parent.insertBefore(text, nextSibling);
+      }
+    else
+      {
+        parent.appendChild(text);
+      }
+    if (next != null)
+      {
+        next.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/TransformerFactoryImpl.java b/libjava/gnu/xml/transform/TransformerFactoryImpl.java
new file mode 100644 (file)
index 0000000..9c4d9da
--- /dev/null
+++ b/libjava/gnu/xml/transform/TransformerFactoryImpl.java
@@ -0,0 +1,345 @@
+/* TransformerFactoryImpl.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Properties;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.xpath.XPathFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import gnu.xml.dom.DomDocument;
+
+/**
+ * GNU transformer factory implementation.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class TransformerFactoryImpl
+  extends TransformerFactory
+{
+
+  final XPathFactory xpathFactory;
+       final XSLURIResolver resolver;
+  ErrorListener userListener;
+  URIResolver userResolver;
+
+  public TransformerFactoryImpl()
+  {
+    xpathFactory = new gnu.xml.xpath.XPathFactoryImpl();
+    resolver = new XSLURIResolver();
+  }
+
+  public Transformer newTransformer(Source source)
+    throws TransformerConfigurationException
+  {
+    Stylesheet stylesheet = newStylesheet(source, 0, null);
+    Properties outputProperties =
+      new TransformerOutputProperties(stylesheet);
+    TransformerImpl transformer =
+      new TransformerImpl(this, stylesheet, outputProperties);
+    stylesheet.transformer = transformer;
+    return transformer;
+  }
+
+  public Transformer newTransformer()
+    throws TransformerConfigurationException
+  {
+    return new TransformerImpl(this, null, new Properties());
+  }
+
+  public Templates newTemplates(Source source)
+    throws TransformerConfigurationException
+  {
+    Stylesheet stylesheet = newStylesheet(source, 0, null);
+    return new TemplatesImpl(this, stylesheet);
+  }
+
+  Stylesheet newStylesheet(Source source, int precedence, Stylesheet parent)
+    throws TransformerConfigurationException
+  {
+    Document doc = null;
+    String systemId = null;
+    if (source != null)
+      {
+        try
+          {
+            DOMSource ds;
+            synchronized (resolver)
+              {
+                resolver.setUserResolver(userResolver);
+                resolver.setUserListener(userListener);
+                ds = resolver.resolveDOM(source, null, null);
+              }
+            Node node = ds.getNode();
+            if (node == null)
+              {
+                throw new TransformerConfigurationException("no source document");
+              }
+            doc = (node instanceof Document) ? (Document) node :
+              node.getOwnerDocument();
+            systemId = ds.getSystemId();
+          }
+        catch (TransformerException e)
+          {
+            throw new TransformerConfigurationException(e);
+          }
+      }
+    return new Stylesheet(this, parent, doc, systemId, precedence);
+  }
+  
+  public Source getAssociatedStylesheet(Source source,
+                                        String media,
+                                        String title,
+                                        String charset)
+    throws TransformerConfigurationException
+  {
+    try
+      {
+        DOMSource ds;
+        synchronized (resolver)
+          {
+            resolver.setUserResolver(userResolver);
+            resolver.setUserListener(userListener);
+            ds = resolver.resolveDOM(source, null, null);
+          }
+        Node node = ds.getNode();
+        if (node == null)
+          {
+            throw new TransformerConfigurationException("no source document");
+          }
+        Document doc = (node instanceof Document) ? (Document) node :
+          node.getOwnerDocument();
+        LinkedList matches = new LinkedList();
+        for (node = doc.getFirstChild();
+             node != null;
+             node = node.getNextSibling())
+          {
+            if (node.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE &&
+                "xml-stylesheet".equals(node.getNodeName()))
+              {
+                Map params = parseParameters(node.getNodeValue());
+                if (media != null && !media.equals(params.get("media")))
+                  {
+                    continue;
+                  }
+                if (title != null && !title.equals(params.get("title")))
+                  {
+                    continue;
+                  }
+                if (charset != null && !charset.equals(params.get("charset")))
+                  {
+                    continue;
+                  }
+                String href = (String) params.get("href");
+                URL url = resolver.resolveURL(null, node.getBaseURI(), href);
+                matches.add(url);
+              }
+          }
+        switch (matches.size())
+          {
+          case 0:
+            return null;
+          case 1:
+            return new StreamSource(((URL) matches.getFirst()).toString());
+          default:
+            // Create a source representing a stylesheet with a list of
+            // imports
+            DomDocument ssDoc = new DomDocument();
+            ssDoc.setBuilding(true);
+            // Create document element
+            Node root =
+              ssDoc.createElementNS(Stylesheet.XSL_NS, "stylesheet");
+            Node version =
+              ssDoc.createAttributeNS(null, "version");
+            version.setNodeValue("1.0");
+            root.getAttributes().setNamedItemNS(version);
+            ssDoc.appendChild(root);
+            // Create xsl:import for each URL
+            for (Iterator i = matches.iterator(); i.hasNext(); )
+              {
+                URL url = (URL) i.next();
+                Node imp =
+                  ssDoc.createElementNS(Stylesheet.XSL_NS, "import");
+                Node href =
+                  ssDoc.createAttributeNS(null, "href");
+                href.setNodeValue(url.toString());
+                imp.getAttributes().setNamedItemNS(href);
+                root.appendChild(imp);
+              }
+            ssDoc.setBuilding(false);
+            return new DOMSource(ssDoc);
+          }
+      }
+    catch (IOException e)
+      {
+        throw new TransformerConfigurationException(e);
+      }
+    catch (TransformerException e)
+      {
+        throw new TransformerConfigurationException(e);
+      }
+  }
+
+  Map parseParameters(String data)
+  {
+    Map ret = new LinkedHashMap();
+    int len = data.length();
+    String key = null;
+    int start = 0;
+    char quoteChar = '\u0000';
+    for (int i = 0; i < len; i++)
+      {
+        char c = data.charAt(i);
+        if (quoteChar == '\u0000' && c == ' ')
+          {
+            if (key == null && start < i)
+              {
+                key = data.substring(start, i);
+              }
+            else
+              {
+                String val = unquote(data.substring(start, i).trim());
+                ret.put(key, val);
+                key = null;
+              }
+            start = i + 1;
+          }
+        else if (c == '"')
+          {
+            quoteChar = (quoteChar == c) ? '\u0000' : c;
+          }
+        else if (c == '\'')
+          {
+            quoteChar = (quoteChar == c) ? '\u0000' : c;
+          }
+      }
+    if (start < len && key != null)
+      {
+        String val = unquote(data.substring(start, len).trim());
+        ret.put(key, val);
+      }
+    return ret;
+  }
+
+  String unquote(String text)
+  {
+    int end = text.length() - 1;
+    if (text.charAt(0) == '\'' && text.charAt(end) == '\'')
+      {
+        return text.substring(1, end);
+      }
+    if (text.charAt(0) == '"' && text.charAt(end) == '"')
+      {
+        return text.substring(1, end);
+      }
+    return text;
+  }
+
+  public void setURIResolver(URIResolver resolver)
+  {
+    userResolver = resolver;
+  }
+
+  public URIResolver getURIResolver()
+  {
+    return userResolver;
+  }
+
+  public void setFeature(String name, boolean value)
+    throws TransformerConfigurationException
+  {
+    throw new TransformerConfigurationException("not supported");
+  }
+
+  public boolean getFeature(String name)
+  {
+    if (SAXSource.FEATURE.equals(name) ||
+        SAXResult.FEATURE.equals(name) ||
+        StreamSource.FEATURE.equals(name) ||
+        StreamResult.FEATURE.equals(name) ||
+        DOMSource.FEATURE.equals(name) ||
+        DOMResult.FEATURE.equals(name))
+      {
+        return true;
+      }
+    return false;
+  }
+
+  public void setAttribute(String name, Object value)
+    throws IllegalArgumentException
+  {
+    throw new IllegalArgumentException("not supported");
+  }
+
+  public Object getAttribute(String name)
+    throws IllegalArgumentException
+  {
+    throw new IllegalArgumentException("not supported");
+  }
+
+  public void setErrorListener(ErrorListener listener)
+    throws IllegalArgumentException
+  {
+    userListener = listener;
+  }
+
+  public ErrorListener getErrorListener()
+  {
+    return userListener;
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/TransformerImpl.java b/libjava/gnu/xml/transform/TransformerImpl.java
new file mode 100644 (file)
index 0000000..fb4632e
--- /dev/null
+++ b/libjava/gnu/xml/transform/TransformerImpl.java
@@ -0,0 +1,586 @@
+/* TransformerImpl.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.io.BufferedOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.net.MalformedURLException;
+import java.net.UnknownServiceException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Properties;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.stream.StreamResult;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
+import gnu.xml.dom.DomDoctype;
+import gnu.xml.dom.DomDocument;
+import gnu.xml.dom.ls.WriterOutputStream;
+import gnu.xml.xpath.Expr;
+import gnu.xml.xpath.Root;
+
+/**
+ * The transformation process for a given stylesheet.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class TransformerImpl
+  extends Transformer
+{
+
+  final TransformerFactoryImpl factory;
+  final Stylesheet stylesheet;
+  URIResolver uriResolver;
+  ErrorListener errorListener;
+  Properties outputProperties;
+
+  TransformerImpl(TransformerFactoryImpl factory,
+                  Stylesheet stylesheet,
+                  Properties outputProperties)
+    throws TransformerConfigurationException
+  {
+    this.factory = factory;
+    uriResolver = factory.userResolver;
+    errorListener = factory.userListener;
+    this.stylesheet = stylesheet;
+    this.outputProperties = outputProperties;
+    if (stylesheet != null)
+      {
+        // Set up parameter context for this transformer
+        stylesheet.bindings.push(false);
+      }
+  }
+
+  public void transform(Source xmlSource, Result outputTarget)
+    throws TransformerException
+  {
+    // Get the source tree
+    DOMSource source;
+    synchronized (factory.resolver)
+      {
+        factory.resolver.setUserResolver(uriResolver);
+        factory.resolver.setUserListener(errorListener);
+        source = factory.resolver.resolveDOM(xmlSource, null, null);
+      }
+    Node context = source.getNode();
+    Document doc = (context instanceof Document) ? (Document) context :
+      context.getOwnerDocument();
+    if (doc instanceof DomDocument)
+      {
+        // Suppress mutation events
+        ((DomDocument) doc).setBuilding(true);
+        // TODO find a better/more generic way of doing this than
+        // casting
+      }
+    // Get the result tree
+    Node parent = null, nextSibling = null;
+    if (outputTarget instanceof DOMResult)
+      {
+        DOMResult dr = (DOMResult) outputTarget;
+        parent = dr.getNode();
+        nextSibling = dr.getNextSibling();
+
+        Document rdoc = (parent instanceof Document) ? (Document) parent :
+          parent.getOwnerDocument();
+        if (rdoc instanceof DomDocument)
+          {
+            // Suppress mutation events and allow multiple root elements
+            DomDocument drdoc = (DomDocument) rdoc;
+            drdoc.setBuilding(true);
+            drdoc.setCheckWellformedness(false);
+            // TODO find a better/more generic way of doing this than
+            // casting
+          }
+      }
+    boolean created = false;
+    // Transformation
+    if (stylesheet != null)
+      {
+        if (parent == null)
+          {
+            // Create a new document to hold the result
+            DomDocument resultDoc = new DomDocument();
+            resultDoc.setBuilding(true);
+            resultDoc.setCheckWellformedness(false);
+            parent = resultDoc;
+            created = true;
+          }
+        // Make a copy of the source node, and strip it
+        context = context.cloneNode(true);
+        strip(context);
+        // XSLT transformation
+        try
+          {
+            // Set output properties in the underlying stylesheet
+            ((TransformerOutputProperties) outputProperties).apply();
+            stylesheet.initTopLevelVariables(context);
+            TemplateNode t = stylesheet.getTemplate(null, context, false);
+            if (t != null)
+              {
+                stylesheet.current = context;
+                t.apply(stylesheet, null, context, 1, 1, parent, nextSibling);
+              }
+          }
+        catch (TransformerException e)
+          {
+            // Done transforming, reset document
+            if (doc instanceof DomDocument)
+              {
+                ((DomDocument) doc).setBuilding(false);
+              }
+            throw e;
+          }
+      }
+    else
+      {
+        // Identity transform
+        Node clone = context.cloneNode(true);
+        if (context.getNodeType() != Node.DOCUMENT_NODE)
+          {
+            Document resultDoc;
+            if (parent == null)
+              {
+                // Create a new document to hold the result
+                DomDocument rd = new DomDocument();
+                rd.setBuilding(true);
+                rd.setCheckWellformedness(false);
+                parent = resultDoc = rd;
+                created = true;
+              }
+            else
+              {
+                resultDoc = (parent instanceof Document) ?
+                  (Document) parent :
+                  parent.getOwnerDocument();
+              }
+            Document sourceDoc = context.getOwnerDocument();
+            if (sourceDoc != resultDoc)
+              {
+                clone = resultDoc.adoptNode(clone);
+              }
+            if (nextSibling != null)
+              {
+                parent.insertBefore(clone, nextSibling);
+              }
+            else
+              {
+                parent.appendChild(clone);
+              }
+          }
+        else
+          {
+            // Cannot append document to another tree
+            parent = clone;
+            created = true;
+          }
+      }
+    String method = outputProperties.getProperty(OutputKeys.METHOD);
+    int outputMethod = "html".equals(method) ? Stylesheet.OUTPUT_HTML :
+      "text".equals(method) ? Stylesheet.OUTPUT_TEXT :
+      Stylesheet.OUTPUT_XML;
+    String encoding = outputProperties.getProperty(OutputKeys.ENCODING);
+    String publicId = outputProperties.getProperty(OutputKeys.DOCTYPE_PUBLIC);
+    String systemId = outputProperties.getProperty(OutputKeys.DOCTYPE_SYSTEM);
+    String version = outputProperties.getProperty(OutputKeys.VERSION);
+    boolean omitXmlDeclaration = 
+      "yes".equals(outputProperties.getProperty(OutputKeys.OMIT_XML_DECLARATION));
+    boolean standalone = 
+      "yes".equals(outputProperties.getProperty(OutputKeys.STANDALONE));
+    String mediaType = outputProperties.getProperty(OutputKeys.MEDIA_TYPE);
+    // TODO cdata-section-elements
+    // TODO indent
+    if (created)
+      {
+        // Discover document element
+        DomDocument resultDoc = (DomDocument) parent;
+        Node root = resultDoc.getDocumentElement();
+        // Add doctype if specified
+        if ((publicId != null || systemId != null) &&
+            root != null)
+          {
+            // We must know the name of the root element to
+            // create the document type
+            resultDoc.appendChild(new DomDoctype(resultDoc,
+                                                 root.getNodeName(),
+                                                 publicId,
+                                                 systemId));
+          }
+        resultDoc.setBuilding(false);
+        resultDoc.setCheckWellformedness(true);
+      }
+    else if (publicId != null || systemId != null)
+      {
+        switch (parent.getNodeType())
+          {
+          case Node.DOCUMENT_NODE:
+          case Node.DOCUMENT_FRAGMENT_NODE:
+            Document resultDoc = (parent instanceof Document) ?
+              (Document) parent :
+              parent.getOwnerDocument();
+            DOMImplementation impl = resultDoc.getImplementation();
+            DocumentType doctype =
+              impl.createDocumentType(resultDoc.getNodeName(),
+                                      publicId,
+                                      systemId);
+            // Try to insert doctype before first element
+            Node ctx = parent.getFirstChild();
+            for (; ctx != null &&
+                 ctx.getNodeType() != Node.ELEMENT_NODE;
+                 ctx = ctx.getNextSibling())
+              {
+              }
+            if (ctx != null)
+              {
+                parent.insertBefore(doctype, ctx);
+              }
+            else
+              {
+                parent.appendChild(doctype);
+              }
+          }
+      }
+    if (version != null)
+      {
+        parent.setUserData("version", version, stylesheet);
+      }
+    if (omitXmlDeclaration)
+      {
+        parent.setUserData("omit-xml-declaration", "yes", stylesheet);
+      }
+    if (standalone)
+      {
+        parent.setUserData("standalone", "yes", stylesheet);
+      }
+    if (mediaType != null)
+      {
+        parent.setUserData("media-type", mediaType, stylesheet);
+      }
+    // Render result to the target device
+    if (outputTarget instanceof DOMResult)
+      {
+        if (created)
+          {
+            DOMResult dr = (DOMResult) outputTarget;
+            dr.setNode(parent);
+            dr.setNextSibling(null);
+          }
+      }
+    else if (outputTarget instanceof StreamResult)
+      {
+        StreamResult sr = (StreamResult) outputTarget;
+        IOException ex = null;
+        try
+          {
+            writeStreamResult(parent, sr, outputMethod, encoding);
+          }
+        catch (UnsupportedEncodingException e)
+          {
+            try
+              {
+                writeStreamResult(parent, sr, outputMethod, "UTF-8");
+              }
+            catch (IOException e2)
+              {
+                ex = e2;
+              }
+          }
+        catch (IOException e)
+          {
+            ex = e;
+          }
+        if (ex != null)
+          {
+            if (errorListener != null)
+              {
+                errorListener.error(new TransformerException(ex));
+              }
+            else
+              {
+                ex.printStackTrace(System.err);
+              }
+          }
+      }
+    else if (outputTarget instanceof SAXResult)
+      {
+        SAXResult sr = (SAXResult) outputTarget;
+        try
+          {
+            ContentHandler ch = sr.getHandler();
+            LexicalHandler lh = sr.getLexicalHandler();
+            if (lh == null && ch instanceof LexicalHandler)
+              {
+                lh = (LexicalHandler) ch;
+              }
+            SAXSerializer serializer = new SAXSerializer();
+            serializer.serialize(parent, ch, lh);
+          }
+        catch (SAXException e)
+          {
+            if (errorListener != null)
+              {
+                errorListener.error(new TransformerException(e));
+              }
+            else
+              {
+                e.printStackTrace(System.err);
+              }
+          }
+      }
+  }
+
+  /**
+   * Strip whitespace from the source tree.
+   */
+  void strip(Node node)
+    throws TransformerConfigurationException
+  {
+    short nt = node.getNodeType();
+    if (nt == Node.ENTITY_REFERENCE_NODE)
+      {
+        // Replace entity reference with its content
+        Node parent = node.getParentNode();
+        Node child = node.getFirstChild();
+        if (child != null)
+          {
+            strip(child);
+          }
+        while (child != null)
+          {
+            Node next = child.getNextSibling();
+            node.removeChild(child);
+            parent.insertBefore(child, node);
+            child = next;
+          }
+        parent.removeChild(node);
+      }
+    if (nt == Node.TEXT_NODE) // CDATA sections ?
+      {
+        if (!stylesheet.isPreserved((Text) node))
+          {
+            node.getParentNode().removeChild(node);
+          }
+      }
+    else
+      {
+        for (Node child = node.getFirstChild(); child != null;
+             child = child.getNextSibling())
+          {
+            strip(child);
+          }
+      }
+  }
+
+  /**
+   * Obtain a suitable output stream for writing the result to,
+   * and use the StreamSerializer to write the result tree to the stream.
+   */
+  void writeStreamResult(Node node, StreamResult sr, int outputMethod,
+                         String encoding)
+    throws IOException
+  {
+    OutputStream out = null;
+    try
+      {
+        out = sr.getOutputStream();
+        if (out == null)
+          {
+            Writer writer = sr.getWriter();
+            if (writer != null)
+              {
+                out = new WriterOutputStream(writer);
+              }
+          }
+        if (out == null)
+          {
+            String systemId = sr.getSystemId();
+            try
+              {
+                URL url = new URL(systemId);
+                URLConnection connection = url.openConnection();
+                connection.setDoOutput(true);
+                out = connection.getOutputStream();
+              }
+            catch (MalformedURLException e)
+              {
+                out = new FileOutputStream(systemId);
+              }
+            catch (UnknownServiceException e)
+              {
+                URL url = new URL(systemId);
+                out = new FileOutputStream(url.getPath());
+              }
+          }
+        out = new BufferedOutputStream(out);
+        StreamSerializer serializer =
+          new StreamSerializer(outputMethod, encoding, null);
+        if (stylesheet != null)
+          {
+            Collection celem = stylesheet.outputCdataSectionElements;
+            serializer.setCdataSectionElements(celem);
+          }
+        serializer.serialize(node, out);
+        out.flush();
+      }
+    finally
+      {
+        try
+          {
+            if (out != null)
+              {
+                out.close();
+              }
+          }
+        catch (IOException e)
+          {
+          }
+      }
+  }
+
+  void copyChildren(Document dstDoc, Node src, Node dst)
+  {
+    Node srcChild = src.getFirstChild();
+    while (srcChild != null)
+      {
+        Node dstChild = dstDoc.adoptNode(srcChild);
+        dst.appendChild(dstChild);
+        srcChild = srcChild.getNextSibling();
+      }
+  }
+
+  public void setParameter(String name, Object value)
+  {
+    if (stylesheet != null)
+      {
+        stylesheet.bindings.set(name, value, false);
+      }
+  }
+
+  public Object getParameter(String name)
+  {
+    if (stylesheet != null)
+      {
+        return stylesheet.bindings.get(name, null, 1, 1);
+      }
+    return null;
+  }
+
+  public void clearParameters()
+  {
+    if (stylesheet != null)
+      {
+        stylesheet.bindings.pop(false);
+        stylesheet.bindings.push(false);
+      }
+  }
+
+  public void setURIResolver(URIResolver resolver)
+  {
+    uriResolver = resolver;
+  }
+
+  public URIResolver getURIResolver()
+  {
+    return uriResolver;
+  }
+
+  public void setOutputProperties(Properties oformat)
+    throws IllegalArgumentException
+  {
+    if (oformat == null)
+      {
+        outputProperties.clear();
+      }
+    else
+      {
+        outputProperties.putAll(oformat);
+      }
+  }
+
+  public Properties getOutputProperties()
+  {
+    return (Properties) outputProperties.clone();
+  }
+
+  public void setOutputProperty(String name, String value)
+    throws IllegalArgumentException
+  {
+    outputProperties.put(name, value);
+  }
+
+  public String getOutputProperty(String name)
+    throws IllegalArgumentException
+  {
+    return outputProperties.getProperty(name);
+  }
+
+  public void setErrorListener(ErrorListener listener)
+  {
+    errorListener = listener;
+  }
+
+  public ErrorListener getErrorListener()
+  {
+    return errorListener;
+  }
+
+}
diff --git a/libjava/gnu/xml/transform/TransformerOutputProperties.java b/libjava/gnu/xml/transform/TransformerOutputProperties.java
new file mode 100644 (file)
index 0000000..d56e795
--- /dev/null
+++ b/libjava/gnu/xml/transform/TransformerOutputProperties.java
@@ -0,0 +1,185 @@
+/* TransformerOutputProperties.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import javax.xml.transform.OutputKeys;
+
+/**
+ * Helper class to manage JAXP user setting of output properties.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class TransformerOutputProperties
+  extends Properties
+{
+  
+  final Properties defaultProperties;
+  final Stylesheet stylesheet;
+  boolean dirty;
+
+  TransformerOutputProperties(Stylesheet stylesheet)
+  {
+    this.stylesheet = stylesheet;
+    defaultProperties = new Properties();
+    switch (stylesheet.outputMethod)
+      {
+      case Stylesheet.OUTPUT_XML:
+        defaultProperties.put(OutputKeys.METHOD, "xml");
+        break;
+      case Stylesheet.OUTPUT_HTML:
+        defaultProperties.put(OutputKeys.METHOD, "html");
+        break;
+      case Stylesheet.OUTPUT_TEXT:
+        defaultProperties.put(OutputKeys.METHOD, "text");
+        break;
+      }
+    if (stylesheet.outputVersion != null)
+      {
+        defaultProperties.put(OutputKeys.VERSION, stylesheet.outputVersion);
+      }
+    if (stylesheet.outputEncoding != null)
+      {
+        defaultProperties.put(OutputKeys.ENCODING, stylesheet.outputEncoding);
+      }
+    defaultProperties.put(OutputKeys.OMIT_XML_DECLARATION,
+                          stylesheet.outputOmitXmlDeclaration ? "yes" : "no");
+    defaultProperties.put(OutputKeys.STANDALONE,
+                          stylesheet.outputStandalone ? "yes" : "no");
+    if (stylesheet.outputPublicId != null)
+      {
+        defaultProperties.put(OutputKeys.DOCTYPE_PUBLIC,
+                              stylesheet.outputPublicId);
+      }
+    if (stylesheet.outputSystemId != null)
+      {
+        defaultProperties.put(OutputKeys.DOCTYPE_SYSTEM,
+                              stylesheet.outputSystemId);
+      }
+    StringBuffer buf = new StringBuffer();
+    for (Iterator i = stylesheet.outputCdataSectionElements.iterator();
+         i.hasNext(); )
+      {
+        if (buf.length() > 0)
+          {
+            buf.append(' ');
+          }
+        buf.append((String) i.next());
+      }
+    defaultProperties.put(OutputKeys.CDATA_SECTION_ELEMENTS, buf.toString());
+    defaultProperties.put(OutputKeys.INDENT,
+                          stylesheet.outputIndent ? "yes" : "no");
+    if (stylesheet.outputMediaType != null)
+      {
+        defaultProperties.put(OutputKeys.MEDIA_TYPE,
+                              stylesheet.outputMediaType);
+      }
+  }
+
+  public String getProperty(String key)
+  {
+    String val = super.getProperty(key);
+    if (val == null)
+      {
+        val = defaultProperties.getProperty(key);
+      }
+    return val;
+  }
+
+  public Object put(Object key, Object value)
+  {
+    Object ret = super.put(key, value);
+    dirty = true;
+    return ret;
+  }
+
+  public void clear()
+  {
+    super.clear();
+    dirty = true;
+  }
+
+  /**
+   * Applies the current set of properties to the underlying stylesheet.
+   */
+  void apply()
+  {
+    if (!dirty)
+      {
+        return;
+      }
+    String method = getProperty(OutputKeys.METHOD);
+    if ("xml".equals(method))
+      {
+        stylesheet.outputMethod = Stylesheet.OUTPUT_XML;
+      }
+    else if ("html".equals(method))
+      {
+        stylesheet.outputMethod = Stylesheet.OUTPUT_HTML;
+      }
+    else if ("text".equals(method))
+      {
+        stylesheet.outputMethod = Stylesheet.OUTPUT_TEXT;
+      }
+    stylesheet.outputVersion = getProperty(OutputKeys.VERSION);
+    stylesheet.outputEncoding = getProperty(OutputKeys.ENCODING);
+    stylesheet.outputOmitXmlDeclaration =
+      "yes".equals(getProperty(OutputKeys.OMIT_XML_DECLARATION));
+    stylesheet.outputStandalone =
+      "yes".equals(getProperty(OutputKeys.STANDALONE));
+    stylesheet.outputPublicId = getProperty(OutputKeys.DOCTYPE_PUBLIC);
+    stylesheet.outputSystemId = getProperty(OutputKeys.DOCTYPE_SYSTEM);
+    StringTokenizer st = 
+      new StringTokenizer(getProperty(OutputKeys.CDATA_SECTION_ELEMENTS));
+    Collection acc = new LinkedHashSet();
+    while (st.hasMoreTokens())
+      {
+        acc.add(st.nextToken());
+      }
+    stylesheet.outputCdataSectionElements = acc;
+    stylesheet.outputIndent = "yes".equals(getProperty(OutputKeys.INDENT));
+    stylesheet.outputMediaType = getProperty(OutputKeys.MEDIA_TYPE);
+    dirty = false;
+  }
+
+}
+
diff --git a/libjava/gnu/xml/transform/URIResolverEntityResolver.java b/libjava/gnu/xml/transform/URIResolverEntityResolver.java
new file mode 100644 (file)
index 0000000..ef29015
--- /dev/null
+++ b/libjava/gnu/xml/transform/URIResolverEntityResolver.java
@@ -0,0 +1,83 @@
+/* URIResolverEntityResolver.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.io.IOException;
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.sax.SAXSource;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * EntityResolver that wraps a URIResolver.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class URIResolverEntityResolver
+  implements EntityResolver
+{
+
+  final URIResolver resolver;
+
+  URIResolverEntityResolver(URIResolver resolver)
+  {
+    this.resolver = resolver;
+  }
+
+  public InputSource resolveEntity(String publicId, String systemId)
+    throws SAXException, IOException
+  {
+    try
+      {
+        Source source = resolver.resolve(null, systemId);
+        if (source == null)
+          {
+            return null;
+          }
+        return SAXSource.sourceToInputSource(source);
+      }
+    catch (TransformerException e)
+      {
+        throw new SAXException(e);
+      }
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/UnparsedEntityUriFunction.java b/libjava/gnu/xml/transform/UnparsedEntityUriFunction.java
new file mode 100644 (file)
index 0000000..41a606e
--- /dev/null
+++ b/libjava/gnu/xml/transform/UnparsedEntityUriFunction.java
@@ -0,0 +1,118 @@
+/* UnparsedEntityUriFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.xml.xpath.XPathFunction;
+import javax.xml.xpath.XPathFunctionException;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.Notation;
+import gnu.xml.xpath.Expr;
+import gnu.xml.xpath.Function;
+
+/**
+ * The XSLT <code>unparsed-entity-uri()</code>function.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class UnparsedEntityUriFunction
+  extends Expr
+  implements XPathFunction, Function
+{
+
+  List args;
+
+  public Object evaluate(List args)
+    throws XPathFunctionException
+  {
+    // Useless...
+    return Collections.EMPTY_SET;
+  }
+
+  public void setArguments(List args)
+  {
+    this.args = args;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    int arity = args.size();
+    List values = new ArrayList(arity);
+    for (int i = 0; i < arity; i++)
+      {
+        Expr arg = (Expr) args.get(i);
+        values.add(arg.evaluate(context, pos, len));
+      }
+    String name = _string(context, values.get(0));
+    DocumentType doctype = context.getOwnerDocument().getDoctype();
+    if (doctype != null)
+      {
+        NamedNodeMap notations = doctype.getNotations();
+        Notation notation = (Notation) notations.getNamedItem(name);
+        if (notation != null)
+          {
+            String systemId = notation.getSystemId();
+            // XXX absolutize?
+            if (systemId != null)
+              {
+                return systemId;
+              }
+          }
+      }
+    return "";
+  }
+
+  public Expr clone(Object context)
+  {
+    UnparsedEntityUriFunction f = new UnparsedEntityUriFunction();
+    int len = args.size();
+    List args2 = new ArrayList(len);
+    for (int i = 0; i < len; i++)
+      {
+        args2.add(((Expr) args.get(i)).clone(context));
+      }
+    f.setArguments(args2);
+    return f;
+  }
+
+}
+
diff --git a/libjava/gnu/xml/transform/ValueOfNode.java b/libjava/gnu/xml/transform/ValueOfNode.java
new file mode 100644 (file)
index 0000000..6027052
--- /dev/null
+++ b/libjava/gnu/xml/transform/ValueOfNode.java
@@ -0,0 +1,129 @@
+/* ValueOfNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.text.DecimalFormat;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
+import gnu.xml.xpath.Expr;
+
+/**
+ * A template node representing an XSLT <code>value-of</code> instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class ValueOfNode
+  extends TemplateNode
+{
+
+  final Expr select;
+  final boolean disableOutputEscaping;
+
+  ValueOfNode(TemplateNode children, TemplateNode next, Expr select,
+              boolean disableOutputEscaping)
+  {
+    super(children, next);
+    this.select = select;
+    this.disableOutputEscaping = disableOutputEscaping;
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new ValueOfNode((children == null) ? null :
+                           children.clone(stylesheet),
+                           (next == null) ? null :
+                           next.clone(stylesheet),
+                           select.clone(stylesheet),
+                           disableOutputEscaping);
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+             Node context, int pos, int len,
+             Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    Object ret = select.evaluate(context, pos, len);
+    String value = Expr._string(context, ret);
+    //System.err.println("value-of: "+context+" "+ select + " -> "+ value);
+    if (value != null && value.length() > 0)
+      {
+        Document doc = (parent instanceof Document) ?
+          (Document) parent : parent.getOwnerDocument();
+        Text textNode = doc.createTextNode(value);
+        if (disableOutputEscaping)
+          {
+            textNode.setUserData("disable-output-escaping", "yes", stylesheet);
+          }
+        if (nextSibling != null)
+          {
+            parent.insertBefore(textNode, nextSibling);
+          }
+        else
+          {
+            parent.appendChild(textNode);
+          }
+      }
+    // value-of doesn't process children
+    if (next != null)
+      {
+        next.apply(stylesheet, mode,
+                   context, pos, len,
+                   parent, nextSibling);
+      }
+  }
+
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    buf.append("select=");
+    buf.append(select);
+    if (disableOutputEscaping)
+      {
+        buf.append(",disableOutputEscaping");
+      }
+    buf.append(']');
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/WhenNode.java b/libjava/gnu/xml/transform/WhenNode.java
new file mode 100644 (file)
index 0000000..f220466
--- /dev/null
+++ b/libjava/gnu/xml/transform/WhenNode.java
@@ -0,0 +1,110 @@
+/* WhenNode.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+
+/**
+ * A template node representing an XSL <code>when</code> instruction.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class WhenNode
+  extends TemplateNode
+{
+
+  final Expr test;
+
+  WhenNode(TemplateNode children, TemplateNode next, Expr test)
+  {
+    super(children, next);
+    this.test = test;
+  }
+
+  TemplateNode clone(Stylesheet stylesheet)
+  {
+    return new WhenNode((children == null) ? null :
+                        children.clone(stylesheet),
+                        (next == null) ? null :
+                        next.clone(stylesheet),
+                        test.clone(stylesheet));
+  }
+
+  void doApply(Stylesheet stylesheet, QName mode,
+             Node context, int pos, int len,
+             Node parent, Node nextSibling)
+    throws TransformerException
+  {
+    Object ret = test.evaluate(context, pos, len);
+    boolean success = (ret instanceof Boolean) ?
+      ((Boolean) ret).booleanValue() :
+      Expr._boolean(context, ret);
+    if (success)
+      {
+        if (children != null)
+          {
+            children.apply(stylesheet, mode,
+                           context, pos, len,
+                           parent, nextSibling);
+          }
+      }
+    else
+      {
+        if (next != null)
+          {
+            next.apply(stylesheet, mode,
+                       context, pos, len,
+                       parent, nextSibling);
+          }
+      }
+  }
+  
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer(getClass().getName());
+    buf.append('[');
+    buf.append("test=");
+    buf.append(test);
+    buf.append(']');
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/WithParam.java b/libjava/gnu/xml/transform/WithParam.java
new file mode 100644 (file)
index 0000000..c8804f8
--- /dev/null
+++ b/libjava/gnu/xml/transform/WithParam.java
@@ -0,0 +1,110 @@
+/* WithParam.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.Collections;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+
+/**
+ * A specification for setting a variable or parameter during template
+ * processing with <code>apply-templates</code> or
+ * <code>call-template</code>.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class WithParam
+{
+
+  final String name;
+  final Expr select;
+  final TemplateNode content;
+
+  WithParam(String name, Expr select)
+  {
+    this.name = name;
+    this.select = select;
+    content = null;
+  }
+
+  WithParam(String name, TemplateNode content)
+  {
+    this.name = name;
+    this.content = content;
+    select = null;
+  }
+
+  Object getValue(Stylesheet stylesheet, QName mode,
+                  Node context, int pos, int len)
+    throws TransformerException
+  {
+    if (select != null)
+      {
+        return select.evaluate(context, pos, len);
+      }
+    else
+      {
+        Document doc = (context instanceof Document) ? (Document) context :
+          context.getOwnerDocument();
+        DocumentFragment fragment = doc.createDocumentFragment();
+        content.apply(stylesheet, mode,
+                      context, pos, len,
+                      fragment, null);
+        return Collections.singleton(fragment);
+      }
+  }
+
+  WithParam clone(Stylesheet stylesheet)
+  {
+    if (content == null)
+      {
+        return new WithParam(name,
+                             select.clone(stylesheet));
+      }
+    else
+      {
+        return new WithParam(name,
+                             content.clone(stylesheet));
+      }
+  }
+
+}
diff --git a/libjava/gnu/xml/transform/XSLComparator.java b/libjava/gnu/xml/transform/XSLComparator.java
new file mode 100644 (file)
index 0000000..1b76ed6
--- /dev/null
+++ b/libjava/gnu/xml/transform/XSLComparator.java
@@ -0,0 +1,124 @@
+/* XSLComparator.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.text.Collator;
+import org.w3c.dom.Node;
+import gnu.xml.xpath.Expr;
+
+/**
+ * Comparator for sorting lists of nodes according to a list of sort keys.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class XSLComparator
+  implements Comparator
+{
+
+  final List sortKeys;
+
+  XSLComparator(List sortKeys)
+  {
+    this.sortKeys = sortKeys;
+  }
+
+  public int compare(Object o1, Object o2)
+  {
+    if (o1 instanceof Node && o2 instanceof Node)
+      {
+        Node n1 = (Node) o1;
+        Node n2 = (Node) o2;
+        for (Iterator i = sortKeys.iterator(); i.hasNext(); )
+          {
+            SortKey sortKey = (SortKey) i.next();
+            String k1 = sortKey.key(n1);
+            String k2 = sortKey.key(n2);
+            if ("text".equals(sortKey.dataType))
+              {
+                Locale locale = (sortKey.lang == null) ? Locale.getDefault() :
+                  new Locale(sortKey.lang);
+                Collator collator = Collator.getInstance(locale);
+                int d = collator.compare(k1, k2);
+                if (d != 0)
+                  {
+                    switch (sortKey.caseOrder)
+                      {
+                      case SortKey.UPPER_FIRST:
+                        // TODO
+                        break;
+                      case SortKey.LOWER_FIRST:
+                        // TODO
+                        break;
+                      }
+                    if (sortKey.descending)
+                      {
+                        d = -d;
+                      }
+                    return d;
+                  }
+              }
+            else if ("number".equals(sortKey.dataType))
+              {
+                double kn1 = Expr._number(n1, k1);
+                double kn2 = Expr._number(n2, k2);
+                int d;
+                if (Double.isNaN(kn1) || Double.isInfinite(kn2))
+                  {
+                    d = -1;
+                  }
+                else if (Double.isNaN(kn2) || Double.isInfinite(kn1))
+                  {
+                    d = 1;
+                  }
+                else
+                  {
+                    // conversion to int may give 0 for small numbers
+                    d = (kn1 > kn2) ? 1 : (kn1 < kn2) ? -1 : 0;
+                  }
+                return (sortKey.descending) ? -d : d;
+              }
+          }
+      }
+    return 0;
+  }
+  
+}
diff --git a/libjava/gnu/xml/transform/XSLURIResolver.java b/libjava/gnu/xml/transform/XSLURIResolver.java
new file mode 100644 (file)
index 0000000..2603cdd
--- /dev/null
+++ b/libjava/gnu/xml/transform/XSLURIResolver.java
@@ -0,0 +1,270 @@
+/* XSLURIResolver.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.transform;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.Reader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.HashMap;
+import java.util.Map;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamSource;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import gnu.xml.dom.ls.ReaderInputStream;
+
+/**
+ * URI resolver for XSLT.
+ * This resolver parses external entities into DOMSources. It
+ * maintains a cache of URIs to DOMSources to avoid expensive re-parsing.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class XSLURIResolver
+  implements URIResolver
+{
+
+  Map lastModifiedCache = new HashMap();
+  Map nodeCache = new HashMap();
+  DocumentBuilder builder;
+  URIResolver userResolver;
+  ErrorListener userListener;
+
+  void setUserResolver(URIResolver userResolver)
+  {
+    this.userResolver = userResolver;
+  }
+
+  void setUserListener(ErrorListener userListener)
+  {
+    this.userListener = userListener;
+  }
+
+  /**
+   * Clear the cache.
+   */
+  void flush()
+  {
+    lastModifiedCache.clear();
+    nodeCache.clear();
+  }
+
+  public Source resolve(String href, String base)
+    throws TransformerException
+  {
+    Source source = null;
+    if (userResolver != null)
+      {
+        source = userResolver.resolve(base, href);
+      }
+    return resolveDOM(source, href, base);
+  }
+
+  DOMSource resolveDOM(Source source, String base, String href)
+    throws TransformerException
+  {
+    if (source != null && source instanceof DOMSource)
+      {
+        return (DOMSource) source;
+      }
+    String systemId = (source == null) ? null : source.getSystemId();
+    long lastModified = 0L, lastLastModified = 0L;
+
+    try
+      {
+        URL url = resolveURL(systemId, base, href);
+        Node node = null;
+        InputStream in = null;
+        if (source instanceof StreamSource)
+          {
+            StreamSource ss = (StreamSource) source;
+            in = ss.getInputStream();
+            if (in == null)
+              {
+                Reader reader = ss.getReader();
+                if (reader != null)
+                  {
+                    in = new ReaderInputStream(reader);
+                  }
+              }
+          }
+        if (in == null && url != null)
+          {
+            systemId = url.toString();
+            node = (Node) nodeCache.get(systemId);
+            // Is the resource up to date?
+            URLConnection conn = url.openConnection();
+            Long llm = (Long) lastModifiedCache.get(systemId);
+            if (llm != null)
+              {
+                lastLastModified = llm.longValue();
+                conn.setIfModifiedSince(lastLastModified);
+              }
+            conn.connect();
+            lastModified = conn.getLastModified();
+            if (node != null && 
+                lastModified > 0L &&
+                lastModified <= lastLastModified)
+              {
+                // Resource unchanged
+                return new DOMSource(node, systemId);
+              }
+            else
+              {
+                // Resource new or modified
+                in = conn.getInputStream();
+                nodeCache.put(systemId, node);
+                lastModifiedCache.put(systemId, new Long(lastModified));
+              }
+          }
+        InputSource input = new InputSource(in);
+        input.setSystemId(systemId);
+        DocumentBuilder builder = getDocumentBuilder();
+        node = builder.parse(input);
+        return new DOMSource(node, systemId);
+      }
+    catch (IOException e)
+      {
+        throw new TransformerException(e);
+      }
+    catch (SAXException e)
+      {
+        throw new TransformerException(e);
+      }
+  }
+
+  URL resolveURL(String systemId, String base, String href)
+    throws IOException
+  {
+    URL url = null;
+    try
+      {
+        if (systemId != null)
+          {
+            try
+              {
+                url = new URL(systemId);
+              }
+            catch (MalformedURLException e)
+              {
+                // Try building from base + href
+              }
+          }
+        if (url == null)
+          {
+            if (base != null)
+              {
+                URL baseURL = new URL(base);
+                url = new URL(baseURL, href);
+              }
+            else if (href != null)
+              {
+                url = new URL(href);
+              }
+          }
+        return url;
+      }
+    catch (MalformedURLException e)
+      {
+        // Fall back to local filesystem
+        File file = null;
+        if (href == null)
+          {
+            href = systemId;
+          }
+        if (base != null)
+          {
+            int lsi = base.lastIndexOf(File.separatorChar);
+            if (lsi != -1 && lsi < base.length() - 1)
+              {
+                base = base.substring(0, lsi);
+              }
+            File baseFile = new File(base);
+            file = new File(baseFile, href);
+          }
+        else if (href != null)
+          {
+            file = new File(href);
+          }
+        return (file == null) ? null : file.toURL();
+      }
+  }
+  
+  DocumentBuilder getDocumentBuilder()
+    throws TransformerException
+  {
+    try
+      {
+        if (builder == null)
+          {
+            DocumentBuilderFactory factory =
+              DocumentBuilderFactory.newInstance();
+            factory.setNamespaceAware(true);
+            factory.setExpandEntityReferences(true);
+            builder = factory.newDocumentBuilder();
+          }
+        if (userResolver != null)
+          {
+            builder.setEntityResolver(new URIResolverEntityResolver(userResolver));
+          }
+        if (userListener != null)
+          {
+            builder.setErrorHandler(new ErrorListenerErrorHandler(userListener));
+          }
+        return builder;
+      }
+    catch (Exception e)
+      {
+        throw new TransformerException(e);
+      }
+  }
+  
+}
+
diff --git a/libjava/gnu/xml/transform/package.html b/libjava/gnu/xml/transform/package.html
new file mode 100644 (file)
index 0000000..d435596
--- /dev/null
+++ b/libjava/gnu/xml/transform/package.html
@@ -0,0 +1,77 @@
+<html>
+<body>
+
+<h1>GNU JAXP XSL transformer</h1>
+
+<div>
+This package contains a Java XSL transformer compliant with the JAXP
+specification. It depends on the GNU DOM and XPath implementations, and
+will generate GNU DOM nodes unless a specific target from another
+implementation was given. It understands DOM, SAX, and stream sources
+and result sinks and supports these JAXP features.
+</div>
+
+<div>
+To use this transformer, set the system property
+<code>javax.xml.transform.TransformerFactory</code> to the value
+<code>gnu.xml.transform.TransformerFactoryImpl</code>. You can then
+instantiate <a href='TransformerFactory.html'>TransformerFactory</a>
+and transformers in the ordinary manner. Reuse of stylesheets is
+supported using the JAXP <a href='Templates.html'>Templates</a>
+mechanism.
+</div>
+
+<h3>Architecture</h3>
+
+<div>
+When given a stylesheet source, this implementation compiles it internally
+into a Stylesheet object, which is a container for templates and state.
+Each stylesheet instruction is represented by a subclass of TemplateNode,
+which is arranged in a directed graph: each TemplateNode has a reference
+to its first child and the next node.
+</div>
+
+<div>
+The transformation process consists of identifying the Template that matches
+the root of the source context, and calling <code>apply</code> on its
+corresponding TemplateNode. This in turn processes its children and next
+TemplateNode, depending on the semantics of each node type.
+</div>
+
+<div>
+Template nodes may reference XPath expressions or patterns. These are fully
+compiled to objects of type <a href='../xpath/Expr.html'>Expr</a> at the
+time the stylesheet is compiled.
+</div>
+
+<h3>Conformance</h3>
+
+<div>
+This implementation is feature complete, but the XSLT specification is
+large and there are still many bugs that need to be ironed out. It has
+been tested against the OASIS XSLT TC test suite, comprising unit tests
+from the Xalan project and Microsoft. Conformance to these unit tests
+is approximately 70% at the current time, although normal usage of the
+transformer should involve relatively few surprises (the test suite is
+designed to test very complex and obscure functionality).
+</div>
+
+<h3>Known bugs</h3>
+
+<ul>
+<li>When reusing stylesheets using the JAXP Templates mechanism, XSL
+<code>apply-imports</code> instructions will not work.</li>
+<li>XPath filter expressions do not always work as expected (this is a
+problem with the GNU XPath implementation rather than the transformer).
+This can result in problems with the <code>position()</code> function,
+as well as <code>select</code> expressions and numbering.</li>
+</ul>
+
+<div>
+Obviously we'd like to improve conformance and fix these bugs. If you're
+interested in working on any of these issues please
+<a href='mailto:classpathx-xml@gnu.org'>contact us</a>.
+</div>
+
+</body>
+</html>
diff --git a/libjava/gnu/xml/util/DoParse.java b/libjava/gnu/xml/util/DoParse.java
new file mode 100644 (file)
index 0000000..23721de
--- /dev/null
+++ b/libjava/gnu/xml/util/DoParse.java
@@ -0,0 +1,306 @@
+/* DoParse.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.util;
+
+import java.io.*;
+
+import org.xml.sax.*;
+import org.xml.sax.helpers.XMLReaderFactory;
+import org.xml.sax.ext.*;
+
+// import gnu.xml.pipeline.*;
+// Added imports directly to fix a GCJ problem.
+import gnu.xml.pipeline.CallFilter;
+import gnu.xml.pipeline.DomConsumer;
+import gnu.xml.pipeline.EventConsumer;
+import gnu.xml.pipeline.EventFilter;
+import gnu.xml.pipeline.LinkFilter;
+import gnu.xml.pipeline.NSFilter;
+import gnu.xml.pipeline.PipelineFactory;
+import gnu.xml.pipeline.TeeConsumer;
+import gnu.xml.pipeline.TextConsumer;
+import gnu.xml.pipeline.ValidationConsumer;
+import gnu.xml.pipeline.WellFormednessFilter;
+import gnu.xml.pipeline.XIncludeFilter;
+import gnu.xml.pipeline.XsltFilter;
+
+
+/**
+ * This class provides a driver which may be invoked from the command line
+ * to process a document using a SAX2 parser and a specified XML processing
+ * pipeline.
+ * This facilitates some common types of command line tools, such as parsing an
+ * XML document in order test it for well formedness or validity.
+ *
+ * <p>The SAX2 XMLReaderFactory should return a SAX2 XML parser which
+ * supports both of the standardized extension handlers (for declaration
+ * and lexical events).  That parser will be used to produce events.
+ *
+ * <p>The first parameter to the command gives the name of the document that
+ * will be given to that processor.  If it is a file name, it is converted
+ * to a URL first.
+ *
+ * <p>The second parameter describes a simple processing pipeline, and will
+ * be used as input to {@link gnu.xml.pipeline.PipelineFactory}
+ * methods which identify the processing to be done.  Examples of such a
+ * pipeline include <pre>
+ *
+ *    nsfix | validate                <em>to validate the input document </em>
+ *    nsfix | write ( stdout )        <em>to echo the file as XML text</em>
+ *    dom | nsfix | write ( stdout )  <em>parse into DOM, print the result</em>
+ * </pre>
+ *
+ * <p> Relatively complex pipelines can be described on the command line, but
+ * not all interesting ones will require as little configuration as can be done
+ * in that way.  Put filters like "nsfix", perhaps followed by "validate",
+ * at the front of the pipeline so they can be optimized out if a parser
+ * supports those modes natively.
+ *
+ * <p> If the parsing is aborted for any reason, the JVM will exit with a
+ * failure code.  If a validating parse was done then both validation and
+ * well formedness errors will cause a failure.  A non-validating parse
+ * will report failure on well formedness errors.
+ *
+ * @see gnu.xml.pipeline.PipelineFactory
+ *
+ * @author David Brownell
+ */
+final public class DoParse
+{
+    private DoParse () { /* no instances allowed */ }
+
+    // first reported nonrecoverable error
+    private static SAXParseException   fatal;
+
+    // error categories
+    private static int                 errorCount;
+    private static int                 fatalCount;
+
+    /**
+     * Command line invoker for this class; pass a filename or URL
+     * as the first argument, and a pipeline description as the second.
+     * Make sure to use filters to condition the input to stages that
+     * require it; an <em>nsfix</em> filter will be a common requirement,
+     * to restore syntax that SAX2 parsers delete by default.  Some
+     * conditioning filters may be eliminated by setting parser options.
+     * (For example, "nsfix" can set the "namespace-prefixes" feature to
+     * a non-default value of "true".  In the same way, "validate" can set
+     * the "validation" feature to "true".)
+     */
+    public static void main (String argv [])
+    throws IOException
+    {
+       int             exitStatus = 1;
+
+       if (argv.length != 2) {
+           System.err.println ("Usage: DoParse [filename|URL] pipeline-spec");
+           System.err.println ("Example pipeline specs:");
+           System.err.println ("  'nsfix | validate'");
+           System.err.println (
+               "       ... restore namespace syntax, validate");
+           System.err.println ("  'nsfix | write ( stdout )'");
+           System.err.println (
+               "       ... restore namespace syntax, write to stdout as XML"
+               );
+           System.exit (1);
+       }
+
+       try {
+           //
+           // Get input source for specified document (or try ;-)
+           //
+           argv [0] = Resolver.getURL (argv [0]);
+           InputSource input = new InputSource (argv [0]);
+
+           //
+           // Get the producer, using the system default parser (which
+           // can be overridden for this particular invocation).
+           //
+           // And the pipeline, using commandline options.
+           //
+           XMLReader           producer;
+           EventConsumer       consumer;
+
+           producer = XMLReaderFactory.createXMLReader ();
+
+           //
+           // XXX pipeline factory now has a pre-tokenized input
+           // method, use it ... that way at least some params
+           // can be written using quotes (have spaces, ...)
+           //
+           consumer = PipelineFactory.createPipeline (argv [1]);
+
+           //
+           // XXX want commandline option for tweaking error handler.
+           // Want to be able to present warnings.
+           //
+           producer.setErrorHandler (new MyErrorHandler ());
+
+           // XXX need facility enabling resolving to local DTDs
+
+           //
+           // Parse.  The pipeline may get optimized a bit, so we
+           // can't always fail cleanly for validation without taking
+           // a look at the filter stages.
+           //
+           EventFilter.bind (producer, consumer);
+           producer.parse (input);
+
+           try {
+               if (producer.getFeature (
+                       "http://org.xml/sax/features/validation"))
+                   exitStatus = ((errorCount + fatalCount) > 0) ? 1 : 0;
+               else if (fatalCount == 0)
+                   exitStatus = 0;
+           } catch (SAXException e) {
+               if (hasValidator (consumer))
+                   exitStatus = ((errorCount + fatalCount) > 0) ? 1 : 0;
+               else if (fatalCount == 0)
+                   exitStatus = 0;
+           }
+
+       } catch (java.net.MalformedURLException e) {
+           System.err.println ("** Malformed URL: " + e.getMessage ());
+           System.err.println ("Is '" + argv [0] + "' a non-existent file?");
+           e.printStackTrace ();
+               // e.g. FNF
+
+       } catch (SAXParseException e) {
+           if (e != fatal) {
+               System.err.print (printParseException ("Parsing Aborted", e));
+               e.printStackTrace ();
+               if (e.getException () != null) {
+                   System.err.println ("++ Wrapped exception:");
+                   e.getException ().printStackTrace ();
+               }
+           }
+
+       } catch (SAXException e) {
+           Exception   x = e;
+           if (e.getException () != null)
+               x = e.getException ();
+           x.printStackTrace ();
+
+       } catch (Throwable t) {
+           t.printStackTrace ();
+       }
+
+       System.exit (exitStatus);
+    }
+
+    // returns true if saw a validator (before end or unrecognized node)
+    // false otherwise
+    private static boolean hasValidator (EventConsumer e)
+    {
+       if (e == null)
+           return false;
+       if (e instanceof ValidationConsumer)
+           return true;
+       if (e instanceof TeeConsumer) {
+           TeeConsumer t = (TeeConsumer) e;
+           return hasValidator (t.getFirst ())
+               || hasValidator (t.getRest ());
+       }
+       if (e instanceof WellFormednessFilter
+               || e instanceof NSFilter
+               )
+           return hasValidator (((EventFilter)e).getNext ());
+       
+       // else ... gee, we can't know.  Assume not.
+
+       return false;
+    }
+
+    static class MyErrorHandler implements ErrorHandler
+    {
+       // dump validation errors, but continue
+       public void error (SAXParseException e)
+       throws SAXParseException
+       {
+           errorCount++;
+           System.err.print (printParseException ("Error", e));
+       }
+
+       public void warning (SAXParseException e)
+       throws SAXParseException
+       {
+           // System.err.print (printParseException ("Warning", e));
+       }
+
+       // try to continue fatal errors, in case a parser reports more
+       public void fatalError (SAXParseException e)
+       throws SAXParseException
+       {
+           fatalCount++;
+           if (fatal == null)
+               fatal = e;
+           System.err.print (printParseException ("Nonrecoverable Error", e));
+       }
+    }
+
+    static private String printParseException (
+       String                  label,
+       SAXParseException       e
+    ) {
+       StringBuffer    buf = new StringBuffer ();
+       int             temp;
+
+       buf.append ("** ");
+       buf.append (label);
+       buf.append (": ");
+       buf.append (e.getMessage ());
+       buf.append ('\n');
+       if (e.getSystemId () != null) {
+           buf.append ("   URI:  ");
+           buf.append (e.getSystemId ());
+           buf.append ('\n');
+       }
+       if ((temp = e.getLineNumber ()) != -1) {
+           buf.append ("   line: ");
+           buf.append (temp);
+           buf.append ('\n');
+       }
+       if ((temp = e.getColumnNumber ()) != -1) {
+           buf.append ("   char: ");
+           buf.append (temp);
+           buf.append ('\n');
+       }
+
+       return buf.toString ();
+    }
+}
diff --git a/libjava/gnu/xml/util/DomParser.java b/libjava/gnu/xml/util/DomParser.java
new file mode 100644 (file)
index 0000000..0a75d54
--- /dev/null
+++ b/libjava/gnu/xml/util/DomParser.java
@@ -0,0 +1,804 @@
+/* DomParser.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.util;
+
+import java.util.Enumeration;
+import java.util.Locale;
+
+import org.xml.sax.*;
+import org.xml.sax.helpers.AttributesImpl;
+import org.xml.sax.helpers.NamespaceSupport;
+import org.xml.sax.ext.DeclHandler;
+import org.xml.sax.ext.DefaultHandler2;
+import org.xml.sax.ext.LexicalHandler;
+
+import org.w3c.dom.*;
+
+
+/**
+ * This parser emits SAX2 parsing events as it traverses a DOM tree, using
+ * any conformant implementation of DOM.  It exposes all SAX1 features,
+ * and the following SAX2 features and properties (as
+ * identified by standard URIs which are not fully provided here).  Note
+ * that if a Level 1 DOM implementation is given, then this behaves as if
+ * namespaces were disabled, and namespace prefixes were enabled.  </p>
+ *
+ * <table border="1" width='100%' cellpadding='3' cellspacing='0'>
+ * <tr bgcolor='#ccccff'>
+ *     <th><font size='+1'>Name</font></th>
+ *     <th><font size='+1'>Notes</font></th></tr>
+ *
+ * <tr><td colspan=2><center><em>Features ... URL prefix is
+ * <b>http://xml.org/sax/features/</b></em></center></td></tr>
+ *
+ * <tr><td>(URL)/external-general-entities</td>
+ *     <td>false (does no parsing)</td></tr>
+ * <tr><td>(URL)/external-parameter-entities</td>
+ *     <td>false (does no parsing)</td></tr>
+ * <tr><td>(URL)/namespaces</td>
+ *     <td>Value is fixed at <em>true</em></td></tr>
+ * <tr><td>(URL)/namespace-prefixes</td>
+ *     <td>Value is settable, defaulting to <em>false</em>
+ *     (<code>xmlns</code> attributes hidden, and names aren't prefixed)
+ *     </td></tr>
+ * <tr><td>(URL)/string-interning</td>
+ *     <td>Value is fixed at <em>false</em> (DOM provides no
+ *     guarantees as to interning)</td></tr>
+ * <tr><td>(URL)/validation</td>
+ *     <td>false (does no parsing)</td></tr>
+ * <tr><td>(URL)/lexical-handler/parameter-entities</td>
+ *     <td>false (DOM doesn't do parameter entities)</td></tr>
+ *
+ * <tr><td colspan=2><center><em>Properties ... URL prefix is
+ * <b>http://xml.org/sax/properties/</b></em></center></td></tr>
+ *
+ *
+ * <tr><td>(URL)/dom-node</td>
+ *     <td>This property may be set before parsing to hold a DOM
+ *     <em>Document</em> node; any arguments given to <em>parse</em>
+ *     methods are ignored.  When retrieved
+ *     during a parse, this value contains the "current" DOM node.
+ *     </td></tr>
+ * <tr><td>(URL)/declaration-handler</td>
+ *     <td>A declaration handler may be provided.  Declaration of external
+ *     general entities is exposed, but not parameter entities; none of the
+ *     entity names reported here will begin with "%". </td></tr>
+ * <tr><td>(URL)/lexical-handler</td>
+ *     <td>A lexical handler may be provided.  While the start and end of
+ *     any external subset are reported, expansion of other parameter
+ *     entities (e.g. inside attribute list declarations) is not exposed.
+ *     Expansion of general entities within attributes is also not exposed
+ *     (see below).</td></tr>
+ * </table>
+ *
+ * <P> The consequences of modifying a DOM document tree as it is being walked
+ * by this "parser" are unspecified; don't do it! </P>
+ *
+ * @author David Brownell
+ */
+final public class DomParser implements XMLReader
+{
+    // Stuff used internally to route events correctly
+    private DefaultHandler2    defaultHandler = new DefaultHandler2 ();
+
+    // per-parse SAX stuff
+    private ContentHandler     contentHandler = defaultHandler;
+    private DTDHandler         dtdHandler = defaultHandler;
+    private DeclHandler                declHandler = defaultHandler;
+    private LexicalHandler     lexicalHandler = defaultHandler;
+
+    // shared context
+    private ErrorHandler       errHandler = defaultHandler;
+    private EntityResolver     resolver = defaultHandler;
+    private Locale             locale = Locale.getDefault ();
+
+    // parser state
+    private Node               start;
+    private Node               current;
+    private boolean            isL2;
+    private boolean            showNamespaces = true;
+    private boolean            showXML1_0 = false;
+    private NamespaceSupport   prefixStack = new NamespaceSupport ();
+    private boolean            isDocument;
+
+
+    /**
+     * Constructs an unitialized <b>SAX2</b> parser.
+     */
+    public DomParser () {
+    } 
+
+    /**
+     * Constructs an <b>SAX2</b> parser initialized to traverse the specified
+     * DOM tree.  If the node is a document, the startDocument() and
+     * endDocument() calls bracket the calls exposing children.
+     */
+    public DomParser (Node node) {
+       setStart (node);
+    } 
+
+
+    // stuff that most components in an application should be sharing:
+    // resolver and error locale.
+
+    /**
+     * <b>SAX2</b>: Returns the object used when resolving external
+     * entities during parsing (both general and parameter entities).
+     */
+    public EntityResolver getEntityResolver ()
+    {
+       return resolver;
+    }
+
+    /**
+     * <b>SAX1</b>: Provides an object which may be used when resolving external
+     * entities during parsing (both general and parameter entities).
+     */
+    public void setEntityResolver (EntityResolver resolver)
+    {
+       if (resolver == null)
+           resolver = defaultHandler;
+       this.resolver = resolver;
+    }
+
+    /**
+     * <b>SAX1</b>: Identifies the locale which the parser should use for the
+     * diagnostics it provides.
+     *
+     * @exception SAXException as defined in the specification for
+     * <em>org.xml.sax.Parser.setLocale()</em>
+     */
+    public void setLocale (Locale locale)
+    throws SAXException
+    {
+       if (locale == null)
+           locale = Locale.getDefault ();
+       this.locale = locale;
+    }
+
+    
+    // different modules will tend to handle error handling the same,
+    // but it may not be the same through the whole app
+
+    /**
+     * <b>SAX2</b>: Returns the object used to receive callbacks for XML
+     * errors of all levels (fatal, nonfatal, warning).
+     */
+    public ErrorHandler getErrorHandler ()
+    {
+       return errHandler;
+    }
+
+    /**
+     * <b>SAX1</b>: Provides an object which receives callbacks for XML errors
+     * of all levels (fatal, nonfatal, warning).
+     */
+    public void setErrorHandler (ErrorHandler handler)
+    {
+       if (handler == null)
+           handler = defaultHandler;
+       errHandler = handler;
+    }
+
+
+    // stuff different parts of a module will handle differently
+
+    /**
+     * <b>SAX2</b>: Returns the object used to report the logical
+     * content of an XML document.
+     */
+    public ContentHandler getContentHandler ()
+    {
+       return contentHandler;
+    }
+
+    /**
+     * <b>SAX2</b>: Assigns the object used to report the logical
+     * content of an XML document.
+     */
+    public void setContentHandler (ContentHandler handler)
+    {
+       if (handler == null)
+           handler = defaultHandler;
+       contentHandler = handler;
+    }
+
+    /**
+     * <b>SAX2</b>: Returns the object used to process declarations related
+     * to notations and unparsed entities.
+     */
+    public DTDHandler getDTDHandler ()
+    {
+       return dtdHandler;
+    }
+
+    /**
+     * <b>SAX1</b>: Provides an object which may be used to intercept
+     * declarations related to notations and unparsed entities.
+     */
+    public void setDTDHandler (DTDHandler handler)
+    {
+       if (handler == null)
+           handler = defaultHandler;
+       dtdHandler = handler;
+    }
+
+
+    /**
+     * <b>SAX1</b>:  Parses the previously provided DOM document (the
+     * input parameter is ignored).  When this returns, that same
+     * document may be parsed again without needing a "reset".
+     *
+     * @param uri ignored (pass an empty string)
+     * @exception SAXException as defined in the specification for
+     * <em>org.xml.sax.Parser.parse()</em>
+     */
+    public void parse (String uri) throws SAXException
+    {
+       parse ();
+    }
+
+    /**
+     * <b>SAX1</b>:  Parses the previously provided DOM document (the
+     * input parameter is ignored).  When this returns, that same
+     * document may be parsed again without needing a "reset".
+     *
+     * @param input ignored
+     * @exception SAXException as defined in the specification for
+     * <em>org.xml.sax.Parser.parse()</em>
+     */
+    public void parse (InputSource input) throws SAXException
+    {
+       parse ();
+    }
+
+    private void parse () throws SAXException
+    {
+       try {
+           walk ();
+       } finally {
+           if (isDocument)
+               contentHandler.endDocument ();
+           current = null;
+           prefixStack.reset ();
+       }
+    }
+
+    private boolean getIsL2 (Node node)
+    {
+       DOMImplementation       impl;
+       Document                doc;
+
+       if (node instanceof Document)
+           doc = (Document) node;
+       else
+           doc = node.getOwnerDocument ();
+       if (doc == null)
+           throw new RuntimeException ("? unowned node - L2 DTD ?");
+       impl = doc.getImplementation ();
+       return impl.hasFeature ("XML", "2.0");
+    }
+
+
+    private static final String FEATURES = "http://xml.org/sax/features/";
+    private static final String HANDLERS = "http://xml.org/sax/properties/";
+
+    /**
+     * <b>SAX2</b>: Tells whether this parser supports the specified feature.
+     */
+    public boolean getFeature (String name)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+    {
+       // basically, none are relevant -- they relate more to
+       // parsing than to walking a "parse tree".
+
+               // FIXME: DOM feature to expose interning?
+
+       if ((FEATURES + "validation").equals (name)
+               || (FEATURES + "external-general-entities")
+                   .equals (name)
+               || (FEATURES + "external-parameter-entities")
+                   .equals (name)
+               || (FEATURES + "string-interning").equals (name)
+               )
+           return false;
+    
+       if ((FEATURES + "namespaces").equals (name))
+           return showNamespaces;
+       if ((FEATURES + "namespace-prefixes").equals (name))
+           return showXML1_0;
+
+       throw new SAXNotRecognizedException (name);
+    }
+
+    /**
+     * <b>SAX2</b>:  Returns the specified property.  At this time only
+     * the declaration and lexical handlers, and current the "DOM" node,
+     * are supported.
+     */
+    public Object getProperty (String name)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+    {
+       if ((HANDLERS + "declaration-handler").equals (name))
+           return declHandler == defaultHandler ? null : declHandler;
+       if ((HANDLERS + "lexical-handler").equals (name))
+           return lexicalHandler == defaultHandler ? null : lexicalHandler;
+
+       if ((HANDLERS + "dom-node").equals (name))
+           return current;
+
+       // unknown properties
+       throw new SAXNotRecognizedException (name);
+    }
+
+    /**
+     * <b>SAX2</b>:  Sets the state of features supported in this parser.
+     * Only the namespace support features are mutable.
+     */
+    public void setFeature (String name, boolean state)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+    {
+       if (current != null)
+           throw new IllegalStateException ("feature change midparse");
+
+       boolean value = getFeature (name);
+
+       if (value == state)
+           return;
+
+       if ((FEATURES + "namespaces").equals (name)) {
+           if (!showXML1_0 && state == false)
+               throw new SAXNotSupportedException ("Illegal namespace "
+                       + "processing configuration");
+           showNamespaces = state;
+           return;
+       }
+       if ((FEATURES + "namespace-prefixes").equals (name)) {
+           if (!showNamespaces && state == false)
+               throw new SAXNotSupportedException ("Illegal namespace "
+                       + "processing configuration");
+           showXML1_0 = state;
+           return;
+       }
+
+       throw new SAXNotSupportedException (name);
+    }
+
+    /**
+     * <b>SAX2</b>:  Assigns the specified property.  At this time only
+     * declaration and lexical handlers, and the initial DOM document, are
+     * supported.  These must not be changed to values of the wrong type.
+     * Like SAX1 handlers, these handlers may be changed at any time.
+     * Like SAX1 input source or document URI, the initial DOM document
+     * may not be changed during a parse.
+     */
+    public void setProperty (String name, Object state)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+    {
+       if ((HANDLERS + "declaration-handler").equals (name)) {
+           if (!(state instanceof DeclHandler || state == null))
+               throw new SAXNotSupportedException (name);
+           declHandler = (DeclHandler) state;
+           return;
+       }
+
+       if ((HANDLERS + "lexical-handler").equals (name)) {
+           if (!(state instanceof LexicalHandler || state == null))
+               throw new SAXNotSupportedException (name);
+           lexicalHandler = (LexicalHandler) state;
+           return;
+       }
+
+       if ((HANDLERS + "dom-node").equals (name)) {
+           if (state == null || state instanceof Node) {
+               if (current != null)
+                   throw new SAXNotSupportedException (
+                       "property is readonly during parse:  " + name);
+               setStart ((Node) state);
+               return;
+           }
+           throw new SAXNotSupportedException ("not a DOM Node");
+       }
+
+       // unknown properties
+       throw new SAXNotRecognizedException (name);
+    }
+
+    private void setStart (Node property)
+    {
+       start = property;
+       if (start != null) {
+           isL2 = getIsL2 (start);
+           isDocument = (start instanceof Document);
+       }
+    }
+
+    //
+    // Non-recursive walk, using DOM state when backtracking is needed
+    //
+    private void walk ()
+    throws SAXException
+    {
+       int                     type;
+       NamedNodeMap            nodes;
+       int                     length;
+       AttributesImpl          attrs = new AttributesImpl ();
+       char                    chars [];
+       String                  ns, local;
+
+       synchronized (this) {
+           if (current != null)
+               throw new IllegalStateException ("already walking tree");
+
+           // JVM guarantees assignments are atomic; so no other
+           // thread could get this far till this walk's done.
+           current = start;
+       }
+    
+       for (;;) {
+           type = current.getNodeType ();
+
+           //
+           // First, visit the current node, including any "start" calls
+           //
+           switch (type) {
+
+             case Node.DOCUMENT_NODE:
+               contentHandler.startDocument ();
+               break;
+
+             case Node.ELEMENT_NODE:
+               nodes = current.getAttributes ();
+               length = nodes.getLength ();
+               prefixStack.pushContext ();
+               for (int i = 0; i < length; i++) {
+                   Attr        attr = (Attr) nodes.item (i);
+                   String      name = attr.getNodeName ();
+
+                   if (showNamespaces && name.startsWith ("xmlns")) {
+                       String  prefix;
+                       String  uri;
+                       
+                       // NOTE: DOM L2 (CR2+ and REC) violate the
+                       // Namespaces REC, treat "xmlns" like a strange
+                       // attribute instead of a magic token
+                       if ("xmlns".equals (name))
+                           prefix = "";
+                       else
+                           prefix = name.substring (6);
+                       uri = attr.getNodeValue ();
+
+                       prefixStack.declarePrefix (prefix, uri);
+                       contentHandler.startPrefixMapping (prefix, uri);
+                       
+                       if (!showXML1_0)
+                           continue;
+                   }
+
+                   //
+                   // NOTE:  DOM doesn't record the attribute type info
+                   // which SAX exposes; so this always reports CDATA.
+                   //
+                   // NOTE:  SAX doesn't expose the isSpecified info which
+                   // DOM exposes; that's discarded here.  Similarly with
+                   // the information DOM hides inside itself about what
+                   // the default values for an attribute are.
+                   //
+                   if (showNamespaces) {
+                       if (isL2) {
+                           if ((ns = attr.getNamespaceURI ()) == null)
+                               ns = "";
+                           // Note:  SAX2 and DOM handle "local" names
+                           // differently
+                           if ((local = attr.getLocalName ()) == null)
+                               local = name;
+                       } else {
+// XXX
+                           throw new RuntimeException (
+                               "NYI, ns lookup when parsing L1 DOM");
+                       }
+                   } else
+                       ns = local = "";
+                   attrs.addAttribute (ns, local, name,
+                       "CDATA", attr.getNodeValue ());
+               }
+               if (showNamespaces) {
+                   if (isL2) {
+                       if ((ns = current.getNamespaceURI ()) == null)
+                           ns = "";
+                       // Note:  SAX2 and DOM handle "local" names differently
+                       if ((local = current.getLocalName ()) == null)
+                           local = current.getNodeName ();
+                   } else {
+// XXX
+                       throw new RuntimeException (
+                           "NYI, ns lookup when parsing L1 DOM");
+                   }
+               } else
+                   ns = local = "";
+               contentHandler.startElement  (ns, local,
+                   current.getNodeName (), attrs);
+               if (length != 0)
+                   attrs.clear ();
+               break;
+
+             case Node.CDATA_SECTION_NODE:
+               lexicalHandler.startCDATA ();
+               chars = current.getNodeValue ().toCharArray ();
+               contentHandler.characters (chars, 0, chars.length);
+               lexicalHandler.endCDATA ();
+               break;
+
+             case Node.COMMENT_NODE:
+               chars = current.getNodeValue ().toCharArray ();
+               lexicalHandler.comment (chars, 0, chars.length);
+               break;
+
+             case Node.DOCUMENT_TYPE_NODE:
+               {
+                   DocumentType        doctype = (DocumentType) current;
+
+                   //
+                   // Only DOM L2 supports recreating even some DTDs in full.
+                   //
+                   if (isL2) {
+                       lexicalHandler.startDTD (doctype.getName (),
+                               doctype.getPublicId (),
+                               doctype.getSystemId ());
+                   } else
+                       lexicalHandler.startDTD (doctype.getName (),
+                               null, null);
+                   
+                   //
+                   // The only sure way to recreate is to provide both the
+                   // internal and external subsets.  Otherwise, only part
+                   // of the job can be done ... because from the DTD, DOM
+                   // discards both the critical data, like the attribute and
+                   // element declarations, as well as the PIs and comments
+                   // that are used to hold their documentation.
+                   //
+                   // Even the entity and notation declarations that it can
+                   // expose can't be recorded without proprietary extensions.
+                   //
+                   // We construct a comment to tell what we know about how
+                   // (in)complete this particular really DTD is.
+                   //
+                   {
+                       String message;
+                       char buf [];
+
+                       //
+                       // Though DOM L2 lets the whole doctype be recreated,
+                       // SAX2 can't represent it (input or output).
+                       // So this will be the typical case.
+                       //
+                       if (isL2 && doctype.getInternalSubset () != null)
+                           message =
+                   " Full DTD known; can't be shown using SAX2. ";
+
+                       //
+                       // Otherwise, we'll concoct a partial DTD.  If there's
+                       // any more data here at all, it was provided using a
+                       // (proprietary) extension to DOM.
+                       //
+                       else
+                           message =
+           " This DTD was was recreated using incomplete DOM L2 records. ";
+
+                       buf = message.toCharArray ();
+                       lexicalHandler.comment (buf, 0, buf.length);
+                   }
+
+                   // report notations first
+                   nodes = doctype.getNotations ();
+                   length = nodes.getLength ();
+                   for (int i = 0; i < length; i++) {
+                       Notation notation = (Notation) nodes.item (i);
+                           dtdHandler.notationDecl (
+                               notation.getNodeName (),
+                               notation.getPublicId (),
+                               notation.getSystemId ());
+                   }
+
+                   // then parsed and unparsed external general entities
+                   nodes = doctype.getEntities ();
+                   length = nodes.getLength ();
+                   for (int i = 0; i < length; i++) {
+                       Entity  entity = (Entity) nodes.item (i);
+                       String  notation = entity.getNotationName ();
+
+                       if (notation != null)
+                           dtdHandler.unparsedEntityDecl (
+                               entity.getNodeName (),
+                               entity.getPublicId (),
+                               entity.getSystemId (),
+                               notation);
+                       else if (entity.getSystemId () != null)
+                           declHandler.externalEntityDecl (
+                               entity.getNodeName (),
+                               entity.getPublicId (),
+                               entity.getSystemId ());
+                       
+                       //
+                       // NOTE:  DOM doesn't clearly provide internal
+                       // entity support; but in case someone tries to
+                       // fudge such support, we defend ourselves above.
+                       //
+                       // NOTE:  DOM doesn't expose parameter entities
+                       // (thank you thank you thank you thank you)
+                       //
+                   }
+
+                   //
+                   // NOTE:  DOM (levels 1 and 2) doesn't expose real
+                   // typing information (element or attribute decls),
+                   // as exposed by SAX2 declaration handlers.
+                   //
+                   lexicalHandler.endDTD ();
+               }
+               break;
+
+             case Node.ENTITY_REFERENCE_NODE:
+               // this isn't done except (a) in content, and
+               // (b) not within a start tag (att value)
+               lexicalHandler.startEntity (current.getNodeName ());
+               break;
+
+             case Node.PROCESSING_INSTRUCTION_NODE:
+               contentHandler.processingInstruction (
+                   current.getNodeName (), current.getNodeValue ());
+               break;
+
+             case Node.TEXT_NODE:
+               chars = current.getNodeValue ().toCharArray ();
+               contentHandler.characters (chars, 0, chars.length);
+               break;
+
+             default:
+               // e.g. fragments, entities, notations, attributes
+               throw new SAXException ("Illegal DOM Node type in Document:  "
+                   +  current.getNodeType ());
+           }
+
+           //
+           // Then, pick the next node to visit.  If the next node isn't
+           // a child, an "end" call may be needed before moving on.
+           // If there's no next node, we're done.
+           //
+           Node                next;
+
+           switch (type) {
+             case Node.DOCUMENT_NODE:
+             case Node.ELEMENT_NODE:
+             case Node.ENTITY_REFERENCE_NODE:
+               //
+               // For elements that can have children, visit those
+               // children before any siblings (i.e. depth first)
+               // and after visiting this node (i.e. preorder)
+               //
+               next = current.getFirstChild ();
+               if (next != null) {
+                   current = next;
+                   break;
+               }
+               //
+               // Else treat this like other childless nodes, but
+               // handle this node's "end" immediately.
+               //
+               callEnd (current);
+
+               // FALLTHROUGH
+
+             case Node.CDATA_SECTION_NODE:
+             case Node.COMMENT_NODE:
+             case Node.DOCUMENT_TYPE_NODE:
+             case Node.ENTITY_NODE:
+             case Node.PROCESSING_INSTRUCTION_NODE:
+             case Node.TEXT_NODE:
+               //
+               // Use next sibling, if there is one.
+               // Else, climb up a level (calling "end")
+               //      until we find an ancestral sibling
+               //      or until we we climb off the top (FINISH)
+               //
+               for (;;) {
+                   if ((next = current.getNextSibling ()) != null)
+                       break;
+                   current = current.getParentNode ();
+                   if (current == null || current == start)
+                       return;
+                   callEnd (current);
+               }
+               current = next;
+               break;
+
+             default:
+               throw new SAXException (
+                   "Illegal DOM Node type found:  " +  current.getNodeType ());
+           }
+       }
+    }
+
+    private void callEnd (Node node) throws SAXException
+    {
+       switch (node.getNodeType ()) {
+         // only these three container types may ever be found
+         // directly inside a Document.
+         case Node.DOCUMENT_NODE:
+           // for SAX conformance, endDocument must always
+           // be called ... it's done in a "finally" clause)
+           return;
+
+         case Node.ELEMENT_NODE:
+           if (showNamespaces) {
+               if (isL2)
+                   contentHandler.endElement (
+                       node.getNamespaceURI (),
+                       node.getLocalName (),
+                       node.getNodeName ());
+               else
+// XXX
+                   throw new RuntimeException (
+                       "NYI, ns lookup when parsing L1 DOM");
+               for (Enumeration e = prefixStack.getDeclaredPrefixes ();
+                       e.hasMoreElements ();
+                       ) {
+                   contentHandler.endPrefixMapping ((String) e.nextElement ());
+               }
+           } else
+               contentHandler.endElement ("", "", node.getNodeName ());
+           prefixStack.popContext ();
+           return;
+
+         case Node.ENTITY_REFERENCE_NODE:
+           // see above -- in content, outside start tags.
+           lexicalHandler.endEntity (node.getNodeName ());
+           return;
+
+         // these can be given at the top level
+         case Node.DOCUMENT_FRAGMENT_NODE:
+         case Node.ATTRIBUTE_NODE:
+           return;
+
+         default:
+           throw new SAXException (
+               "Illegal DOM container type found:  "
+                       +  current.getNodeType ());
+       }
+    }
+}
diff --git a/libjava/gnu/xml/util/Resolver.java b/libjava/gnu/xml/util/Resolver.java
new file mode 100644 (file)
index 0000000..4ca0787
--- /dev/null
+++ b/libjava/gnu/xml/util/Resolver.java
@@ -0,0 +1,263 @@
+/* Resolver.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.util;
+
+import java.io.*;
+
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import org.xml.sax.*;
+
+
+/**
+ * Utility implementation of a SAX resolver, which can be used to improve
+ * network utilization of SAX based XML components.  It does this by
+ * supporting local caches of external entities.
+ * SAX parsers <em>should</em> use such local caches when possible.
+ *
+ * @see XCat
+ */
+public class Resolver implements EntityResolver, Cloneable
+{
+    /**
+     * Updates a dictionary used to map PUBLIC identifiers to file names,
+     * so that it uses the mappings in a specified directory.
+     *
+     * @param mappings Array of string pairs, where the first member
+     * of each pair is a PUBLIC identifier and the second is the
+     * name of a file, relative to the specified directory.
+     * @param directory File holding the specified files.
+     */
+    public static void addDirectoryMapping (
+       Dictionary      table,
+       String          mappings [][],
+       File            directory
+    ) throws IOException
+    {
+       for (int i = 0; i < mappings.length; i++) {
+           File        file = new File (directory, mappings [i][1]);
+           String      temp;
+
+           if (!file.exists ())        // ?? log a warning ??
+               continue;
+
+           temp = fileToURL (file);
+           table.put (mappings [i][0], temp);
+       }
+    }
+
+       // FIXME: these *URL routines don't quite belong here, except
+       // that they're all in the same spirit of making it easy to
+       // use local filesystem URIs with XML parsers.
+
+    /**
+     * Provides the URL for a named file, without relying on the JDK 1.2
+     * {@link java.io.File#toURL File.toURL}() utility method.
+     *
+     * @param filename the file name to convert.  Relative file names
+     * are resolved the way the JVM resolves them (current to the
+     * process-global current working directory).
+     *
+     * @exception IOException if the file does not exist
+     */
+    public static String fileNameToURL (String filename)
+    throws IOException
+    {
+       return fileToURL (new File (filename));
+    }
+
+    /**
+     * Provides the URL for a file, without relying on the JDK 1.2
+     * {@link java.io.File#toURL File.toURL}() utility method.
+     *
+     * @param f the file to convert.  Relative file names
+     * are resolved the way the JVM resolves them (current to the
+     * process-global current working directory).
+     *
+     * @exception IOException if the file does not exist
+     */
+    public static String fileToURL (File f)
+    throws IOException
+    {
+       String  temp;
+
+       // NOTE:  the javax.xml.parsers.DocumentBuilder and
+       // javax.xml.transform.stream.StreamSource versions
+       // of this don't have this test.  Some JVM versions
+       // don't report this error sanely through URL code. 
+       if (!f.exists ())
+           throw new IOException ("no such file: " + f.getName ());
+
+           // FIXME: getAbsolutePath() seems buggy; I'm seeing components
+           // like "/foo/../" which are clearly not "absolute"
+           // and should have been resolved with the filesystem.
+
+           // Substituting "/" would be wrong, "foo" may have been
+           // symlinked ... the URL code will make that change
+           // later, so that things can get _really_ broken!
+
+       temp = f.getAbsolutePath ();
+
+       if (File.separatorChar != '/')
+           temp = temp.replace (File.separatorChar, '/');
+       if (!temp.startsWith ("/"))
+           temp = "/" + temp;
+       if (!temp.endsWith ("/") && f.isDirectory ())
+           temp = temp + "/";
+       return "file:" + temp;
+    }
+
+
+    /**
+     * Returns a URL string.  Note that if a malformed URL is provided, or
+     * the parameter names a nonexistent file, the resulting URL may be
+     * malformed.
+     *
+     * @param fileOrURL If this is the name of a file which exists,
+     * then its URL is returned.  Otherwise the argument is returned.
+     */
+    public static String getURL (String fileOrURL)
+    {
+       try {
+           return fileNameToURL (fileOrURL);
+       } catch (Exception e) {
+           return fileOrURL;
+       }
+    }
+
+
+
+    // note:  cloneable, this is just copied; unguarded against mods
+    private Dictionary         pubidMapping;
+
+    /**
+     * Constructs a resolver which understands how to map PUBLIC identifiers
+     * to other URIs, typically for local copies of standard DTD components.
+     * 
+     * @param dictionary maps PUBLIC identifiers to URIs.  This is not
+     * copied; subsequent modifications will be reported through the
+     * resolution operations.
+     */
+    public Resolver (Dictionary dict)
+       { pubidMapping = dict; }
+
+    
+    // FIXME: want notion of a "system default" resolver, presumably
+    // loaded with all sorts of useful stuff.  At the same time need
+    // a notion of resolver chaining (failure --> next) so that subsystems
+    // can set up things that won't interfere with other ones.
+
+    /**
+     * This parses most MIME content type strings that have <em>charset=...</em>
+     * encoding declarations to and returns the specified encoding.  This
+     * conforms to RFC 3023, and is useful when constructing InputSource
+     * objects from URLConnection objects or other objects using MIME
+     * content typing.
+     *
+     * @param contentType the MIME content type that will be parsed; must
+     * not be null.
+     * @return the appropriate encoding, or null if the content type is
+     * not text and there's no <code>charset=...</code> attribute
+     */
+    static public String getEncoding (String contentType)
+    {
+       // currently a dumb parsing algorithm that works "mostly" and handles
+       //      ..anything...charset=ABC
+       //      ..anything...charset=ABC;otherAttr=DEF
+       //      ..anything...charset=ABC (comment);otherAttr=DEF
+       //      ..anything...charset= "ABC" (comment);otherAttr=DEF
+
+       int     temp;
+       String  encoding;
+       String  defValue = null;
+
+       if (contentType.startsWith ("text/"))
+           defValue = contentType.startsWith ("text/html")
+                   ? "ISO-8859-1" : "US-ASCII";
+
+       // Assumes 'charset' is only an attribute name, not part
+       // of a value, comment, or other attribute name
+       // ALSO assumes no escaped values like "\;" or "\)"
+       if ((temp = contentType.indexOf ("charset")) != -1) {
+           // strip out everything up to '=' ...
+           temp = contentType.indexOf ('=', temp);
+           if (temp == -1)
+               return defValue;
+           encoding = contentType.substring (temp + 1);
+           // ... and any subsequent attributes
+           if ((temp = encoding.indexOf (';')) != -1)
+               encoding = encoding.substring (0, temp);
+           // ... and any comments after value
+           if ((temp = encoding.indexOf ('(')) != -1)
+               encoding = encoding.substring (0, temp);
+           // ... then whitespace, and any (double) quotes
+           encoding = encoding.trim ();
+           if (encoding.charAt (0) == '"')
+               encoding = encoding.substring (1, encoding.length () - 1);
+       } else
+           encoding = defValue;
+       return encoding;
+    }
+
+
+    /**
+     * Uses a local dictionary of public identifiers to resolve URIs,
+     * normally with the goal of minimizing network traffic or latencies.
+     */
+    public InputSource resolveEntity (String publicId, String systemId)
+    throws IOException, SAXException
+    {
+       InputSource     retval = null;
+       String          uri;
+
+       if (publicId != null
+               && ((uri = (String) pubidMapping.get (publicId)) != null)) {
+           retval = new InputSource (uri);
+           retval.setPublicId (publicId);
+       }
+
+       // Could do URN resolution here
+
+       // URL resolution always done by parser
+
+       // FIXME: chain to "next" resolver
+
+       return retval;
+    }
+}
diff --git a/libjava/gnu/xml/util/SAXNullTransformerFactory.java b/libjava/gnu/xml/util/SAXNullTransformerFactory.java
new file mode 100644 (file)
index 0000000..3b199f6
--- /dev/null
+++ b/libjava/gnu/xml/util/SAXNullTransformerFactory.java
@@ -0,0 +1,675 @@
+/* SAXNullTransformerFactory.java -- 
+   Copyright (C) 2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.util;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import gnu.xml.dom.Consumer;
+import gnu.xml.dom.DomDocument;
+import gnu.xml.pipeline.DomConsumer;
+import gnu.xml.pipeline.EventFilter;
+
+import javax.xml.transform.*;
+import javax.xml.transform.dom.*;
+import javax.xml.transform.sax.*;
+import javax.xml.transform.stream.*;
+
+import org.xml.sax.*;
+import org.xml.sax.helpers.XMLReaderFactory;
+import org.xml.sax.helpers.LocatorImpl;
+
+
+/**
+ * Implements null transforms. XSLT stylesheets are not supported.
+ * This class provides a way to translate three representations of
+ * XML data (SAX event stream, DOM tree, and XML text) into each other.
+ * In essence it's a thinnish wrapper around basic SAX event
+ * <a href="../pipeline/package-summary.html">pipeline</a> facilities, which
+ * exposes only limited functionality.  The <em>javax.xml.transform</em>
+ * functionality is implemented as follows: <ul>
+ *
+ * <li>The {@link javax.xml.transform.sax.SAXSource SAXSource} class
+ * just wraps an {@link XMLReader} and {@link InputSource}, while the
+ * {@link javax.xml.transform.sax.SAXResult SAXResult} class is less
+ * functional than a {@link gnu.xml.pipeline.EventConsumer EventConsumer}.
+ * (Notably, it drops all but one declaration from any DTD.)</li>
+ *
+ * <li>The {@link javax.xml.transform.dom.DOMSource DOMSource} class
+ * corresponds to special SAX parsers like {@link DomParser}, and the
+ * {@link javax.xml.transform.dom.DOMResult DOMResult} class corresponds
+ * to a {@link gnu.xml.pipeline.DomConsumer DomConsumer}.</li>
+ *
+ * <li>The {@link javax.xml.transform.stream.StreamSource StreamSource}
+ * class corresponds to a SAX {@link InputSource}, and the
+ * {@link javax.xml.transform.stream.StreamResult StreamResult} class
+ * corresponds to a {@link gnu.xml.pipeline.TextConsumer TextConsumer}.</li>
+ *
+ * </ul>
+ *
+ * <p><em>This implementation is preliminary.</em>
+ *
+ * @see gnu.xml.pipeline.XsltFilter
+ *
+ * @author David Brownell
+ */
+public class SAXNullTransformerFactory extends SAXTransformerFactory
+{
+  
+  private ErrorListener        errListener;
+  private URIResolver          uriResolver;
+  
+  /** Default constructor */
+  public SAXNullTransformerFactory () { }
+  
+  //
+  // only has stuff that makes sense with null transforms
+  //
+  
+  /**
+   * Returns true if the requested feature is supported.
+   * All three kinds of input and output are accepted:
+   * XML text, SAX events, and DOM nodes.
+   */
+  public boolean getFeature (String feature)
+  {
+    return SAXTransformerFactory.FEATURE.equals (feature)
+      || SAXResult.FEATURE.equals (feature)
+      || SAXSource.FEATURE.equals (feature)
+      || DOMResult.FEATURE.equals (feature)
+      || DOMSource.FEATURE.equals (feature)
+      || StreamResult.FEATURE.equals (feature)
+      || StreamSource.FEATURE.equals (feature)
+      ;
+  }
+
+  public void setFeature(String name, boolean value)
+    throws TransformerConfigurationException
+  {
+    throw new TransformerConfigurationException(name);
+  }
+
+
+  /** Throws an exception (no implementation attributes are supported) */
+  public void setAttribute (String key, Object value)
+  {
+    throw new IllegalArgumentException ();
+  }
+
+  /** Throws an exception (no implementation attributes are supported) */
+  public Object getAttribute (String key)
+  {
+    throw new IllegalArgumentException ();
+  }
+
+  /** (not yet implemented) */
+  public Source getAssociatedStylesheet (Source source,
+                                         String media,
+                                         String title,
+                                         String charset)
+    throws TransformerConfigurationException
+  {
+    // parse, and find the appropriate xsl-stylesheet PI contents
+    throw new IllegalArgumentException ();
+  }
+
+  public Transformer newTransformer ()
+    throws TransformerConfigurationException
+  {
+    return new NullTransformer ();
+  }
+
+  /**
+   * Returns a TransformerHandler that knows how to generate output
+   * in all three standard formats.  Output text is generated using
+   * {@link XMLWriter}, and the GNU implementation of
+   * {@link DomDocument DOM} is used.
+   *
+   * @see SAXResult
+   * @see StreamResult
+   * @see DOMResult
+   */
+  public TransformerHandler newTransformerHandler ()
+    throws TransformerConfigurationException
+  {
+    NullTransformer    transformer = new NullTransformer ();
+    return transformer.handler;
+  }
+
+  //
+  // Stuff that depends on XSLT support, which we don't provide
+  //
+  private static final String          noXSLT = "No XSLT support";
+
+  /** Throws an exception (XSLT is not supported). */
+  public Transformer newTransformer (Source stylesheet)
+    throws TransformerConfigurationException
+  {
+    throw new TransformerConfigurationException (noXSLT);
+  }
+
+  /** Throws an exception (XSLT is not supported). */
+  public Templates newTemplates (Source stylesheet)
+    throws TransformerConfigurationException
+  {
+    throw new TransformerConfigurationException (noXSLT);
+  }
+
+  /** Throws an exception (XSLT is not supported). */
+  public TemplatesHandler newTemplatesHandler ()
+    throws TransformerConfigurationException
+  {
+    throw new TransformerConfigurationException (noXSLT);
+  }
+
+  /** Throws an exception (XSLT is not supported). */
+  public TransformerHandler newTransformerHandler (Source stylesheet)
+    throws TransformerConfigurationException
+  {
+    throw new TransformerConfigurationException (noXSLT);
+  }
+
+  /** Throws an exception (XSLT is not supported). */
+  public TransformerHandler newTransformerHandler (Templates stylesheet)
+    throws TransformerConfigurationException
+  {
+    throw new TransformerConfigurationException (noXSLT);
+  }
+
+  /** Throws an exception (XSLT is not supported). */
+  public XMLFilter newXMLFilter (Source stylesheet)
+    throws TransformerConfigurationException
+  {
+    throw new TransformerConfigurationException (noXSLT);
+  }
+
+  /** Throws an exception (XSLT is not supported). */
+  public XMLFilter newXMLFilter (Templates stylesheet)
+    throws TransformerConfigurationException
+  {
+    throw new TransformerConfigurationException (noXSLT);
+  }
+
+  /** Returns the value assigned by {@link #setErrorListener}.  */
+  public ErrorListener getErrorListener ()
+  {
+    return errListener;
+  }
+
+  /** Assigns a value that would be used when parsing stylesheets */
+  public void setErrorListener (ErrorListener e)
+  {
+    errListener = e;
+  }
+
+  /** Returns the value assigned by {@link #setURIResolver}.  */
+  public URIResolver getURIResolver ()
+  {
+    return uriResolver;
+  }
+
+  /** Assigns a value that would be used when parsing stylesheets */
+  public void setURIResolver (URIResolver u)
+  {
+    uriResolver = u;
+  }
+
+
+  //
+  // Helper classes.  These might in theory be subclassed
+  // by an XSLT implementation, if they were exported.
+  //
+
+  static class DomTerminus
+    extends DomConsumer
+  {
+
+    DomTerminus (DOMResult result)
+      throws SAXException
+    {
+      // won't really throw SAXException
+      super (DomDocument.class);
+      setHandler (new DomHandler (this, result));
+    }
+    
+  }
+
+  static class DomHandler
+    extends Consumer.Backdoor
+  {
+  
+    private DOMResult  result;
+    
+    DomHandler (DomConsumer c, DOMResult r)
+      throws SAXException
+    {
+      // won't really throw SAXException
+      super (c);
+      result = r;
+    }
+
+    public void endDocument ()
+      throws SAXException
+    {
+      super.endDocument ();
+      result.setNode (getDocument ());
+    }
+    
+  }
+
+  private static OutputStream getOutputStream (String uri)
+    throws IOException
+  {
+    // JDK stupidity:  file "protocol does not support output" ... 
+    if (uri.startsWith ("file:"))
+      return new FileOutputStream (uri.substring (5));
+    
+    // Otherwise ...
+    URL                url = new URL (uri);
+    URLConnection      conn = url.openConnection ();
+    
+    conn.setDoOutput (true);
+    return conn.getOutputStream ();
+  }
+  
+
+  static class NullHandler
+    extends EventFilter
+    implements TransformerHandler
+  {
+   
+    private String             systemId;
+    private Transformer        transformer;
+    
+    NullHandler (Transformer t)
+    {
+      transformer = t;
+    }
+
+    public Transformer getTransformer ()
+    {
+      return transformer;
+    }
+
+    public String getSystemId ()
+    {
+      return systemId;
+    }
+
+    public void setSystemId (String id)
+    {
+      systemId = id;
+    }
+
+    public void setResult (Result result)
+    {
+      if (result.getSystemId () != null)
+        systemId = result.getSystemId ();
+      
+      try
+        {
+          
+          // output to partial SAX event stream?
+          if (result instanceof SAXResult)
+            {
+              SAXResult        r = (SAXResult) result;
+              
+              setContentHandler (r.getHandler ());
+              setProperty (LEXICAL_HANDLER, r.getLexicalHandler ());
+              // DTD info is filtered out by javax.transform
+              
+              // output to DOM tree?
+            }
+          else if (result instanceof DOMResult)
+            {
+              DomTerminus      out = new DomTerminus ((DOMResult) result);
+
+              setContentHandler (out.getContentHandler ());
+              setProperty (LEXICAL_HANDLER,
+                           out.getProperty (LEXICAL_HANDLER));
+              // save DTD-derived info, if any.
+              setDTDHandler (out.getDTDHandler ());
+              setProperty (DECL_HANDLER,
+                           out.getProperty (DECL_HANDLER));
+
+              // node is saved into result on endDocument()
+
+              // output to (XML) text?
+            }
+          else if (result instanceof StreamResult)
+            {
+              StreamResult     r = (StreamResult) result;
+              XMLWriter                out;
+
+              // FIXME:  when do output properties take effect?
+              // encoding, standalone decl, xml/xhtml/... ...
+
+              // FIXME:  maybe put nsfix filter up front
+
+              try
+                {
+                  if (r.getWriter () != null)
+                    out = new XMLWriter (r.getWriter ());
+                  else if (r.getOutputStream () != null)
+                    out = new XMLWriter (r.getOutputStream ());
+                  else if (r.getSystemId () != null)
+                    out = new XMLWriter (
+                                         getOutputStream (r.getSystemId ()));
+                  else
+                    throw new IllegalArgumentException (
+                                                        "bad StreamResult");
+                }
+              catch (IOException e)
+                {
+                  e.printStackTrace ();
+                  // on jdk 1.4, pass the root cause ...
+                  throw new IllegalArgumentException (e.getMessage ());
+                }
+
+              // out.setExpandingEntities (true);
+              // out.setPrettyPrinting (true);
+              // out.setXhtml (true);
+
+              setContentHandler (out);
+              setProperty (LEXICAL_HANDLER, out);
+              // save DTD info, if any; why not?
+              setDTDHandler (out);
+              setProperty (DECL_HANDLER, out);
+            }
+          
+        }
+      catch (SAXException e)
+        {
+          // SAXNotSupportedException or SAXNotRecognizedException:
+          // "can't happen" ... but SAXException for DOM build probs
+          // could happen, so ...
+          // on jdk 1.4, pass the root cause ...
+          throw new IllegalArgumentException (e.getMessage ());
+        }
+    }
+  }
+
+  // an interface that adds no value
+  static class LocatorAdapter
+    extends LocatorImpl
+    implements SourceLocator
+  {
+  
+    LocatorAdapter (SAXParseException e)
+    {
+      setSystemId (e.getSystemId ());
+      setPublicId (e.getPublicId ());
+      setLineNumber (e.getLineNumber ());
+      setColumnNumber (e.getColumnNumber ());
+    }
+    
+  }
+
+  // another interface that adds no value
+  static class ListenerAdapter
+    implements ErrorHandler
+  {
+    
+    NullTransformer    transformer;
+    
+    ListenerAdapter (NullTransformer t)
+    {
+      transformer = t;
+    }
+    
+    private TransformerException map (SAXParseException e)
+    {
+      return new TransformerException (
+                                       e.getMessage (),
+                                       new LocatorAdapter (e),
+                                       e);
+    }
+
+    public void error (SAXParseException e)
+      throws SAXParseException
+    {
+      try
+        {
+          if (transformer.errListener != null)
+            transformer.errListener.error (map (e));
+        }
+      catch (TransformerException ex)
+        {
+          transformer.ex = ex;
+          throw e;
+        }
+    }
+
+    public void fatalError (SAXParseException e)
+      throws SAXParseException
+    {
+      try
+        {
+          if (transformer.errListener != null)
+            transformer.errListener.fatalError (map (e));
+          else
+            throw map (e);
+        } catch (TransformerException ex) {
+          transformer.ex = ex;
+          throw e;
+        }
+    }
+
+    public void warning (SAXParseException e)
+      throws SAXParseException
+    {
+      try
+        {
+          if (transformer.errListener != null)
+            transformer.errListener.warning (map (e));
+        }
+      catch (TransformerException ex)
+        {
+          transformer.ex = ex;
+          throw e;
+        }
+    }
+  }
+
+  static class NullTransformer
+    extends Transformer
+  {
+  
+    private URIResolver                uriResolver;
+    private Properties         props = new Properties ();
+    private Hashtable          params = new Hashtable (7);
+    
+    ErrorListener                      errListener = null;
+    TransformerException               ex = null;
+    NullHandler                        handler;
+    
+    NullTransformer ()
+    {
+      super ();
+      handler = new NullHandler (this);
+    }
+    
+    public ErrorListener getErrorListener ()
+    {
+      return errListener;
+    }
+    
+    public void setErrorListener (ErrorListener e)
+    {
+      errListener = e;
+    }
+    
+    public URIResolver getURIResolver ()
+    {
+      return uriResolver;
+    }
+    
+    public void setURIResolver (URIResolver u)
+    {
+      uriResolver = u;
+    }
+
+    public void setOutputProperties (Properties p)
+    {
+      props = (Properties) p.clone ();
+    }
+    
+    public Properties getOutputProperties ()
+    {
+      return (Properties) props.clone ();
+    }
+
+    public void setOutputProperty (String name, String value)
+    {
+      props.setProperty (name, value);
+    }
+    
+    public String getOutputProperty (String name)
+    {
+      return props.getProperty (name);
+    }
+
+    public void clearParameters ()
+    {
+      params.clear ();
+    }
+    
+    public void setParameter (String name, Object value)
+    {
+      props.put (name, value);
+    }
+    
+    public Object getParameter (String name)
+    {
+      return props.get (name);
+    }
+
+    public void transform (Source in, Result out)
+      throws TransformerException
+    {
+      try
+        {
+          XMLReader            producer;
+          InputSource          input;
+          
+          // Input from DOM?
+          if (in instanceof DOMSource)
+            {
+              DOMSource        source = (DOMSource) in;
+              
+              if (source.getNode () == null)
+                throw new IllegalArgumentException ("no DOM node");
+              producer = new DomParser (source.getNode ());
+              input = null;
+              
+              // Input from SAX?
+            }
+          else if (in instanceof SAXSource)
+            {
+              SAXSource        source = (SAXSource) in;
+              
+              producer = source.getXMLReader ();
+              if (producer == null)
+                producer = XMLReaderFactory.createXMLReader ();
+              
+              input = source.getInputSource ();
+              if (input == null)
+                {
+                  if (source.getSystemId () != null)
+                    input = new InputSource (source.getSystemId ());
+                  else
+                    throw new IllegalArgumentException (
+                                                        "missing SAX input");
+                }
+              
+              // Input from a stream or something?
+            }
+          else
+            {
+              producer = XMLReaderFactory.createXMLReader ();
+              input = SAXSource.sourceToInputSource (in);
+              if (input == null)
+                throw new IllegalArgumentException ("missing input");
+            }
+          
+          // preserve original namespace prefixes
+          try
+            {
+              producer.setFeature(handler.FEATURE_URI + "namespace-prefixes",
+                                  true);
+            }
+          catch (Exception e)
+            {
+              /* ignore */
+              // FIXME if we couldn't, "NsFix" stage before the output ..
+            }
+          
+          // arrange the output
+          handler.setResult (out);
+          handler.bind (producer, handler);
+          
+          // then parse ... single element pipeline
+          producer.parse (input);
+          
+        }
+      catch (IOException e)
+        {
+          throw new TransformerException ("transform failed", e);
+          
+        }
+      catch (SAXException e)
+        {
+          if (ex == null && ex.getCause () == e)
+            throw ex;
+          else
+            throw new TransformerException ("transform failed", e);
+          
+        }
+      finally
+        {
+          ex = null;
+        }
+    }
+  }
+
+}
diff --git a/libjava/gnu/xml/util/XCat.java b/libjava/gnu/xml/util/XCat.java
new file mode 100644 (file)
index 0000000..269c97b
--- /dev/null
+++ b/libjava/gnu/xml/util/XCat.java
@@ -0,0 +1,1609 @@
+/* XCat.java -- 
+   Copyright (C) 2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.xml.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+import java.util.Stack;
+import java.util.Vector;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLReader;
+
+import org.xml.sax.ext.DefaultHandler2;
+import org.xml.sax.ext.EntityResolver2;
+
+import org.xml.sax.helpers.XMLReaderFactory;
+
+/**
+ * Packages <a href=
+    "http://www.oasis-open.org/committees/entity/spec-2001-08-06.html"
+    >OASIS XML Catalogs</a>,
+ * primarily for entity resolution by parsers.
+ * That specification defines an XML syntax for mappings between
+ * identifiers declared in DTDs (particularly PUBLIC identifiers) and
+ * locations.  SAX has always supported such mappings, but conventions for
+ * an XML file syntax to maintain them have previously been lacking.
+ *
+ * <p> This has three main operational modes.  The primary intended mode is
+ * to create a resolver, then preloading it with one or more site-standard
+ * catalogs before using it with one or more SAX parsers: <pre>
+ *     XCat    catalog = new XCat ();
+ *     catalog.setErrorHandler (diagnosticErrorHandler);
+ *     catalog.loadCatalog ("file:/local/catalogs/catalog.cat");
+ *     catalog.loadCatalog ("http://shared/catalog.cat");
+ *     ...
+ *     catalog.disableLoading ();
+ *     parser1.setEntityResolver (catalog);
+ *     parser2.setEntityResolver (catalog);
+ *     ...</pre>
+ *
+ * <p>A second mode is to arrange that your application uses instances of
+ * this class as its entity resolver, and automatically loads catalogs
+ * referenced by <em>&lt;?oasis-xml-catalog...?&gt;</em> processing
+ * instructions found before the DTD in documents it parses.
+ * It would then discard the resolver after each parse.
+ *
+ * <p> A third mode applies catalogs in contexts other than entity
+ * resolution for parsers.
+ * The {@link #resolveURI resolveURI()} method supports resolving URIs
+ * stored in XML application data, rather than inside DTDs.
+ * Catalogs would be loaded as shown above, and the catalog could
+ * be used concurrently for parser entity resolution and for
+ * application URI resolution.
+ * </p>
+ *
+ * <center><hr width='70%'></center>
+ *
+ * <p>Errors in catalogs implicitly loaded (during resolution) are ignored
+ * beyond being reported through any <em>ErrorHandler</em> assigned using
+ * {@link #setErrorHandler setErrorHandler()}.  SAX exceptions
+ * thrown from such a handler won't abort resolution, although throwing a
+ * <em>RuntimeException</em> or <em>Error</em> will normally abort both
+ * resolution and parsing.  Useful diagnostic information is available to
+ * any <em>ErrorHandler</em> used to report problems, or from any exception
+ * thrown from an explicit {@link #loadCatalog loadCatalog()} invocation.
+ * Applications can use that information as troubleshooting aids.
+ *
+ * <p>While this class requires <em>SAX2 Extensions 1.1</em> classes in
+ * its class path, basic functionality does not require using a SAX2
+ * parser that supports the extended entity resolution functionality.
+ * See the original SAX1
+ * {@link #resolveEntity(java.lang.String,java.lang.String) resolveEntity()}
+ * method for a list of restrictions which apply when it is used with
+ * older SAX parsers.
+ *
+ * @see EntityResolver2
+ *
+ * @author David Brownell
+ */
+public class XCat implements EntityResolver2
+{
+    private Catalog            catalogs [];
+    private boolean            usingPublic = true;
+    private boolean            loadingPermitted = true;
+    private boolean            unified = true;
+    private String             parserClass;
+    private ErrorHandler       errorHandler;
+
+    // private EntityResolver  next;   // chain to next if we fail...
+
+    //
+    // NOTE:  This is a straightforward implementation, and if
+    // there are lots of "nextCatalog" or "delegate*" entries
+    // in use, two tweaks would be worth considering:
+    //
+    // - Centralize some sort of cache (key by URI) for individual
+    //   resolvers.  That'd avoid multiple copies of a given catalog.
+    //
+    // - Have resolution track what catalogs (+modes) have been
+    //   searched.  This would support loop detection.
+    //
+
+
+    /**
+     * Initializes without preloading a catalog.
+     * This API is convenient when you may want to arrange that catalogs
+     * are automatically loaded when explicitly referenced in documents,
+     * using the <em>oasis-xml-catalog</em> processing instruction.
+     * In such cases you won't usually be able to preload catalogs.
+     */
+    public XCat () { }
+
+    /**
+     * Initializes, and preloads a catalog using the default SAX parser.
+     * This API is convenient when you operate with one or more standard
+     * catalogs.
+     *
+     * <p> This just delegates to {@link #loadCatalog loadCatalog()};
+     * see it for exception information.
+     *
+     * @param uri absolute URI for the catalog file.
+     */
+    public XCat (String uri)
+    throws SAXException, IOException
+       { loadCatalog (uri); }
+
+
+    /**
+     * Loads an OASIS XML Catalog.
+     * It is appended to the list of currently active catalogs, or
+     * reloaded if a catalog with the same URI was already loaded.
+     * Callers have control over what parser is used, how catalog parsing
+     * errors are reported, and whether URIs will be resolved consistently.
+     *
+     * <p> The OASIS specification says that errors detected when loading
+     * catalogs "must recover by ignoring the catalog entry file that
+     * failed, and proceeding."  In this API, that action can be the
+     * responsibility of applications, when they explicitly load any
+     * catalog using this method.
+     *
+     * <p>Note that catalogs referenced by this one will not be loaded
+     * at this time.  Catalogs referenced through <em>nextCatalog</em>
+     * or <em>delegate*</em> elements are normally loaded only if needed. 
+     *
+     * @see #setErrorHandler
+     * @see #setParserClass
+     * @see #setUnified
+     *
+     * @param uri absolute URI for the catalog file.
+     *
+     * @exception IOException As thrown by the parser, typically to
+     * indicate problems reading data from that URI.
+     * @exception SAXException As thrown by the parser, typically to
+     * indicate problems parsing data from that URI.  It may also
+     *  be thrown if the parser doesn't support necessary handlers. 
+     * @exception IllegalStateException When attempting to load a
+     * catalog after loading has been {@link #disableLoading disabled},
+     * such as after any entity or URI lookup has been performed.
+     */
+    public synchronized void loadCatalog (String uri)
+    throws SAXException, IOException
+    {
+       Catalog         catalog;
+       int             index = -1;
+
+       if (!loadingPermitted)
+           throw new IllegalStateException ();
+       
+       uri = normalizeURI (uri);
+       if (catalogs != null) {
+           // maybe just reload
+           for (index = 0; index < catalogs.length; index++)
+               if (uri.equals (catalogs [index].catalogURI))
+                   break;
+       }
+       catalog = loadCatalog (parserClass, errorHandler, uri, unified);
+
+       // add to list of catalogs
+       if (catalogs == null) {
+           index = 0;
+           catalogs = new Catalog [1];
+       } else if (index == catalogs.length) {
+           Catalog             tmp [];
+
+           tmp = new Catalog [index + 1];
+           System.arraycopy (catalogs, 0, tmp, 0, index);
+           catalogs = tmp;
+       }
+       catalogs [index] = catalog;
+    }
+
+
+    /**
+     * "New Style" external entity resolution for parsers.
+     * Calls to this method prevent explicit loading of additional catalogs
+     * using {@link #loadCatalog loadCatalog()}.
+     *
+     * <p>This supports the full core catalog functionality for locating
+     * (and relocating) parsed entities that have been declared in a
+     * document's DTD.
+     *
+     * @param name Entity name, such as "dudley", "%nell", or "[dtd]".
+     * @param publicId Either a normalized public ID, or null.
+     * @param baseURI Absolute base URI associated with systemId.
+     * @param systemId URI found in entity declaration (may be
+     * relative to baseURI).
+     *
+     * @return Input source for accessing the external entity, or null
+     * if no mapping was found.  The input source may have opened
+     * the stream, and will have a fully resolved URI.
+     *
+     * @see #getExternalSubset
+     */
+    public InputSource resolveEntity (
+       String name,            // UNUSED ... systemId is always non-null
+       String publicId,
+       String baseURI,         // UNUSED ... it just lets sysId be relative
+       String systemId
+    ) throws SAXException, IOException
+    {
+       if (loadingPermitted)
+           disableLoading ();
+
+       try {
+           // steps as found in OASIS XML catalog spec 7.1.2
+           // steps 1, 8 involve looping over the list of catalogs
+           for (int i = 0; i < catalogs.length; i++) {
+               InputSource     retval;
+               retval = catalogs [i].resolve (usingPublic, publicId, systemId);
+               if (retval != null)
+                   return retval;;
+           }
+       } catch (DoneDelegation x) {
+           // done!
+       }
+       // step 9 involves returning "no match" 
+       return null;
+    }
+
+
+    /**
+     * "New Style" parser callback to add an external subset.
+     * For documents that don't include an external subset, this may
+     * return one according to <em>doctype</em> catalog entries.
+     * (This functionality is not a core part of the OASIS XML Catalog
+     * specification, though it's presented in an appendix.)
+     * If no such entry is defined, this returns null to indicate that
+     * this document will not be modified to include such a subset.
+     * Calls to this method prevent explicit loading of additional catalogs
+     * using {@link #loadCatalog loadCatalog()}.
+     *
+     * <p><em>Warning:</em> That catalog functionality can be dangerous.
+     * It can provide definitions of general entities, and thereby mask
+     * certain well formedess errors.
+     *
+     * @param name Name of the document element, either as declared in
+     * a DOCTYPE declaration or as observed in the text.
+     * @param baseURI Document's base URI (absolute).
+     *
+     * @return Input source for accessing the external subset, or null
+     * if no mapping was found.  The input source may have opened
+     * the stream, and will have a fully resolved URI.
+     */
+    public InputSource getExternalSubset (String name, String baseURI)
+    throws SAXException, IOException
+    {
+       if (loadingPermitted)
+           disableLoading ();
+       try {
+           for (int i = 0; i < catalogs.length; i++) {
+               InputSource retval = catalogs [i].getExternalSubset (name);
+               if (retval != null)
+                   return retval;
+           }
+       } catch (DoneDelegation x) {
+           // done!
+       }
+       return null;
+    }
+
+
+    /**
+     * "Old Style" external entity resolution for parsers.
+     * This API provides only core functionality.
+     * Calls to this method prevent explicit loading of additional catalogs
+     * using {@link #loadCatalog loadCatalog()}.
+     *
+     * <p>The functional limitations of this interface include:</p><ul>
+     *
+     * <li>Since system IDs will be absolutized before the resolver
+     * sees them, matching against relative URIs won't work.
+     * This may affect <em>system</em>, <em>rewriteSystem</em>,
+     * and <em>delegateSystem</em> catalog entries.
+     *
+     * <li>Because of that absolutization, documents declaring entities
+     * with system IDs using URI schemes that the JVM does not recognize
+     * may be unparsable.  URI schemes such as <em>file:/</em>,
+     * <em>http://</em>, <em>https://</em>, and <em>ftp://</em>
+     * will usually work reliably.
+     *
+     * <li>Because missing external subsets can't be provided, the
+     * <em>doctype</em> catalog entries will be ignored.
+     * (The {@link #getExternalSubset getExternalSubset()} method is
+     * a "New Style" resolution option.)
+     *
+     * </ul>
+     *
+     * <p>Applications can tell whether this limited functionality will be
+     * used: if the feature flag associated with the {@link EntityResolver2}
+     * interface is not <em>true</em>, the limitations apply.  Applications
+     * can't usually know whether a given document and catalog will trigger
+     * those limitations.  The issue can only be bypassed by operational
+     * procedures such as not using catalogs or documents which involve
+     * those features.
+     *
+     * @param publicId Either a normalized public ID, or null
+     * @param systemId Always an absolute URI.
+     *
+     * @return Input source for accessing the external entity, or null
+     * if no mapping was found.  The input source may have opened
+     * the stream, and will have a fully resolved URI.
+     */
+    final public InputSource resolveEntity (String publicId, String systemId)
+    throws SAXException, IOException
+    {
+       return resolveEntity (null, publicId, null, systemId);
+    }
+
+
+    /**
+     * Resolves a URI reference that's not defined to the DTD.
+     * This is intended for use with URIs found in document text, such as
+     * <em>xml-stylesheet</em> processing instructions and in attribute
+     * values, where they are not recognized as URIs by XML parsers.
+     * Calls to this method prevent explicit loading of additional catalogs
+     * using {@link #loadCatalog loadCatalog()}.
+     *
+     * <p>This functionality is supported by the OASIS XML Catalog
+     * specification, but will never be invoked by an XML parser.
+     * It corresponds closely to functionality for mapping system
+     * identifiers for entities declared in DTDs; closely enough that
+     * this implementation's default behavior is that they be
+     * identical, to minimize potential confusion.
+     *
+     * <p>This method could be useful when implementing the
+     * {@link javax.xml.transform.URIResolver} interface, wrapping the
+     * input source in a {@link javax.xml.transform.sax.SAXSource}.
+     *
+     * @see #isUnified
+     * @see #setUnified
+     *
+     * @param baseURI The relevant base URI as specified by the XML Base
+     * specification.  This recognizes <em>xml:base</em> attributes
+     * as overriding the actual (physical) base URI.
+     * @param uri Either an absolute URI, or one relative to baseURI
+     *
+     * @return Input source for accessing the mapped URI, or null
+     * if no mapping was found.  The input source may have opened
+     * the stream, and will have a fully resolved URI.
+     */
+    public InputSource resolveURI (String baseURI, String uri)
+    throws SAXException, IOException
+    {
+       if (loadingPermitted)
+           disableLoading ();
+
+       // NOTE:  baseURI isn't used here, but caller MUST have it,
+       // and heuristics _might_ use it in the future ... plus,
+       // it's symmetric with resolveEntity ().
+
+       // steps 1, 6 involve looping
+       try {
+           for (int i = 0; i < catalogs.length; i++) {
+               InputSource     tmp = catalogs [i].resolveURI (uri);
+               if (tmp != null)
+                   return tmp;
+           }
+       } catch (DoneDelegation x) {
+           // done
+       }
+       // step 7 reports no match
+       return null;
+    }
+
+
+    /** 
+     * Records that catalog loading is no longer permitted.
+     * Loading is automatically disabled when lookups are performed,
+     * and should be manually disabled when <em>startDTD()</em> (or
+     * any other DTD declaration callback) is invoked, or at the latest
+     * when the document root element is seen.
+     */
+    public synchronized void disableLoading ()
+    {
+       // NOTE:  this method and loadCatalog() are synchronized
+       // so that it's impossible to load (top level) catalogs
+       // after lookups start.  Likewise, deferred loading is also
+       // synchronized (for "next" and delegated catalogs) to
+       // ensure that parsers can share resolvers.
+       loadingPermitted = false;
+    }
+
+
+    /**
+     * Returns the error handler used to report catalog errors.
+     * Null is returned if the parser's default error handling
+     * will be used.
+     *
+     * @see #setErrorHandler
+     */
+    public ErrorHandler getErrorHandler ()
+       { return errorHandler; }
+
+    /**
+     * Assigns the error handler used to report catalog errors.
+     * These errors may come either from the SAX2 parser or
+     * from the catalog parsing code driven by the parser. 
+     *
+     * <p> If you're sharing the resolver between parsers, don't
+     * change this once lookups have begun.
+     *
+     * @see #getErrorHandler
+     *
+     * @param parser The error handler, or null saying to use the default
+     * (no diagnostics, and only fatal errors terminate loading).
+     */
+    public void setErrorHandler (ErrorHandler handler)
+       { errorHandler = handler; }
+
+
+    /**
+     * Returns the name of the SAX2 parser class used to parse catalogs.
+     * Null is returned if the system default is used.
+     * @see #setParserClass
+     */
+    public String getParserClass ()
+       { return parserClass; }
+
+    /**
+     * Names the SAX2 parser class used to parse catalogs.
+     *
+     * <p> If you're sharing the resolver between parsers, don't change
+     * this once lookups have begun.
+     *
+     * <p> Note that in order to properly support the <em>xml:base</em>
+     * attribute and relative URI resolution, the SAX parser used to parse
+     * the catalog must provide a {@link Locator} and support the optional
+     * declaration and lexical handlers.
+     *
+     * @see #getParserClass
+     *
+     * @param parser The parser class name, or null saying to use the
+     * system default SAX2 parser.
+     */
+    public void setParserClass (String parser)
+       { parserClass = parser; }
+
+
+    /**
+     * Returns true (the default) if all methods resolve
+     * a given URI in the same way.
+     * Returns false if calls resolving URIs as entities (such as
+     * {@link #resolveEntity resolveEntity()}) use different catalog entries
+     * than those resolving them as URIs ({@link #resolveURI resolveURI()}),
+     * which will generally produce different results.
+     *
+     * <p>The OASIS XML Catalog specification defines two related schemes
+     * to map URIs "as URIs" or "as system IDs".
+     * URIs use <em>uri</em>, <em>rewriteURI</em>, and <em>delegateURI</em>
+     * elements.  System IDs do the same things with <em>systemId</em>,
+     * <em>rewriteSystemId</em>, and <em>delegateSystemId</em>.
+     * It's confusing and error prone to maintain two parallel copies of
+     * such data.  Accordingly, this class makes that behavior optional.
+     * The <em>unified</em> interpretation of URI mappings is preferred,
+     * since it prevents surprises where one URI gets mapped to different
+     * contents depending on whether the reference happens to have come
+     * from a DTD (or not).
+     *
+     * @see #setUnified
+     */
+    public boolean isUnified ()
+       { return unified; }
+
+    /**
+     * Assigns the value of the flag returned by {@link #isUnified}.
+     * Set it to false to be strictly conformant with the OASIS XML Catalog
+     * specification.  Set it to true to make all mappings for a given URI
+     * give the same result, regardless of the reason for the mapping.
+     *
+     * <p>Don't change this once you've loaded the first catalog.
+     *
+     * @param value new flag setting
+     */
+    public void setUnified (boolean value)
+       { unified = value; }
+
+
+    /**
+     * Returns true (the default) if a catalog's public identifier
+     * mappings will be used.
+     * When false is returned, such mappings are ignored except when
+     * system IDs are discarded, such as for
+     * entities using the <em>urn:publicid:</em> URI scheme in their
+     * system identifiers.  (See RFC 3151 for information about that
+     * URI scheme.  Using it in system identifiers may not work well
+     * with many SAX parsers unless the <em>resolve-dtd-uris</em>
+     * feature flag is set to false.)
+     * @see #setUsingPublic
+     */
+    public boolean isUsingPublic ()
+       { return usingPublic; }
+
+    /**
+     * Specifies which catalog search mode is used.
+     * By default, public identifier mappings are able to override system
+     * identifiers when both are available.
+     * Applications may choose to ignore public
+     * identifier mappings in such cases, so that system identifiers
+     * declared in DTDs will only be overridden by an explicit catalog
+     * match for that system ID.
+     *
+     * <p> If you're sharing the resolver between parsers, don't
+     * change this once lookups have begun.
+     * @see #isUsingPublic
+     *
+     * @param value true to always use public identifier mappings,
+     * false to only use them for system ids using the <em>urn:publicid:</em>
+     * URI scheme.
+     */
+    public void setUsingPublic (boolean value)
+       { usingPublic = value; }
+
+
+
+    // hmm, what's this do? :)
+    private static Catalog loadCatalog (
+       String          parserClass,
+       ErrorHandler    eh,
+       String          uri,
+       boolean         unified
+    ) throws SAXException, IOException
+    {
+       XMLReader       parser;
+       Loader          loader;
+       boolean         doesIntern = false;
+
+       if (parserClass == null)
+           parser = XMLReaderFactory.createXMLReader ();
+       else
+           parser = XMLReaderFactory.createXMLReader (parserClass);
+       if (eh != null)
+           parser.setErrorHandler (eh);
+       // resolve-dtd-entities is at default value (unrecognized == true)
+
+       try {
+           doesIntern = parser.getFeature (
+               "http://xml.org/sax/features/string-interning");
+       } catch (SAXNotRecognizedException e) { }
+
+       loader = new Loader (doesIntern, eh, unified);
+       loader.cat.parserClass = parserClass;
+       loader.cat.catalogURI = uri;
+
+       parser.setContentHandler (loader);
+       parser.setProperty (
+           "http://xml.org/sax/properties/declaration-handler",
+           loader);
+       parser.setProperty (
+           "http://xml.org/sax/properties/lexical-handler",
+           loader);
+       parser.parse (uri);
+
+       return loader.cat;
+    }
+
+    // perform one or both the normalizations for public ids
+    private static String normalizePublicId (boolean full, String publicId)
+    {
+       if (publicId.startsWith ("urn:publicid:")) {
+           StringBuffer        buf = new StringBuffer ();
+           char                chars [] = publicId.toCharArray ();
+boolean hasbug = false;
+
+           for (int i = 13; i < chars.length; i++) {
+               switch (chars [i]) {
+               case '+':       buf.append (' '); continue;
+               case ':':       buf.append ("//"); continue;
+               case ';':       buf.append ("::"); continue;
+               case '%':
+// FIXME unhex that char!  meanwhile, warn and fallthrough ...
+                   hasbug = true;
+               default:        buf.append (chars [i]); continue;
+               }
+           }
+           publicId = buf.toString ();
+if (hasbug)
+System.err.println ("nyet unhexing public id: " + publicId);
+           full = true;
+       }
+
+       // SAX parsers do everything except that URN mapping, but
+       // we can't trust other sources to normalize correctly
+       if (full) {
+           StringTokenizer     tokens;
+           String              token;
+
+           tokens = new StringTokenizer (publicId, " \r\n");
+           publicId = null;
+           while (tokens.hasMoreTokens ()) {
+               if (publicId == null)
+                   publicId = tokens.nextToken ();
+               else
+                   publicId += " " + tokens.nextToken ();
+           }
+       }
+       return publicId;
+    }
+
+    private static boolean isUriExcluded (int c)
+       { return c <= 0x20 || c >= 0x7f || "\"<>^`{|}".indexOf (c) != -1; }
+
+    private static int hexNibble (int c)
+    {
+       if (c < 10)
+           return c + '0';
+       return ('a' - 10) + c;
+    }
+
+    // handles URIs with "excluded" characters
+    private static String normalizeURI (String systemId)
+    {
+       int                     length = systemId.length ();
+
+       for (int i = 0; i < length; i++) {
+           char        c = systemId.charAt (i);
+
+           // escape non-ASCII plus "excluded" characters
+           if (isUriExcluded (c)) {
+               byte                    buf [];
+               ByteArrayOutputStream   out;
+               int                             b;
+
+               // a JVM that doesn't know UTF8 and 8859_1 is unusable!
+               try {
+                   buf = systemId.getBytes ("UTF8");
+                   out = new ByteArrayOutputStream (buf.length + 10);
+
+                   for (i = 0; i < buf.length; i++) {
+                       b = buf [i] & 0x0ff;
+                       if (isUriExcluded (b)) {
+                           out.write ((int) '%');
+                           out.write (hexNibble (b >> 4));
+                           out.write (hexNibble (b & 0x0f));
+                       } else
+                           out.write (b);
+                   }
+                   return out.toString ("8859_1");
+               } catch (IOException e) {
+                   throw new RuntimeException (
+                       "can't normalize URI: " + e.getMessage ());
+               }
+           }
+       }
+       return systemId;
+    }
+
+    // thrown to mark authoritative end of a search
+    private static class DoneDelegation extends SAXException
+    {
+       DoneDelegation () { }
+    }
+
+
+    /**
+     * Represents a OASIS XML Catalog, and encapsulates much of
+     * the catalog functionality.
+     */
+    private static class Catalog
+    {
+       // loading infrastructure
+       String          catalogURI;
+       ErrorHandler    eh;
+       boolean         unified;
+       String          parserClass;
+
+       // catalog data
+       boolean         hasPreference;
+       boolean         usingPublic;
+
+       Hashtable       publicIds;
+       Hashtable       publicDelegations;
+
+       Hashtable       systemIds;
+       Hashtable       systemRewrites;
+       Hashtable       systemDelegations;
+
+       Hashtable       uris;
+       Hashtable       uriRewrites;
+       Hashtable       uriDelegations;
+
+       Hashtable       doctypes;
+
+       Vector          next;
+
+       // nonpublic!
+       Catalog () { }
+
+       
+       // steps as found in OASIS XML catalog spec 7.1.2
+       private InputSource locatePublicId (String publicId)
+       throws SAXException, IOException
+       {
+           // 5. return (first) 'public' entry
+           if (publicIds != null) {
+               String  retval = (String) publicIds.get (publicId);
+               if (retval != null) {
+                   // IF the URI is accessible ...
+                   return new InputSource (retval);
+               }
+           }
+
+           // 6. return delegatePublic catalog match [complex]
+           if (publicDelegations != null)
+               return checkDelegations (publicDelegations, publicId,
+                               publicId, null);
+           
+           return null;
+       }
+
+       // steps as found in OASIS XML catalog spec 7.1.2 or 7.2.2
+       private InputSource mapURI (
+           String      uri,
+           Hashtable   ids,
+           Hashtable   rewrites,
+           Hashtable   delegations
+       ) throws SAXException, IOException
+       {
+           // 7.1.2: 2. return (first) 'system' entry
+           // 7.2.2: 2. return (first) 'uri' entry
+           if (ids != null) {
+               String  retval = (String) ids.get (uri);
+               if (retval != null) {
+                   // IF the URI is accessible ...
+                   return new InputSource (retval);
+               }
+           }
+
+           // 7.1.2: 3. return 'rewriteSystem' entries
+           // 7.2.2: 3. return 'rewriteURI' entries
+           if (rewrites != null) {
+               String  prefix = null;
+               String  replace = null;
+               int     prefixLen = -1;
+
+               for (Enumeration e = rewrites.keys ();
+                       e.hasMoreElements ();
+                       /* NOP */) {
+                   String      temp = (String) e.nextElement ();
+                   int         len = -1;
+
+                   if (!uri.startsWith (temp))
+                       continue;
+                   if (prefix != null
+                           && (len = temp.length ()) < prefixLen)
+                       continue;
+                   prefix = temp;
+                   prefixLen = len;
+                   replace = (String) rewrites.get (temp);
+               }
+               if (prefix != null) {
+                   StringBuffer        buf = new StringBuffer (replace);
+                   buf.append (uri.substring (prefixLen));
+                   // IF the URI is accessible ...
+                   return new InputSource (buf.toString ());
+               }
+           }
+
+           // 7.1.2: 4. return 'delegateSystem' catalog match [complex]
+           // 7.2.2: 4. return 'delegateURI' catalog match [complex]
+           if (delegations != null)
+               return checkDelegations (delegations, uri, null, uri);
+
+           return null;
+       }
+
+
+       /**
+        * Returns a URI for an external entity.
+        */
+       public InputSource resolve (
+           boolean     usingPublic,
+           String      publicId,
+           String      systemId
+       ) throws SAXException, IOException
+       {
+           boolean     preferSystem;
+           InputSource retval;
+
+           if (hasPreference)
+               preferSystem = !this.usingPublic;
+           else
+               preferSystem = !usingPublic;
+           
+           if (publicId != null)
+               publicId = normalizePublicId (false, publicId);
+
+           // behavior here matches section 7.1.1 of the oasis spec
+           if (systemId != null) {
+               if (systemId.startsWith ("urn:publicid:")) {
+                   String      temp = normalizePublicId (true, systemId);
+                   if (publicId == null) {
+                       publicId = temp;
+                       systemId = null;
+                   } else if (!publicId.equals (temp)) {
+                       // error; ok to recover by:
+                       systemId = null;
+                   }
+               } else
+                   systemId = normalizeURI (systemId);
+           }
+
+           if (systemId == null && publicId == null)
+               return null;
+
+           if (systemId != null) {
+               retval = mapURI (systemId, systemIds, systemRewrites,
+                                       systemDelegations);
+               if (retval != null) {
+                   retval.setPublicId (publicId);
+                   return retval;
+               }
+           }
+
+           if (publicId != null
+                   && !(systemId != null && preferSystem)) {
+               retval = locatePublicId (publicId);
+               if (retval != null) {
+                   retval.setPublicId (publicId);
+                   return retval;
+               }
+           }
+
+           // 7. apply nextCatalog entries
+           if (next != null) {
+               int     length = next.size ();
+               for (int i = 0; i < length; i++) {
+                   Catalog     n = getNext (i);
+                   retval = n.resolve (usingPublic, publicId, systemId);
+                   if (retval != null)
+                       return retval;
+               }
+           }
+
+           return null;
+       }
+
+       /**
+        * Maps one URI into another, for resources that are not defined
+        * using XML external entity or notation syntax.
+        */
+       public InputSource resolveURI (String uri)
+       throws SAXException, IOException
+       {
+           if (uri.startsWith ("urn:publicid:"))
+               return resolve (true, normalizePublicId (true, uri), null);
+
+           InputSource retval;
+
+           uri = normalizeURI (uri);
+
+           // 7.2.2 steps 2-4
+           retval = mapURI (uri, uris, uriRewrites, uriDelegations);
+           if (retval != null)
+               return retval;
+
+           // 7.2.2 step 5. apply nextCatalog entries
+           if (next != null) {
+               int     length = next.size ();
+               for (int i = 0; i < length; i++) {
+                   Catalog     n = getNext (i);
+                   retval = n.resolveURI (uri);
+                   if (retval != null)
+                       return retval;
+               }
+           }
+
+           return null;
+       }
+
+
+       /**
+        * Finds the external subset associated with a given root element.
+        */
+       public InputSource getExternalSubset (String name)
+       throws SAXException, IOException
+       {
+           if (doctypes != null) {
+               String  value = (String) doctypes.get (name);
+               if (value != null) {
+                   // IF the URI is accessible ...
+                   return new InputSource (value);
+               }
+           }
+           if (next != null) {
+               int     length = next.size ();
+               for (int i = 0; i < length; i++) {
+                   Catalog     n = getNext (i);
+                   if (n == null)
+                       continue;
+                   InputSource retval = n.getExternalSubset (name);
+                   if (retval != null)
+                       return retval;
+               }
+           }
+           return null;
+       }
+
+       private synchronized Catalog getNext (int i)
+       throws SAXException, IOException
+       {
+           Object      obj;
+
+           if (next == null || i < 0 || i >= next.size ())
+               return null;
+           obj = next.elementAt (i);
+           if (obj instanceof Catalog)
+               return (Catalog) obj;
+           
+           // ok, we deferred reading that catalog till now.
+           // load and cache it.
+           Catalog     cat = null;
+
+           try {
+               cat = loadCatalog (parserClass, eh, (String) obj, unified);
+               next.setElementAt (cat, i);
+           } catch (SAXException e) {
+               // must fail quietly, says the OASIS spec
+           } catch (IOException e) {
+               // same applies here
+           }
+           return cat;
+       }
+
+       private InputSource checkDelegations (
+           Hashtable   delegations,
+           String      id,
+           String      publicId,       // only one of public/system
+           String      systemId        // will be non-null...
+       ) throws SAXException, IOException
+       {
+           Vector      matches = null;
+           int         length = 0;
+
+           // first, see if any prefixes match.
+           for (Enumeration e = delegations.keys ();
+                   e.hasMoreElements ();
+                   /* NOP */) {
+               String  prefix = (String) e.nextElement ();
+
+               if (!id.startsWith (prefix))
+                   continue;
+               if (matches == null)
+                   matches = new Vector ();
+               
+               // maintain in longer->shorter sorted order
+               // NOTE:  assumes not many matches will fire!
+               int     index;
+
+               for (index = 0; index < length; index++) {
+                   String      temp = (String) matches.elementAt (index);
+                   if (prefix.length () > temp.length ()) {
+                       matches.insertElementAt (prefix, index);
+                       break;
+                   }
+               }
+               if (index == length)
+                   matches.addElement (prefix);
+               length++;
+           }
+           if (matches == null)
+               return null;
+
+           // now we know the list of catalogs to replace our "top level"
+           // list ... we use it here, rather than somehow going back and
+           // restarting, since this helps avoid reading most catalogs.
+           // this assumes stackspace won't be a problem.
+           for (int i = 0; i < length; i++) {
+               Catalog         catalog = null;
+               InputSource     result;
+
+               // get this catalog.  we may not have read it yet.
+               synchronized (delegations) {
+                   Object      prefix = matches.elementAt (i);
+                   Object      cat = delegations.get (prefix);
+
+                   if (cat instanceof Catalog)
+                       catalog = (Catalog) cat;
+                   else {
+                       try {
+                           // load and cache that catalog
+                           catalog = loadCatalog (parserClass, eh,
+                                   (String) cat, unified);
+                           delegations.put (prefix, catalog);
+                       } catch (SAXException e) {
+                           // must ignore, says the OASIS spec
+                       } catch (IOException e) {
+                           // same applies here
+                       }
+                   }
+               }
+
+               // ignore failed loads, and proceed
+               if (catalog == null)
+                   continue;
+               
+               // we have a catalog ... resolve!
+               // usingPublic value can't matter, there's no choice
+               result = catalog.resolve (true, publicId, systemId);
+               if (result != null)
+                   return result;
+           }
+
+           // if there were no successes, the entire
+           // lookup failed (all the way to top level)
+           throw new DoneDelegation ();
+       }
+    }
+
+
+    /** This is the namespace URI used for OASIS XML Catalogs.  */
+    private static final String        catalogNamespace =
+       "urn:oasis:names:tc:entity:xmlns:xml:catalog";
+
+
+    /**
+     * Loads/unmarshals one catalog.
+     */
+    private static class Loader extends DefaultHandler2
+    {
+       private boolean         preInterned;
+       private ErrorHandler    handler;
+       private boolean         unified;
+       private int             ignoreDepth;
+       private Locator         locator;
+       private boolean         started;
+       private Hashtable       externals;
+       private Stack           bases;
+
+       Catalog                 cat = new Catalog ();
+
+
+       /**
+        * Constructor.
+        * @param flag true iff the parser already interns strings.
+        * @param eh Errors and warnings are delegated to this.
+        * @param unified true keeps one table for URI mappings;
+        *      false matches OASIS spec, storing mappings
+        *      for URIs and SYSTEM ids in parallel tables.
+        */
+       Loader (boolean flag, ErrorHandler eh, boolean unified)
+       {
+           preInterned = flag;
+           handler = eh;
+           this.unified = unified;
+           cat.unified = unified;
+           cat.eh = eh;
+       }
+
+
+       // strips out fragments
+       private String nofrag (String uri)
+       throws SAXException
+       {
+           if (uri.indexOf ('#') != -1) {
+               warn ("URI with fragment: " + uri);
+               uri = uri.substring (0, uri.indexOf ('#'));
+           }
+           return uri;
+       }
+
+       // absolutizes relative URIs
+       private String absolutize (String uri)
+       throws SAXException
+       {
+           // avoid creating URLs if they're already absolutized,
+           // or if the URI is already using a known scheme
+           if (uri.startsWith ("file:/")
+                   || uri.startsWith ("http:/")
+                   || uri.startsWith ("https:/")
+                   || uri.startsWith ("ftp:/")
+                   || uri.startsWith ("urn:")
+                   )
+               return uri;
+
+           // otherwise, let's hope the JDK handles this URI scheme.
+           try {
+               URL     base = (URL) bases.peek ();
+               return new URL (base, uri).toString ();
+           } catch (Exception e) {
+               fatal ("can't absolutize URI: " + uri);
+               return null;
+           }
+       }
+
+       // recoverable error
+       private void error (String message)
+       throws SAXException
+       {
+           if (handler == null)
+               return;
+           handler.error (new SAXParseException (message, locator));
+       }
+
+       // nonrecoverable error
+       private void fatal (String message)
+       throws SAXException
+       {
+           SAXParseException   spe;
+           
+           spe = new SAXParseException (message, locator);
+           if (handler != null)
+               handler.fatalError (spe);
+           throw spe;
+       }
+
+       // low severity problem
+       private void warn (String message)
+       throws SAXException
+       {
+           if (handler == null)
+               return;
+           handler.warning (new SAXParseException (message, locator));
+       }
+
+       // callbacks:
+
+       public void setDocumentLocator (Locator l)
+           { locator = l; }
+
+       public void startDocument ()
+       throws SAXException
+       {
+           if (locator == null)
+               error ("no locator!");
+           bases = new Stack ();
+           String      uri = locator.getSystemId ();
+           try {
+               bases.push (new URL (uri));
+           } catch (IOException e) {
+               fatal ("bad document base URI: " + uri);
+           }
+       }
+
+       public void endDocument ()
+       throws SAXException
+       {
+           try {
+               if (!started)
+                   error ("not a catalog!");
+           } finally {
+               locator = null;
+               handler = null;
+               externals = null;
+               bases = null;
+           }
+       }
+
+       // XML Base support for external entities.
+
+       // NOTE: expects parser is in default "resolve-dtd-uris" mode.
+       public void externalEntityDecl (String name, String pub, String sys)
+       throws SAXException
+       {
+           if (externals == null)
+               externals = new Hashtable ();
+           if (externals.get (name) == null)
+               externals.put (name, pub);
+       }
+
+       public void startEntity (String name)
+       throws SAXException
+       {
+           if (externals == null)
+               return;
+           String uri = (String) externals.get (name);
+
+           // NOTE: breaks if an EntityResolver substitutes these URIs.
+           // If toplevel loader supports one, must intercept calls...
+           if (uri != null) {
+               try {
+                   bases.push (new URL (uri));
+               } catch (IOException e) {
+                   fatal ("entity '" + name + "', bad URI: " + uri);
+               }
+           }
+       }
+
+       public void endEntity (String name)
+       {
+           if (externals == null)
+               return;
+           String value = (String) externals.get (name);
+
+           if (value != null)
+               bases.pop ();
+       }
+
+       /**
+        * Processes catalog elements, saving their data.
+        */
+       public void startElement (String namespace, String local,
+           String qName, Attributes atts)
+       throws SAXException
+       {
+           // must ignore non-catalog elements, and their contents
+           if (ignoreDepth != 0 || !catalogNamespace.equals (namespace)) {
+               ignoreDepth++;
+               return;
+           }
+
+           // basic sanity checks
+           if (!preInterned)
+               local = local.intern ();
+           if (!started) {
+               started = true;
+               if ("catalog" != local)
+                   fatal ("root element not 'catalog': " + local);
+           }
+
+           // Handle any xml:base attribute
+           String      xmlbase = atts.getValue ("xml:base");
+
+           if (xmlbase != null) {
+               URL     base = (URL) bases.peek ();
+               try {
+                   base = new URL (base, xmlbase);
+               } catch (IOException e) {
+                   fatal ("can't resolve xml:base attribute: " + xmlbase);
+               }
+               bases.push (base);
+           } else
+               bases.push (bases.peek ());
+
+           // fetch multi-element attributes, apply standard tweaks
+           // values (uri, catalog, rewritePrefix) get normalized too,
+           // as a precaution and since we may compare the values
+           String      catalog = atts.getValue ("catalog");
+           if (catalog != null)
+               catalog = normalizeURI (absolutize (catalog));
+
+           String      rewritePrefix = atts.getValue ("rewritePrefix");
+           if (rewritePrefix != null)
+               rewritePrefix = normalizeURI (absolutize (rewritePrefix));
+
+           String      systemIdStartString;
+           systemIdStartString = atts.getValue ("systemIdStartString");
+           if (systemIdStartString != null) {
+               systemIdStartString = normalizeURI (systemIdStartString);
+               // unmatchable <rewriteSystemId>, <delegateSystemId> elements
+               if (systemIdStartString.startsWith ("urn:publicid:")) {
+                   error ("systemIdStartString is really a publicId!!");
+                   return;
+               }
+           }
+
+           String      uri = atts.getValue ("uri");
+           if (uri != null)
+               uri = normalizeURI (absolutize (uri));
+
+           String      uriStartString;
+           uriStartString = atts.getValue ("uriStartString");
+           if (uriStartString != null) {
+               uriStartString = normalizeURI (uriStartString);
+               // unmatchable <rewriteURI>, <delegateURI> elements
+               if (uriStartString.startsWith ("urn:publicid:")) {
+                   error ("uriStartString is really a publicId!!");
+                   return;
+               }
+           }
+
+           // strictly speaking "group" and "catalog" shouldn't nest
+           // ... arbitrary restriction, no evident motivation
+
+// FIXME stack "prefer" settings (two elements only!) and use
+// them to populate different public mapping/delegation tables
+
+           if ("catalog" == local || "group" == local) {
+               String  prefer = atts.getValue ("prefer");
+
+               if (prefer != null && !"public".equals (prefer)) {
+                   if (!"system".equals (prefer)) {
+                       error ("in <" + local + " ... prefer='...'>, "
+                           + "assuming 'public'");
+                       prefer = "public";
+                   }
+               }
+               if (prefer != null) {
+                   if ("catalog" == local) {
+                       cat.hasPreference = true;
+                       cat.usingPublic = "public".equals (prefer);
+                   } else {
+                       if (!cat.hasPreference || cat.usingPublic
+                                   != "public".equals (prefer)) {
+fatal ("<group prefer=...> case not handled");
+                       }
+                   }
+               } else if ("group" == local && cat.hasPreference) {
+fatal ("<group prefer=...> case not handled");
+               }
+
+           //
+           // PUBLIC ids:  cleanly set up for id substitution
+           //
+           } else if ("public" == local) {
+               String  publicId = atts.getValue ("publicId");
+               String  value = null;
+
+               if (publicId == null || uri == null) {
+                   error ("expecting <public publicId=... uri=.../>");
+                   return;
+               }
+               publicId = normalizePublicId (true, publicId);
+               uri = nofrag (uri);
+               if (cat.publicIds == null)
+                   cat.publicIds = new Hashtable ();
+               else
+                   value = (String) cat.publicIds.get (publicId);
+               if (value != null) {
+                   if (!value.equals (uri))
+                       warn ("ignoring <public...> entry for " + publicId);
+               } else
+                   cat.publicIds.put (publicId, uri);
+
+           } else if ("delegatePublic" == local) {
+               String  publicIdStartString;
+               Object  value = null;
+
+               publicIdStartString = atts.getValue ("publicIdStartString");
+               if (publicIdStartString == null || catalog == null) {
+                   error ("expecting <delegatePublic "
+                       + "publicIdStartString=... catalog=.../>");
+                   return;
+               }
+               publicIdStartString = normalizePublicId (true,
+                       publicIdStartString);
+               if (cat.publicDelegations == null)
+                   cat.publicDelegations = new Hashtable ();
+               else
+                   value = cat.publicDelegations.get (publicIdStartString);
+               if (value != null) {
+                   if (!value.equals (catalog))
+                       warn ("ignoring <delegatePublic...> entry for "
+                           + uriStartString);
+               } else
+                   cat.publicDelegations.put (publicIdStartString, catalog);
+
+
+           //
+           // SYSTEM ids:  need substitution due to operational issues
+           //
+           } else if ("system" == local) {
+               String  systemId = atts.getValue ("systemId");
+               String  value = null;
+
+               if (systemId == null || uri == null) {
+                   error ("expecting <system systemId=... uri=.../>");
+                   return;
+               }
+               systemId = normalizeURI (systemId);
+               uri = nofrag (uri);
+               if (systemId.startsWith ("urn:publicid:")) {
+                   error ("systemId is really a publicId!!");
+                   return;
+               }
+               if (cat.systemIds == null) {
+                   cat.systemIds = new Hashtable ();
+                   if (unified)
+                       cat.uris = cat.systemIds;
+               } else
+                   value = (String) cat.systemIds.get (systemId);
+               if (value != null) {
+                   if (!value.equals (uri))
+                       warn ("ignoring <system...> entry for " + systemId);
+               } else
+                   cat.systemIds.put (systemId, uri);
+
+           } else if ("rewriteSystem" == local) {
+               String  value = null;
+
+               if (systemIdStartString == null || rewritePrefix == null
+                       || systemIdStartString.length () == 0
+                       || rewritePrefix.length () == 0
+                       ) {
+                   error ("expecting <rewriteSystem "
+                       + "systemIdStartString=... rewritePrefix=.../>");
+                   return;
+               }
+               if (cat.systemRewrites == null) {
+                   cat.systemRewrites = new Hashtable ();
+                   if (unified)
+                       cat.uriRewrites = cat.systemRewrites;
+               } else
+                   value = (String) cat.systemRewrites.get (
+                                               systemIdStartString);
+               if (value != null) {
+                   if (!value.equals (rewritePrefix))
+                       warn ("ignoring <rewriteSystem...> entry for "
+                           + systemIdStartString);
+               } else
+                   cat.systemRewrites.put (systemIdStartString,
+                               rewritePrefix);
+
+           } else if ("delegateSystem" == local) {
+               Object  value = null;
+
+               if (systemIdStartString == null || catalog == null) {
+                   error ("expecting <delegateSystem "
+                       + "systemIdStartString=... catalog=.../>");
+                   return;
+               }
+               if (cat.systemDelegations == null) {
+                   cat.systemDelegations = new Hashtable ();
+                   if (unified)
+                       cat.uriDelegations = cat.systemDelegations;
+               } else
+                   value = cat.systemDelegations.get (systemIdStartString);
+               if (value != null) {
+                   if (!value.equals (catalog))
+                       warn ("ignoring <delegateSystem...> entry for "
+                           + uriStartString);
+               } else
+                   cat.systemDelegations.put (systemIdStartString, catalog);
+
+
+           //
+           // URI:  just like "system" ID support, except that
+           // fragment IDs are disallowed in "system" elements.
+           //
+           } else if ("uri" == local) {
+               String  name = atts.getValue ("name");
+               String  value = null;
+
+               if (name == null || uri == null) {
+                   error ("expecting <uri name=... uri=.../>");
+                   return;
+               }
+               if (name.startsWith ("urn:publicid:")) {
+                   error ("name is really a publicId!!");
+                   return;
+               }
+               name = normalizeURI (name);
+               if (cat.uris == null) {
+                   cat.uris = new Hashtable ();
+                   if (unified)
+                       cat.systemIds = cat.uris;
+               } else
+                   value = (String) cat.uris.get (name);
+               if (value != null) {
+                   if (!value.equals (uri))
+                       warn ("ignoring <uri...> entry for " + name);
+               } else
+                   cat.uris.put (name, uri);
+
+           } else if ("rewriteURI" == local) {
+               String value = null;
+
+               if (uriStartString == null || rewritePrefix == null
+                       || uriStartString.length () == 0
+                       || rewritePrefix.length () == 0
+                       ) {
+                   error ("expecting <rewriteURI "
+                       + "uriStartString=... rewritePrefix=.../>");
+                   return;
+               }
+               if (cat.uriRewrites == null) {
+                   cat.uriRewrites = new Hashtable ();
+                   if (unified)
+                       cat.systemRewrites = cat.uriRewrites;
+               } else
+                   value = (String) cat.uriRewrites.get (uriStartString);
+               if (value != null) {
+                   if (!value.equals (rewritePrefix))
+                       warn ("ignoring <rewriteURI...> entry for "
+                           + uriStartString);
+               } else
+                   cat.uriRewrites.put (uriStartString, rewritePrefix);
+
+           } else if ("delegateURI" == local) {
+               Object  value = null;
+
+               if (uriStartString == null || catalog == null) {
+                   error ("expecting <delegateURI "
+                       + "uriStartString=... catalog=.../>");
+                   return;
+               }
+               if (cat.uriDelegations == null) {
+                   cat.uriDelegations = new Hashtable ();
+                   if (unified)
+                       cat.systemDelegations = cat.uriDelegations;
+               } else
+                   value = cat.uriDelegations.get (uriStartString);
+               if (value != null) {
+                   if (!value.equals (catalog))
+                       warn ("ignoring <delegateURI...> entry for "
+                           + uriStartString);
+               } else
+                   cat.uriDelegations.put (uriStartString, catalog);
+
+           //
+           // NON-DELEGATING approach to modularity
+           //
+           } else if ("nextCatalog" == local) {
+               if (catalog == null) {
+                   error ("expecting <nextCatalog catalog=.../>");
+                   return;
+               }
+               if (cat.next == null)
+                   cat.next = new Vector ();
+               cat.next.addElement (catalog);
+
+           //
+           // EXTENSIONS from appendix E
+           //
+           } else if ("doctype" == local) {
+               String  name = atts.getValue ("name");
+               String  value = null;
+
+               if (name == null || uri == null) {
+                   error ("expecting <doctype name=... uri=.../>");
+                   return;
+               }
+               name = normalizeURI (name);
+               if (cat.doctypes == null)
+                   cat.doctypes = new Hashtable ();
+               else
+                   value = (String) cat.doctypes.get (name);
+               if (value != null) {
+                   if (!value.equals (uri))
+                       warn ("ignoring <doctype...> entry for "
+                           + uriStartString);
+               } else
+                   cat.doctypes.put (name, uri);
+           
+
+           //
+           // RESERVED ... ignore (like reserved attributes) but warn
+           //
+           } else {
+               warn ("ignoring unknown catalog element: " + local);
+               ignoreDepth++;
+           }
+       }
+
+       public void endElement (String uri, String local, String qName)
+       throws SAXException
+       {
+           if (ignoreDepth != 0)
+               ignoreDepth--;
+           else
+               bases.pop ();
+       }
+    }
+}
diff --git a/libjava/gnu/xml/util/XHTMLWriter.java b/libjava/gnu/xml/util/XHTMLWriter.java
new file mode 100644 (file)
index 0000000..c1502b7
--- /dev/null
+++ b/libjava/gnu/xml/util/XHTMLWriter.java
@@ -0,0 +1,112 @@
+/* XHTMLWriter.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.util;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+
+
+/**
+ * This extends XMLWriter to create a class which defaults to writing
+ * XHTML text, preferring the US-ASCII encoding.  It adds no unique
+ * functionality, only changing the defaults slightly to simplify writing
+ * XHTML processing components by providing a bean class whose properties
+ * have more convenient defaults.  An artifact of using the US-ASCII
+ * encoding is that no XML declaration is written, so that HTML tools
+ * that can't accept them will not become confused.  Components can treat
+ * the output as UTF-8, ISO-8859-1, or US-ASCII without incurring any
+ * data loss.
+ *
+ * @author David Brownell
+ */
+public class XHTMLWriter extends XMLWriter
+{
+    /**
+     * Constructs this handler with System.out used to write
+     * SAX events using the US-ASCII encoding, as XHTML.
+     */
+    public XHTMLWriter ()
+    throws IOException
+    {
+       this (System.out);
+    }
+
+    /**
+     * Constructs this handler such that the specified output stream
+     * is used to write SAX events in the US-ASCII encoding, as XHTML.
+     *
+     * @param out Where US-ASCII encoding of the stream of SAX
+     * events will be sent.
+     */
+    public XHTMLWriter (OutputStream out)
+    throws IOException
+    {
+       // not all JVMs understand "ASCII" as an encoding name, so
+       // we use 8859_1 (they all seem to handle that one) and
+       // make the echo handler filter out non-ASCII characters
+       this (new OutputStreamWriter (out, "8859_1"), "US-ASCII");
+    }
+
+    /**
+     * Constructs this handler such that the specified output stream
+     * is used to write SAX events as XHTML.
+     *
+     * @param out Where the stream of SAX events will be written.
+     */
+    public XHTMLWriter (Writer out)
+    {
+       this (out, null);
+    }
+
+    /**
+     * Constructs this handler such that the specified output stream
+     * is used to write SAX events as XHTML, labeled with the specified
+     * encoding.
+     *
+     * @param out Where the stream of SAX events will be written.
+     * @param encoding If non-null, this names the encoding to be
+     * placed in the encoding declaration.
+     */
+    public XHTMLWriter (Writer out, String encoding)
+    {
+       super (out, encoding);
+       setXhtml (true);
+    }
+}
diff --git a/libjava/gnu/xml/util/XMLWriter.java b/libjava/gnu/xml/util/XMLWriter.java
new file mode 100644 (file)
index 0000000..feb9e4f
--- /dev/null
+++ b/libjava/gnu/xml/util/XMLWriter.java
@@ -0,0 +1,1927 @@
+/* XMLWriter.java -- 
+   Copyright (C) 1999,2000,2001 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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.util;
+
+import java.io.BufferedWriter;
+import java.io.CharConversionException;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.Stack;
+
+import org.xml.sax.*;
+import org.xml.sax.ext.*;
+import org.xml.sax.helpers.*;
+
+
+/**
+ * This class is a SAX handler which writes all its input as a well formed
+ * XML or XHTML document.  If driven using SAX2 events, this output may
+ * include a recreated document type declaration, subject to limitations
+ * of SAX (no internal subset exposed) or DOM (the important declarations,
+ * with their documentation, are discarded).
+ *
+ * <p> By default, text is generated "as-is", but some optional modes
+ * are supported.  Pretty-printing is supported, to make life easier
+ * for people reading the output.  XHTML (1.0) output has can be made
+ * particularly pretty; all the built-in character entities are known.
+ * Canonical XML can also be generated, assuming the input is properly
+ * formed.
+ *
+ * <hr>
+ *
+ * <p> Some of the methods on this class are intended for applications to
+ * use directly, rather than as pure SAX2 event callbacks.  Some of those
+ * methods access the JavaBeans properties (used to tweak output formats,
+ * for example canonicalization and pretty printing).  Subclasses
+ * are expected to add new behaviors, not to modify current behavior, so
+ * many such methods are final.</p>
+ *
+ * <p> The <em>write*()</em> methods may be slightly simpler for some
+ * applications to use than direct callbacks.  For example, they support
+ * a simple policy for encoding data items as the content of a single element.
+ *
+ * <p> To reuse an XMLWriter you must provide it with a new Writer, since
+ * this handler closes the writer it was given as part of its endDocument()
+ * handling.  (XML documents have an end of input, and the way to encode
+ * that on a stream is to close it.) </p>
+ *
+ * <hr>
+ *
+ * <p> Note that any relative URIs in the source document, as found in
+ * entity and notation declarations, ought to have been fully resolved by
+ * the parser providing events to this handler.  This means that the
+ * output text should only have fully resolved URIs, which may not be
+ * the desired behavior in cases where later binding is desired. </p>
+ *
+ * <p> <em>Note that due to SAX2 defaults, you may need to manually
+ * ensure that the input events are XML-conformant with respect to namespace
+ * prefixes and declarations.  {@link gnu.xml.pipeline.NSFilter} is
+ * one solution to this problem, in the context of processing pipelines.</em>
+ * Something as simple as connecting this handler to a parser might not
+ * generate the correct output.  Another workaround is to ensure that the
+ * <em>namespace-prefixes</em> feature is always set to true, if you're
+ * hooking this directly up to some XMLReader implementation.
+ *
+ * @see gnu.xml.pipeline.TextConsumer
+ *
+ * @author David Brownell
+ */
+public class XMLWriter
+    implements ContentHandler, LexicalHandler, DTDHandler, DeclHandler
+{
+    // text prints/escapes differently depending on context
+    // CTX_ENTITY ... entity literal value
+    // CTX_ATTRIBUTE ... attribute literal value
+    // CTX_CONTENT ... content of an element
+    // CTX_UNPARSED ... CDATA, comment, PI, names, etc
+    //  CTX_NAME ... name or nmtoken, no escapes possible
+    private static final int   CTX_ENTITY = 1;
+    private static final int   CTX_ATTRIBUTE = 2;
+    private static final int   CTX_CONTENT = 3;
+    private static final int   CTX_UNPARSED = 4;
+    private static final int   CTX_NAME = 5;
+
+// FIXME: names (element, attribute, PI, notation, etc) are not
+// currently written out with range checks (escapeChars).
+// In non-XHTML, some names can't be directly written; panic!
+
+    private static String      sysEOL;
+
+    static {
+       try {
+           sysEOL = System.getProperty ("line.separator", "\n");
+
+           // don't use the system's EOL if it's illegal XML.
+           if (!isLineEnd (sysEOL))
+               sysEOL = "\n";
+
+       } catch (SecurityException e) {
+           sysEOL = "\n";
+       }
+    }
+
+    private static boolean isLineEnd (String eol)
+    {
+       return "\n".equals (eol)
+                   || "\r".equals (eol)
+                   || "\r\n".equals (eol);
+    }
+
+    private Writer             out;
+    private boolean            inCDATA;
+    private int                        elementNestLevel;
+    private String             eol = sysEOL;
+
+    private short              dangerMask;
+    private StringBuffer       stringBuf;
+    private Locator            locator;
+    private ErrorHandler       errHandler;
+
+    private boolean            expandingEntities = false;
+    private int                        entityNestLevel;
+    private boolean            xhtml;
+    private boolean            startedDoctype;
+    private String             encoding;
+
+    private boolean            canonical;
+    private boolean            inDoctype;
+    private boolean            inEpilogue;
+
+    // pretty printing controls
+    private boolean            prettyPrinting;
+    private int                        column;
+    private boolean            noWrap;
+    private Stack              space = new Stack ();
+
+    // this is not a hard'n'fast rule -- longer lines are OK,
+    // but are to be avoided.  Here, prettyprinting is more to
+    // show structure "cleanly" than to be precise about it.
+    // better to have ragged layout than one line 24Kb long.
+    private static final int   lineLength = 75;
+
+
+    /**
+     * Constructs this handler with System.out used to write SAX events
+     * using the UTF-8 encoding.  Avoid using this except when you know
+     * it's safe to close System.out at the end of the document.
+     */
+    public XMLWriter () throws IOException
+       { this (System.out); }
+
+    /**
+     * Constructs a handler which writes all input to the output stream
+     * in the UTF-8 encoding, and closes it when endDocument is called.
+     * (Yes it's annoying that this throws an exception -- but there's
+     * really no way around it, since it's barely possible a JDK may
+     * exist somewhere that doesn't know how to emit UTF-8.)
+     */
+    public XMLWriter (OutputStream out) throws IOException
+    {
+       this (new OutputStreamWriter (out, "UTF8"));
+    }
+
+    /**
+     * Constructs a handler which writes all input to the writer, and then
+     * closes the writer when the document ends.  If an XML declaration is
+     * written onto the output, and this class can determine the name of
+     * the character encoding for this writer, that encoding name will be
+     * included in the XML declaration.
+     *
+     * <P> See the description of the constructor which takes an encoding
+     * name for imporant information about selection of encodings.
+     *
+     * @param writer XML text is written to this writer.
+     */
+    public XMLWriter (Writer writer)
+    {
+       this (writer, null);
+    }
+
+    /**
+     * Constructs a handler which writes all input to the writer, and then
+     * closes the writer when the document ends.  If an XML declaration is
+     * written onto the output, this class will use the specified encoding
+     * name in that declaration.  If no encoding name is specified, no
+     * encoding name will be declared unless this class can otherwise
+     * determine the name of the character encoding for this writer.
+     *
+     * <P> At this time, only the UTF-8 ("UTF8") and UTF-16 ("Unicode")
+     * output encodings are fully lossless with respect to XML data.  If you
+     * use any other encoding you risk having your data be silently mangled
+     * on output, as the standard Java character encoding subsystem silently
+     * maps non-encodable characters to a question mark ("?") and will not
+     * report such errors to applications.
+     *
+     * <p> For a few other encodings the risk can be reduced. If the writer is
+     * a java.io.OutputStreamWriter, and uses either the ISO-8859-1 ("8859_1",
+     * "ISO8859_1", etc) or US-ASCII ("ASCII") encodings, content which
+     * can't be encoded in those encodings will be written safely.  Where
+     * relevant, the XHTML entity names will be used; otherwise, numeric
+     * character references will be emitted.
+     *
+     * <P> However, there remain a number of cases where substituting such
+     * entity or character references is not an option.  Such references are
+     * not usable within a DTD, comment, PI, or CDATA section.  Neither may
+     * they be used when element, attribute, entity, or notation names have
+     * the problematic characters.
+     *
+     * @param writer XML text is written to this writer.
+     * @param encoding if non-null, and an XML declaration is written,
+     * this is the name that will be used for the character encoding.
+     */
+    public XMLWriter (Writer writer, String encoding)
+    {
+       setWriter (writer, encoding);
+    }
+    
+    private void setEncoding (String encoding)
+    {
+       if (encoding == null && out instanceof OutputStreamWriter)
+           encoding = ((OutputStreamWriter)out).getEncoding ();
+
+       if (encoding != null) {
+           encoding = encoding.toUpperCase ();
+
+           // Use official encoding names where we know them,
+           // avoiding the Java-only names.  When using common
+           // encodings where we can easily tell if characters
+           // are out of range, we'll escape out-of-range
+           // characters using character refs for safety.
+
+           // I _think_ these are all the main synonyms for these!
+           if ("UTF8".equals (encoding)) {
+               encoding = "UTF-8";
+           } else if ("US-ASCII".equals (encoding)
+                   || "ASCII".equals (encoding)) {
+               dangerMask = (short) 0xff80;
+               encoding = "US-ASCII";
+           } else if ("ISO-8859-1".equals (encoding)
+                   || "8859_1".equals (encoding)
+                   || "ISO8859_1".equals (encoding)) {
+               dangerMask = (short) 0xff00;
+               encoding = "ISO-8859-1";
+           } else if ("UNICODE".equals (encoding)
+                   || "UNICODE-BIG".equals (encoding)
+                   || "UNICODE-LITTLE".equals (encoding)) {
+               encoding = "UTF-16";
+
+               // TODO: UTF-16BE, UTF-16LE ... no BOM; what
+               // release of JDK supports those Unicode names?
+           }
+
+           if (dangerMask != 0)
+               stringBuf = new StringBuffer ();
+       }
+
+       this.encoding = encoding;
+    }
+
+
+    /**
+     * Resets the handler to write a new text document.
+     *
+     * @param writer XML text is written to this writer.
+     * @param encoding if non-null, and an XML declaration is written,
+     * this is the name that will be used for the character encoding.
+     *
+     * @exception IllegalStateException if the current
+     * document hasn't yet ended (with {@link #endDocument})
+     */
+    final public void setWriter (Writer writer, String encoding)
+    {
+       if (out != null)
+           throw new IllegalStateException (
+               "can't change stream in mid course");
+       out = writer;
+       if (out != null)
+           setEncoding (encoding);
+       if (!(out instanceof BufferedWriter))
+           out = new BufferedWriter (out);
+       space.push ("default");
+    }
+
+    /**
+     * Assigns the line ending style to be used on output.
+     * @param eolString null to use the system default; else
+     * "\n", "\r", or "\r\n".
+     */
+    final public void setEOL (String eolString)
+    {
+       if (eolString == null)
+           eol = sysEOL;
+       else if (!isLineEnd (eolString))
+           eol = eolString;
+       else
+           throw new IllegalArgumentException (eolString);
+    }
+
+    /**
+     * Assigns the error handler to be used to present most fatal
+     * errors.
+     */
+    public void setErrorHandler (ErrorHandler handler)
+    {
+       errHandler = handler;
+    }
+
+    /**
+     * Used internally and by subclasses, this encapsulates the logic
+     * involved in reporting fatal errors.  It uses locator information
+     * for good diagnostics, if available, and gives the application's
+     * ErrorHandler the opportunity to handle the error before throwing
+     * an exception.
+     */
+    protected void fatal (String message, Exception e)
+    throws SAXException
+    {
+       SAXParseException       x;
+
+       if (locator == null)
+           x = new SAXParseException (message, null, null, -1, -1, e);
+       else
+           x = new SAXParseException (message, locator, e);
+       if (errHandler != null)
+           errHandler.fatalError (x);
+       throw x;
+    }
+
+
+    // JavaBeans properties
+
+    /**
+     * Controls whether the output should attempt to follow the "transitional"
+     * XHTML rules so that it meets the "HTML Compatibility Guidelines"
+     * appendix in the XHTML specification.  A "transitional" Document Type
+     * Declaration (DTD) is placed near the beginning of the output document,
+     * instead of whatever DTD would otherwise have been placed there, and
+     * XHTML empty elements are printed specially.  When writing text in
+     * US-ASCII or ISO-8859-1 encodings, the predefined XHTML internal
+     * entity names are used (in preference to character references) when
+     * writing content characters which can't be expressed in those encodings.
+     *
+     * <p> When this option is enabled, it is the caller's responsibility
+     * to ensure that the input is otherwise valid as XHTML.  Things to
+     * be careful of in all cases, as described in the appendix referenced
+     * above, include:  <ul>
+     *
+     * <li> Element and attribute names must be in lower case, both
+     *         in the document and in any CSS style sheet.
+     * <li> All XML constructs must be valid as defined by the XHTML
+     *         "transitional" DTD (including all familiar constructs,
+     *         even deprecated ones).
+     * <li> The root element must be "html".
+     * <li> Elements that must be empty (such as <em>&lt;br&gt;</em>
+     *         must have no content.
+     * <li> Use both <em>lang</em> and <em>xml:lang</em> attributes
+     *         when specifying language.
+     * <li> Similarly, use both <em>id</em> and <em>name</em> attributes
+     *         when defining elements that may be referred to through
+     *         URI fragment identifiers ... and make sure that the
+     *         value is a legal NMTOKEN, since not all such HTML 4.0
+     *         identifiers are valid in XML.
+     * <li> Be careful with character encodings; make sure you provide
+     *         a <em>&lt;meta http-equiv="Content-type"
+     *         content="text/xml;charset=..." /&gt;</em> element in
+     *         the HTML "head" element, naming the same encoding
+     *         used to create this handler.  Also, if that encoding
+     *         is anything other than US-ASCII, make sure that if
+     *         the document is given a MIME content type, it has
+     *         a <em>charset=...</em> attribute with that encoding.
+     * </ul>
+     *
+     * <p> Additionally, some of the oldest browsers have additional
+     * quirks, to address with guidelines such as: <ul>
+     *
+     * <li> Processing instructions may be rendered, so avoid them.
+     *         (Similarly for an XML declaration.)
+     * <li> Embedded style sheets and scripts should not contain XML
+     *         markup delimiters:  &amp;, &lt;, and ]]&gt; are trouble.
+     * <li> Attribute values should not have line breaks or multiple
+     *         consecutive white space characters.
+     * <li> Use no more than one of the deprecated (transitional)
+     *         <em>&lt;isindex&gt;</em> elements.
+     * <li> Some boolean attributes (such as <em>compact, checked,
+     *         disabled, readonly, selected,</em> and more) confuse
+     *         some browsers, since they only understand minimized
+     *         versions which are illegal in XML.
+     * </ul>
+     *
+     * <p> Also, some characteristics of the resulting output may be
+     * a function of whether the document is later given a MIME
+     * content type of <em>text/html</em> rather than one indicating
+     * XML (<em>application/xml</em> or <em>text/xml</em>).  Worse,
+     * some browsers ignore MIME content types and prefer to rely URI
+     * name suffixes -- so an "index.xml" could always be XML, never
+     * XHTML, no matter its MIME type.
+     */
+    final public void setXhtml (boolean value)
+    {
+       if (locator != null)
+           throw new IllegalStateException ("started parsing");
+       xhtml = value;
+       if (xhtml)
+           canonical = false;
+    }
+
+    /**
+     * Returns true if the output attempts to echo the input following
+     * "transitional" XHTML rules and matching the "HTML Compatibility
+     * Guidelines" so that an HTML version 3 browser can read the output
+     * as HTML; returns false (the default) othewise.
+     */
+    final public boolean isXhtml ()
+    {
+       return xhtml;
+    }
+
+    /**
+     * Controls whether the output text contains references to
+     * entities (the default), or instead contains the expanded
+     * values of those entities.
+     */
+    final public void setExpandingEntities (boolean value)
+    {
+       if (locator != null)
+           throw new IllegalStateException ("started parsing");
+       expandingEntities = value;
+       if (!expandingEntities)
+           canonical = false;
+    }
+
+    /**
+     * Returns true if the output will have no entity references;
+     * returns false (the default) otherwise.
+     */
+    final public boolean isExpandingEntities ()
+    {
+       return expandingEntities;
+    }
+
+    /**
+     * Controls pretty-printing, which by default is not enabled
+     * (and currently is most useful for XHTML output).
+     * Pretty printing enables structural indentation, sorting of attributes
+     * by name, line wrapping, and potentially other mechanisms for making
+     * output more or less readable.
+     *
+     * <p> At this writing, structural indentation and line wrapping are
+     * enabled when pretty printing is enabled and the <em>xml:space</em>
+     * attribute has the value <em>default</em> (its other legal value is
+     * <em>preserve</em>, as defined in the XML specification).  The three
+     * XHTML element types which use another value are recognized by their
+     * names (namespaces are ignored).
+     *
+     * <p> Also, for the record, the "pretty" aspect of printing here
+     * is more to provide basic structure on outputs that would otherwise
+     * risk being a single long line of text.  For now, expect the
+     * structure to be ragged ... unless you'd like to submit a patch
+     * to make this be more strictly formatted!
+     *
+     * @exception IllegalStateException thrown if this method is invoked
+     * after output has begun.
+     */
+    final public void setPrettyPrinting (boolean value)
+    {
+       if (locator != null)
+           throw new IllegalStateException ("started parsing");
+       prettyPrinting = value;
+       if (prettyPrinting)
+           canonical = false;
+    }
+
+    /**
+     * Returns value of flag controlling pretty printing.
+     */
+    final public boolean isPrettyPrinting ()
+    {
+       return prettyPrinting;
+    }
+
+
+    /**
+     * Sets the output style to be canonicalized.  Input events must
+     * meet requirements that are slightly more stringent than the
+     * basic well-formedness ones, and include:  <ul>
+     *
+     * <li> Namespace prefixes must not have been changed from those
+     * in the original document.  (This may only be ensured by setting
+     * the SAX2 XMLReader <em>namespace-prefixes</em> feature flag;
+     * by default, it is cleared.)
+     *
+     * <li> Redundant namespace declaration attributes have been
+     * removed.  (If an ancestor element defines a namespace prefix
+     * and that declaration hasn't been overriden, an element must
+     * not redeclare it.)
+     *
+     * <li> If comments are not to be included in the canonical output,
+     * they must first be removed from the input event stream; this
+     * <em>Canonical XML with comments</em> by default.
+     *
+     * <li> If the input character encoding was not UCS-based, the
+     * character data must have been normalized using Unicode
+     * Normalization Form C.  (UTF-8 and UTF-16 are UCS-based.)
+     *
+     * <li> Attribute values must have been normalized, as is done
+     * by any conformant XML processor which processes all external
+     * parameter entities.
+     *
+     * <li> Similarly, attribute value defaulting has been performed.
+     *
+     * </ul>
+     *
+     * <p> Note that fragments of XML documents, as specified by an XPath
+     * node set, may be canonicalized.  In such cases, elements may need
+     * some fixup (for <em>xml:*</em> attributes and application-specific
+     * context).
+     *
+     * @exception IllegalArgumentException if the output encoding
+     * is anything other than UTF-8.
+     */
+    final public void setCanonical (boolean value)
+    {
+       if (value && !"UTF-8".equals (encoding))
+           throw new IllegalArgumentException ("encoding != UTF-8");
+       canonical = value;
+       if (canonical) {
+           prettyPrinting = xhtml = false;
+           expandingEntities = true;
+           eol = "\n";
+       }
+    }
+
+
+    /**
+     * Returns value of flag controlling canonical output.
+     */
+    final public boolean isCanonical ()
+    {
+       return canonical;
+    }
+
+
+    /**
+     * Flushes the output stream.  When this handler is used in long lived
+     * pipelines, it can be important to flush buffered state, for example
+     * so that it can reach the disk as part of a state checkpoint.
+     */
+    final public void flush ()
+    throws IOException
+    {
+       if (out != null)
+           out.flush ();
+    }
+
+
+    // convenience routines
+
+// FIXME:  probably want a subclass that holds a lot of these...
+// and maybe more!
+    
+    /**
+     * Writes the string as if characters() had been called on the contents
+     * of the string.  This is particularly useful when applications act as
+     * producers and write data directly to event consumers.
+     */
+    final public void write (String data)
+    throws SAXException
+    {
+       char    buf [] = data.toCharArray ();
+       characters (buf, 0, buf.length);
+    }
+
+
+    /**
+     * Writes an element that has content consisting of a single string.
+     * @see #writeEmptyElement
+     * @see #startElement
+     */
+    public void writeElement (
+       String uri,
+       String localName,
+       String qName,
+       Attributes atts,
+       String content
+    ) throws SAXException
+    {
+       if (content == null || content.length () == 0) {
+           writeEmptyElement (uri, localName, qName, atts);
+           return;
+       }
+       startElement (uri, localName, qName, atts);
+       char chars [] = content.toCharArray ();
+       characters (chars, 0, chars.length);
+       endElement (uri, localName, qName);
+    }
+
+
+    /**
+     * Writes an element that has content consisting of a single integer,
+     * encoded as a decimal string.
+     * @see #writeEmptyElement
+     * @see #startElement
+     */
+    public void writeElement (
+       String uri,
+       String localName,
+       String qName,
+       Attributes atts,
+       int content
+    ) throws SAXException
+    {
+       writeElement (uri, localName, qName, atts, Integer.toString (content));
+    }
+
+
+    // SAX1 ContentHandler
+    /** <b>SAX1</b>:  provides parser status information */
+    final public void setDocumentLocator (Locator l)
+    {
+       locator = l;
+    }
+
+
+    // URL for dtd that validates against all normal HTML constructs
+    private static final String xhtmlFullDTD =
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";
+
+    
+    /**
+     * <b>SAX1</b>:  indicates the beginning of a document parse.
+     * If you're writing (well formed) fragments of XML, neither
+     * this nor endDocument should be called.
+     */
+    // NOT final
+    public void startDocument ()
+    throws SAXException
+    {
+       try {
+           if (out == null)
+               throw new IllegalStateException (
+                   "null Writer given to XMLWriter");
+
+           // Not all parsers provide the locator we want; this also
+           // flags whether events are being sent to this object yet.
+           // We could only have this one call if we only printed whole
+           // documents ... but we also print fragments, so most of the
+           // callbacks here replicate this test.
+
+           if (locator == null)
+               locator = new LocatorImpl ();
+           
+           // Unless the data is in US-ASCII or we're canonicalizing, write
+           // the XML declaration if we know the encoding.  US-ASCII won't
+           // normally get mangled by web server confusion about the
+           // character encodings used.  Plus, it's an easy way to
+           // ensure we can write ASCII that's unlikely to confuse
+           // elderly HTML parsers.
+
+           if (!canonical
+                   && dangerMask != (short) 0xff80
+                   && encoding != null) {
+               rawWrite ("<?xml version='1.0'");
+               rawWrite (" encoding='" + encoding + "'");
+               rawWrite ("?>");
+               newline ();
+           }
+
+           if (xhtml) {
+
+               rawWrite ("<!DOCTYPE html PUBLIC");
+               newline ();
+               rawWrite ("  '-//W3C//DTD XHTML 1.0 Transitional//EN'");
+               newline ();
+               rawWrite ("  '");
+                   // NOTE:  URL (above) matches the REC
+               rawWrite (xhtmlFullDTD);
+               rawWrite ("'>");
+               newline ();
+               newline ();
+
+               // fake the rest of the handler into ignoring
+               // everything until the root element, so any
+               // XHTML DTD comments, PIs, etc are ignored
+               startedDoctype = true;
+           }
+
+           entityNestLevel = 0;
+
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    /**
+     * <b>SAX1</b>:  indicates the completion of a parse.
+     * Note that all complete SAX event streams make this call, even
+     * if an error is reported during a parse.
+     */
+    // NOT final
+    public void endDocument ()
+    throws SAXException
+    {
+       try {
+           if (!canonical) {
+               newline ();
+               newline ();
+           }
+           out.close ();
+           out = null;
+           locator = null;
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    // XHTML elements declared as EMPTY print differently
+    final private static boolean isEmptyElementTag (String tag)
+    {
+       switch (tag.charAt (0)) {
+         case 'a':     return "area".equals (tag);
+         case 'b':     return "base".equals (tag)
+                           || "basefont".equals (tag)
+                           || "br".equals (tag);
+         case 'c':     return "col".equals (tag);
+         case 'f':     return "frame".equals (tag);
+         case 'h':     return "hr".equals (tag);
+         case 'i':     return "img".equals (tag)
+                           || "input".equals (tag)
+                           || "isindex".equals (tag);
+         case 'l':     return "link".equals (tag);
+         case 'm':     return "meta".equals (tag);
+         case 'p':     return "param".equals (tag);
+       }
+       return false;
+    }
+
+    private static boolean indentBefore (String tag)
+    {
+       // basically indent before block content
+       // and within structure like tables, lists
+       switch (tag.charAt (0)) {
+         case 'a':     return "applet".equals (tag);
+         case 'b':     return "body".equals (tag)
+                           || "blockquote".equals (tag);
+         case 'c':     return "center".equals (tag);
+         case 'f':     return "frame".equals (tag)
+                           || "frameset".equals (tag);
+         case 'h':     return "head".equals (tag);
+         case 'm':     return "meta".equals (tag);
+         case 'o':     return "object".equals (tag);
+         case 'p':     return "param".equals (tag)
+                           || "pre".equals (tag);
+         case 's':     return "style".equals (tag);
+         case 't':     return "title".equals (tag)
+                           || "td".equals (tag)
+                           || "th".equals (tag);
+       }
+       // ... but not inline elements like "em", "b", "font"
+       return false;
+    }
+
+    private static boolean spaceBefore (String tag)
+    {
+       // blank line AND INDENT before certain structural content
+       switch (tag.charAt (0)) {
+         case 'h':     return "h1".equals (tag)
+                           || "h2".equals (tag)
+                           || "h3".equals (tag)
+                           || "h4".equals (tag)
+                           || "h5".equals (tag)
+                           || "h6".equals (tag)
+                           || "hr".equals (tag);
+         case 'l':     return "li".equals (tag);
+         case 'o':     return "ol".equals (tag);
+         case 'p':     return "p".equals (tag);
+         case 't':     return "table".equals (tag)
+                           || "tr".equals (tag);
+         case 'u':     return "ul".equals (tag);
+       }
+       return false;
+    }
+
+    // XHTML DTDs say these three have xml:space="preserve"
+    private static boolean spacePreserve (String tag)
+    {
+       return "pre".equals (tag)
+               || "style".equals (tag)
+               || "script".equals (tag);
+    }
+
+    /**
+     * <b>SAX2</b>:  ignored.
+     */
+    final public void startPrefixMapping (String prefix, String uri)
+       {}
+
+    /**
+     * <b>SAX2</b>:  ignored.
+     */
+    final public void endPrefixMapping (String prefix)
+       {}
+
+    private void writeStartTag (
+       String name,
+       Attributes atts,
+       boolean isEmpty
+    ) throws SAXException, IOException
+    {
+       rawWrite ('<');
+       rawWrite (name);
+
+       // write out attributes ... sorting is particularly useful
+       // with output that's been heavily defaulted.
+       if (atts != null && atts.getLength () != 0) {
+
+           // Set up to write, with optional sorting
+           int         indices [] = new int [atts.getLength ()];
+
+           for (int i= 0; i < indices.length; i++)
+               indices [i] = i;
+           
+           // optionally sort
+
+// FIXME:  canon xml demands xmlns nodes go first,
+// and sorting by URI first (empty first) then localname
+// it should maybe use a different sort
+
+           if (canonical || prettyPrinting) {
+
+               // insertion sort by attribute name
+               for (int i = 1; i < indices.length; i++) {
+                   int n = indices [i], j;
+                   String      s = atts.getQName (n);
+
+                   for (j = i - 1; j >= 0; j--) {
+                       if (s.compareTo (atts.getQName (indices [j]))
+                               >= 0)
+                           break;
+                       indices [j + 1] = indices [j];
+                   }
+                   indices [j + 1] = n;
+               }
+           }
+
+           // write, sorted or no
+           for (int i= 0; i < indices.length; i++) {
+               String  s = atts.getQName (indices [i]);
+
+                   if (s == null || "".equals (s))
+                       throw new IllegalArgumentException ("no XML name");
+               rawWrite (" ");
+               rawWrite (s);
+               rawWrite ("=");
+               writeQuotedValue (atts.getValue (indices [i]),
+                   CTX_ATTRIBUTE);
+           }
+       }
+       if (isEmpty)
+           rawWrite (" /");
+       rawWrite ('>');
+    }
+
+    /**
+     * <b>SAX2</b>:  indicates the start of an element.
+     * When XHTML is in use, avoid attribute values with
+     * line breaks or multiple whitespace characters, since
+     * not all user agents handle them correctly.
+     */
+    final public void startElement (
+       String uri,
+       String localName,
+       String qName,
+       Attributes atts
+    ) throws SAXException
+    {
+       startedDoctype = false;
+
+       if (locator == null)
+           locator = new LocatorImpl ();
+           
+       if (qName == null || "".equals (qName))
+           throw new IllegalArgumentException ("no XML name");
+
+       try {
+           if (entityNestLevel != 0)
+               return;
+           if (prettyPrinting) {
+               String whitespace = null;
+
+               if (xhtml && spacePreserve (qName))
+                   whitespace = "preserve";
+               else if (atts != null)
+                   whitespace = atts.getValue ("xml:space");
+               if (whitespace == null)
+                   whitespace = (String) space.peek ();
+               space.push (whitespace);
+
+               if ("default".equals (whitespace)) {
+                   if (xhtml) {
+                       if (spaceBefore (qName)) {
+                           newline ();
+                           doIndent ();
+                       } else if (indentBefore (qName))
+                           doIndent ();
+                       // else it's inlined, modulo line length
+                       // FIXME: incrementing element nest level
+                       // for inlined elements causes ugliness
+                   } else
+                       doIndent ();
+               }
+           }
+           elementNestLevel++;
+           writeStartTag (qName, atts, xhtml && isEmptyElementTag (qName));
+
+           if (xhtml) {
+// FIXME: if this is an XHTML "pre" element, turn
+// off automatic wrapping.
+           }
+
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    /**
+     * Writes an empty element.
+     * @see #startElement
+     */
+    public void writeEmptyElement (
+       String uri,
+       String localName,
+       String qName,
+       Attributes atts
+    ) throws SAXException
+    {
+       if (canonical) {
+           startElement (uri, localName, qName, atts);
+           endElement (uri, localName, qName);
+       } else {
+           try {
+               writeStartTag (qName, atts, true);
+           } catch (IOException e) {
+               fatal ("can't write", e);
+           }
+       }
+    }
+
+
+    /** <b>SAX2</b>:  indicates the end of an element */
+    final public void endElement (String uri, String localName, String qName)
+    throws SAXException
+    {
+       if (qName == null || "".equals (qName))
+           throw new IllegalArgumentException ("no XML name");
+
+       try {
+           elementNestLevel--;
+           if (entityNestLevel != 0)
+               return;
+           if (xhtml && isEmptyElementTag (qName))
+               return;
+           rawWrite ("</");
+           rawWrite (qName);
+           rawWrite ('>');
+
+           if (prettyPrinting) {
+               if (!space.empty ())
+                   space.pop ();
+               else
+                   fatal ("stack discipline", null);
+           }
+           if (elementNestLevel == 0)
+               inEpilogue = true;
+
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    /** <b>SAX1</b>:  reports content characters */
+    final public void characters (char ch [], int start, int length)
+    throws SAXException
+    {
+       if (locator == null)
+           locator = new LocatorImpl ();
+
+       try {
+           if (entityNestLevel != 0)
+               return;
+           if (inCDATA) {
+               escapeChars (ch, start, length, CTX_UNPARSED);
+           } else {
+               escapeChars (ch, start, length, CTX_CONTENT);
+           }
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    /** <b>SAX1</b>:  reports ignorable whitespace */
+    final public void ignorableWhitespace (char ch [], int start, int length)
+    throws SAXException
+    {
+       if (locator == null)
+           locator = new LocatorImpl ();
+
+       try {
+           if (entityNestLevel != 0)
+               return;
+           // don't forget to map NL to CRLF, CR, etc
+           escapeChars (ch, start, length, CTX_CONTENT);
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    /**
+     * <b>SAX1</b>:  reports a PI.
+     * This doesn't check for illegal target names, such as "xml" or "XML",
+     * or namespace-incompatible ones like "big:dog"; the caller is
+     * responsible for ensuring those names are legal.
+     */
+    final public void processingInstruction (String target, String data)
+    throws SAXException
+    {
+       if (locator == null)
+           locator = new LocatorImpl ();
+
+       // don't print internal subset for XHTML
+       if (xhtml && startedDoctype)
+           return;
+
+       // ancient HTML browsers might render these ... their loss.
+       // to prevent:  "if (xhtml) return;".
+
+       try {
+           if (entityNestLevel != 0)
+               return;
+           if (canonical && inEpilogue)
+               newline ();
+           rawWrite ("<?");
+           rawWrite (target);
+           rawWrite (' ');
+           escapeChars (data.toCharArray (), -1, -1, CTX_UNPARSED);
+           rawWrite ("?>");
+           if (elementNestLevel == 0 && !(canonical && inEpilogue))
+               newline ();
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    /** <b>SAX1</b>: indicates a non-expanded entity reference */
+    public void skippedEntity (String name)
+    throws SAXException
+    {
+       try {
+           rawWrite ("&");
+           rawWrite (name);
+           rawWrite (";");
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    // SAX2 LexicalHandler
+
+    /** <b>SAX2</b>:  called before parsing CDATA characters */
+    final public void startCDATA ()
+    throws SAXException
+    {
+       if (locator == null)
+           locator = new LocatorImpl ();
+       
+       if (canonical)
+           return;
+
+       try {
+           inCDATA = true;
+           if (entityNestLevel == 0)
+               rawWrite ("<![CDATA[");
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    /** <b>SAX2</b>:  called after parsing CDATA characters */
+    final public void endCDATA ()
+    throws SAXException
+    {
+       if (canonical)
+           return;
+
+       try {
+           inCDATA = false;
+           if (entityNestLevel == 0)
+               rawWrite ("]]>");
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    /**
+     * <b>SAX2</b>:  called when the doctype is partially parsed
+     * Note that this, like other doctype related calls, is ignored
+     * when XHTML is in use.
+     */
+    final public void startDTD (String name, String publicId, String systemId)
+    throws SAXException
+    {
+       if (locator == null)
+           locator = new LocatorImpl ();
+       if (xhtml)
+           return;
+       try {
+           inDoctype = startedDoctype = true;
+           if (canonical)
+               return;
+           rawWrite ("<!DOCTYPE ");
+           rawWrite (name);
+           rawWrite (' ');
+
+           if (!expandingEntities) {
+               if (publicId != null)
+                   rawWrite ("PUBLIC '" + publicId + "' '" + systemId + "' ");
+               else if (systemId != null)
+                   rawWrite ("SYSTEM '" + systemId + "' ");
+           }
+
+           rawWrite ('[');
+           newline ();
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    /** <b>SAX2</b>:  called after the doctype is parsed */
+    final public void endDTD ()
+    throws SAXException
+    {
+       inDoctype = false;
+       if (canonical || xhtml)
+           return;
+       try {
+           rawWrite ("]>");
+           newline ();
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    /**
+     * <b>SAX2</b>:  called before parsing a general entity in content
+     */
+    final public void startEntity (String name)
+    throws SAXException
+    {
+       try {
+           boolean     writeEOL = true;
+
+           // Predefined XHTML entities (for characters) will get
+           // mapped back later.
+           if (xhtml || expandingEntities)
+               return;
+
+           entityNestLevel++;
+           if (name.equals ("[dtd]"))
+               return;
+           if (entityNestLevel != 1)
+               return;
+           if (!name.startsWith ("%")) {
+               writeEOL = false;
+               rawWrite ('&');
+           }
+           rawWrite (name);
+           rawWrite (';');
+           if (writeEOL)
+               newline ();
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    /**
+     * <b>SAX2</b>:  called after parsing a general entity in content
+     */
+    final public void endEntity (String name)
+    throws SAXException
+    {
+       if (xhtml || expandingEntities)
+           return;
+       entityNestLevel--;
+    }
+
+    /**
+     * <b>SAX2</b>:  called when comments are parsed.
+     * When XHTML is used, the old HTML tradition of using comments
+     * to for inline CSS, or for JavaScript code is  discouraged.
+     * This is because XML processors are encouraged to discard, on
+     * the grounds that comments are for users (and perhaps text
+     * editors) not programs.  Instead, use external scripts
+     */
+    final public void comment (char ch [], int start, int length)
+    throws SAXException
+    {
+       if (locator == null)
+           locator = new LocatorImpl ();
+
+       // don't print internal subset for XHTML
+       if (xhtml && startedDoctype)
+           return;
+       // don't print comment in doctype for canon xml
+       if (canonical && inDoctype)
+           return;
+
+       try {
+           boolean indent;
+
+           if (prettyPrinting && space.empty ())
+               fatal ("stack discipline", null);
+           indent = prettyPrinting && "default".equals (space.peek ());
+           if (entityNestLevel != 0)
+               return;
+           if (indent)
+               doIndent ();
+           if (canonical && inEpilogue)
+               newline ();
+           rawWrite ("<!--");
+           escapeChars (ch, start, length, CTX_UNPARSED);
+           rawWrite ("-->");
+           if (indent)
+               doIndent ();
+           if (elementNestLevel == 0 && !(canonical && inEpilogue))
+               newline ();
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    // SAX1 DTDHandler
+
+    /** <b>SAX1</b>:  called on notation declarations */
+    final public void notationDecl (String name,
+       String publicId, String systemId)
+    throws SAXException
+    {
+       if (xhtml)
+           return;
+       try {
+           // At this time, only SAX2 callbacks start these.
+           if (!startedDoctype)
+               return;
+
+           if (entityNestLevel != 0)
+               return;
+           rawWrite ("<!NOTATION " + name + " ");
+           if (publicId != null)
+               rawWrite ("PUBLIC \"" + publicId + '"');
+           else
+               rawWrite ("SYSTEM ");
+           if (systemId != null)
+               rawWrite ('"' + systemId + '"');
+           rawWrite (">");
+           newline ();
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    /** <b>SAX1</b>:  called on unparsed entity declarations */
+    final public void unparsedEntityDecl (String name,
+       String publicId, String systemId,
+       String notationName)
+    throws SAXException
+    {
+       if (xhtml)
+           return;
+       try {
+           // At this time, only SAX2 callbacks start these.
+           if (!startedDoctype)  {
+               // FIXME: write to temporary buffer, and make the start
+               // of the root element write these declarations.
+               return;
+           }
+
+           if (entityNestLevel != 0)
+               return;
+           rawWrite ("<!ENTITY " + name + " ");
+           if (publicId != null)
+               rawWrite ("PUBLIC \"" + publicId + '"');
+           else
+               rawWrite ("SYSTEM ");
+           rawWrite ('"' + systemId + '"');
+           rawWrite (" NDATA " + notationName + ">");
+           newline ();
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    // SAX2 DeclHandler
+
+    /** <b>SAX2</b>:  called on attribute declarations */
+    final public void attributeDecl (String eName, String aName,
+           String type, String mode, String value)
+    throws SAXException
+    {
+       if (xhtml)
+           return;
+       try {
+           // At this time, only SAX2 callbacks start these.
+           if (!startedDoctype)
+               return;
+           if (entityNestLevel != 0)
+               return;
+           rawWrite ("<!ATTLIST " + eName + ' ' + aName + ' ');
+           rawWrite (type);
+           rawWrite (' ');
+           if (mode != null)
+               rawWrite (mode + ' ');
+           if (value != null) 
+               writeQuotedValue (value, CTX_ATTRIBUTE);
+           rawWrite ('>');
+           newline ();
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    /** <b>SAX2</b>:  called on element declarations */
+    final public void elementDecl (String name, String model)
+    throws SAXException
+    {
+       if (xhtml)
+           return;
+       try {
+           // At this time, only SAX2 callbacks start these.
+           if (!startedDoctype)
+               return;
+           if (entityNestLevel != 0)
+               return;
+           rawWrite ("<!ELEMENT " + name + ' ' + model + '>');
+           newline ();
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    /** <b>SAX2</b>:  called on external entity declarations */
+    final public void externalEntityDecl (
+       String name,
+       String publicId,
+       String systemId)
+    throws SAXException
+    {
+       if (xhtml)
+           return;
+       try {
+           // At this time, only SAX2 callbacks start these.
+           if (!startedDoctype)
+               return;
+           if (entityNestLevel != 0)
+               return;
+           rawWrite ("<!ENTITY ");
+           if (name.startsWith ("%")) {
+               rawWrite ("% ");
+               rawWrite (name.substring (1));
+           } else
+               rawWrite (name);
+           if (publicId != null)
+               rawWrite (" PUBLIC \"" + publicId + '"');
+           else
+               rawWrite (" SYSTEM ");
+           rawWrite ('"' + systemId + "\">");
+           newline ();
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    /** <b>SAX2</b>:  called on internal entity declarations */
+    final public void internalEntityDecl (String name, String value)
+    throws SAXException
+    {
+       if (xhtml)
+           return;
+       try {
+           // At this time, only SAX2 callbacks start these.
+           if (!startedDoctype)
+               return;
+           if (entityNestLevel != 0)
+               return;
+           rawWrite ("<!ENTITY ");
+           if (name.startsWith ("%")) {
+               rawWrite ("% ");
+               rawWrite (name.substring (1));
+           } else
+               rawWrite (name);
+           rawWrite (' ');
+           writeQuotedValue (value, CTX_ENTITY);
+           rawWrite ('>');
+           newline ();
+       } catch (IOException e) {
+           fatal ("can't write", e);
+       }
+    }
+
+    private void writeQuotedValue (String value, int code)
+    throws SAXException, IOException
+    {
+       char    buf [] = value.toCharArray ();
+       int     off = 0, len = buf.length;
+
+       // we can't add line breaks to attribute/entity/... values
+       noWrap = true;
+       rawWrite ('"');
+       escapeChars (buf, off, len, code);
+       rawWrite ('"');
+       noWrap = false;
+    }
+    
+    // From "HTMLlat1x.ent" ... names of entities for ISO-8859-1
+    // (Latin/1) characters, all codes:  160-255 (0xA0-0xFF).
+    // Codes 128-159 have no assigned values.
+    private static final String HTMLlat1x [] = {
+       // 160
+       "nbsp", "iexcl", "cent", "pound", "curren",
+       "yen", "brvbar", "sect", "uml", "copy",
+
+       // 170
+       "ordf", "laquo", "not", "shy", "reg",
+       "macr", "deg", "plusmn", "sup2", "sup3",
+
+       // 180
+       "acute", "micro", "para", "middot", "cedil",
+       "sup1", "ordm", "raquo", "frac14", "frac12",
+
+       // 190
+       "frac34", "iquest", "Agrave", "Aacute", "Acirc",
+       "Atilde", "Auml", "Aring", "AElig", "Ccedil",
+
+       // 200
+       "Egrave", "Eacute", "Ecirc", "Euml", "Igrave",
+       "Iacute", "Icirc", "Iuml", "ETH", "Ntilde",
+
+       // 210
+       "Ograve", "Oacute", "Ocirc", "Otilde", "Ouml",
+       "times", "Oslash", "Ugrave", "Uacute", "Ucirc",
+
+       // 220
+       "Uuml", "Yacute", "THORN", "szlig", "agrave",
+       "aacute", "acirc", "atilde", "auml", "aring",
+
+       // 230
+       "aelig", "ccedil", "egrave", "eacute", "ecirc",
+       "euml", "igrave", "iacute", "icirc", "iuml",
+
+       // 240
+       "eth", "ntilde", "ograve", "oacute", "ocirc",
+       "otilde", "ouml", "divide", "oslash", "ugrave",
+
+       // 250
+       "uacute", "ucirc", "uuml", "yacute", "thorn",
+       "yuml"
+    };
+
+    // From "HTMLsymbolx.ent" ... some of the symbols that
+    // we can conveniently handle.  Entities for the Greek.
+    // alphabet (upper and lower cases) are compact.
+    private static final String HTMLsymbolx_GR [] = {
+       // 913
+       "Alpha", "Beta", "Gamma", "Delta", "Epsilon",
+       "Zeta", "Eta", "Theta", "Iota", "Kappa",
+
+       // 923
+       "Lambda", "Mu", "Nu", "Xi", "Omicron",
+       "Pi", "Rho", null, "Sigma", "Tau",
+
+       // 933
+       "Upsilon", "Phi", "Chi", "Psi", "Omega"
+    };
+
+    private static final String HTMLsymbolx_gr [] = {
+       // 945
+       "alpha", "beta", "gamma", "delta", "epsilon",
+       "zeta", "eta", "theta", "iota", "kappa",
+
+       // 955
+       "lambda", "mu", "nu", "xi", "omicron",
+       "pi", "rho", "sigmaf", "sigma", "tau",
+
+       // 965
+       "upsilon", "phi", "chi", "psi", "omega"
+    };
+
+
+    // General routine to write text and substitute predefined
+    // entities (XML, and a special case for XHTML) as needed.
+    private void escapeChars (char buf [], int off, int len, int code)
+    throws SAXException, IOException
+    {
+       int     first = 0;
+
+       if (off < 0) {
+           off = 0;
+           len = buf.length;
+       }
+       for (int i = 0; i < len; i++) {
+           String      esc;
+           char        c = buf [off + i];
+
+           switch (c) {
+             // Note that CTX_ATTRIBUTE isn't explicitly tested here;
+             // all syntax delimiters are escaped in CTX_ATTRIBUTE,
+             // otherwise it's similar to CTX_CONTENT
+
+             // ampersand flags entity references; entity replacement
+             // text has unexpanded references, other text doesn't.
+             case '&':
+               if (code == CTX_ENTITY || code == CTX_UNPARSED)
+                   continue;
+               esc = "amp";
+               break;
+
+             // attributes and text may NOT have literal '<', but
+             // entities may have markup constructs
+             case '<':
+               if (code == CTX_ENTITY || code == CTX_UNPARSED)
+                   continue;
+               esc = "lt";
+               break;
+
+             // as above re markup constructs; but otherwise
+             // except when canonicalizing, this is for consistency
+             case '>':
+               if (code == CTX_ENTITY || code == CTX_UNPARSED)
+                   continue;
+               esc = "gt";
+               break;
+             case '\'':
+               if (code == CTX_CONTENT || code == CTX_UNPARSED)
+                   continue;
+               if (canonical)
+                   continue;
+               esc = "apos";
+               break;
+
+             // needed when printing quoted attribute/entity values
+             case '"':
+               if (code == CTX_CONTENT || code == CTX_UNPARSED)
+                   continue;
+               esc = "quot";
+               break;
+
+             // make line ends work per host OS convention
+             case '\n':
+               esc = eol;
+               break;
+
+             //
+             // No other characters NEED special treatment ... except
+             // for encoding-specific issues, like whether the character
+             // can really be represented in that encoding.
+             //
+             default:
+               //
+               // There are characters we can never write safely; getting
+               // them is an error.
+               //
+               //   (a) They're never legal in XML ... detected by range 
+               //      checks, and (eventually) by remerging surrogate
+               //      pairs on output.  (Easy error for apps to prevent.)
+               //
+               //   (b) This encoding can't represent them, and we
+               //      can't make reference substitution (e.g. inside
+               //      CDATA sections, names, PI data, etc).  (Hard for
+               //      apps to prevent, except by using UTF-8 or UTF-16
+               //      as their output encoding.)
+               //
+               // We know a very little bit about what characters
+               // the US-ASCII and ISO-8859-1 encodings support.  For
+               // other encodings we can't detect the second type of
+               // error at all.  (Never an issue for UTF-8 or UTF-16.)
+               //
+
+// FIXME:  CR in CDATA is an error; in text, turn to a char ref
+
+// FIXME:  CR/LF/TAB in attributes should become char refs
+
+               if ((c > 0xfffd)
+                       || ((c < 0x0020) && !((c == 0x0009)
+                               || (c == 0x000A) || (c == 0x000D)))
+                       || (((c & dangerMask) != 0)
+                           && (code == CTX_UNPARSED))) {
+
+                   // if case (b) in CDATA, we might end the section,
+                   // write a reference, then restart ... possible
+                   // in one DOM L3 draft.
+
+                   throw new CharConversionException (
+                           "Illegal or non-writable character: U+"
+                           + Integer.toHexString (c));
+               }
+
+               //
+               // If the output encoding represents the character
+               // directly, let it do so!  Else we'll escape it.
+               //
+               if ((c & dangerMask) == 0)
+                   continue;
+               esc = null;
+
+               // Avoid numeric refs where symbolic ones exist, as
+               // symbolic ones make more sense to humans reading!
+               if (xhtml) {
+                   // all the HTMLlat1x.ent entities
+                   // (all the "ISO-8859-1" characters)
+                   if (c >= 160 && c <= 255)
+                       esc = HTMLlat1x [c - 160];
+
+                   // not quite half the HTMLsymbolx.ent entities
+                   else if (c >= 913 && c <= 937)
+                       esc = HTMLsymbolx_GR [c - 913];
+                   else if (c >= 945 && c <= 969)
+                       esc = HTMLsymbolx_gr [c - 945];
+
+                   else switch (c) {
+                       // all of the HTMLspecialx.ent entities
+                       case  338: esc = "OElig";       break;
+                       case  339: esc = "oelig";       break;
+                       case  352: esc = "Scaron";      break;
+                       case  353: esc = "scaron";      break;
+                       case  376: esc = "Yuml";        break;
+                       case  710: esc = "circ";        break;
+                       case  732: esc = "tilde";       break;
+                       case 8194: esc = "ensp";        break;
+                       case 8195: esc = "emsp";        break;
+                       case 8201: esc = "thinsp";      break;
+                       case 8204: esc = "zwnj";        break;
+                       case 8205: esc = "zwj";         break;
+                       case 8206: esc = "lrm";         break;
+                       case 8207: esc = "rlm";         break;
+                       case 8211: esc = "ndash";       break;
+                       case 8212: esc = "mdash";       break;
+                       case 8216: esc = "lsquo";       break;
+                       case 8217: esc = "rsquo";       break;
+                       case 8218: esc = "sbquo";       break;
+                       case 8220: esc = "ldquo";       break;
+                       case 8221: esc = "rdquo";       break;
+                       case 8222: esc = "bdquo";       break;
+                       case 8224: esc = "dagger";      break;
+                       case 8225: esc = "Dagger";      break;
+                       case 8240: esc = "permil";      break;
+                       case 8249: esc = "lsaquo";      break;
+                       case 8250: esc = "rsaquo";      break;
+                       case 8364: esc = "euro";        break;
+
+                       // the other HTMLsymbox.ent entities
+                       case  402: esc = "fnof";        break;
+                       case  977: esc = "thetasym";    break;
+                       case  978: esc = "upsih";       break;
+                       case  982: esc = "piv";         break;
+                       case 8226: esc = "bull";        break;
+                       case 8230: esc = "hellip";      break;
+                       case 8242: esc = "prime";       break;
+                       case 8243: esc = "Prime";       break;
+                       case 8254: esc = "oline";       break;
+                       case 8260: esc = "frasl";       break;
+                       case 8472: esc = "weierp";      break;
+                       case 8465: esc = "image";       break;
+                       case 8476: esc = "real";        break;
+                       case 8482: esc = "trade";       break;
+                       case 8501: esc = "alefsym";     break;
+                       case 8592: esc = "larr";        break;
+                       case 8593: esc = "uarr";        break;
+                       case 8594: esc = "rarr";        break;
+                       case 8595: esc = "darr";        break;
+                       case 8596: esc = "harr";        break;
+                       case 8629: esc = "crarr";       break;
+                       case 8656: esc = "lArr";        break;
+                       case 8657: esc = "uArr";        break;
+                       case 8658: esc = "rArr";        break;
+                       case 8659: esc = "dArr";        break;
+                       case 8660: esc = "hArr";        break;
+                       case 8704: esc = "forall";      break;
+                       case 8706: esc = "part";        break;
+                       case 8707: esc = "exist";       break;
+                       case 8709: esc = "empty";       break;
+                       case 8711: esc = "nabla";       break;
+                       case 8712: esc = "isin";        break;
+                       case 8713: esc = "notin";       break;
+                       case 8715: esc = "ni";          break;
+                       case 8719: esc = "prod";        break;
+                       case 8721: esc = "sum";         break;
+                       case 8722: esc = "minus";       break;
+                       case 8727: esc = "lowast";      break;
+                       case 8730: esc = "radic";       break;
+                       case 8733: esc = "prop";        break;
+                       case 8734: esc = "infin";       break;
+                       case 8736: esc = "ang";         break;
+                       case 8743: esc = "and";         break;
+                       case 8744: esc = "or";          break;
+                       case 8745: esc = "cap";         break;
+                       case 8746: esc = "cup";         break;
+                       case 8747: esc = "int";         break;
+                       case 8756: esc = "there4";      break;
+                       case 8764: esc = "sim";         break;
+                       case 8773: esc = "cong";        break;
+                       case 8776: esc = "asymp";       break;
+                       case 8800: esc = "ne";          break;
+                       case 8801: esc = "equiv";       break;
+                       case 8804: esc = "le";          break;
+                       case 8805: esc = "ge";          break;
+                       case 8834: esc = "sub";         break;
+                       case 8835: esc = "sup";         break;
+                       case 8836: esc = "nsub";        break;
+                       case 8838: esc = "sube";        break;
+                       case 8839: esc = "supe";        break;
+                       case 8853: esc = "oplus";       break;
+                       case 8855: esc = "otimes";      break;
+                       case 8869: esc = "perp";        break;
+                       case 8901: esc = "sdot";        break;
+                       case 8968: esc = "lceil";       break;
+                       case 8969: esc = "rceil";       break;
+                       case 8970: esc = "lfloor";      break;
+                       case 8971: esc = "rfloor";      break;
+                       case 9001: esc = "lang";        break;
+                       case 9002: esc = "rang";        break;
+                       case 9674: esc = "loz";         break;
+                       case 9824: esc = "spades";      break;
+                       case 9827: esc = "clubs";       break;
+                       case 9829: esc = "hearts";      break;
+                       case 9830: esc = "diams";       break;
+                   }
+               }
+
+               // else escape with numeric char refs
+               if (esc == null) {
+                   stringBuf.setLength (0);
+                   stringBuf.append ("#x");
+                   stringBuf.append (Integer.toHexString (c).toUpperCase ());
+                   esc = stringBuf.toString ();
+
+                   // FIXME:  We don't write surrogate pairs correctly.
+                   // They should work as one ref per character, since
+                   // each pair is one character.  For reading back into
+                   // Unicode, it matters beginning in Unicode 3.1 ...
+               }
+               break;
+           }
+           if (i != first)
+               rawWrite (buf, off + first, i - first);
+           first = i + 1;
+           if (esc == eol)
+               newline ();
+           else {
+               rawWrite ('&');
+               rawWrite (esc);
+               rawWrite (';');
+           }
+       }
+       if (first < len)
+           rawWrite (buf, off + first, len - first);
+    }
+
+
+
+    private void newline ()
+    throws SAXException, IOException
+    {
+       out.write (eol);
+       column = 0;
+    }
+
+    private void doIndent ()
+    throws SAXException, IOException
+    {
+       int     space = elementNestLevel * 2;
+
+       newline ();
+       column = space;
+       // track tabs only at line starts
+       while (space > 8) {
+           out.write ("\t");
+           space -= 8;
+       }
+       while (space > 0) {
+           out.write ("  ");
+           space -= 2;
+       }
+    }
+
+    private void rawWrite (char c)
+    throws IOException
+    {
+       out.write (c);
+       column++;
+    }
+
+    private void rawWrite (String s)
+    throws SAXException, IOException
+    {
+       if (prettyPrinting && "default".equals (space.peek ())) {
+           char data [] = s.toCharArray ();
+           rawWrite (data, 0, data.length);
+       } else {
+           out.write (s);
+           column += s.length ();
+       }
+    }
+
+    // NOTE:  if xhtml, the REC gives some rules about whitespace
+    // which we could follow ... notably, many places where conformant
+    // agents "must" consolidate/normalize whitespace.  Line ends can
+    // be removed there, etc.  This may not be the right place to do
+    // such mappings though.
+
+    // Line buffering may help clarify algorithms and improve results.
+
+    // It's likely xml:space needs more attention.
+
+    private void rawWrite (char buf [], int offset, int length)
+    throws SAXException, IOException
+    {
+       boolean         wrap;
+
+       if (prettyPrinting && space.empty ())
+           fatal ("stack discipline", null);
+
+       wrap = prettyPrinting && "default".equals (space.peek ());
+       if (!wrap) {
+           out.write (buf, offset, length);
+           column += length;
+           return;
+       }
+
+       // we're pretty printing and want to fill lines out only
+       // to the desired line length.
+       while (length > 0) {
+           int         target = lineLength - column;
+           boolean     wrote = false;
+
+           // Do we even have a problem?
+           if (target > length || noWrap) {
+               out.write (buf, offset, length);
+               column += length;
+               return;
+           }
+
+           // break the line at a space character, trying to fill
+           // as much of the line as possible.
+           char        c;
+
+           for (int i = target - 1; i >= 0; i--) {
+               if ((c = buf [offset + i]) == ' ' || c == '\t') {
+                   i++;
+                   out.write (buf, offset, i);
+                   doIndent ();
+                   offset += i;
+                   length -= i;
+                   wrote = true;
+                   break;
+               }
+           }
+           if (wrote)
+               continue;
+           
+           // no space character permitting break before target
+           // line length is filled.  So, take the next one.
+           if (target < 0)
+               target = 0;
+           for (int i = target; i < length; i++)
+               if ((c = buf [offset + i]) == ' ' || c == '\t') {
+                   i++;
+                   out.write (buf, offset, i);
+                   doIndent ();
+                   offset += i;
+                   length -= i;
+                   wrote = true;
+                   break;
+               }
+           if (wrote)
+               continue;
+           
+           // no such luck.
+           out.write (buf, offset, length);
+           column += length;
+           break;
+       }
+    }
+}
diff --git a/libjava/gnu/xml/util/package.html b/libjava/gnu/xml/util/package.html
new file mode 100644 (file)
index 0000000..6e6c0d7
--- /dev/null
+++ b/libjava/gnu/xml/util/package.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC
+    "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/1999/PR-xhtml1-19991210/DTD/xhtml1-transitional.dtd">
+
+<html><head><title> org.brownell.xml package </title> </head>
+<!--
+/*
+ * Copyright (C) 1999,2000 The Free Software Foundation, Inc.
+ */
+-->
+<body>
+    <p> This package contains XML utilities, including SAX2 XML writers
+    and a parser of DOM trees, plus a command line driver.
+    That <a href="DoParse.html">driver</a>
+    connects parsers simple processing pipelines.
+    It can be handy for command line validation or
+    transformation tasks, possibly in batch mode,
+    or within Makefiles. </p>
+
+</body></html>
diff --git a/libjava/gnu/xml/xpath/AndExpr.java b/libjava/gnu/xml/xpath/AndExpr.java
new file mode 100644 (file)
index 0000000..91fb3bc
--- /dev/null
+++ b/libjava/gnu/xml/xpath/AndExpr.java
@@ -0,0 +1,81 @@
+/* AndExpr.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import org.w3c.dom.Node;
+
+/**
+ * Logical and.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public final class AndExpr
+  extends Expr
+{
+
+  final Expr lhs;
+  final Expr rhs;
+
+  public AndExpr(Expr lhs, Expr rhs)
+  {
+    this.lhs = lhs;
+    this.rhs = rhs;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object left = lhs.evaluate(context, pos, len);
+    if (!_boolean(context, left))
+      {
+        return Boolean.FALSE;
+      }
+    Object right = rhs.evaluate(context, pos, len);
+    return _boolean(context, right) ? Boolean.TRUE : Boolean.FALSE;
+  }
+
+  public Expr clone(Object context)
+  {
+    return new AndExpr(lhs.clone(context), rhs.clone(context));
+  }
+
+  public String toString()
+  {
+    return lhs + " and " + rhs;
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/ArithmeticExpr.java b/libjava/gnu/xml/xpath/ArithmeticExpr.java
new file mode 100644 (file)
index 0000000..ad9da1e
--- /dev/null
+++ b/libjava/gnu/xml/xpath/ArithmeticExpr.java
@@ -0,0 +1,148 @@
+/* ArithmeticExpr.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import org.w3c.dom.Node;
+
+/**
+ * Binary arithmetic expression.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class ArithmeticExpr
+  extends Expr
+{
+
+  static final int ADD = 0;
+  static final int SUBTRACT = 1;
+  static final int MULTIPLY = 2;
+  static final int DIVIDE = 3;
+  static final int MODULO = 4;
+
+  final Expr lhs;
+  final Expr rhs;
+  final int op;
+
+  ArithmeticExpr(Expr lhs, Expr rhs, int op)
+  {
+    this.lhs = lhs;
+    this.rhs = rhs;
+    switch (op)
+      {
+      case ADD:
+      case SUBTRACT:
+      case MULTIPLY:
+      case DIVIDE:
+      case MODULO:
+                               this.op = op;
+                               break;
+      default:
+        throw new IllegalArgumentException();
+      }
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object left = lhs.evaluate(context, pos, len);
+    Object right = rhs.evaluate(context, pos, len);
+
+    double ln = _number(context, left);
+    double rn = _number(context, right);
+    switch (op)
+      {
+      case ADD:
+        return new Double(ln + rn);
+      case SUBTRACT:
+        return new Double(ln - rn);
+      case MULTIPLY:
+        return new Double(ln * rn);
+      case DIVIDE:
+        if (rn == 0.0d || rn == -0.0d)
+          {
+            return new Double(ln < 0.0d ?
+                              Double.NEGATIVE_INFINITY :
+                              Double.POSITIVE_INFINITY);
+          }
+        return new Double(ln / rn);
+      case MODULO:
+        if (rn == 0.0d || rn == -0.0d)
+          {
+            return new Double(ln < 0.0d ?
+                              Double.NEGATIVE_INFINITY :
+                              Double.POSITIVE_INFINITY);
+          }
+        return new Double(ln % rn);
+      default:
+        throw new IllegalStateException();
+      }
+  }
+
+  public Expr clone(Object context)
+  {
+    return new ArithmeticExpr(lhs.clone(context), rhs.clone(context), op);
+  }
+
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer();
+    buf.append(lhs);
+    buf.append(' ');
+    switch (op)
+      {
+      case ADD:
+        buf.append('+');
+        break;
+      case SUBTRACT:
+        buf.append('-');
+        break;
+      case MULTIPLY:
+        buf.append('*');
+        break;
+      case DIVIDE:
+        buf.append("div");
+        break;
+      case MODULO:
+        buf.append("mod");
+        break;
+      }
+    buf.append(' ');
+    buf.append(rhs);
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/BooleanFunction.java b/libjava/gnu/xml/xpath/BooleanFunction.java
new file mode 100644 (file)
index 0000000..df54ff5
--- /dev/null
+++ b/libjava/gnu/xml/xpath/BooleanFunction.java
@@ -0,0 +1,89 @@
+/* BooleanFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>boolean</code> function converts its argument to a boolean as
+ * follows:
+ * <ul>
+ * <li>a number is true if and only if it is neither positive or negative
+ * zero nor NaN</li>
+ * <li>a node-set is true if and only if it is non-empty</li>
+ * <li>a string is true if and only if its length is non-zero</li>
+ * <li>an object of a type other than the four basic types is converted to a
+ * boolean in a way that is dependent on that type</li>
+ * </ul>
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class BooleanFunction
+  extends Expr
+{
+
+  final Expr arg;
+  
+  BooleanFunction(List args)
+  {
+    this((Expr) args.get(0));
+  }
+
+  BooleanFunction(Expr arg)
+  {
+    this.arg = arg;
+  }
+  
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = arg.evaluate(context, pos, len);
+    return _boolean(context, val) ? Boolean.TRUE : Boolean.FALSE;
+  }
+
+  public Expr clone(Object context)
+  {
+    return new BooleanFunction(arg.clone(context));
+  }
+  
+  public String toString()
+  {
+    return "boolean(" + arg + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/CeilingFunction.java b/libjava/gnu/xml/xpath/CeilingFunction.java
new file mode 100644 (file)
index 0000000..8c0b8b1
--- /dev/null
+++ b/libjava/gnu/xml/xpath/CeilingFunction.java
@@ -0,0 +1,83 @@
+/* CeilingFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>ceiling</code> function returns the smallest (closest to
+ * negative infinity) number that is not less than the argument and that
+ * is an integer.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class CeilingFunction
+  extends Expr
+{
+
+  final Expr arg;
+  
+  CeilingFunction(List args)
+  {
+    this((Expr) args.get(0));
+  }
+  
+  CeilingFunction(Expr arg)
+  {
+    this.arg = arg;
+  }
+  
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = arg.evaluate(context, pos, len);
+    double n = _number(context, val);
+    return new Double(Math.ceil(n));
+  }
+
+  public Expr clone(Object context)
+  {
+    return new CeilingFunction(arg.clone(context));
+  }
+  
+  public String toString()
+  {
+    return "ceiling(" + arg + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/ConcatFunction.java b/libjava/gnu/xml/xpath/ConcatFunction.java
new file mode 100644 (file)
index 0000000..7c51f9d
--- /dev/null
+++ b/libjava/gnu/xml/xpath/ConcatFunction.java
@@ -0,0 +1,100 @@
+/* ConcatFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>concat</code> function returns the concatenation of its arguments.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class ConcatFunction
+  extends Expr
+{
+
+  final List args;
+
+  ConcatFunction(List args)
+  {
+    this.args = args;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    StringBuffer buf = new StringBuffer();
+    for (Iterator i = args.iterator(); i.hasNext(); )
+      {
+        Expr arg = (Expr) i.next();
+        Object val = arg.evaluate(context, pos, len);
+        buf.append(_string(context, val));
+      }
+    return buf.toString();
+  }
+
+  public Expr clone(Object context)
+  {
+    int len = args.size();
+    List args2 = new ArrayList(len);
+    for (int i = 0; i < len; i++)
+      {
+        args2.add(((Expr) args.get(i)).clone(context));
+      }
+    return new ConcatFunction(args2);
+  }
+
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer("concat(");
+    int len = args.size();
+    for (int i = 0; i < len; i++)
+      {
+        if (i > 0)
+          {
+            buf.append(',');
+          }
+        buf.append(args.get(i));
+      }
+    buf.append(')');
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/Constant.java b/libjava/gnu/xml/xpath/Constant.java
new file mode 100644 (file)
index 0000000..d38f7ea
--- /dev/null
+++ b/libjava/gnu/xml/xpath/Constant.java
@@ -0,0 +1,92 @@
+/* Constant.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import org.w3c.dom.Node;
+
+/**
+ * Constant value (string literal or number).
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public final class Constant
+  extends Expr
+{
+
+  final Object value;
+
+  public Constant(Object value)
+  {
+    this.value = value;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    return value;
+  }
+
+  public Expr clone(Object context)
+  {
+    return new Constant(value);
+  }
+
+  public String toString()
+  {
+    String ret = value.toString();
+    if (value instanceof String)
+      {
+        if (ret.indexOf('\'') == -1)
+          {
+            return '\'' + ret + '\'';
+          }
+        else
+          {
+            return '"' + ret + '"';
+          }
+      }
+    if (value instanceof Double)
+      {
+        if (ret.endsWith(".0"))
+          {
+            ret = ret.substring(0, ret.length() - 2);
+          }
+      }
+    return ret;
+  }
+  
+} 
diff --git a/libjava/gnu/xml/xpath/ContainsFunction.java b/libjava/gnu/xml/xpath/ContainsFunction.java
new file mode 100644 (file)
index 0000000..2a0d76d
--- /dev/null
+++ b/libjava/gnu/xml/xpath/ContainsFunction.java
@@ -0,0 +1,86 @@
+/* ContainsFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>contains</code> function returns true if the first argument
+ * string contains the second argument string, and otherwise returns false.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class ContainsFunction
+  extends Expr
+{
+
+  final Expr arg1;
+  final Expr arg2;
+
+  ContainsFunction(List args)
+  {
+    this((Expr) args.get(0), (Expr) args.get(1));
+  }
+
+  ContainsFunction(Expr arg1, Expr arg2)
+  {
+    this.arg1 = arg1;
+    this.arg2 = arg2;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val1 = arg1.evaluate(context, pos, len);
+    Object val2 = arg2.evaluate(context, pos, len);
+    String s1 = _string(context, val1);
+    String s2 = _string(context, val2);
+    return (s1.indexOf(s2) != -1) ? Boolean.TRUE : Boolean.FALSE;
+  }
+
+  public Expr clone(Object context)
+  {
+    return new ContainsFunction(arg1.clone(context), arg2.clone(context));
+  }
+
+  public String toString()
+  {
+    return "contains(" + arg1 + "," + arg2 + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/CountFunction.java b/libjava/gnu/xml/xpath/CountFunction.java
new file mode 100644 (file)
index 0000000..33663c9
--- /dev/null
+++ b/libjava/gnu/xml/xpath/CountFunction.java
@@ -0,0 +1,82 @@
+/* CountFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.Collection;
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>count</code> function returns the number of nodes in the
+ * argument node-set.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class CountFunction
+  extends Expr
+{
+
+  final Expr arg;
+
+  CountFunction(List args)
+  {
+    this((Expr) args.get(0));
+  }
+
+  CountFunction(Expr arg)
+  {
+    this.arg = arg;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = arg.evaluate(context, pos, len);
+    return new Double((double) ((Collection) val).size());
+  }
+
+  public Expr clone(Object context)
+  {
+    return new CountFunction(arg.clone(context));
+  }
+
+  public String toString()
+  {
+    return "count(" + arg + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/DocumentOrderComparator.java b/libjava/gnu/xml/xpath/DocumentOrderComparator.java
new file mode 100644 (file)
index 0000000..28d97eb
--- /dev/null
+++ b/libjava/gnu/xml/xpath/DocumentOrderComparator.java
@@ -0,0 +1,63 @@
+/* DocumentOrderComparator.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.Comparator;
+import org.w3c.dom.Node;
+
+/**
+ * Sorts nodes into document order.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DocumentOrderComparator
+  implements Comparator
+{
+  
+  public int compare(Object o1, Object o2)
+  {
+    if (o1 instanceof Node && o2 instanceof Node)
+      {
+        Node n1 = (Node)o1;
+        Node n2 = (Node)o2;
+        return (int) n1.compareDocumentPosition(n2);
+      }
+    return 0;
+  }
+
+}
diff --git a/libjava/gnu/xml/xpath/EqualityExpr.java b/libjava/gnu/xml/xpath/EqualityExpr.java
new file mode 100644 (file)
index 0000000..bedf1e9
--- /dev/null
+++ b/libjava/gnu/xml/xpath/EqualityExpr.java
@@ -0,0 +1,258 @@
+/* EqualityExpr.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.Collection;
+import java.util.Iterator;
+import org.w3c.dom.Node;
+
+/**
+ * Boolean equality expression.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class EqualityExpr
+  extends Expr
+{
+
+  final Expr lhs;
+  final Expr rhs;
+  final boolean invert;
+
+  EqualityExpr(Expr lhs, Expr rhs, boolean invert)
+  {
+    this.lhs = lhs;
+    this.rhs = rhs;
+    this.invert = invert;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    boolean val = evaluateImpl(context, pos, len);
+    if (invert)
+      {
+        return val ? Boolean.FALSE : Boolean.TRUE;
+      }
+    else
+      {
+        return val ? Boolean.TRUE : Boolean.FALSE;
+      }
+  }
+
+  private boolean evaluateImpl(Node context, int pos, int len)
+  {
+    Object left = lhs.evaluate(context, pos, len);
+    Object right = rhs.evaluate(context, pos, len);
+
+    /*
+     * If both objects to be compared are node-sets, then the comparison
+     * will be true if and only if there is a node in the first node-set and
+     * a node in the second node-set such that the result of performing the
+     * comparison on the string-values of the two nodes is true.
+     */
+    boolean flns = left instanceof Collection;
+    boolean frns = right instanceof Collection;
+    if (flns && frns)
+      {
+        Collection lns = (Collection) left;
+        Collection rns = (Collection) right;
+        boolean all = true;
+        for (Iterator i = lns.iterator(); i.hasNext(); )
+          {
+            Node ltest = (Node) i.next();
+            for (Iterator j = rns.iterator(); j.hasNext(); )
+              {
+                Node rtest = (Node) j.next();
+                if (ltest == rtest || ltest.equals(rtest))
+                  {
+                    // much shorter
+                    if (!invert)
+                      {
+                        return true;
+                      }
+                  }
+                else if (stringValue(ltest).equals(stringValue(rtest)))
+                  {
+                    if (!invert)
+                      {
+                        return true;
+                      }
+                  }
+                else
+                  {
+                    all = false;
+                  }
+              }
+          }
+        return false;
+      }
+    /* 
+     * If one object to be compared is a node-set and the other is a number,
+     * then the comparison will be true if and only if there is a node in
+     * the node-set such that the result of performing the comparison on the
+     * number to be compared and on the result of converting the
+     * string-value of that node to a number using the number function is
+     * true.
+     */
+    boolean fln = left instanceof Double;
+    boolean frn = right instanceof Double;
+    if ((flns && frn) || (frns && fln))
+      {
+        Collection ns = flns ? (Collection) left : (Collection) right;
+        double n = fln ? ((Double) left).doubleValue() :
+          ((Double) right).doubleValue();
+        boolean all = true;
+        for (Iterator i = ns.iterator(); i.hasNext(); )
+          {
+            Node test = (Node) i.next();
+            double nn = _number(context, stringValue(test));
+            if (nn == n)
+              {
+                if (!invert)
+                  {
+                    return true;
+                  }
+              }
+            else
+              {
+                all = false;
+              }
+          }
+        return invert ? all : false;
+      }
+    /*
+     * If one object to be compared is a node-set and the other is a
+     * string, then the comparison will be true if and only if there is a
+     * node in the node-set such that the result of performing the
+     * comparison on the string-value of the node and the other string is
+     * true.
+     */
+    boolean fls = left instanceof String;
+    boolean frs = right instanceof String;
+    if ((flns && frs) || (frns && fls))
+      {
+        Collection ns = flns ? (Collection) left : (Collection) right;
+        String s = fls ? (String) left : (String) right;
+        boolean all = true;
+        for (Iterator i = ns.iterator(); i.hasNext(); )
+          {
+            Node test = (Node) i.next();
+            if (stringValue(test).equals(s))
+              {
+                if (!invert)
+                  {
+                    return true;
+                  }
+              }
+            else
+              {
+                all = false;
+              }
+          }
+        return invert ? all : false;
+      }
+    /*
+     * If one object to be compared is a node-set and the other is a
+     * boolean, then the comparison will be true if and only if the result
+     * of performing the comparison on the boolean and on the result of
+     * converting the node-set to a boolean using the boolean function is
+     * true.
+     */
+    boolean flb = left instanceof Boolean;
+    boolean frb = right instanceof Boolean;
+    if ((flns && frb) || (frns && flb))
+      {
+        Collection ns = flns ? (Collection) left : (Collection) right;
+        boolean b = flb ? ((Boolean) left).booleanValue() :
+          ((Boolean) right).booleanValue();
+        return _boolean(context, ns) == b;
+      }
+    /*
+     * If at least one object to be compared is a boolean, then each object
+     * to be compared is converted to a boolean as if by applying the
+     * boolean function.
+     */
+    if (flb || frb)
+      {
+        boolean lb = flb ? ((Boolean) left).booleanValue() :
+          _boolean(context, left);
+        boolean rb = frb ? ((Boolean) right).booleanValue() :
+          _boolean(context, right);
+        return lb == rb;
+      }
+    /*
+     * Otherwise, if at least one object to be compared is
+     * a number, then each object to be compared is converted to a number as
+     * if by applying the number function.
+     */
+    if (fln || frn)
+      {
+        double ln = fln ? ((Double) left).doubleValue() :
+          _number(context, left);
+        double rn = frn ? ((Double) right).doubleValue() :
+          _number(context, right);
+        return ln == rn;
+      }
+    /*
+     * Otherwise, both objects to be
+     * compared are converted to strings as if by applying the string
+     * function.
+     */
+    String ls = fls ? (String) left : _string(context, left);
+    String rs = frs ? (String) right : _string(context, right);
+    return ls.equals(rs);
+  }
+
+  public Expr clone(Object context)
+  {
+    return new EqualityExpr(lhs.clone(context), rhs.clone(context), invert);
+  }
+
+  public String toString()
+  {
+    if (invert)
+      {
+        return lhs + " != " + rhs;
+      }
+    else
+      {
+        return lhs + " = " + rhs;
+      }
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/Expr.java b/libjava/gnu/xml/xpath/Expr.java
new file mode 100644 (file)
index 0000000..6a933c8
--- /dev/null
+++ b/libjava/gnu/xml/xpath/Expr.java
@@ -0,0 +1,476 @@
+/* Expr.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.StringTokenizer;
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathExpressionException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * An XPath expression.
+ * This can be evaluated in the context of a node to produce a result.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public abstract class Expr
+  implements XPathExpression
+{
+
+  protected static final Comparator documentOrderComparator =
+    new DocumentOrderComparator();
+
+  protected static final DecimalFormat decimalFormat =
+    new DecimalFormat("####################################################" +
+                      ".####################################################",
+                      new DecimalFormatSymbols(Locale.US));
+
+  public Object evaluate(Object item, QName returnType)
+    throws XPathExpressionException
+  {
+    Object ret = null;
+    Node context = null;
+    if (item instanceof Node)
+      {
+        context = (Node) item;
+        ret = evaluate(context, 1, 1);
+        if (XPathConstants.STRING == returnType &&
+            !(ret instanceof String))
+          {
+            ret = _string(context, ret);
+          }
+        else if (XPathConstants.NUMBER == returnType &&
+                 !(ret instanceof Double))
+          {
+            ret = new Double(_number(context, ret));
+          }
+        else if (XPathConstants.BOOLEAN == returnType &&
+                 !(ret instanceof Boolean))
+          {
+            ret = _boolean(context, ret) ? Boolean.TRUE : Boolean.FALSE;
+          }
+        else if (XPathConstants.NODE == returnType)
+          {
+            if (ret instanceof Collection)
+              {
+                Collection ns = (Collection) ret;
+                switch (ns.size())
+                  {
+                  case 0:
+                    ret = null;
+                    break;
+                  case 1:
+                    ret = (Node) ns.iterator().next();
+                    break;
+                  default:
+                    throw new XPathExpressionException("multiple nodes in node-set");
+                  }
+              }
+            else if (ret != null)
+              {
+                throw new XPathExpressionException("return value is not a node-set");
+              }
+          }
+        else if (XPathConstants.NODESET == returnType)
+          {
+            if (ret != null && !(ret instanceof Collection))
+              {
+                throw new XPathExpressionException("return value is not a node-set");
+              }
+          }
+      }
+    return ret;
+  }
+
+  public String evaluate(Object item)
+    throws XPathExpressionException
+  {
+    return (String) evaluate(item, XPathConstants.STRING); 
+  }
+
+  public Object evaluate(InputSource source, QName returnType)
+    throws XPathExpressionException
+  {
+    try
+      {
+        DocumentBuilderFactory factory =
+          new gnu.xml.dom.JAXPFactory();
+        DocumentBuilder builder = factory.newDocumentBuilder();
+        Document doc = builder.parse(source);
+        return evaluate(doc, returnType);
+      }
+    catch (ParserConfigurationException e)
+      {
+        throw new XPathExpressionException(e); 
+      }
+    catch (SAXException e)
+      {
+        throw new XPathExpressionException(e); 
+      }
+    catch (IOException e)
+      {
+        throw new XPathExpressionException(e); 
+      }
+  }
+
+  public String evaluate(InputSource source)
+    throws XPathExpressionException
+  {
+    return (String) evaluate(source, XPathConstants.STRING);
+  }
+
+  public abstract Object evaluate(Node context, int pos, int len);
+
+  public abstract Expr clone(Object context);
+  
+  /* -- 4.1 Node Set Functions -- */
+
+  /**
+   * The id function selects elements by their unique ID.
+   * When the argument to id is of type node-set, then the result is
+   * the union of the result of applying id to the string-value of each of
+   * the nodes in the argument node-set. When the argument to id is of any
+   * other type, the argument is converted to a string as if by a call to
+   * the string function; the string is split into a whitespace-separated
+   * list of tokens (whitespace is any sequence of characters matching the
+   * production S); the result is a node-set containing the elements in the
+   * same document as the context node that have a unique ID equal to any of
+   * the tokens in the list.
+   */
+  public static Collection _id(Node context, Object object)
+  {
+    Set ret = new HashSet();
+    if (object instanceof Collection)
+      {
+        Collection nodeSet = (Collection) object;
+        for (Iterator i = nodeSet.iterator(); i.hasNext(); )
+          {
+            String string = stringValue((Node) i.next());
+            ret.addAll(_id (context, string));
+          }
+      }
+    else
+      {
+        Document doc = (context instanceof Document) ? (Document) context :
+          context.getOwnerDocument();
+        String string = _string(context, object);
+        StringTokenizer st = new StringTokenizer(string, " \t\r\n");
+        while (st.hasMoreTokens())
+          {
+            Node element = doc.getElementById(st.nextToken());
+            if (element != null)
+              {
+                ret.add(element);
+              }
+          }
+      }
+    return ret;
+  }
+
+  /**
+   * The local-name function returns the local part of the expanded-name of
+   * the node in the argument node-set that is first in document order. If
+   * the argument node-set is empty or the first node has no expanded-name,
+   * an empty string is returned. If the argument is omitted, it defaults to
+   * a node-set with the context node as its only member.
+   */
+  public static String _local_name(Node context, Collection nodeSet)
+  {
+    Node node = (nodeSet == null || nodeSet.size() == 0) ? context :
+      firstNode(nodeSet);
+    return node.getLocalName();
+  }
+
+  /**
+   * The namespace-uri function returns the namespace URI of the
+   * expanded-name of the node in the argument node-set that is first in
+   * document order. If the argument node-set is empty, the first node has
+   * no expanded-name, or the namespace URI of the expanded-name is null, an
+   * empty string is returned. If the argument is omitted, it defaults to a
+   * node-set with the context node as its only member.
+   */
+  public static String _namespace_uri(Node context, Collection nodeSet)
+  {
+    Node node = (nodeSet == null || nodeSet.size() == 0) ? context :
+      firstNode(nodeSet);
+    return node.getNamespaceURI();
+  }
+  
+  /**
+   * The name function returns a string containing a QName representing the
+   * expanded-name of the node in the argument node-set that is first in
+   * document order. The QName must represent the expanded-name with respect
+   * to the namespace declarations in effect on the node whose expanded-name
+   * is being represented. Typically, this will be the QName that occurred
+   * in the XML source. This need not be the case if there are namespace
+   * declarations in effect on the node that associate multiple prefixes
+   * with the same namespace. However, an implementation may include
+   * information about the original prefix in its representation of nodes;
+   * in this case, an implementation can ensure that the returned string is
+   * always the same as the QName used in the XML source. If the argument
+   * node-set is empty or the first node has no expanded-name, an empty
+   * string is returned. If the argument it omitted, it defaults to a
+   * node-set with the context node as its only member.
+   */
+  public static String _name(Node context, Collection nodeSet)
+  {
+    Node node = (nodeSet == null || nodeSet.size() == 0) ? context :
+      firstNode(nodeSet);
+    switch (node.getNodeType())
+      {
+      case Node.ATTRIBUTE_NODE:
+      case Node.ELEMENT_NODE:
+      case Node.PROCESSING_INSTRUCTION_NODE:
+        return node.getNodeName();
+      default:
+        return "";
+      }
+  }
+
+  /**
+   * Returns the first node in the set in document order.
+   */
+  static Node firstNode(Collection nodeSet)
+  {
+    List list = new ArrayList(nodeSet);
+    Collections.sort(list, documentOrderComparator);
+    return (Node) list.get(0);
+  }
+
+  /* -- 4.2 String Functions -- */
+
+  /**
+   * Implementation of the XPath <code>string</code> function.
+   */
+  public static String _string(Node context, Object object)
+  {
+    if (object == null)
+      {
+        return stringValue(context);
+      }
+    if (object instanceof String)
+      {
+        return (String) object;
+      }
+    if (object instanceof Boolean)
+      {
+        return object.toString();
+      }
+    if (object instanceof Double)
+      {
+        double d = ((Double) object).doubleValue();
+        if (Double.isNaN(d))
+          {
+            return "NaN";
+          }
+        else if (d == 0.0d)
+          {
+            return "0";
+          }
+        else if (Double.isInfinite(d))
+          {
+            if (d < 0)
+              {
+                return "-Infinity";
+              }
+            else
+              {
+                return "Infinity";
+              }
+          }
+        else
+          {
+            String ret = decimalFormat.format(d);
+            if (ret.endsWith (".0"))
+              { 
+                ret = ret.substring(0, ret.length() - 2);
+              }
+            return ret;
+          }
+      }
+    if (object instanceof Collection)
+      {
+        Collection nodeSet = (Collection) object;
+        if (nodeSet.isEmpty())
+          {
+            return "";
+          }
+        Node node = firstNode(nodeSet);
+        return stringValue(node);
+      }
+    throw new IllegalArgumentException(object.toString());
+  }
+
+  /* -- 4.3 Boolean Functions -- */
+  
+  /**
+   * Implementation of the XPath <code>boolean</code> function.
+   */
+  public static boolean _boolean(Node context, Object object)
+  {
+    if (object instanceof Boolean)
+      {
+        return ((Boolean) object).booleanValue();
+      }
+    if (object instanceof Double)
+      {
+        return ((Double) object).doubleValue() != 0.0;
+      }
+    if (object instanceof String)
+      {
+        return ((String) object).length() != 0;
+      }
+    if (object instanceof Collection)
+      {
+        return ((Collection) object).size() != 0;
+      }
+    return false; // TODO user defined types
+  }
+
+  /* -- 4.4 Number Functions -- */
+
+  /**
+   * Implementation of the XPath <code>number</code> function.
+   */
+  public static double _number(Node context, Object object)
+  {
+    if (object == null)
+      {
+        object = Collections.singleton(context);
+      }
+    if (object instanceof Double)
+      {
+        return ((Double) object).doubleValue();
+      }
+    if (object instanceof Boolean)
+      {
+        return ((Boolean) object).booleanValue() ? 1.0 : 0.0;
+      }
+    if (object instanceof Collection)
+      {
+        // Convert node-set to string
+        object = stringValue((Collection) object);
+      }
+    if (object instanceof String)
+      {
+        String string = ((String) object).trim();
+        try
+          {
+            return Double.parseDouble(string);
+          }
+        catch (NumberFormatException e)
+          {
+            return Double.NaN;
+          }
+      }
+    return Double.NaN; // TODO user-defined types
+  }
+
+  /**
+   * Computes the XPath string-value of the specified node-set.
+   */
+  public static String stringValue(Collection nodeSet)
+  {
+    StringBuffer buf = new StringBuffer();
+    for (Iterator i = nodeSet.iterator(); i.hasNext(); )
+      {
+        buf.append(stringValue((Node) i.next()));
+      }
+    return buf.toString();
+  }
+
+  /**
+   * Computes the XPath string-value of the specified node.
+   */
+  public static String stringValue(Node node)
+  {
+    return stringValue(node, false);
+  }
+  
+  static String stringValue(Node node, boolean elementMode)
+  {
+    switch (node.getNodeType())
+      {
+      case Node.DOCUMENT_NODE: // 5.1 Root Node
+      case Node.DOCUMENT_FRAGMENT_NODE:
+      case Node.ELEMENT_NODE: // 5.2 Element Nodes
+        StringBuffer buf = new StringBuffer();
+        for (Node ctx = node.getFirstChild(); ctx != null;
+             ctx = ctx.getNextSibling())
+          {
+            buf.append(stringValue(ctx, true));
+          }
+        return buf.toString();
+      case Node.TEXT_NODE: // 5.7 Text Nodes
+      case Node.CDATA_SECTION_NODE:
+        return node.getNodeValue();
+      case Node.ATTRIBUTE_NODE: // 5.3 Attribute Nodes
+      case Node.PROCESSING_INSTRUCTION_NODE: // 5.5 Processing Instruction
+      case Node.COMMENT_NODE: // 5.6 Comment Nodes
+        if (!elementMode)
+          {
+            return node.getNodeValue();
+          }
+      default:
+        return "";
+      }
+  }
+
+}
diff --git a/libjava/gnu/xml/xpath/FalseFunction.java b/libjava/gnu/xml/xpath/FalseFunction.java
new file mode 100644 (file)
index 0000000..85417a1
--- /dev/null
+++ b/libjava/gnu/xml/xpath/FalseFunction.java
@@ -0,0 +1,66 @@
+/* FalseFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import org.w3c.dom.Node;
+
+/**
+ * The <code>false</code> function returns false.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class FalseFunction
+  extends Expr
+{
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    return Boolean.FALSE;
+  }
+
+  public Expr clone(Object context)
+  {
+    return new FalseFunction();
+  }
+
+  public String toString()
+  {
+    return "false()";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/FloorFunction.java b/libjava/gnu/xml/xpath/FloorFunction.java
new file mode 100644 (file)
index 0000000..dd9cd84
--- /dev/null
+++ b/libjava/gnu/xml/xpath/FloorFunction.java
@@ -0,0 +1,83 @@
+/* FloorFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>floor</code> function returns the largest (closest to positive
+ * infinity) number that is not greater than the argument and that is an
+ * integer.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class FloorFunction
+  extends Expr
+{
+
+  final Expr arg;
+
+  FloorFunction(List args)
+  {
+    this((Expr) args.get(0));
+  }
+
+  FloorFunction(Expr arg)
+  {
+    this.arg = arg;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = arg.evaluate(context, pos, len);
+    double n = _number(context, val);
+    return new Double(Math.floor(n));
+  }
+
+  public Expr clone(Object context)
+  {
+    return new FloorFunction(arg.clone(context));
+  }
+
+  public String toString()
+  {
+    return "floor(" + arg + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/Function.java b/libjava/gnu/xml/xpath/Function.java
new file mode 100644 (file)
index 0000000..d40dff6
--- /dev/null
+++ b/libjava/gnu/xml/xpath/Function.java
@@ -0,0 +1,57 @@
+/* Function.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+
+/**
+ * Interface to be implemented by external functions that need to receive
+ * parameter values.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public interface Function
+{
+
+  /**
+   * Sets the list of expressions to evaluate as parameter values.
+   */
+  void setArguments(List args);
+
+}
+
diff --git a/libjava/gnu/xml/xpath/FunctionCall.java b/libjava/gnu/xml/xpath/FunctionCall.java
new file mode 100644 (file)
index 0000000..2c77b58
--- /dev/null
+++ b/libjava/gnu/xml/xpath/FunctionCall.java
@@ -0,0 +1,151 @@
+/* FunctionCall.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import javax.xml.namespace.QName;
+import javax.xml.xpath.XPathFunction;
+import javax.xml.xpath.XPathFunctionException;
+import javax.xml.xpath.XPathFunctionResolver;
+import org.w3c.dom.Node;
+
+/**
+ * Executes an XPath core or extension function.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public final class FunctionCall
+  extends Expr
+{
+
+  final XPathFunctionResolver resolver;
+  final String name;
+  final List args;
+
+  public FunctionCall(XPathFunctionResolver resolver, String name)
+  {
+    this(resolver, name, Collections.EMPTY_LIST);
+  }
+
+  public FunctionCall(XPathFunctionResolver resolver, String name, List args)
+  {
+    this.resolver = resolver;
+    this.name = name;
+    this.args = args;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    if (resolver != null)
+      {
+        QName qname = QName.valueOf(name);
+                               int arity = args.size();
+        XPathFunction function = resolver.resolveFunction(qname, arity);
+        if (function != null)
+          {
+            //System.err.println("Calling "+toString()+" with "+values);
+            if (function instanceof Expr)
+              {
+                if (function instanceof Function)
+                  {
+                    ((Function) function).setArguments(args);
+                  }
+                return ((Expr) function).evaluate(context, pos, len);
+              }
+            else
+              {
+                List values = new ArrayList(arity);
+                for (int i = 0; i < arity; i++)
+                  {
+                    Expr arg = (Expr) args.get(i);
+                    values.add(arg.evaluate(context, pos, len));
+                  }
+                try
+                  {
+                    return function.evaluate(values);
+                  }
+                catch (XPathFunctionException e)
+                  {
+                    e.printStackTrace(System.err); // FIXME
+                    throw new RuntimeException(e.getMessage(), e);
+                  }
+              }
+          }
+      }
+    throw new IllegalArgumentException("Invalid function call: " +
+                                       toString());
+  }
+
+  public Expr clone(Object context)
+  {
+    int len = args.size();
+    List args2 = new ArrayList(len);
+    for (int i = 0; i < len; i++)
+      {
+        args2.add(((Expr) args.get(i)).clone(context));
+      }
+    XPathFunctionResolver r = resolver;
+    if (context instanceof XPathFunctionResolver)
+      {
+        r = (XPathFunctionResolver) context;
+      }
+    return new FunctionCall(r, name, args2);
+  }
+
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer();
+    buf.append(name);
+    buf.append('(');
+    int len = args.size();
+    for (int i = 0; i < len; i++)
+      {
+        if (i > 0)
+          {
+            buf.append(',');
+          }
+        buf.append(args.get(i));
+      }
+    buf.append(')');
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/IdFunction.java b/libjava/gnu/xml/xpath/IdFunction.java
new file mode 100644 (file)
index 0000000..a32cb89
--- /dev/null
+++ b/libjava/gnu/xml/xpath/IdFunction.java
@@ -0,0 +1,96 @@
+/* IdFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.Collection;
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>id</code> function selects elements by their unique ID.
+ * When the argument to id is of type node-set, then the result is
+ * the union of the result of applying id to the string-value of each of the
+ * nodes in the argument node-set. When the argument to id is of any other
+ * type, the argument is converted to a string as if by a call to the string
+ * function; the string is split into a whitespace-separated list of tokens
+ * (whitespace is any sequence of characters matching the production S); the
+ * result is a node-set containing the elements in the same document as the
+ * context node that have a unique ID equal to any of the tokens in the
+ * list.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public final class IdFunction
+  extends Pattern
+{
+
+  final Expr arg;
+
+  IdFunction(List args)
+  {
+    this((Expr) args.get(0));
+  }
+
+  public IdFunction(Expr arg)
+  {
+    this.arg = arg;
+  }
+
+  public boolean matches(Node context)
+  {
+    Object ret = evaluate(context, 1, 1);
+    return !((Collection) ret).isEmpty();
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = arg.evaluate(context, pos, len);
+    return _id(context, val);
+  }
+
+  public Expr clone(Object context)
+  {
+    return new IdFunction(arg.clone(context));
+  }
+
+  public String toString()
+  {
+    return "id(" + arg + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/LangFunction.java b/libjava/gnu/xml/xpath/LangFunction.java
new file mode 100644 (file)
index 0000000..d44c72c
--- /dev/null
+++ b/libjava/gnu/xml/xpath/LangFunction.java
@@ -0,0 +1,110 @@
+/* LangFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>lang</code> function returns true or false depending on whether
+ * the language of the context node as specified by xml:lang attributes is
+ * the same as or is a sublanguage of the language specified by the argument
+ * string. The language of the context node is determined by the value of
+ * the xml:lang attribute on the context node, or, if the context node has
+ * no xml:lang attribute, by the value of the xml:lang attribute on the
+ * nearest ancestor of the context node that has an xml:lang attribute. If
+ * there is no such attribute, then lang returns false. If there is such an
+ * attribute, then lang returns true if the attribute value is equal to the
+ * argument ignoring case, or if there is some suffix starting with - such
+ * that the attribute value is equal to the argument ignoring that suffix of
+ * the attribute value and ignoring case.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class LangFunction
+  extends Expr
+{
+
+  final Expr arg;
+
+  LangFunction(List args)
+  {
+    this((Expr) args.get(0));
+  }
+
+  LangFunction(Expr arg)
+  {
+    this.arg = arg;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = arg.evaluate(context, pos, len);
+    String lang = _string(context, val);
+    String clang = getLang(context);
+    while (clang == null && context != null)
+      {
+        context = context.getParentNode();
+        clang = getLang(context);
+      }
+    boolean ret = (clang == null) ? false :
+      clang.toLowerCase().startsWith(lang.toLowerCase());
+    return ret ? Boolean.TRUE : Boolean.FALSE;
+  }
+
+  String getLang(Node node)
+  {
+    if (node.getNodeType() == Node.ELEMENT_NODE)
+      {
+        return ((Element) node).getAttribute("xml:lang");
+      }
+    return null;
+  }
+  
+  public Expr clone(Object context)
+  {
+    return new IdFunction(arg.clone(context));
+  }
+
+  public String toString()
+  {
+    return "lang(" + arg + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/LastFunction.java b/libjava/gnu/xml/xpath/LastFunction.java
new file mode 100644 (file)
index 0000000..a7458a3
--- /dev/null
+++ b/libjava/gnu/xml/xpath/LastFunction.java
@@ -0,0 +1,67 @@
+/* LastFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import org.w3c.dom.Node;
+
+/**
+ * The <code>last</code> function returns a number equal to the context
+ * size from the expression evaluation context.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class LastFunction
+  extends Expr
+{
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    return new Double((double) len);
+  }
+
+  public Expr clone(Object context)
+  {
+    return new LastFunction();
+  }
+
+  public String toString()
+  {
+    return "last()";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/LocalNameFunction.java b/libjava/gnu/xml/xpath/LocalNameFunction.java
new file mode 100644 (file)
index 0000000..d91f973
--- /dev/null
+++ b/libjava/gnu/xml/xpath/LocalNameFunction.java
@@ -0,0 +1,87 @@
+/* LocalNameFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.Collection;
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>local-name</code> function returns the local part of the
+ * expanded-name of the node in the argument node-set that is first in
+ * document order.
+ * If the argument node-set is empty or the first node has no expanded-name,
+ * an empty string is returned. If the argument is omitted, it defaults to a
+ * node-set with the context node as its only member.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class LocalNameFunction
+  extends Expr
+{
+
+  final Expr arg;
+
+  LocalNameFunction(List args)
+  {
+    this(args.size() > 0 ? (Expr) args.get(0) : null);
+  }
+
+  LocalNameFunction(Expr arg)
+  {
+    this.arg = arg;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = (arg == null) ? null : arg.evaluate(context, pos, len);
+    return _local_name(context, (Collection) val);
+  }
+
+  public Expr clone(Object context)
+  {
+    return new LocalNameFunction((arg == null) ? null :
+                                 arg.clone(context));
+  }
+
+  public String toString()
+  {
+    return (arg == null) ? "local-name()" : "local-name(" + arg + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/NameFunction.java b/libjava/gnu/xml/xpath/NameFunction.java
new file mode 100644 (file)
index 0000000..a42681d
--- /dev/null
+++ b/libjava/gnu/xml/xpath/NameFunction.java
@@ -0,0 +1,95 @@
+/* NameFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.Collection;
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>name</code> function returns a string containing a QName
+ * representing the expanded-name of the node in the argument node-set that
+ * is first in document order. The QName must represent the expanded-name
+ * with respect to the namespace declarations in effect on the node whose
+ * expanded-name is being represented. Typically, this will be the QName
+ * that occurred in the XML source. This need not be the case if there are
+ * namespace declarations in effect on the node that associate multiple
+ * prefixes with the same namespace. However, an implementation may include
+ * information about the original prefix in its representation of nodes; in
+ * this case, an implementation can ensure that the returned string is
+ * always the same as the QName used in the XML source. If the argument
+ * node-set is empty or the first node has no expanded-name, an empty string
+ * is returned. If the argument it omitted, it defaults to a node-set with
+ * the context node as its only member.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class NameFunction
+  extends Expr
+{
+
+  final Expr arg;
+
+  NameFunction(List args)
+  {
+    this(args.size() > 0 ? (Expr) args.get(0) : null);
+  }
+
+  NameFunction(Expr arg)
+  {
+    this.arg = arg;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = (arg == null) ? null : arg.evaluate(context, pos, len);
+    return _name(context, (Collection) val);
+  }
+
+  public Expr clone(Object context)
+  {
+    return new NameFunction((arg == null) ? null :
+                            arg.clone(context));
+  }
+  
+  public String toString()
+  {
+    return (arg == null) ? "name()" : "name(" + arg + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/NameTest.java b/libjava/gnu/xml/xpath/NameTest.java
new file mode 100644 (file)
index 0000000..ececc92
--- /dev/null
+++ b/libjava/gnu/xml/xpath/NameTest.java
@@ -0,0 +1,131 @@
+/* NameTest.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+import org.w3c.dom.Node;
+
+/**
+ * Tests whether a node has the specified name.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public final class NameTest
+  extends Test
+{
+
+  final QName qName;
+  final boolean anyLocalName;
+  final boolean any;
+
+  public NameTest(QName qName, boolean anyLocalName, boolean any)
+  {
+    this.anyLocalName = anyLocalName;
+    this.any = any;
+    this.qName = qName;
+  }
+
+  public boolean matchesAny()
+  {
+    return any;
+  }
+
+  public boolean matchesAnyLocalName()
+  {
+    return anyLocalName;
+  }
+
+  public boolean matches(Node node, int pos, int len)
+  {
+    switch (node.getNodeType())
+      {
+      case Node.ATTRIBUTE_NODE:
+        // Do not match namespace attributes
+        String uri = node.getNamespaceURI();
+        if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(uri) ||
+            XMLConstants.XMLNS_ATTRIBUTE.equals(node.getPrefix()) ||
+            XMLConstants.XMLNS_ATTRIBUTE.equals(node.getNodeName()))
+          {
+            return false;
+          }
+        // Fall through
+      case Node.ELEMENT_NODE:
+        break;
+      default:
+        return false;
+      }
+    if (any)
+      {
+        return true;
+      }
+    String uri = qName.getNamespaceURI();
+    if (!equal(uri, node.getNamespaceURI()))
+      {
+        return false;
+      }
+    if (anyLocalName)
+      {
+        return true;
+      }
+    String localName = qName.getLocalPart();
+    return (localName.equals(node.getLocalName()));
+  }
+
+  final boolean equal(String s1, String s2)
+  {
+    return (((s1 == null || s1.length() == 0) &&
+             (s2 == null || s2.length() == 0)) ||
+            s1 != null && s1.equals(s2));
+  }
+
+  public Test clone(Object context)
+  {
+    return new NameTest(qName, anyLocalName, any);
+  }
+
+  public String toString ()
+  {
+    if (any)
+      {
+        return "*";
+      }
+    return qName.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/NamespaceTest.java b/libjava/gnu/xml/xpath/NamespaceTest.java
new file mode 100644 (file)
index 0000000..bdfe961
--- /dev/null
+++ b/libjava/gnu/xml/xpath/NamespaceTest.java
@@ -0,0 +1,118 @@
+/* NamespaceTest.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+import org.w3c.dom.Node;
+
+/**
+ * Tests whether a namespace attribute has the specified name.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public final class NamespaceTest
+  extends Test
+{
+
+  final QName qName;
+  final boolean anyLocalName;
+  final boolean any;
+
+  public NamespaceTest(QName qName, boolean anyLocalName, boolean any)
+  {
+    this.anyLocalName = anyLocalName;
+    this.any = any;
+    this.qName = qName;
+  }
+
+  public boolean matchesAny()
+  {
+    return any;
+  }
+
+  public boolean matchesAnyLocalName()
+  {
+    return anyLocalName;
+  }
+
+  public boolean matches(Node node, int pos, int len)
+  {
+    switch (node.getNodeType())
+      {
+      case Node.ATTRIBUTE_NODE:
+        // Only match namespace attributes
+        String uri = node.getNamespaceURI();
+        if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(uri) ||
+            XMLConstants.XMLNS_ATTRIBUTE.equals(node.getPrefix()) ||
+            XMLConstants.XMLNS_ATTRIBUTE.equals(node.getNodeName()))
+          {
+            break;
+          }
+        // Fall through
+      default:
+        // Only process namespace attributes
+        return false;
+      }
+    if (any)
+      {
+        return true;
+      }
+    if (anyLocalName)
+      {
+        return true;
+      }
+    String localName = qName.getLocalPart();
+    return (localName.equals(node.getLocalName()));
+  }
+
+  public Test clone(Object context)
+  {
+    return new NamespaceTest(qName, anyLocalName, any);
+  }
+
+  public String toString ()
+  {
+    if (any)
+      {
+        return "*";
+      }
+    return qName.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/NamespaceUriFunction.java b/libjava/gnu/xml/xpath/NamespaceUriFunction.java
new file mode 100644 (file)
index 0000000..ee8978e
--- /dev/null
+++ b/libjava/gnu/xml/xpath/NamespaceUriFunction.java
@@ -0,0 +1,87 @@
+/* NamespaceUriFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.Collection;
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>namespace-uri</code> function returns the namespace URI of the
+ * expanded-name of the node in the argument node-set that is first in
+ * document order. If the argument node-set is empty, the first node has no
+ * expanded-name, or the namespace URI of the expanded-name is null, an
+ * empty string is returned. If the argument is omitted, it defaults to a
+ * node-set with the context node as its only member.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class NamespaceUriFunction
+  extends Expr
+{
+
+  final Expr arg;
+
+  NamespaceUriFunction(List args)
+  {
+    this(args.size() > 0 ? (Expr) args.get(0) : null);
+  }
+  
+  NamespaceUriFunction(Expr arg)
+  {
+    this.arg = arg;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = (arg == null) ? null : arg.evaluate(context, pos, len);
+    return _namespace_uri(context, (Collection) val);
+  }
+
+  public Expr clone(Object context)
+  {
+    return new NamespaceUriFunction((arg == null) ? null :
+                                    arg.clone(context));
+  }
+  
+  public String toString()
+  {
+    return (arg == null) ? "namespace-uri()" : "namespace-uri(" + arg + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/NegativeExpr.java b/libjava/gnu/xml/xpath/NegativeExpr.java
new file mode 100644 (file)
index 0000000..5d7c00d
--- /dev/null
+++ b/libjava/gnu/xml/xpath/NegativeExpr.java
@@ -0,0 +1,75 @@
+/* NegativeExpr.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import org.w3c.dom.Node;
+
+/**
+ * Unary negative.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class NegativeExpr
+  extends Expr
+{
+
+  final Expr expr;
+
+  NegativeExpr(Expr expr)
+  {
+    this.expr = expr;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = expr.evaluate(context, pos, len);
+    double n = _number(context, val);
+    return new Double(-n);
+  }
+
+  public Expr clone(Object context)
+  {
+    return new NegativeExpr(expr.clone(context));
+  }
+
+  public String toString()
+  {
+    return "-" + expr;
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/NodeTypeTest.java b/libjava/gnu/xml/xpath/NodeTypeTest.java
new file mode 100644 (file)
index 0000000..d7798a2
--- /dev/null
+++ b/libjava/gnu/xml/xpath/NodeTypeTest.java
@@ -0,0 +1,130 @@
+/* NodeTypeTest.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import org.w3c.dom.Node;
+
+/**
+ * Tests whether a node is of a given type.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public final class NodeTypeTest
+  extends Test
+{
+
+  final short type;
+  final String data;
+
+  public NodeTypeTest(short type)
+  {
+    this(type, null);
+  }
+
+  public NodeTypeTest(short type, String data)
+  {
+    this.type = type;
+    this.data = data;
+  }
+
+  public short getNodeType()
+  {
+    return type;
+  }
+
+  public String getData()
+  {
+    return data;
+  }
+
+  public boolean matches(Node node, int pos, int len)
+  {
+    short nodeType = node.getNodeType();
+    switch (nodeType)
+      {
+      case Node.ELEMENT_NODE:
+      case Node.ATTRIBUTE_NODE:
+      case Node.TEXT_NODE:
+      case Node.CDATA_SECTION_NODE:
+      case Node.COMMENT_NODE:
+      case Node.PROCESSING_INSTRUCTION_NODE:
+        if (type > 0)
+          {
+            if (nodeType != type)
+              {
+                return false;
+              }
+            if (data != null && !data.equals(node.getNodeValue()))
+              {
+                return false;
+              }
+          }
+        return true;
+      default:
+        // Not part of XPath data model
+        return false;
+      }
+  }
+
+  public Test clone(Object context)
+  {
+    return new NodeTypeTest(type, data);
+  }
+
+  public String toString()
+  {
+    switch (type)
+      {
+      case 0:
+        return "node()";
+      case Node.TEXT_NODE:
+        return "text()";
+      case Node.COMMENT_NODE:
+        return "comment()";
+      case Node.PROCESSING_INSTRUCTION_NODE:
+        if (data != null)
+          {
+            return "processing-instruction('" + data + "')";
+          }
+        return "processing-instruction()";
+      default:
+        throw new IllegalStateException();
+      }
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/NormalizeSpaceFunction.java b/libjava/gnu/xml/xpath/NormalizeSpaceFunction.java
new file mode 100644 (file)
index 0000000..2dabe1e
--- /dev/null
+++ b/libjava/gnu/xml/xpath/NormalizeSpaceFunction.java
@@ -0,0 +1,99 @@
+/* NormalizeSpaceFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+import java.util.StringTokenizer;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>normalize-space</code> function returns the argument string
+ * with whitespace normalized by stripping leading and trailing whitespace
+ * and replacing sequences of whitespace characters by a single space.
+ * Whitespace characters are the same as those allowed by the S production
+ * in XML. If the argument is omitted, it defaults to the context node
+ * converted to a string, in other words the string-value of the context
+ * node.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class NormalizeSpaceFunction
+  extends Expr
+{
+
+  final Expr arg;
+
+  NormalizeSpaceFunction(List args)
+  {
+    this((Expr) args.get(0));
+  }
+  
+  NormalizeSpaceFunction(Expr arg)
+  {
+    this.arg = arg;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = (arg == null) ? null : arg.evaluate(context, pos, len);
+    String s = _string(context, val);
+    StringTokenizer st = new StringTokenizer(s, " \t\r\n");
+    StringBuffer buf = new StringBuffer();
+    if (st.hasMoreTokens())
+      {
+        buf.append(st.nextToken()); 
+        while (st.hasMoreTokens())
+          {
+            buf.append(' ');
+            buf.append(st.nextToken());
+          }
+      }
+    return buf.toString();
+  }
+
+  public Expr clone(Object context)
+  {
+    return new NormalizeSpaceFunction(arg.clone(context));
+  }
+
+  public String toString()
+  {
+    return (arg == null) ? "normalize-space()" : "normalize-space(" + arg + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/NotFunction.java b/libjava/gnu/xml/xpath/NotFunction.java
new file mode 100644 (file)
index 0000000..d7d1ad1
--- /dev/null
+++ b/libjava/gnu/xml/xpath/NotFunction.java
@@ -0,0 +1,81 @@
+/* NotFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>not</code> function returns true if its argument is false,
+ * and false otherwise.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class NotFunction
+  extends Expr
+{
+
+  final Expr arg;
+
+  NotFunction(List args)
+  {
+    this((Expr) args.get(0));
+  }
+
+  NotFunction(Expr arg)
+  {
+    this.arg = arg;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = arg.evaluate(context, pos, len);
+    return _boolean(context, val) ? Boolean.FALSE : Boolean.TRUE;
+  }
+
+  public Expr clone(Object context)
+  {
+    return new NotFunction(arg.clone(context));
+  }
+
+  public String toString()
+  {
+    return "not(" + arg + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/NumberFunction.java b/libjava/gnu/xml/xpath/NumberFunction.java
new file mode 100644 (file)
index 0000000..9436533
--- /dev/null
+++ b/libjava/gnu/xml/xpath/NumberFunction.java
@@ -0,0 +1,96 @@
+/* NumberFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>number</code> function converts its argument to a number as
+ * follows:
+ * <ul>
+ * <li>a string that consists of optional whitespace followed by an optional
+ * minus sign followed by a Number followed by whitespace is converted to
+ * the IEEE 754 number that is nearest (according to the IEEE 754
+ * round-to-nearest rule) to the mathematical value represented by the
+ * string; any other string is converted to NaN</li>
+ * <li>boolean true is converted to 1; boolean false is converted to 0</li>
+ * <li>a node-set is first converted to a string as if by a call to the
+ * string function and then converted in the same way as a string
+ * argument</li>
+ * <li>an object of a type other than the four basic types is converted to a
+ * number in a way that is dependent on that type</li>
+ * </ul>
+ * If the argument is omitted, it defaults to a node-set with the context
+ * node as its only member.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class NumberFunction
+  extends Expr
+{
+
+  final Expr arg;
+
+  NumberFunction(List args)
+  {
+    this(args.size() > 0 ? (Expr) args.get(0) : null);
+  }
+
+  NumberFunction(Expr arg)
+  {
+    this.arg = arg;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = (arg == null) ? null : arg.evaluate(context, pos, len);
+    return new Double(_number(context, val));
+  }
+
+  public Expr clone(Object context)
+  {
+    return new NumberFunction(arg.clone(context));
+  }
+
+  public String toString()
+  {
+    return "number(" + arg + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/OrExpr.java b/libjava/gnu/xml/xpath/OrExpr.java
new file mode 100644 (file)
index 0000000..4cfda4a
--- /dev/null
+++ b/libjava/gnu/xml/xpath/OrExpr.java
@@ -0,0 +1,81 @@
+/* OrExpr.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import org.w3c.dom.Node;
+
+/**
+ * Logical or.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public final class OrExpr
+  extends Expr
+{
+
+  final Expr lhs;
+  final Expr rhs;
+
+  public OrExpr(Expr lhs, Expr rhs)
+  {
+    this.lhs = lhs;
+    this.rhs = rhs;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object left = lhs.evaluate(context, pos, len);
+    if (_boolean(context, left))
+      {
+        return Boolean.TRUE;
+      }
+    Object right = rhs.evaluate(context, pos, len);
+    return _boolean(context, right) ? Boolean.TRUE : Boolean.FALSE;
+  }
+
+  public Expr clone(Object context)
+  {
+    return new OrExpr(lhs.clone(context), rhs.clone(context));
+  }
+
+  public String toString()
+  {
+    return lhs + " or " + rhs;
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/ParenthesizedExpr.java b/libjava/gnu/xml/xpath/ParenthesizedExpr.java
new file mode 100644 (file)
index 0000000..6c2d571
--- /dev/null
+++ b/libjava/gnu/xml/xpath/ParenthesizedExpr.java
@@ -0,0 +1,84 @@
+/* ParenthesizedExpr.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * Simple subexpression.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class ParenthesizedExpr
+  extends Expr
+{
+
+  final Expr expr;
+
+  ParenthesizedExpr(Expr expr)
+  {
+    this.expr = expr;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object ret = expr.evaluate(context, pos, len);
+    if (ret instanceof Collection)
+      {
+        List list = new ArrayList((Collection) ret);
+        Collections.sort(list, documentOrderComparator);
+        ret = list;
+      }
+    return ret;
+  }
+
+  public Expr clone(Object context)
+  {
+    return new ParenthesizedExpr(expr.clone(context));
+  }
+
+  public String toString()
+  {
+    return "(" + expr + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/Path.java b/libjava/gnu/xml/xpath/Path.java
new file mode 100644 (file)
index 0000000..488215e
--- /dev/null
+++ b/libjava/gnu/xml/xpath/Path.java
@@ -0,0 +1,54 @@
+/* Path.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.Collection;
+import org.w3c.dom.Node;
+
+/**
+ * An XPath path component expression.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+abstract class Path
+  extends Pattern
+{
+
+  abstract Collection evaluate(Node context, Collection nodeSet);
+  
+}
diff --git a/libjava/gnu/xml/xpath/Pattern.java b/libjava/gnu/xml/xpath/Pattern.java
new file mode 100644 (file)
index 0000000..dcce68f
--- /dev/null
+++ b/libjava/gnu/xml/xpath/Pattern.java
@@ -0,0 +1,54 @@
+/* Pattern.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import org.w3c.dom.Node;
+
+/**
+ * Interface implemented by expressions that can for part of XSL patterns.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public abstract class Pattern
+  extends Expr
+{
+
+  public abstract boolean matches(Node context);
+
+}
+
diff --git a/libjava/gnu/xml/xpath/PositionFunction.java b/libjava/gnu/xml/xpath/PositionFunction.java
new file mode 100644 (file)
index 0000000..6d6f7ad
--- /dev/null
+++ b/libjava/gnu/xml/xpath/PositionFunction.java
@@ -0,0 +1,67 @@
+/* PositionFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import org.w3c.dom.Node;
+
+/**
+ * The <code>position</code> function returns a number equal to the context
+ * position from the expression evaluation context.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class PositionFunction
+  extends Expr
+{
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    return new Double((double) pos);
+  }
+
+  public Expr clone(Object context)
+  {
+    return new PositionFunction();
+  }
+
+  public String toString()
+  {
+    return "position()";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/Predicate.java b/libjava/gnu/xml/xpath/Predicate.java
new file mode 100644 (file)
index 0000000..81e1755
--- /dev/null
+++ b/libjava/gnu/xml/xpath/Predicate.java
@@ -0,0 +1,79 @@
+/* Predicate.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import org.w3c.dom.Node;
+
+/**
+ * Tests whether an expression matches against a given context node.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+class Predicate
+  extends Test
+{
+
+  final Expr expr;
+
+  Predicate(Expr expr)
+  {
+    this.expr = expr;
+  }
+
+  public boolean matches(Node node, int pos, int len)
+  {
+    Object ret = expr.evaluate(node, pos, len);
+    if (ret instanceof Double)
+      {
+        // Same as [position() = x]
+        return ((Double) ret).intValue() == pos;
+      }
+    return expr._boolean(node, expr.evaluate(node, pos, len));
+  }
+
+  public Test clone(Object context)
+  {
+    return new Predicate(expr.clone(context));
+  }
+  
+  public String toString()
+  {
+    return "[" + expr + "]";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/RelationalExpr.java b/libjava/gnu/xml/xpath/RelationalExpr.java
new file mode 100644 (file)
index 0000000..e039cc1
--- /dev/null
+++ b/libjava/gnu/xml/xpath/RelationalExpr.java
@@ -0,0 +1,102 @@
+/* RelationalExpr.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.Collection;
+import org.w3c.dom.Node;
+
+/**
+ * Numerical comparison expression.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class RelationalExpr
+  extends Expr
+{
+
+  final Expr lhs;
+  final Expr rhs;
+  final boolean lt;
+  final boolean eq;
+
+  RelationalExpr(Expr lhs, Expr rhs, boolean lt, boolean eq)
+  {
+    this.lhs = lhs;
+    this.rhs = rhs;
+    this.lt = lt;
+    this.eq = eq;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object left = lhs.evaluate(context, pos, len);
+    Object right = rhs.evaluate(context, pos, len);
+    double ln = _number(context, left);
+    double rn = _number(context, right);
+    if (eq && ln == rn)
+      {
+        return Boolean.TRUE;
+      }
+    if (lt)
+      {
+        if (ln < rn || Double.isInfinite(rn))
+          {
+            return Boolean.TRUE;
+          }
+      }
+    else
+      {
+        if (ln > rn || Double.isInfinite(ln))
+          {
+            return Boolean.TRUE;
+          }
+      }
+    return Boolean.FALSE;
+  }
+
+  public Expr clone(Object context)
+  {
+    return new RelationalExpr(lhs.clone(context), rhs.clone(context), lt, eq);
+  }
+
+  public String toString()
+  {
+    return lhs + " " + (lt ? "<" : ">") + (eq ? "=" : "") + " " + rhs;
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/Root.java b/libjava/gnu/xml/xpath/Root.java
new file mode 100644 (file)
index 0000000..b8fe5df
--- /dev/null
+++ b/libjava/gnu/xml/xpath/Root.java
@@ -0,0 +1,81 @@
+/* Root.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.Collection;
+import java.util.Collections;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
+/**
+ * Expression that evaluates to the document root.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public final class Root
+  extends Path
+{
+
+  public boolean matches(Node node)
+  {
+    return (node.getNodeType() == Node.DOCUMENT_NODE);
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    return evaluate(context, Collections.EMPTY_SET);
+  }
+
+  Collection evaluate(Node context, Collection ns)
+  {
+    Document doc = (context instanceof Document) ? (Document) context :
+      context.getOwnerDocument();
+    return Collections.singleton(doc);
+  }
+
+  public Expr clone(Object context)
+  {
+    return new Root();
+  }
+
+  public String toString()
+  {
+    return "/";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/RoundFunction.java b/libjava/gnu/xml/xpath/RoundFunction.java
new file mode 100644 (file)
index 0000000..76f5d8a
--- /dev/null
+++ b/libjava/gnu/xml/xpath/RoundFunction.java
@@ -0,0 +1,90 @@
+/* RoundFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>round</code> function returns the number that is closest to the
+ * argument and that is an integer. If there are two such numbers, then the
+ * one that is closest to positive infinity is returned. If the argument is
+ * NaN, then NaN is returned. If the argument is positive infinity, then
+ * positive infinity is returned. If the argument is negative infinity, then
+ * negative infinity is returned. If the argument is positive zero, then
+ * positive zero is returned. If the argument is negative zero, then
+ * negative zero is returned. If the argument is less than zero, but greater
+ * than or equal to -0.5, then negative zero is returned.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class RoundFunction
+  extends Expr
+{
+
+  final Expr arg;
+
+  RoundFunction(List args)
+  {
+    this((Expr) args.get(0));
+  }
+
+  RoundFunction(Expr arg)
+  {
+    this.arg = arg;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = arg.evaluate(context, pos, len);
+    double n = _number(context, val);
+    return (Double.isNaN(n) || Double.isInfinite(n)) ?
+      new Double(n) : new Double(Math.round(n));
+  }
+
+  public Expr clone(Object context)
+  {
+    return new RoundFunction(arg.clone(context));
+  }
+
+  public String toString()
+  {
+    return "round(" + arg + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/Selector.java b/libjava/gnu/xml/xpath/Selector.java
new file mode 100644 (file)
index 0000000..5431cbe
--- /dev/null
+++ b/libjava/gnu/xml/xpath/Selector.java
@@ -0,0 +1,500 @@
+/* Selector.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import javax.xml.XMLConstants;
+import org.w3c.dom.Attr;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * A single component of a location path.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public final class Selector
+  extends Path
+{
+
+  public static final int ANCESTOR = 0;
+  public static final int ANCESTOR_OR_SELF = 1;
+  public static final int ATTRIBUTE = 2;
+  public static final int CHILD = 3;
+  public static final int DESCENDANT = 4;
+  public static final int DESCENDANT_OR_SELF = 5;
+  public static final int FOLLOWING = 6;
+  public static final int FOLLOWING_SIBLING = 7;
+  public static final int NAMESPACE = 8;
+  public static final int PARENT = 9;
+  public static final int PRECEDING = 10;
+  public static final int PRECEDING_SIBLING = 11;
+  public static final int SELF = 12;
+
+  /**
+   * Axis to select nodes in.
+   */
+  final int axis;
+
+  /**
+   * List of tests to perform on candidates.
+   */
+  final Test[] tests;
+
+  public Selector(int axis, List tests)
+  {
+    this.axis = axis;
+    this.tests = new Test[tests.size()];
+    tests.toArray(this.tests);
+    if (axis == NAMESPACE &&
+        this.tests.length > 0 &&
+        this.tests[0] instanceof NameTest)
+      {
+        NameTest nt = (NameTest) this.tests[0];
+        this.tests[0] = new NamespaceTest(nt.qName, nt.anyLocalName, nt.any);
+      }
+  }
+
+  /**
+   * Returns the list of tests to perform on candidates.
+   */
+  public Test[] getTests()
+  {
+    return tests;
+  }
+
+  public boolean matches(Node context)
+  {
+    short nodeType = context.getNodeType();
+    switch (axis)
+      {
+      case CHILD:
+        if (nodeType == Node.ATTRIBUTE_NODE)
+          {
+            return false;
+          }
+        break;
+      case ATTRIBUTE:
+      case NAMESPACE:
+        if (nodeType != Node.ATTRIBUTE_NODE)
+          {
+            return false;
+          }
+        break;
+      case DESCENDANT_OR_SELF:
+        return true;
+      default:
+        return false;
+      }
+    int tlen = tests.length;
+    if (tlen > 0)
+      {
+        int pos = getContextPosition(context);
+        int len = getContextSize(context);
+        for (int j = 0; j < tlen && len > 0; j++)
+          {
+            Test test = tests[j];
+            if (!test.matches(context, pos, len))
+              {
+                return false;
+              }
+          }
+      }
+    return true;
+  }
+
+  private int getContextPosition(Node ctx)
+  {
+    int pos = 1;
+    for (ctx = ctx.getPreviousSibling(); ctx != null;
+         ctx = ctx.getPreviousSibling())
+      {
+        pos++;
+      }
+    return pos;
+  }
+
+  private int getContextSize(Node ctx)
+  {
+    if (ctx.getNodeType() == Node.ATTRIBUTE_NODE)
+      {
+        Node parent = ((Attr) ctx).getOwnerElement();
+        return parent.getAttributes().getLength();
+      }
+    Node parent = ctx.getParentNode();
+    if (parent != null)
+      {
+        return parent.getChildNodes().getLength();
+      }
+    return 1;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Set acc = new LinkedHashSet();
+    addCandidates(context, acc);
+    List candidates = new ArrayList(acc);
+    //Collections.sort(candidates, documentOrderComparator);
+    List ret = filterCandidates(candidates, false);
+    return ret;
+  }
+
+  Collection evaluate(Node context, Collection ns)
+  {
+    Set acc = new LinkedHashSet();
+    for (Iterator i = ns.iterator(); i.hasNext(); )
+      {
+        addCandidates((Node) i.next(), acc);
+      }
+    List candidates = new ArrayList(acc);
+    //Collections.sort(candidates, documentOrderComparator);
+    List ret = filterCandidates(candidates, true);
+    return ret;
+  }
+
+  /**
+   * Filter the given list of candidates according to the node tests.
+   */
+  List filterCandidates(List candidates, boolean cascade)
+  {
+    int len = candidates.size();
+    int tlen = tests.length;
+    if (tlen > 0 && len > 0)
+      {
+        // Present the result of each successful generation to the next test
+        for (int j = 0; j < tlen && len > 0; j++)
+          {
+            Test test = tests[j];
+            List successful = new ArrayList(len);
+            for (int i = 0; i < len; i++)
+              {
+                Node node = (Node) candidates.get(i);
+                if (cascade)
+                  {
+                    // Documents and DocumentFragments should be considered
+                    // if part of a location path where the axis involves
+                    // the SELF concept
+                    short nodeType = node.getNodeType();
+                    if ((nodeType == Node.DOCUMENT_NODE ||
+                         nodeType == Node.DOCUMENT_FRAGMENT_NODE) &&
+                        (axis == DESCENDANT_OR_SELF ||
+                         axis == ANCESTOR_OR_SELF ||
+                         axis == SELF) &&
+                        (tests.length == 1 &&
+                         tests[0] instanceof NodeTypeTest &&
+                         ((NodeTypeTest) tests[0]).type == (short) 0))
+                      {
+                        successful.add(node);
+                        continue;
+                      }
+                  }
+                if (test.matches(node, i + 1, len))
+                  {
+                    successful.add(node);
+                  }
+                /*
+                   System.err.println("Testing "+node);
+                   int p = getContextPosition(node);
+                   int l = getContextSize(node);
+                   if (test.matches(node, p, l))
+                   {
+                   successful.add(node);
+                   }*/
+              }
+            candidates = successful;
+            len = candidates.size();
+          }
+      }
+    return candidates;
+  }
+
+  void addCandidates(Node context, Collection candidates)
+  {
+    // Build list of candidates
+    switch (axis)
+      {
+      case CHILD:
+        addChildNodes(context, candidates, false);
+        break;
+      case DESCENDANT:
+        addChildNodes(context, candidates, true);
+        break;
+      case DESCENDANT_OR_SELF:
+        candidates.add (context);
+        addChildNodes(context, candidates, true);
+        break;
+      case PARENT:
+        addParentNode(context, candidates, false);
+        break;
+      case ANCESTOR:
+        addParentNode(context, candidates, true);
+        break;
+      case ANCESTOR_OR_SELF:
+        candidates.add(context);
+        addParentNode(context, candidates, true);
+        break;
+      case FOLLOWING_SIBLING:
+        addFollowingNodes(context, candidates, false);
+        break;
+      case PRECEDING_SIBLING:
+        addPrecedingNodes(context, candidates, false);
+        break;
+      case FOLLOWING:
+        addFollowingNodes(context, candidates, true);
+        break;
+      case PRECEDING:
+        addPrecedingNodes(context, candidates, true);
+        break;
+      case ATTRIBUTE:
+        addAttributes(context, candidates);
+        break;
+      case NAMESPACE:
+        addNamespaceAttributes(context, candidates);
+        break;
+      case SELF:
+        candidates.add(context);
+        break;
+      }
+  }
+
+  void addChildNodes(Node context, Collection acc, boolean recurse)
+  {
+    Node child = context.getFirstChild();
+    while (child != null)
+      {
+        acc.add(child);
+        if (recurse)
+          {
+            addChildNodes(child, acc, recurse);
+          }
+        child = child.getNextSibling();
+      }
+  }
+
+  void addParentNode(Node context, Collection acc, boolean recurse)
+  {
+    Node parent = (context.getNodeType() == Node.ATTRIBUTE_NODE) ?
+      ((Attr) context).getOwnerElement() : context.getParentNode();
+    if (parent != null)
+      {
+        acc.add(parent);
+        if (recurse)
+          {
+            addParentNode(parent, acc, recurse);
+          }
+      }
+  }
+
+  void addFollowingNodes(Node context, Collection acc, boolean recurse)
+  {
+    Node cur = context.getNextSibling();
+    while (cur != null)
+      {
+        acc.add(cur);
+        if (recurse)
+          {
+            addChildNodes(cur, acc, true);
+          }
+        cur = cur.getNextSibling();
+      }
+    if (recurse)
+      {
+        context = (context.getNodeType() == Node.ATTRIBUTE_NODE) ?
+          ((Attr) context).getOwnerElement() : context.getParentNode();
+        if (context != null)
+          {
+            addFollowingNodes(context, acc, recurse);
+          }
+      }
+  }
+
+  void addPrecedingNodes(Node context, Collection acc, boolean recurse)
+  {
+    Node cur = context.getPreviousSibling();
+    while (cur != null)
+      {
+        acc.add(cur);
+        if (recurse)
+          {
+            addChildNodes(cur, acc, true);
+          }
+        cur = cur.getPreviousSibling();
+      }
+    if (recurse)
+      {
+        context = (context.getNodeType() == Node.ATTRIBUTE_NODE) ?
+          ((Attr) context).getOwnerElement() : context.getParentNode();
+        if (context != null)
+          {
+            addPrecedingNodes(context, acc, recurse);
+          }
+      }
+  }
+
+  void addAttributes(Node context, Collection acc)
+  {
+    NamedNodeMap attrs = context.getAttributes();
+    if (attrs != null)
+      {
+        int attrLen = attrs.getLength();
+        for (int i = 0; i < attrLen; i++)
+          {
+            Node attr = attrs.item(i);
+            if (!isNamespaceAttribute(attr))
+              {
+                acc.add(attr);
+              }
+          }
+      }
+  }
+
+  void addNamespaceAttributes(Node context, Collection acc)
+  {
+    NamedNodeMap attrs = context.getAttributes();
+    if (attrs != null)
+      {
+        int attrLen = attrs.getLength();
+        for (int i = 0; i < attrLen; i++)
+          {
+            Node attr = attrs.item(i);
+            if (isNamespaceAttribute(attr))
+              {
+                acc.add(attr);
+              }
+          }
+      }
+  }
+
+  final boolean isNamespaceAttribute(Node node)
+  {
+    String uri = node.getNamespaceURI();
+    return (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(uri) ||
+            XMLConstants.XMLNS_ATTRIBUTE.equals(node.getPrefix()) ||
+            XMLConstants.XMLNS_ATTRIBUTE.equals(node.getNodeName()));
+  }
+
+  public Expr clone(Object context)
+  {
+    int len = tests.length;
+    List tests2 = new ArrayList(len);
+    for (int i = 0; i < len; i++)
+      {
+        tests2.add(tests[i].clone(context));
+      }
+    return new Selector(axis, tests2);
+  }
+
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer();
+    switch (axis)
+      {
+      case ANCESTOR:
+        buf.append("ancestor::");
+        break;
+      case ANCESTOR_OR_SELF:
+        buf.append("ancestor-or-self::");
+        break;
+      case ATTRIBUTE:
+        buf.append("attribute::");
+        break;
+      case CHILD:
+        //buf.append("child::");
+        break;
+      case DESCENDANT:
+        buf.append("descendant::");
+        break;
+      case DESCENDANT_OR_SELF:
+        buf.append("descendant-or-self::");
+        break;
+      case FOLLOWING:
+        buf.append("following::");
+        break;
+      case FOLLOWING_SIBLING:
+        buf.append("following-sibling::");
+        break;
+      case NAMESPACE:
+        buf.append("namespace::");
+        break;
+      case PARENT:
+        if (tests.length == 0 ||
+            (tests[0] instanceof NodeTypeTest &&
+             ((NodeTypeTest) tests[0]).type == 0))
+          {
+            return "..";
+          }
+        buf.append("parent::");
+        break;
+      case PRECEDING:
+        buf.append("preceding::");
+        break;
+      case PRECEDING_SIBLING:
+        buf.append("preceding-sibling::");
+        break;
+      case SELF:
+        if (tests.length == 0 ||
+            (tests[0] instanceof NodeTypeTest &&
+             ((NodeTypeTest) tests[0]).type == 0))
+          {
+            return ".";
+          }
+        buf.append("self::");
+        break;
+      }
+    if (tests.length == 0)
+      {
+        buf.append('*');
+      }
+    else
+      {
+        for (int i = 0; i < tests.length; i++)
+          {
+            buf.append(tests[i]);
+          }
+      }
+    return buf.toString();
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/StartsWithFunction.java b/libjava/gnu/xml/xpath/StartsWithFunction.java
new file mode 100644 (file)
index 0000000..c748295
--- /dev/null
+++ b/libjava/gnu/xml/xpath/StartsWithFunction.java
@@ -0,0 +1,86 @@
+/* StartsWithFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>starts-with</code> function returns true if the first argument
+ * string starts with the second argument string, and otherwise returns false.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class StartsWithFunction
+  extends Expr
+{
+
+  final Expr arg1;
+  final Expr arg2;
+
+  StartsWithFunction(List args)
+  {
+    this((Expr) args.get(0), (Expr) args.get(1));
+  }
+
+  StartsWithFunction(Expr arg1, Expr arg2)
+  {
+    this.arg1 = arg1;
+    this.arg2 = arg2;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val1 = arg1.evaluate(context, pos, len);
+    Object val2 = arg2.evaluate(context, pos, len);
+    String s1 = _string(context, val1);
+    String s2 = _string(context, val2);
+    return s1.startsWith(s2) ? Boolean.TRUE : Boolean.FALSE;
+  }
+
+  public Expr clone(Object context)
+  {
+    return new StartsWithFunction(arg1.clone(context), arg2.clone(context));
+  }
+
+  public String toString()
+  {
+    return "starts-with(" + arg1 + "," + arg2 + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/Steps.java b/libjava/gnu/xml/xpath/Steps.java
new file mode 100644 (file)
index 0000000..abd30e4
--- /dev/null
+++ b/libjava/gnu/xml/xpath/Steps.java
@@ -0,0 +1,240 @@
+/* Steps.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.Set;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Node;
+
+/**
+ * A list of transitions between components in a location path.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public final class Steps
+  extends Path
+{
+
+  final LinkedList path;
+
+  public Steps()
+  {
+    this(new LinkedList());
+  }
+
+  Steps(LinkedList path)
+  {
+    this.path = path;
+  }
+
+  public boolean matches(Node context)
+  {
+    // Right to left
+    return matches(context, path.size() - 1);
+  }
+
+  boolean matches(Node context, int pos)
+  {
+    Pattern right = (Pattern) path.get(pos);
+    if (!right.matches(context))
+      {
+        return false;
+      }
+    if (pos > 0)
+      {
+        Pattern left = (Pattern) path.get(pos - 1);
+        Iterator j = possibleContexts(right, context).iterator();
+        while (j.hasNext())
+          {
+            Node candidate = (Node) j.next();
+            if (left.matches(candidate) &&
+                matches(candidate, pos - 1))
+              {
+                return true;
+              }
+            // keep going, there may be another candidate
+          }
+        return false;
+      }
+    return true;
+  }
+
+  /**
+   * Essentially the reverse of Selector.addCandidates.
+   * The idea is to determine possible context nodes for a match.
+   */
+  Collection possibleContexts(Pattern pattern, Node context)
+  {
+    if (pattern instanceof Selector)
+      {
+        Selector s = (Selector) pattern;
+        Collection candidates = new LinkedHashSet();
+        switch (s.axis)
+          {
+          case Selector.PARENT:
+            s.addChildNodes(context, candidates, false);
+            break;
+          case Selector.ANCESTOR:
+            s.addChildNodes(context, candidates, true);
+            break;
+          case Selector.ANCESTOR_OR_SELF:
+            candidates.add (context);
+            s.addChildNodes(context, candidates, true);
+            break;
+          case Selector.CHILD:
+            s.addParentNode(context, candidates, false);
+            break;
+          case Selector.DESCENDANT:
+            s.addParentNode(context, candidates, true);
+            break;
+          case Selector.DESCENDANT_OR_SELF:
+            candidates.add(context);
+            s.addParentNode(context, candidates, true);
+            break;
+          case Selector.PRECEDING_SIBLING:
+            s.addFollowingNodes(context, candidates, false);
+            break;
+          case Selector.FOLLOWING_SIBLING:
+            s.addPrecedingNodes(context, candidates, false);
+            break;
+          case Selector.PRECEDING:
+            s.addFollowingNodes(context, candidates, true);
+            break;
+          case Selector.FOLLOWING:
+            s.addPrecedingNodes(context, candidates, true);
+            break;
+          case Selector.ATTRIBUTE:
+          case Selector.NAMESPACE:
+            if (context.getNodeType() == Node.ATTRIBUTE_NODE)
+              {
+                candidates.add(((Attr) context).getOwnerElement());
+              }
+            break;
+          case Selector.SELF:
+            candidates.add(context);
+            break;
+          }
+        return candidates;
+      }
+    return Collections.EMPTY_SET;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    //System.err.println(toString()+" evaluate");
+    // Left to right
+    Iterator i = path.iterator();
+    Expr lhs = (Expr) i.next();
+    Object val = lhs.evaluate(context, pos, len);
+    //System.err.println("\tevaluate "+lhs+" = "+val);
+    while (val instanceof Collection && i.hasNext())
+      {
+        Path rhs = (Path) i.next();
+        val = rhs.evaluate(context, (Collection) val);
+        //System.err.println("\tevaluate "+rhs+" = "+val);
+      }
+    return val;
+  }
+
+  Collection evaluate(Node context, Collection ns)
+  {
+    // Left to right
+    Iterator i = path.iterator();
+    Expr lhs = (Expr) i.next();
+    if (lhs instanceof Path)
+      {
+        ns = ((Path) lhs).evaluate(context, ns);
+      }
+    else
+      {
+        Set acc = new LinkedHashSet();
+        int pos = 1, len = ns.size();
+        for (Iterator j = ns.iterator(); j.hasNext(); )
+          {
+            Node node = (Node) j.next();
+            Object ret = lhs.evaluate(node, pos++, len);
+            if (ret instanceof Collection)
+              {
+                acc.addAll((Collection) ret);
+              }
+          }
+        ns = acc;
+      }
+    while (i.hasNext())
+      {
+        Path rhs = (Path) i.next();
+        ns = rhs.evaluate(context, ns);
+      }
+    return ns;
+  }
+
+  public Expr clone(Object context)
+  {
+    int len = path.size();
+    LinkedList path2 = new LinkedList();
+    for (int i = 0; i < len; i++)
+      {
+        path2.add(((Expr) path.get(i)).clone(context));
+      }
+    return new Steps(path2);
+  }
+
+  public String toString()
+  {
+    StringBuffer buf = new StringBuffer();
+    Iterator i = path.iterator();
+    Expr expr = (Expr) i.next();
+    if (!(expr instanceof Root))
+      {
+        buf.append(expr);
+      }
+    while (i.hasNext())
+      {
+        expr = (Expr) i.next();
+        buf.append('/');
+        buf.append(expr);
+      }
+    return buf.toString();
+  }
+
+}
diff --git a/libjava/gnu/xml/xpath/StringFunction.java b/libjava/gnu/xml/xpath/StringFunction.java
new file mode 100644 (file)
index 0000000..658995c
--- /dev/null
+++ b/libjava/gnu/xml/xpath/StringFunction.java
@@ -0,0 +1,113 @@
+/* StringFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>string function converts an object to a string as follows:
+ * <ul>
+ * <li>A node-set is converted to a string by returning the string-value of
+ * the node in the node-set that is first in document order. If the node-set
+ * is empty, an empty string is returned.</li>
+ * <li>A number is converted to a string as follows
+ * <ul>
+ * <li>NaN is converted to the string NaN</li>
+ * <li>positive zero is converted to the string 0</li>
+ * <li>negative zero is converted to the string 0</li>
+ * <li>positive infinity is converted to the string Infinity</li>
+ * <li>negative infinity is converted to the string -Infinity</li>
+ * <li>if the number is an integer, the number is represented in decimal
+ * form as a Number with no decimal point and no leading zeros, preceded by
+ * a minus sign (-) if the number is negative</li>
+ * <li>otherwise, the number is represented in decimal form as a Number
+ * including a decimal point with at least one digit before the decimal
+ * point and at least one digit after the decimal point, preceded by a minus
+ * sign (-) if the number is negative; there must be no leading zeros before
+ * the decimal point apart possibly from the one required digit immediately
+ * before the decimal point; beyond the one required digit after the decimal
+ * point there must be as many, but only as many, more digits as are needed
+ * to uniquely distinguish the number from all other IEEE 754 numeric
+ * values.</li>
+ * </ul>
+ * </li>
+ * <li>The boolean false value is converted to the string false. The boolean
+ * true value is converted to the string true.</li>
+ * <li>An object of a type other than the four basic types is converted to a
+ * string in a way that is dependent on that type.</li>
+ * </ul>
+ * If the argument is omitted, it defaults to a node-set with the context
+ * node as its only member.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class StringFunction
+  extends Expr
+{
+
+  final Expr arg;
+
+  StringFunction(List args)
+  {
+    this(args.size() > 0 ? (Expr) args.get(0) : null);
+  }
+  
+  StringFunction(Expr arg)
+  {
+    this.arg = arg;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = (arg == null) ? null : arg.evaluate(context, pos, len);
+    return _string(context, val);
+  }
+
+  public Expr clone(Object context)
+  {
+    return new StringFunction((arg == null) ? null :
+                              arg.clone(context));
+  }
+
+  public String toString()
+  {
+    return (arg == null) ? "string()" : "string(" + arg + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/StringLengthFunction.java b/libjava/gnu/xml/xpath/StringLengthFunction.java
new file mode 100644 (file)
index 0000000..7ed0463
--- /dev/null
+++ b/libjava/gnu/xml/xpath/StringLengthFunction.java
@@ -0,0 +1,85 @@
+/* StringLengthFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>string-length</code> function returns the number of characters
+ * in the string.
+ * If the argument is omitted, it defaults to the context node converted to
+ * a string, in other words the string-value of the context node.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class StringLengthFunction
+  extends Expr
+{
+
+  final Expr arg;
+
+  StringLengthFunction(List args)
+  {
+    this(args.isEmpty() ? null : (Expr) args.get(0));
+  }
+  
+  StringLengthFunction(Expr arg)
+  {
+    this.arg = arg;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = (arg == null) ? null : arg.evaluate(context, pos, len);
+    String s = _string(context, val);
+    return new Double((double) s.length());
+  }
+
+  public Expr clone(Object context)
+  {
+    return new StringLengthFunction((arg == null) ? null :
+                                    arg.clone(context));
+  }
+
+  public String toString()
+  {
+    return (arg == null) ? "string-length()" : "string-length(" + arg + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/SubstringAfterFunction.java b/libjava/gnu/xml/xpath/SubstringAfterFunction.java
new file mode 100644 (file)
index 0000000..90b6060
--- /dev/null
+++ b/libjava/gnu/xml/xpath/SubstringAfterFunction.java
@@ -0,0 +1,92 @@
+/* SubstringAfterFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>substring-after</code> function returns the substring of the
+ * first argument string that follows the first occurrence of the second
+ * argument string in the first argument string, or the empty string if the
+ * first argument string does not contain the second argument string. For
+ * example, substring-after("1999/04/01","/") returns 04/01, and
+ * substring-after("1999/04/01","19") returns 99/04/01.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class SubstringAfterFunction
+  extends Expr
+{
+
+  final Expr arg1;
+  final Expr arg2;
+
+  SubstringAfterFunction(List args)
+  {
+    this((Expr) args.get(0), (Expr) args.get(1));
+  }
+
+  SubstringAfterFunction(Expr arg1, Expr arg2)
+  {
+    this.arg1 = arg1;
+    this.arg2 = arg2;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val1 = arg1.evaluate(context, pos, len);
+    Object val2 = arg2.evaluate(context, pos, len);
+    String s1 = _string(context, val1);
+    String s2 = _string(context, val2);
+    int index = s1.indexOf(s2);
+    return (index == -1) ? "" : s1.substring(index + s2.length());
+  }
+
+  public Expr clone(Object context)
+  {
+    return new SubstringAfterFunction(arg1.clone(context),
+                                      arg2.clone(context));
+  }
+
+  public String toString()
+  {
+    return "substring-after(" + arg1 + "," + arg2 + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/SubstringBeforeFunction.java b/libjava/gnu/xml/xpath/SubstringBeforeFunction.java
new file mode 100644 (file)
index 0000000..cadb77c
--- /dev/null
+++ b/libjava/gnu/xml/xpath/SubstringBeforeFunction.java
@@ -0,0 +1,91 @@
+/* SubstringBeforeFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>substring-before</code> function returns the substring of the
+ * first argument string that precedes the first occurrence of the second
+ * argument string in the first argument string, or the empty string if the
+ * first argument string does not contain the second argument string. For
+ * example, substring-before("1999/04/01","/") returns 1999.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class SubstringBeforeFunction
+  extends Expr
+{
+
+  final Expr arg1;
+  final Expr arg2;
+
+  SubstringBeforeFunction(List args)
+  {
+    this((Expr) args.get(0), (Expr) args.get(1));
+  }
+
+  SubstringBeforeFunction(Expr arg1, Expr arg2)
+  {
+    this.arg1 = arg1;
+    this.arg2 = arg2;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val1 = arg1.evaluate(context, pos, len);
+    Object val2 = arg2.evaluate(context, pos, len);
+    String s1 = _string(context, val1);
+    String s2 = _string(context, val2);
+    int index = s1.indexOf(s2);
+    return (index == -1) ? "" : s1.substring(0, index);
+  }
+
+  public Expr clone(Object context)
+  {
+    return new SubstringBeforeFunction(arg1.clone(context),
+                                       arg2.clone(context));
+  }
+
+  public String toString()
+  {
+    return "substring-before(" + arg1 + "," + arg2 + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/SubstringFunction.java b/libjava/gnu/xml/xpath/SubstringFunction.java
new file mode 100644 (file)
index 0000000..fdbbd06
--- /dev/null
+++ b/libjava/gnu/xml/xpath/SubstringFunction.java
@@ -0,0 +1,122 @@
+/* SubstringFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The substring function returns the substring of the first argument
+ * starting at the position specified in the second argument with length
+ * specified in the third argument. For example, substring("12345",2,3)
+ * returns "234". If the third argument is not specified, it returns the
+ * substring starting at the position specified in the second argument and
+ * continuing to the end of the string. For example, substring("12345",2)
+ * returns "2345".
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class SubstringFunction
+  extends Expr
+{
+
+  final Expr arg1;
+  final Expr arg2;
+  final Expr arg3;
+
+  SubstringFunction(List args)
+  {
+    this((Expr) args.get(0), (Expr) args.get(1),
+         (args.size() > 2) ? (Expr) args.get(2) : null);
+  }
+
+  SubstringFunction(Expr arg1, Expr arg2, Expr arg3)
+  {
+    this.arg1 = arg1;
+    this.arg2 = arg2;
+    this.arg3 = arg3;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val1 = arg1.evaluate(context, pos, len);
+    Object val2 = arg2.evaluate(context, pos, len);
+    String s = _string(context, val1);
+    int p = (val2 instanceof Double) ?
+      ((Double) val2).intValue() :
+        (int) Math.round(_number(context, val2));
+    p--;
+    if (p < 0)
+      {
+        p = 0;
+      }
+
+    int l = s.length() - p;
+    if (l <= 0)
+      {
+        return "";
+      }
+
+    if (arg3 != null)
+      {
+        Object val3 = arg3.evaluate(context, pos, len);
+        int v3 = (val3 instanceof Double) ?
+          ((Double) val3).intValue() :
+            (int) Math.round(_number(context, val3));
+        if (v3 < l) 
+          {
+            l = v3;
+          }
+      }
+
+    return s.substring(p, p + l);
+  }
+
+  public Expr clone(Object context)
+  {
+    return new SubstringFunction(arg1.clone(context), arg2.clone(context),
+                                 (arg3 == null) ? null : arg3.clone(context));
+  }
+
+  public String toString()
+  {
+    return (arg3 == null) ? "substring(" + arg1 + "," + arg2 + ")" :
+      "substring(" + arg1 + "," + arg2 + "," + arg3 + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/SumFunction.java b/libjava/gnu/xml/xpath/SumFunction.java
new file mode 100644 (file)
index 0000000..1501b46
--- /dev/null
+++ b/libjava/gnu/xml/xpath/SumFunction.java
@@ -0,0 +1,94 @@
+/* SumFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>sum</code> function returns the sum, for each node in the
+ * argument node-set, of the result of converting the string-values of the
+ * node to a number.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class SumFunction
+  extends Expr
+{
+
+  final Expr arg;
+
+  SumFunction(List args)
+  {
+    this((Expr) args.get(0));
+  }
+
+  SumFunction(Expr arg)
+  {
+    this.arg = arg;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val = arg.evaluate(context, pos, len);
+    double sum = 0.0d;
+    if (val instanceof Collection)
+      {
+        for (Iterator i = ((Collection) val).iterator(); i.hasNext(); )
+          {
+            Node node = (Node) i.next();
+            String s = stringValue(node);
+            sum += _number(context, s);
+          }
+      }
+    return new Double(sum);
+  }
+
+  public Expr clone(Object context)
+  {
+    return new SumFunction(arg.clone(context));
+  }
+
+  public String toString()
+  {
+    return "sum(" + arg + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/Test.java b/libjava/gnu/xml/xpath/Test.java
new file mode 100644 (file)
index 0000000..865461c
--- /dev/null
+++ b/libjava/gnu/xml/xpath/Test.java
@@ -0,0 +1,55 @@
+/* Test.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import org.w3c.dom.Node;
+
+/**
+ * A test that can be performed on a node to determine whether to include it
+ * in a selection.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public abstract class Test
+{
+
+  public abstract boolean matches(Node node, int pos, int len);
+
+  public abstract Test clone(Object context);
+
+}
diff --git a/libjava/gnu/xml/xpath/TranslateFunction.java b/libjava/gnu/xml/xpath/TranslateFunction.java
new file mode 100644 (file)
index 0000000..b92ec31
--- /dev/null
+++ b/libjava/gnu/xml/xpath/TranslateFunction.java
@@ -0,0 +1,126 @@
+/* TranslateFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.List;
+import org.w3c.dom.Node;
+
+/**
+ * The <code>translate</code> function returns the first argument string
+ * with occurrences of characters in the second argument string replaced by
+ * the character at the corresponding position in the third argument string.
+ * For example, translate("bar","abc","ABC") returns the string BAr. If
+ * there is a character in the second argument string with no character at a
+ * corresponding position in the third argument string (because the second
+ * argument string is longer than the third argument string), then
+ * occurrences of that character in the first argument string are removed.
+ * For example, translate("--aaa--","abc-","ABC") returns "AAA". If a
+ * character occurs more than once in the second argument string, then the
+ * first occurrence determines the replacement character. If the third
+ * argument string is longer than the second argument string, then excess
+ * characters are ignored.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class TranslateFunction
+  extends Expr
+{
+
+  final Expr arg1;
+  final Expr arg2;
+  final Expr arg3;
+
+  TranslateFunction(List args)
+  {
+    this((Expr) args.get(0), (Expr) args.get(1), (Expr) args.get(2));
+  }
+
+  TranslateFunction(Expr arg1, Expr arg2, Expr arg3)
+  {
+    this.arg1 = arg1;
+    this.arg2 = arg2;
+    this.arg3 = arg3;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object val1 = arg1.evaluate(context, pos, len);
+    Object val2 = arg2.evaluate(context, pos, len);
+    Object val3 = arg3.evaluate(context, pos, len);
+    String string = _string(context, val1);
+    String search = _string(context, val2);
+    String replace = _string(context, val3);
+    StringBuffer buf = new StringBuffer();
+    int l1 = string.length();
+    int l2 = search.length();
+    int l3 = replace.length();
+    for (int i = 0; i < l1; i++)
+      {
+        char c = string.charAt(i);
+        boolean replaced = false;
+        for (int j = 0; j < l2; j++)
+          {
+            if (c == search.charAt(j))
+              {
+                if (j < l3)
+                  {
+                    buf.append(replace.charAt(j));
+                  }
+                replaced = true;
+              }
+          }
+        if (!replaced)
+          {
+            buf.append(c);
+          } 
+      } 
+    return new String(buf);
+  }
+
+  public Expr clone(Object context)
+  {
+    return new TranslateFunction(arg1.clone(context), arg2.clone(context),
+                                 arg3.clone(context));
+  }
+  
+  public String toString()
+  {
+    return "translate(" + arg1 + "," + arg2 + "," + arg3 + ")";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/TrueFunction.java b/libjava/gnu/xml/xpath/TrueFunction.java
new file mode 100644 (file)
index 0000000..2d47ed3
--- /dev/null
+++ b/libjava/gnu/xml/xpath/TrueFunction.java
@@ -0,0 +1,66 @@
+/* TrueFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import org.w3c.dom.Node;
+
+/**
+ * The <code>true</code> function returns true.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+final class TrueFunction
+  extends Expr
+{
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    return Boolean.TRUE;
+  }
+
+  public Expr clone(Object context)
+  {
+    return new TrueFunction();
+  }
+
+  public String toString()
+  {
+    return "true()";
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/UnionExpr.java b/libjava/gnu/xml/xpath/UnionExpr.java
new file mode 100644 (file)
index 0000000..1b1344e
--- /dev/null
+++ b/libjava/gnu/xml/xpath/UnionExpr.java
@@ -0,0 +1,102 @@
+/* UnionExpr.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.w3c.dom.Node;
+
+/**
+ * The union of two node-sets.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public final class UnionExpr
+  extends Pattern
+{
+
+  final Expr lhs;
+  final Expr rhs;
+
+  public UnionExpr(Expr lhs, Expr rhs)
+  {
+    this.lhs = lhs;
+    this.rhs = rhs;
+  }
+
+  public boolean matches(Node context)
+  {
+    if (lhs instanceof Pattern && rhs instanceof Pattern)
+      {
+        return ((Pattern) lhs).matches(context) ||
+          ((Pattern) rhs).matches(context);
+      }
+    return false;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    Object left = lhs.evaluate(context, pos, len);
+    Object right = rhs.evaluate(context, pos, len);
+    if (left instanceof Collection && right instanceof Collection)
+      {
+        Set set = new HashSet();
+        set.addAll ((Collection) left);
+        set.addAll ((Collection) right);
+        List list = new ArrayList(set);
+        Collections.sort(list, documentOrderComparator);
+        return list;
+      }
+    return Collections.EMPTY_SET;
+  }
+
+  public Expr clone(Object context)
+  {
+    return new UnionExpr(lhs.clone(context), rhs.clone(context));
+  }
+
+  public String toString()
+  {
+    return lhs + " | " + rhs;
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/VariableReference.java b/libjava/gnu/xml/xpath/VariableReference.java
new file mode 100644 (file)
index 0000000..faa5bfa
--- /dev/null
+++ b/libjava/gnu/xml/xpath/VariableReference.java
@@ -0,0 +1,88 @@
+/* VariableReference.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import javax.xml.namespace.QName;
+import javax.xml.xpath.XPathVariableResolver;
+import org.w3c.dom.Node;
+import gnu.xml.transform.Bindings;
+
+public class VariableReference
+  extends Expr
+{
+
+  final XPathVariableResolver resolver;
+  final String name;
+
+  public VariableReference(XPathVariableResolver resolver, String name)
+  {
+    this.resolver = resolver;
+    this.name = name;
+  }
+
+  public Object evaluate(Node context, int pos, int len)
+  {
+    if (resolver != null)
+      {
+        if (resolver instanceof Bindings)
+          {
+            // Needs context to operate properly
+            return ((Bindings) resolver).get(name, context, pos, len);
+          }
+        QName qname = QName.valueOf(name);
+        return resolver.resolveVariable(qname);
+      }
+    throw new IllegalStateException("no variable resolver");
+  }
+
+  public Expr clone(Object context)
+  {
+    XPathVariableResolver r = resolver;
+    if (context instanceof XPathVariableResolver)
+      {
+        r = (XPathVariableResolver) context;
+      }
+    return new VariableReference(r, name);
+  }
+
+  public String toString()
+  {
+    return "$" + name;
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/XPathFactoryImpl.java b/libjava/gnu/xml/xpath/XPathFactoryImpl.java
new file mode 100644 (file)
index 0000000..f9f70a3
--- /dev/null
+++ b/libjava/gnu/xml/xpath/XPathFactoryImpl.java
@@ -0,0 +1,90 @@
+/* XPathFactoryImpl.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathFactory;
+import javax.xml.xpath.XPathFactoryConfigurationException;
+import javax.xml.xpath.XPathFunctionResolver;
+import javax.xml.xpath.XPathVariableResolver;
+
+/**
+ * GNU XPath factory implementation.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class XPathFactoryImpl
+  extends XPathFactory
+{
+
+  XPathVariableResolver variableResolver;
+  XPathFunctionResolver functionResolver;
+
+  public boolean isObjectModelSupported(String objectModel)
+  {
+    return XPathFactory.DEFAULT_OBJECT_MODEL_URI.equals(objectModel);
+  }
+
+  public void setFeature(String name, boolean value)
+    throws XPathFactoryConfigurationException
+  {
+    throw new XPathFactoryConfigurationException(name);
+  }
+
+  public boolean getFeature(String name)
+    throws XPathFactoryConfigurationException
+  {
+    throw new XPathFactoryConfigurationException(name);
+  }
+
+  public void setXPathVariableResolver(XPathVariableResolver resolver)
+  {
+    variableResolver = resolver;
+  }
+
+  public void setXPathFunctionResolver(XPathFunctionResolver resolver)
+  {
+    functionResolver = resolver;
+  }
+
+  public XPath newXPath()
+  {
+    return new XPathImpl(null, variableResolver, functionResolver);
+  }
+  
+}
diff --git a/libjava/gnu/xml/xpath/XPathImpl.java b/libjava/gnu/xml/xpath/XPathImpl.java
new file mode 100644 (file)
index 0000000..2189364
--- /dev/null
+++ b/libjava/gnu/xml/xpath/XPathImpl.java
@@ -0,0 +1,164 @@
+/* XPathImpl.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.io.IOException;
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.namespace.QName;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFunctionResolver;
+import javax.xml.xpath.XPathVariableResolver;
+import org.xml.sax.InputSource;
+
+/**
+ * JAXP XPath implementation.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class XPathImpl
+  implements XPath
+{
+
+  XPathParser parser;
+  NamespaceContext namespaceContext;
+  XPathVariableResolver variableResolver;
+  XPathFunctionResolver functionResolver;
+
+  XPathImpl(NamespaceContext namespaceContext,
+            XPathVariableResolver variableResolver,
+            XPathFunctionResolver functionResolver)
+  {
+    parser = new XPathParser();
+    this.namespaceContext = namespaceContext;
+    this.variableResolver = variableResolver;
+    this.functionResolver = functionResolver;
+    reset();
+  }
+
+  public void reset()
+  {
+    parser.namespaceContext = namespaceContext;
+    parser.variableResolver = variableResolver;
+    parser.functionResolver = functionResolver;
+  }
+
+  public void setXPathVariableResolver(XPathVariableResolver resolver)
+  {
+    parser.variableResolver = resolver;
+  }
+
+  public XPathVariableResolver getXPathVariableResolver()
+  {
+    return parser.variableResolver;
+  }
+
+  public void setXPathFunctionResolver(XPathFunctionResolver resolver)
+  {
+    parser.functionResolver = resolver;
+  }
+
+  public XPathFunctionResolver getXPathFunctionResolver()
+  {
+    return parser.functionResolver;
+  }
+
+  public void setNamespaceContext(NamespaceContext nsContext)
+  {
+    parser.namespaceContext = nsContext;
+  }
+
+  public NamespaceContext getNamespaceContext()
+  {
+    return parser.namespaceContext;
+  }
+
+  public XPathExpression compile(String expression)
+    throws XPathExpressionException
+  {
+    XPathTokenizer tokenizer = new XPathTokenizer(expression);
+    try
+      {
+        return (Expr) parser.yyparse(tokenizer);
+      }
+    catch (IOException e)
+      {
+        throw new XPathExpressionException(e);
+      }
+    catch (XPathParser.yyException e)
+      {
+        throw new XPathExpressionException(expression);
+      }
+  }
+  
+  public Object evaluate(String expression,
+                         Object item,
+                         QName returnType)
+    throws XPathExpressionException
+  {
+    XPathExpression expr = compile(expression);
+    return expr.evaluate(item, returnType);
+  }
+
+  public String evaluate(String expression,
+                         Object item)
+    throws XPathExpressionException
+  {
+    XPathExpression expr = compile(expression);
+    return expr.evaluate(item);
+  }
+
+  public Object evaluate(String expression,
+                         InputSource source,
+                         QName returnType)
+    throws XPathExpressionException
+  {
+    XPathExpression expr = compile(expression);
+    return expr.evaluate(source, returnType);
+  }
+
+  public String evaluate(String expression,
+                         InputSource source)
+    throws XPathExpressionException
+  {
+    XPathExpression expr = compile(expression);
+    return expr.evaluate(source);
+  }
+
+}
diff --git a/libjava/gnu/xml/xpath/XPathParser.java b/libjava/gnu/xml/xpath/XPathParser.java
new file mode 100644 (file)
index 0000000..973919b
--- /dev/null
+++ b/libjava/gnu/xml/xpath/XPathParser.java
@@ -0,0 +1,1462 @@
+// created by jay 0.8 (c) 1998 Axel.Schreiner@informatik.uni-osnabrueck.de
+
+                                       // line 2 "XPathParser.y"
+/* XPathParser.java -- An XPath 1.0 parser.
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.namespace.QName;
+import javax.xml.xpath.XPathFunctionResolver;
+import javax.xml.xpath.XPathVariableResolver;
+import org.w3c.dom.Node;
+
+/**
+ * An XPath 1.0 parser.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class XPathParser
+{
+
+  NamespaceContext namespaceContext;
+  XPathVariableResolver variableResolver;
+  XPathFunctionResolver functionResolver;
+
+  QName getQName(String name)
+  {
+    QName qName = QName.valueOf(name);
+    if (namespaceContext != null)
+      {
+        String prefix = qName.getPrefix();
+        String uri = qName.getNamespaceURI();
+        if (prefix != null && (uri == null || uri.length() == 0))
+          {
+            uri = namespaceContext.getNamespaceURI(prefix);
+            String localName = qName.getLocalPart();
+            qName = new QName(uri, localName, prefix);
+          }
+      }
+    return qName;
+  }
+
+  Expr lookupFunction(String name, List args)
+  {
+    int arity = args.size();
+    if ("position".equals(name) && arity == 0)
+      {
+        return new PositionFunction();
+      }
+    else if ("last".equals(name) && arity == 0)
+      {
+        return new LastFunction();
+      }
+    else if ("string".equals(name) && (arity == 1 || arity == 0))
+      {
+        return new StringFunction(args);
+      }
+    else if ("number".equals(name) && (arity == 1 || arity == 0))
+      {
+        return new NumberFunction(args);
+      }
+    else if ("boolean".equals(name) && arity == 1)
+      {
+        return new BooleanFunction(args);
+      }
+    else if ("count".equals(name) && arity == 1)
+      {
+        return new CountFunction(args);
+      }
+    else if ("not".equals(name) && arity == 1)
+      {
+        return new NotFunction(args);
+      }
+    else if ("id".equals(name) && arity == 1)
+      {
+        return new IdFunction(args);
+      }
+    else if ("concat".equals(name) && arity > 1)
+      {
+        return new ConcatFunction(args);
+      }
+    else if ("true".equals(name) && arity == 0)
+      {
+        return new TrueFunction();
+      }
+    else if ("false".equals(name) && arity == 0)
+      {
+        return new FalseFunction();
+      }
+    else if ("name".equals(name) && (arity == 1 || arity == 0))
+      {
+        return new NameFunction(args);
+      }
+    else if ("local-name".equals(name) && (arity == 1 || arity == 0))
+      {
+        return new LocalNameFunction(args);
+      }
+    else if ("namespace-uri".equals(name) && (arity == 1 || arity == 0))
+      {
+        return new NamespaceUriFunction(args);
+      }
+    else if ("starts-with".equals(name) && arity == 2)
+      {
+        return new StartsWithFunction(args);
+      }
+    else if ("contains".equals(name) && arity == 2)
+      {
+        return new ContainsFunction(args);
+      }
+    else if ("string-length".equals(name) && (arity == 1 || arity == 0))
+      {
+        return new StringLengthFunction(args);
+      }
+    else if ("translate".equals(name) && arity == 3)
+      {
+        return new TranslateFunction(args);
+      }
+    else if ("normalize-space".equals(name) && (arity == 1 || arity == 0))
+      {
+        return new NormalizeSpaceFunction(args);
+      }
+    else if ("substring".equals(name) && (arity == 2 || arity == 3))
+      {
+        return new SubstringFunction(args);
+      }
+    else if ("substring-before".equals(name) && arity == 2)
+      {
+        return new SubstringBeforeFunction(args);
+      }
+    else if ("substring-after".equals(name) && arity == 2)
+      {
+        return new SubstringAfterFunction(args);
+      }
+    else if ("lang".equals(name) && arity == 1)
+      {
+        return new LangFunction(args);
+      }
+    else if ("sum".equals(name) && arity == 1)
+      {
+        return new SumFunction(args);
+      }
+    else if ("floor".equals(name) && arity == 1)
+      {
+        return new FloorFunction(args);
+      }
+    else if ("ceiling".equals(name) && arity == 1)
+      {
+        return new CeilingFunction(args);
+      }
+    else if ("round".equals(name) && arity == 1)
+      {
+        return new RoundFunction(args);
+      }
+    else if (functionResolver != null)
+      {
+        QName qName = QName.valueOf(name);
+        Object function = functionResolver.resolveFunction(qName, arity);
+        if (function != null &&
+            function instanceof Function &&
+            function instanceof Expr)
+          {
+            Function f = (Function) function;
+            f.setArguments(args);
+            return (Expr) function;
+          }
+      }
+    return new FunctionCall(functionResolver, name, args);
+  }
+
+                                       // line 210 "-"
+// %token constants
+
+  public static final int LITERAL = 257;
+  public static final int DIGITS = 258;
+  public static final int NAME = 259;
+  public static final int LP = 260;
+  public static final int RP = 261;
+  public static final int LB = 262;
+  public static final int RB = 263;
+  public static final int COMMA = 264;
+  public static final int PIPE = 265;
+  public static final int SLASH = 266;
+  public static final int DOUBLE_SLASH = 267;
+  public static final int EQ = 268;
+  public static final int NE = 269;
+  public static final int GT = 270;
+  public static final int LT = 271;
+  public static final int GTE = 272;
+  public static final int LTE = 273;
+  public static final int PLUS = 274;
+  public static final int MINUS = 275;
+  public static final int AT = 276;
+  public static final int STAR = 277;
+  public static final int DOLLAR = 278;
+  public static final int COLON = 279;
+  public static final int DOUBLE_COLON = 280;
+  public static final int DOT = 281;
+  public static final int DOUBLE_DOT = 282;
+  public static final int ANCESTOR = 283;
+  public static final int ANCESTOR_OR_SELF = 284;
+  public static final int ATTRIBUTE = 285;
+  public static final int CHILD = 286;
+  public static final int DESCENDANT = 287;
+  public static final int DESCENDANT_OR_SELF = 288;
+  public static final int FOLLOWING = 289;
+  public static final int FOLLOWING_SIBLING = 290;
+  public static final int NAMESPACE = 291;
+  public static final int PARENT = 292;
+  public static final int PRECEDING = 293;
+  public static final int PRECEDING_SIBLING = 294;
+  public static final int SELF = 295;
+  public static final int DIV = 296;
+  public static final int MOD = 297;
+  public static final int OR = 298;
+  public static final int AND = 299;
+  public static final int COMMENT = 300;
+  public static final int PROCESSING_INSTRUCTION = 301;
+  public static final int TEXT = 302;
+  public static final int NODE = 303;
+  public static final int UNARY = 304;
+  public static final int yyErrorCode = 256;
+
+  /** thrown for irrecoverable syntax errors and stack overflow.
+    */
+  public static class yyException extends java.lang.Exception {
+    public yyException (String message) {
+      super(message);
+    }
+  }
+
+  /** must be implemented by a scanner object to supply input to the parser.
+    */
+  public interface yyInput {
+    /** move on to next token.
+        @return false if positioned beyond tokens.
+        @throws IOException on input error.
+      */
+    boolean advance () throws java.io.IOException;
+    /** classifies current token.
+        Should not be called if advance() returned false.
+        @return current %token or single character.
+      */
+    int token ();
+    /** associated with current token.
+        Should not be called if advance() returned false.
+        @return value for token().
+      */
+    Object value ();
+  }
+
+  /** simplified error message.
+      @see <a href="#yyerror(java.lang.String, java.lang.String[])">yyerror</a>
+    */
+  public void yyerror (String message) {
+    yyerror(message, null);
+  }
+
+  /** (syntax) error message.
+      Can be overwritten to control message format.
+      @param message text to be displayed.
+      @param expected vector of acceptable tokens, if available.
+    */
+  public void yyerror (String message, String[] expected) {
+    if (expected != null && expected.length > 0) {
+      System.err.print(message+", expecting");
+      for (int n = 0; n < expected.length; ++ n)
+        System.err.print(" "+expected[n]);
+      System.err.println();
+    } else
+      System.err.println(message);
+  }
+
+  /** debugging support, requires the package jay.yydebug.
+      Set to null to suppress debugging messages.
+    */
+//t  protected jay.yydebug.yyDebug yydebug;
+
+  protected static final int yyFinal = 30;
+
+  /** index-checked interface to yyName[].
+      @param token single character or %token value.
+      @return token name or [illegal] or [unknown].
+    */
+//t  public static final String yyname (int token) {
+//t    if (token < 0 || token > YyNameClass.yyName.length) return "[illegal]";
+//t    String name;
+//t    if ((name = YyNameClass.yyName[token]) != null) return name;
+//t    return "[unknown]";
+//t  }
+
+  /** computes list of expected tokens on error by tracing the tables.
+      @param state for which to compute the list.
+      @return list of token names.
+    */
+  protected String[] yyExpecting (int state) {
+    int token, n, len = 0;
+    boolean[] ok = new boolean[YyNameClass.yyName.length];
+
+    if ((n = YySindexClass.yySindex[state]) != 0)
+      for (token = n < 0 ? -n : 0;
+           token < YyNameClass.yyName.length && n+token < YyTableClass.yyTable.length; ++ token)
+        if (YyCheckClass.yyCheck[n+token] == token && !ok[token] && YyNameClass.yyName[token] != null) {
+          ++ len;
+          ok[token] = true;
+        }
+    if ((n = YyRindexClass.yyRindex[state]) != 0)
+      for (token = n < 0 ? -n : 0;
+           token < YyNameClass.yyName.length && n+token < YyTableClass.yyTable.length; ++ token)
+        if (YyCheckClass.yyCheck[n+token] == token && !ok[token] && YyNameClass.yyName[token] != null) {
+          ++ len;
+          ok[token] = true;
+        }
+
+    String result[] = new String[len];
+    for (n = token = 0; n < len;  ++ token)
+      if (ok[token]) result[n++] = YyNameClass.yyName[token];
+    return result;
+  }
+
+  /** the generated parser, with debugging messages.
+      Maintains a state and a value stack, currently with fixed maximum size.
+      @param yyLex scanner.
+      @param yydebug debug message writer implementing yyDebug, or null.
+      @return result of the last reduction, if any.
+      @throws yyException on irrecoverable parse error.
+    */
+  public Object yyparse (yyInput yyLex, Object yydebug)
+                               throws java.io.IOException, yyException {
+//t    this.yydebug = (jay.yydebug.yyDebug)yydebug;
+    return yyparse(yyLex);
+  }
+
+  /** initial size and increment of the state/value stack [default 256].
+      This is not final so that it can be overwritten outside of invocations
+      of yyparse().
+    */
+  protected int yyMax;
+
+  /** executed at the beginning of a reduce action.
+      Used as $$ = yyDefault($1), prior to the user-specified action, if any.
+      Can be overwritten to provide deep copy, etc.
+      @param first value for $1, or null.
+      @return first.
+    */
+  protected Object yyDefault (Object first) {
+    return first;
+  }
+
+  /** the generated parser.
+      Maintains a state and a value stack, currently with fixed maximum size.
+      @param yyLex scanner.
+      @return result of the last reduction, if any.
+      @throws yyException on irrecoverable parse error.
+    */
+  public Object yyparse (yyInput yyLex)
+                               throws java.io.IOException, yyException {
+    if (yyMax <= 0) yyMax = 256;                       // initial size
+    int yyState = 0, yyStates[] = new int[yyMax];      // state stack
+    Object yyVal = null, yyVals[] = new Object[yyMax]; // value stack
+    int yyToken = -1;                                  // current input
+    int yyErrorFlag = 0;                               // #tks to shift
+
+    yyLoop: for (int yyTop = 0;; ++ yyTop) {
+      if (yyTop >= yyStates.length) {                  // dynamically increase
+        int[] i = new int[yyStates.length+yyMax];
+        System.arraycopy(yyStates, 0, i, 0, yyStates.length);
+        yyStates = i;
+        Object[] o = new Object[yyVals.length+yyMax];
+        System.arraycopy(yyVals, 0, o, 0, yyVals.length);
+        yyVals = o;
+      }
+      yyStates[yyTop] = yyState;
+      yyVals[yyTop] = yyVal;
+//t      if (yydebug != null) yydebug.push(yyState, yyVal);
+
+      yyDiscarded: for (;;) {  // discarding a token does not change stack
+        int yyN;
+        if ((yyN = YyDefRedClass.yyDefRed[yyState]) == 0) {    // else [default] reduce (yyN)
+          if (yyToken < 0) {
+            yyToken = yyLex.advance() ? yyLex.token() : 0;
+//t            if (yydebug != null)
+//t              yydebug.lex(yyState, yyToken, yyname(yyToken), yyLex.value());
+          }
+          if ((yyN = YySindexClass.yySindex[yyState]) != 0 && (yyN += yyToken) >= 0
+              && yyN < YyTableClass.yyTable.length && YyCheckClass.yyCheck[yyN] == yyToken) {
+//t            if (yydebug != null)
+//t              yydebug.shift(yyState, YyTableClass.yyTable[yyN], yyErrorFlag-1);
+            yyState = YyTableClass.yyTable[yyN];               // shift to yyN
+            yyVal = yyLex.value();
+            yyToken = -1;
+            if (yyErrorFlag > 0) -- yyErrorFlag;
+            continue yyLoop;
+          }
+          if ((yyN = YyRindexClass.yyRindex[yyState]) != 0 && (yyN += yyToken) >= 0
+              && yyN < YyTableClass.yyTable.length && YyCheckClass.yyCheck[yyN] == yyToken)
+            yyN = YyTableClass.yyTable[yyN];                   // reduce (yyN)
+          else
+            switch (yyErrorFlag) {
+  
+            case 0:
+              yyerror("syntax error", yyExpecting(yyState));
+//t              if (yydebug != null) yydebug.error("syntax error");
+  
+            case 1: case 2:
+              yyErrorFlag = 3;
+              do {
+                if ((yyN = YySindexClass.yySindex[yyStates[yyTop]]) != 0
+                    && (yyN += yyErrorCode) >= 0 && yyN < YyTableClass.yyTable.length
+                    && YyCheckClass.yyCheck[yyN] == yyErrorCode) {
+//t                  if (yydebug != null)
+//t                    yydebug.shift(yyStates[yyTop], YyTableClass.yyTable[yyN], 3);
+                  yyState = YyTableClass.yyTable[yyN];
+                  yyVal = yyLex.value();
+                  continue yyLoop;
+                }
+//t                if (yydebug != null) yydebug.pop(yyStates[yyTop]);
+              } while (-- yyTop >= 0);
+//t              if (yydebug != null) yydebug.reject();
+              throw new yyException("irrecoverable syntax error");
+  
+            case 3:
+              if (yyToken == 0) {
+//t                if (yydebug != null) yydebug.reject();
+                throw new yyException("irrecoverable syntax error at end-of-file");
+              }
+//t              if (yydebug != null)
+//t                yydebug.discard(yyState, yyToken, yyname(yyToken),
+//t                                                    yyLex.value());
+              yyToken = -1;
+              continue yyDiscarded;            // leave stack alone
+            }
+        }
+        int yyV = yyTop + 1-YyLenClass.yyLen[yyN];
+//t        if (yydebug != null)
+//t          yydebug.reduce(yyState, yyStates[yyV-1], yyN, YyRuleClass.yyRule[yyN], YyLenClass.yyLen[yyN]);
+        yyVal = yyDefault(yyV > yyTop ? null : yyVals[yyV]);
+        switch (yyN) {
+case 4:
+                                       // line 276 "XPathParser.y"
+  {
+      yyVal = new Root();
+    }
+  break;
+case 5:
+                                       // line 280 "XPathParser.y"
+  {
+      Steps steps;
+      if (yyVals[0+yyTop] instanceof Steps)
+        {
+          steps = (Steps) yyVals[0+yyTop];
+        }
+      else
+        {
+          steps = new Steps();
+          steps.path.addFirst(yyVals[0+yyTop]);
+        }
+      steps.path.addFirst(new Root());
+      yyVal = steps;
+      /*$$ = new Step(new Root(), (Path) $2);*/
+    }
+  break;
+case 6:
+                                       // line 296 "XPathParser.y"
+  {
+      Test nt = new NodeTypeTest((short) 0);
+      Selector s = new Selector(Selector.DESCENDANT_OR_SELF,
+                                Collections.singletonList (nt));
+      Steps steps;
+      if (yyVals[0+yyTop] instanceof Steps)
+        {
+          steps = (Steps) yyVals[0+yyTop];
+        }
+      else
+        {
+          steps = new Steps();
+          steps.path.addFirst(yyVals[0+yyTop]);
+        }
+      steps.path.addFirst(s);
+      steps.path.addFirst(new Root());
+      yyVal = steps;
+      /*Step step = new Step(s, (Path) $2);*/
+      /*$$ = new Step(new Root(), step);*/
+    }
+  break;
+case 8:
+                                       // line 321 "XPathParser.y"
+  {
+      Steps steps;
+      if (yyVals[-2+yyTop] instanceof Steps)
+        {
+          steps = (Steps) yyVals[-2+yyTop];
+        }
+      else
+        {
+          steps = new Steps();
+          steps.path.addFirst(yyVals[-2+yyTop]);
+        }
+      steps.path.addLast(yyVals[0+yyTop]);
+      yyVal = steps;
+      /*$$ = new Step((Expr) $1, (Path) $3);*/
+    }
+  break;
+case 9:
+                                       // line 337 "XPathParser.y"
+  {
+      Test nt = new NodeTypeTest((short) 0);
+      Selector s = new Selector(Selector.DESCENDANT_OR_SELF,
+                                Collections.singletonList (nt));
+      Steps steps;
+      if (yyVals[-2+yyTop] instanceof Steps)
+        {
+          steps = (Steps) yyVals[-2+yyTop];
+        }
+      else
+        {
+          steps = new Steps();
+          steps.path.addFirst(yyVals[-2+yyTop]);
+        }
+      steps.path.addLast(s);
+      steps.path.addLast(yyVals[0+yyTop]);
+      yyVal = steps;
+      /*Step step = new Step(s, (Path) $3);*/
+      /*$$ = new Step((Expr) $1, step);*/
+    }
+  break;
+case 10:
+                                       // line 361 "XPathParser.y"
+  {
+      yyVal = new Selector (Selector.CHILD, (List) yyVals[0+yyTop]);
+    }
+  break;
+case 11:
+                                       // line 365 "XPathParser.y"
+  {
+      yyVal = new Selector (Selector.ATTRIBUTE, (List) yyVals[0+yyTop]);
+    }
+  break;
+case 12:
+                                       // line 369 "XPathParser.y"
+  {
+      yyVal = new Selector (((Integer) yyVals[-2+yyTop]).intValue (), (List) yyVals[0+yyTop]);
+    }
+  break;
+case 13:
+                                       // line 373 "XPathParser.y"
+  {
+      yyVal = new Selector (Selector.SELF, Collections.EMPTY_LIST);
+    }
+  break;
+case 14:
+                                       // line 377 "XPathParser.y"
+  {
+      yyVal = new Selector (Selector.PARENT, Collections.EMPTY_LIST);
+    }
+  break;
+case 15:
+                                       // line 384 "XPathParser.y"
+  {
+      List list = new ArrayList();
+      list.add(yyVals[0+yyTop]);
+      yyVal = list;
+    }
+  break;
+case 16:
+                                       // line 390 "XPathParser.y"
+  {
+      List list = (List)yyVals[-1+yyTop];
+      list.add(yyVals[0+yyTop]);
+      yyVal = list;
+    }
+  break;
+case 17:
+                                       // line 414 "XPathParser.y"
+  {
+      yyVal = new Integer(Selector.ANCESTOR);
+    }
+  break;
+case 18:
+                                       // line 418 "XPathParser.y"
+  {
+      yyVal = new Integer(Selector.ANCESTOR_OR_SELF);
+    }
+  break;
+case 19:
+                                       // line 422 "XPathParser.y"
+  {
+      yyVal = new Integer(Selector.ATTRIBUTE);
+    }
+  break;
+case 20:
+                                       // line 426 "XPathParser.y"
+  {
+      yyVal = new Integer(Selector.CHILD);
+    }
+  break;
+case 21:
+                                       // line 430 "XPathParser.y"
+  {
+      yyVal = new Integer(Selector.DESCENDANT);
+    }
+  break;
+case 22:
+                                       // line 434 "XPathParser.y"
+  {
+      yyVal = new Integer(Selector.DESCENDANT_OR_SELF);
+    }
+  break;
+case 23:
+                                       // line 438 "XPathParser.y"
+  {
+      yyVal = new Integer(Selector.FOLLOWING);
+    }
+  break;
+case 24:
+                                       // line 442 "XPathParser.y"
+  {
+      yyVal = new Integer(Selector.FOLLOWING_SIBLING);
+    }
+  break;
+case 25:
+                                       // line 446 "XPathParser.y"
+  {
+      yyVal = new Integer(Selector.NAMESPACE);
+    }
+  break;
+case 26:
+                                       // line 450 "XPathParser.y"
+  {
+      yyVal = new Integer(Selector.PARENT);
+    }
+  break;
+case 27:
+                                       // line 454 "XPathParser.y"
+  {
+      yyVal = new Integer(Selector.PRECEDING);
+    }
+  break;
+case 28:
+                                       // line 458 "XPathParser.y"
+  {
+      yyVal = new Integer(Selector.PRECEDING_SIBLING);
+    }
+  break;
+case 29:
+                                       // line 462 "XPathParser.y"
+  {
+      yyVal = new Integer(Selector.SELF);
+    }
+  break;
+case 31:
+                                       // line 471 "XPathParser.y"
+  {
+      yyVal = new NodeTypeTest(Node.PROCESSING_INSTRUCTION_NODE, (String) yyVals[-1+yyTop]);
+    }
+  break;
+case 32:
+                                       // line 476 "XPathParser.y"
+  {
+      yyVal = new NodeTypeTest(((Short) yyVals[-1+yyTop]).shortValue());
+    }
+  break;
+case 33:
+                                       // line 483 "XPathParser.y"
+  {
+      yyVal = new Predicate((Expr) yyVals[-1+yyTop]);
+    }
+  break;
+case 35:
+                                       // line 491 "XPathParser.y"
+  {
+      yyVal = new ParenthesizedExpr((Expr) yyVals[-1+yyTop]);
+    }
+  break;
+case 36:
+                                       // line 495 "XPathParser.y"
+  {
+      yyVal = new Constant(yyVals[0+yyTop]);
+    }
+  break;
+case 37:
+                                       // line 499 "XPathParser.y"
+  {
+      yyVal = new Constant(yyVals[0+yyTop]);
+    }
+  break;
+case 39:
+                                       // line 507 "XPathParser.y"
+  {
+      yyVal = lookupFunction((String) yyVals[-2+yyTop], Collections.EMPTY_LIST);
+    }
+  break;
+case 40:
+                                       // line 511 "XPathParser.y"
+  {
+      yyVal = lookupFunction((String) yyVals[-3+yyTop], (List) yyVals[-1+yyTop]);
+    }
+  break;
+case 41:
+                                       // line 518 "XPathParser.y"
+  {
+      List list = new ArrayList();
+      list.add(yyVals[0+yyTop]);
+      yyVal = list;
+    }
+  break;
+case 42:
+                                       // line 524 "XPathParser.y"
+  {
+      List list = (List) yyVals[0+yyTop];
+      list.add(0, yyVals[-2+yyTop]);
+      yyVal = list;
+    }
+  break;
+case 44:
+                                       // line 534 "XPathParser.y"
+  {
+      yyVal = new UnionExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop]);
+    }
+  break;
+case 47:
+                                       // line 543 "XPathParser.y"
+  {
+      Steps steps;
+      if (yyVals[0+yyTop] instanceof Steps)
+        {
+          steps = (Steps) yyVals[0+yyTop];
+        }
+      else
+        {
+          steps = new Steps();
+          steps.path.addFirst(yyVals[0+yyTop]);
+        }
+      steps.path.addFirst(yyVals[-2+yyTop]);
+      yyVal = steps;
+      /*$$ = new Step ((Expr) $1, (Path) $3);*/
+    }
+  break;
+case 48:
+                                       // line 559 "XPathParser.y"
+  {
+      Test nt = new NodeTypeTest((short) 0);
+      Selector s = new Selector(Selector.DESCENDANT_OR_SELF,
+                                Collections.singletonList(nt));
+      Steps steps;
+      if (yyVals[0+yyTop] instanceof Steps)
+        {
+          steps = (Steps) yyVals[0+yyTop];
+        }
+      else
+        {
+          steps = new Steps();
+          steps.path.addFirst(yyVals[0+yyTop]);
+        }
+      steps.path.addFirst(s);
+      steps.path.addFirst(yyVals[-2+yyTop]);
+      yyVal = steps;
+      /*Step step = new Step (s, (Path) $3);*/
+      /*$$ = new Step ((Expr) $1, step);*/
+    }
+  break;
+case 50:
+                                       // line 584 "XPathParser.y"
+  {
+      Predicate filter = (Predicate) yyVals[0+yyTop];
+      Selector s = new Selector(Selector.SELF,
+                                Collections.singletonList(filter));
+      Steps steps;
+      if (yyVals[-1+yyTop] instanceof Steps)
+        {
+          steps = (Steps) yyVals[-1+yyTop];
+        }
+      else
+        {
+          steps = new Steps();
+          steps.path.addFirst(yyVals[-1+yyTop]);
+        }
+      steps.path.addLast(s);
+      yyVal = steps;
+      /*$$ = new Step ((Expr) $1, s);*/
+    }
+  break;
+case 52:
+                                       // line 607 "XPathParser.y"
+  {
+      yyVal = new OrExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop]);
+    }
+  break;
+case 54:
+                                       // line 615 "XPathParser.y"
+  {
+      yyVal = new AndExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop]);
+    }
+  break;
+case 56:
+                                       // line 623 "XPathParser.y"
+  {
+      yyVal = new EqualityExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], false);
+    }
+  break;
+case 57:
+                                       // line 627 "XPathParser.y"
+  {
+      yyVal = new EqualityExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], true);
+    }
+  break;
+case 59:
+                                       // line 635 "XPathParser.y"
+  {
+      yyVal = new RelationalExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], true, false);
+    }
+  break;
+case 60:
+                                       // line 639 "XPathParser.y"
+  {
+      yyVal = new RelationalExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], false, false);
+    }
+  break;
+case 61:
+                                       // line 643 "XPathParser.y"
+  {
+      yyVal = new RelationalExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], true, true);
+    }
+  break;
+case 62:
+                                       // line 647 "XPathParser.y"
+  {
+      yyVal = new RelationalExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], false, true);
+    }
+  break;
+case 64:
+                                       // line 655 "XPathParser.y"
+  {
+      yyVal = new ArithmeticExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], ArithmeticExpr.ADD);
+    }
+  break;
+case 65:
+                                       // line 659 "XPathParser.y"
+  {
+      yyVal = new ArithmeticExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], ArithmeticExpr.SUBTRACT);
+    }
+  break;
+case 67:
+                                       // line 667 "XPathParser.y"
+  {
+      yyVal = new ArithmeticExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], ArithmeticExpr.MULTIPLY);
+    }
+  break;
+case 68:
+                                       // line 671 "XPathParser.y"
+  {
+      yyVal = new ArithmeticExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], ArithmeticExpr.DIVIDE);
+    }
+  break;
+case 69:
+                                       // line 675 "XPathParser.y"
+  {
+      yyVal = new ArithmeticExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], ArithmeticExpr.MODULO);
+    }
+  break;
+case 71:
+                                       // line 683 "XPathParser.y"
+  {
+      yyVal = new NegativeExpr((Expr) yyVals[0+yyTop]);
+    }
+  break;
+case 72:
+                                       // line 690 "XPathParser.y"
+  {
+      yyVal = new Double((String) yyVals[0+yyTop] + ".0");
+    }
+  break;
+case 73:
+                                       // line 694 "XPathParser.y"
+  {
+      yyVal = new Double((String) yyVals[-1+yyTop] + ".0");
+    }
+  break;
+case 74:
+                                       // line 698 "XPathParser.y"
+  {
+      yyVal = new Double((String) yyVals[-2+yyTop] + "." + (String) yyVals[0+yyTop]);
+    }
+  break;
+case 75:
+                                       // line 702 "XPathParser.y"
+  {
+      yyVal = new Double("0." + (String) yyVals[0+yyTop]);
+    }
+  break;
+case 77:
+                                       // line 731 "XPathParser.y"
+  {
+      yyVal = new VariableReference(variableResolver, (String) yyVals[0+yyTop]);
+    }
+  break;
+case 78:
+                                       // line 738 "XPathParser.y"
+  {
+      yyVal = new NameTest(null, true, true);
+    }
+  break;
+case 79:
+                                       // line 742 "XPathParser.y"
+  {
+      QName qName = getQName((String) yyVals[-2+yyTop]);
+      yyVal = new NameTest(qName, true, false);
+    }
+  break;
+case 80:
+                                       // line 747 "XPathParser.y"
+  {
+      QName qName = getQName((String) yyVals[0+yyTop]);
+      yyVal = new NameTest(qName, false, false);
+    }
+  break;
+case 82:
+                                       // line 756 "XPathParser.y"
+  {
+      yyVal = (String) yyVals[-2+yyTop] + ':' + (String) yyVals[0+yyTop];
+    }
+  break;
+case 83:
+                                       // line 763 "XPathParser.y"
+  {
+      yyVal = new Short(Node.COMMENT_NODE);
+    }
+  break;
+case 84:
+                                       // line 767 "XPathParser.y"
+  {
+      yyVal = new Short(Node.TEXT_NODE);
+    }
+  break;
+case 85:
+                                       // line 771 "XPathParser.y"
+  {
+      yyVal = new Short(Node.PROCESSING_INSTRUCTION_NODE);
+    }
+  break;
+case 86:
+                                       // line 775 "XPathParser.y"
+  {
+      yyVal = new Short((short) 0);
+    }
+  break;
+                                       // line 986 "-"
+        }
+        yyTop -= YyLenClass.yyLen[yyN];
+        yyState = yyStates[yyTop];
+        int yyM = YyLhsClass.yyLhs[yyN];
+        if (yyState == 0 && yyM == 0) {
+//t          if (yydebug != null) yydebug.shift(0, yyFinal);
+          yyState = yyFinal;
+          if (yyToken < 0) {
+            yyToken = yyLex.advance() ? yyLex.token() : 0;
+//t            if (yydebug != null)
+//t               yydebug.lex(yyState, yyToken,yyname(yyToken), yyLex.value());
+          }
+          if (yyToken == 0) {
+//t            if (yydebug != null) yydebug.accept(yyVal);
+            return yyVal;
+          }
+          continue yyLoop;
+        }
+        if ((yyN = YyGindexClass.yyGindex[yyM]) != 0 && (yyN += yyState) >= 0
+            && yyN < YyTableClass.yyTable.length && YyCheckClass.yyCheck[yyN] == yyState)
+          yyState = YyTableClass.yyTable[yyN];
+        else
+          yyState = YyDgotoClass.yyDgoto[yyM];
+//t        if (yydebug != null) yydebug.shift(yyStates[yyTop], yyState);
+        continue yyLoop;
+      }
+    }
+  }
+
+  protected static final class YyLhsClass {
+
+    public static final short yyLhs [] = {              -1,
+          0,    2,    2,    4,    4,    4,    3,    3,    3,    5,
+          5,    5,    5,    5,    6,    6,    7,    7,    7,    7,
+          7,    7,    7,    7,    7,    7,    7,    7,    7,    8,
+          8,    8,    9,   12,   12,   12,   12,   12,   15,   15,
+         17,   17,   18,   18,   19,   19,   19,   19,   20,   20,
+          1,    1,   21,   21,   22,   22,   22,   23,   23,   23,
+         23,   23,   24,   24,   24,   25,   25,   25,   25,   26,
+         26,   14,   14,   14,   14,   16,   13,   10,   10,   10,
+         27,   27,   11,   11,   11,   11,
+    };
+  } /* End of class YyLhsClass */
+
+  protected static final class YyLenClass {
+
+    public static final short yyLen [] = {           2,
+          1,    1,    1,    1,    2,    2,    1,    3,    3,    1,
+          2,    3,    1,    1,    1,    2,    1,    1,    1,    1,
+          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+          3,    2,    3,    1,    3,    1,    1,    1,    3,    4,
+          1,    3,    1,    3,    1,    1,    3,    3,    1,    2,
+          1,    3,    1,    3,    1,    3,    3,    1,    3,    3,
+          3,    3,    1,    3,    3,    1,    3,    3,    3,    1,
+          2,    1,    2,    3,    2,    1,    2,    1,    3,    1,
+          1,    3,    1,    1,    1,    1,
+    };
+  } /* End class YyLenClass */
+
+  protected static final class YyDefRedClass {
+
+    public static final short yyDefRed [] = {            0,
+         36,    0,    0,    0,    0,    0,    0,    0,   78,    0,
+          0,   14,   17,   18,   19,   20,   21,   22,   23,   24,
+         25,   26,   27,   28,   29,   83,    0,   84,   86,    0,
+          0,   45,    0,    3,    7,    0,    0,   15,   30,    0,
+         49,   34,   37,   38,    0,    0,   43,    0,    0,    0,
+          0,    0,    0,   66,    0,    0,    0,    0,   13,    0,
+         80,    0,   71,    0,    0,   77,   75,    0,    0,    0,
+          0,    0,   16,    0,   32,    0,    0,    0,    0,   50,
+          0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+          0,    0,   74,   82,   79,   35,    0,   31,    0,    8,
+          9,    0,    0,   39,    0,    0,   44,    0,    0,    0,
+          0,    0,    0,    0,    0,    0,    0,    0,   67,   68,
+         69,   33,    0,   40,   42,
+    };
+  } /* End of class YyDefRedClass */
+
+  protected static final class YyDgotoClass {
+
+    public static final short yyDgoto [] = {           105,
+         31,   32,   33,   34,   35,   36,   37,   38,   73,   39,
+         40,   41,   42,   43,   44,   45,  106,   46,   47,   48,
+         49,   50,   51,   52,   53,   54,   55,
+    };
+  } /* End of class YyDgotoClass */
+
+  protected static final class YySindexClass {
+
+    public static final short yySindex [] = {          -97,
+          0, -271, -267,  -97, -239, -239,  -97, -199,    0, -236,
+       -222,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+          0,    0,    0,    0,    0,    0, -218,    0,    0,    0,
+       -257,    0, -241,    0,    0, -205, -221,    0,    0, -194,
+          0,    0,    0,    0, -190, -185,    0, -238, -211, -234,
+       -255, -209, -275,    0,    0, -169, -250, -168,    0, -241,
+          0, -241,    0, -205, -187,    0,    0, -167,  -97, -239,
+       -239,  -97,    0, -199,    0, -151,  -43, -239, -239,    0,
+        -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,
+        -97,  -97,    0,    0,    0,    0, -164,    0, -211,    0,
+          0, -166, -205,    0, -165, -163,    0, -241, -241, -234,
+       -255, -255, -209, -209, -209, -209, -275, -275,    0,    0,
+          0,    0,  -97,    0,    0,
+    };
+  } /* End of class YySindexClass */
+
+  protected static final class YyRindexClass {
+
+    public static final short yyRindex [] = {            0,
+          0,   58,    1,    0,  420,    0,    0,    0,    0,    0,
+        129,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+          0,    0,    0,    0,    0,    0, -161,    0,    0,    0,
+         40,    0,  237,    0,    0,  168,    0,    0,    0,    0,
+          0,    0,    0,    0,    0,  459,    0,  277,  557,  544,
+        656,  561,  474,    0,   19,   75,    0,    0,    0,  295,
+          0,  334,    0,  183,  114,    0,    0,    0,    0,    0,
+          0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+          0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+          0,    0,    0,    0,    0,    0,    0,    0,  686,    0,
+          0,    0,  222,    0, -156,    0,    0,  351,  405,  553,
+        665,  697,  577,  600,  617,  639,  513,  528,    0,    0,
+          0,    0,    0,    0,    0,
+    };
+  } /* End of class YyRindexClass */
+
+  protected static final class YyGindexClass {
+
+    public static final short yyGindex [] = {            7,
+          0,    0,    8,    0,    3,   -3,    0,    0,   48,    0,
+          0,    0,    0,    0,    0,    0,  -12,    0,   35,    0,
+         44,   36,   -1,  -54,    2,   -7,   -2,
+    };
+  } /* End of class YyGindexClass */
+
+  protected static final class YyTableClass {
+
+    public static final short yyTable [] = {            63,
+         81,   90,   61,   61,   64,   61,   30,   66,   94,   56,
+         58,   57,   60,   62,   84,   85,   86,   87,   80,    3,
+         91,   92,   65,   72,   70,   71,   95,   78,   79,  113,
+        114,  115,  116,   82,   83,   67,    8,    9,   68,    1,
+         69,   59,   12,   13,   14,   15,   16,   17,   18,   19,
+         20,   21,   22,   23,   24,   25,   72,   72,   74,    3,
+         26,   27,   28,   29,   88,   89,   75,   61,   61,   76,
+        103,   61,  100,  101,   73,   61,   61,    9,  102,   77,
+        111,  112,  119,  120,  121,  108,  109,   81,   93,  117,
+        118,   97,   96,   98,   94,   80,  122,  124,  123,   85,
+         26,   27,   28,   29,   41,    1,    2,    3,    4,  104,
+        125,  107,   99,   81,    5,    6,  110,    0,    0,    0,
+          0,    0,    0,    7,    8,    9,   10,    0,   13,   11,
+         12,   13,   14,   15,   16,   17,   18,   19,   20,   21,
+         22,   23,   24,   25,    0,    0,    0,    0,   26,   27,
+         28,   29,    0,    0,    0,    0,    0,    0,    0,    1,
+          2,    3,    4,    0,    0,    0,    0,   10,    5,    6,
+          0,    0,    0,    0,    0,    0,    0,    7,    8,    9,
+         10,    0,   11,   11,   12,   13,   14,   15,   16,   17,
+         18,   19,   20,   21,   22,   23,   24,   25,    0,    0,
+          0,    0,   26,   27,   28,   29,    0,    0,    0,    0,
+          0,    0,    0,    1,    2,    3,    4,    0,    0,    0,
+          0,   12,    5,    6,    0,    0,    0,    0,    0,    0,
+          0,    0,    8,    9,   10,    0,    2,   11,   12,   13,
+         14,   15,   16,   17,   18,   19,   20,   21,   22,   23,
+         24,   25,    0,    0,    0,    0,   26,   27,   28,   29,
+         81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
+         81,   81,   81,   81,   81,   81,   46,   81,   76,   80,
+         80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
+         80,   80,   80,   80,    5,   80,   81,   81,   81,   81,
+          1,    0,    1,    1,    0,    0,    0,    0,    0,    0,
+          0,    0,    0,    0,   80,   80,   80,   80,   72,   72,
+         72,   72,   72,   72,   72,   72,   72,   72,   72,   72,
+         72,   72,   72,    6,   72,   73,   73,   73,   73,   73,
+         73,   73,   73,   73,   73,   73,   73,   73,   73,   73,
+         47,   73,    0,   72,   72,   72,   72,    0,    0,    0,
+          0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+         73,   73,   73,   73,   81,   81,   81,   81,   81,   81,
+         81,   81,   81,   81,   81,   81,   81,   81,   81,   13,
+         81,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+         13,   13,   13,   13,   48,   13,    0,    0,    0,   81,
+         81,   81,   81,    0,    0,    0,    0,    0,    0,    4,
+          0,    0,    0,    0,   13,   13,   13,   13,   10,    0,
+         10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
+         10,   10,   10,   11,   10,   11,   11,   11,   11,   11,
+         11,   11,   11,   11,   11,   11,   11,   11,   70,   11,
+          0,    0,    0,   10,   10,   10,   10,    0,    0,    0,
+          0,    0,    0,   63,    0,    0,    0,    0,   11,   11,
+         11,   11,   12,    0,   12,   12,   12,   12,   12,   12,
+         12,   12,   12,   12,   12,   12,   12,    2,   12,    2,
+          2,    2,    0,    0,    2,    2,    2,    2,    2,    2,
+          2,    2,   64,    2,    0,    0,    0,   12,   12,   12,
+         12,    0,    0,    0,    0,    0,    0,   65,    0,    0,
+          0,    0,    2,    2,    2,    2,    0,   46,    0,   46,
+         46,   46,    0,   53,   46,   46,   46,   46,   46,   46,
+         46,   46,   54,   46,    0,    5,   51,    5,    5,    5,
+         58,    0,    5,    5,    5,    5,    5,    5,    5,    5,
+          0,    5,   46,   46,   46,   46,   60,    0,    0,    0,
+          0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+          5,    5,    5,    5,    6,    0,    6,    6,    6,   59,
+          0,    6,    6,    6,    6,    6,    6,    6,    6,    0,
+          6,   47,    0,   47,   47,   47,   62,    0,   47,   47,
+         47,   47,   47,   47,   47,   47,    0,   47,    0,    6,
+          6,    6,    6,    0,    0,    0,    0,    0,   61,    0,
+          0,    0,    0,    0,    0,    0,   47,   47,   47,   47,
+          0,    0,    0,    0,    0,   55,    0,    0,    0,    0,
+          0,    0,    0,    0,   56,   48,    0,   48,   48,   48,
+          0,    0,   48,   48,   48,   48,   48,   48,   48,   48,
+          4,   48,    4,    4,    4,   52,    0,    4,    4,    4,
+          4,    4,    4,    4,    4,    0,   57,    0,    0,    0,
+         48,   48,   48,   48,    0,    0,    0,    0,    0,    0,
+          0,    0,    0,    0,    0,    4,    4,    4,    4,   70,
+          0,   70,   70,    0,    0,    0,   70,   70,   70,   70,
+         70,   70,   70,   70,   63,   70,   63,   63,    0,    0,
+          0,   63,   63,   63,   63,   63,   63,   63,   63,    0,
+          0,    0,    0,    0,   70,   70,   70,   70,    0,    0,
+          0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+          0,   63,   63,   64,    0,   64,   64,    0,    0,    0,
+         64,   64,   64,   64,   64,   64,   64,   64,   65,    0,
+         65,   65,    0,    0,    0,   65,   65,   65,   65,   65,
+         65,   65,   65,    0,   53,    0,   53,   53,    0,    0,
+         64,   64,    0,   54,    0,   54,   54,   51,    0,   51,
+         51,   58,    0,   58,   58,   65,   65,    0,   58,   58,
+         58,   58,   58,   58,    0,    0,    0,   60,    0,   60,
+         60,   53,   53,    0,   60,   60,   60,   60,   60,   60,
+         54,   54,    0,    0,   51,    0,    0,    0,   58,   58,
+         59,    0,   59,   59,    0,    0,    0,   59,   59,   59,
+         59,   59,   59,    0,   60,   60,    0,   62,    0,   62,
+         62,    0,    0,    0,   62,   62,   62,   62,   62,   62,
+          0,    0,    0,    0,    0,    0,    0,   59,   59,   61,
+          0,   61,   61,    0,    0,    0,   61,   61,   61,   61,
+         61,   61,    0,    0,   62,   62,   55,    0,   55,   55,
+          0,    0,    0,   55,   55,   56,    0,   56,   56,    0,
+          0,    0,   56,   56,    0,    0,   61,   61,    0,    0,
+          0,    0,    0,    0,    0,    0,   52,    0,   52,   52,
+          0,    0,    0,   55,   55,    0,    0,   57,    0,   57,
+         57,    0,   56,   56,   57,   57,    0,    0,    0,    0,
+          0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+          0,    0,    0,   52,    0,    0,    0,    0,    0,    0,
+          0,    0,    0,    0,   57,   57,
+    };
+  } /* End of class YyTableClass */
+
+  protected static final class YyCheckClass {
+
+    public static final short yyCheck [] = {             7,
+          0,  277,    5,    6,    8,    8,    0,   10,  259,  281,
+          4,  279,    5,    6,  270,  271,  272,  273,    0,  259,
+        296,  297,  259,  262,  266,  267,  277,  266,  267,   84,
+         85,   86,   87,  268,  269,  258,  276,  277,  257,    0,
+        298,  281,  282,  283,  284,  285,  286,  287,  288,  289,
+        290,  291,  292,  293,  294,  295,  262,    0,  280,  259,
+        300,  301,  302,  303,  274,  275,  261,   70,   71,  260,
+         74,   74,   70,   71,    0,   78,   79,  277,   72,  265,
+         82,   83,   90,   91,   92,   78,   79,  299,  258,   88,
+         89,  279,  261,  261,  259,   48,  263,  261,  264,  261,
+        300,  301,  302,  303,  261,  257,  258,  259,  260,  261,
+        123,   77,   69,    0,  266,  267,   81,   -1,   -1,   -1,
+         -1,   -1,   -1,  275,  276,  277,  278,   -1,    0,  281,
+        282,  283,  284,  285,  286,  287,  288,  289,  290,  291,
+        292,  293,  294,  295,   -1,   -1,   -1,   -1,  300,  301,
+        302,  303,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,
+        258,  259,  260,   -1,   -1,   -1,   -1,    0,  266,  267,
+         -1,   -1,   -1,   -1,   -1,   -1,   -1,  275,  276,  277,
+        278,   -1,    0,  281,  282,  283,  284,  285,  286,  287,
+        288,  289,  290,  291,  292,  293,  294,  295,   -1,   -1,
+         -1,   -1,  300,  301,  302,  303,   -1,   -1,   -1,   -1,
+         -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,   -1,
+         -1,    0,  266,  267,   -1,   -1,   -1,   -1,   -1,   -1,
+         -1,   -1,  276,  277,  278,   -1,    0,  281,  282,  283,
+        284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
+        294,  295,   -1,   -1,   -1,   -1,  300,  301,  302,  303,
+        260,  261,  262,  263,  264,  265,  266,  267,  268,  269,
+        270,  271,  272,  273,  274,  275,    0,  277,  260,  261,
+        262,  263,  264,  265,  266,  267,  268,  269,  270,  271,
+        272,  273,  274,  275,    0,  277,  296,  297,  298,  299,
+        261,   -1,  263,  264,   -1,   -1,   -1,   -1,   -1,   -1,
+         -1,   -1,   -1,   -1,  296,  297,  298,  299,  261,  262,
+        263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
+        273,  274,  275,    0,  277,  261,  262,  263,  264,  265,
+        266,  267,  268,  269,  270,  271,  272,  273,  274,  275,
+          0,  277,   -1,  296,  297,  298,  299,   -1,   -1,   -1,
+         -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+        296,  297,  298,  299,  261,  262,  263,  264,  265,  266,
+        267,  268,  269,  270,  271,  272,  273,  274,  275,  261,
+        277,  263,  264,  265,  266,  267,  268,  269,  270,  271,
+        272,  273,  274,  275,    0,  277,   -1,   -1,   -1,  296,
+        297,  298,  299,   -1,   -1,   -1,   -1,   -1,   -1,    0,
+         -1,   -1,   -1,   -1,  296,  297,  298,  299,  261,   -1,
+        263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
+        273,  274,  275,  261,  277,  263,  264,  265,  266,  267,
+        268,  269,  270,  271,  272,  273,  274,  275,    0,  277,
+         -1,   -1,   -1,  296,  297,  298,  299,   -1,   -1,   -1,
+         -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,  296,  297,
+        298,  299,  261,   -1,  263,  264,  265,  266,  267,  268,
+        269,  270,  271,  272,  273,  274,  275,  261,  277,  263,
+        264,  265,   -1,   -1,  268,  269,  270,  271,  272,  273,
+        274,  275,    0,  277,   -1,   -1,   -1,  296,  297,  298,
+        299,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,
+         -1,   -1,  296,  297,  298,  299,   -1,  261,   -1,  263,
+        264,  265,   -1,    0,  268,  269,  270,  271,  272,  273,
+        274,  275,    0,  277,   -1,  261,    0,  263,  264,  265,
+          0,   -1,  268,  269,  270,  271,  272,  273,  274,  275,
+         -1,  277,  296,  297,  298,  299,    0,   -1,   -1,   -1,
+         -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+        296,  297,  298,  299,  261,   -1,  263,  264,  265,    0,
+         -1,  268,  269,  270,  271,  272,  273,  274,  275,   -1,
+        277,  261,   -1,  263,  264,  265,    0,   -1,  268,  269,
+        270,  271,  272,  273,  274,  275,   -1,  277,   -1,  296,
+        297,  298,  299,   -1,   -1,   -1,   -1,   -1,    0,   -1,
+         -1,   -1,   -1,   -1,   -1,   -1,  296,  297,  298,  299,
+         -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
+         -1,   -1,   -1,   -1,    0,  261,   -1,  263,  264,  265,
+         -1,   -1,  268,  269,  270,  271,  272,  273,  274,  275,
+        261,  277,  263,  264,  265,    0,   -1,  268,  269,  270,
+        271,  272,  273,  274,  275,   -1,    0,   -1,   -1,   -1,
+        296,  297,  298,  299,   -1,   -1,   -1,   -1,   -1,   -1,
+         -1,   -1,   -1,   -1,   -1,  296,  297,  298,  299,  261,
+         -1,  263,  264,   -1,   -1,   -1,  268,  269,  270,  271,
+        272,  273,  274,  275,  261,  277,  263,  264,   -1,   -1,
+         -1,  268,  269,  270,  271,  272,  273,  274,  275,   -1,
+         -1,   -1,   -1,   -1,  296,  297,  298,  299,   -1,   -1,
+         -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+         -1,  298,  299,  261,   -1,  263,  264,   -1,   -1,   -1,
+        268,  269,  270,  271,  272,  273,  274,  275,  261,   -1,
+        263,  264,   -1,   -1,   -1,  268,  269,  270,  271,  272,
+        273,  274,  275,   -1,  261,   -1,  263,  264,   -1,   -1,
+        298,  299,   -1,  261,   -1,  263,  264,  261,   -1,  263,
+        264,  261,   -1,  263,  264,  298,  299,   -1,  268,  269,
+        270,  271,  272,  273,   -1,   -1,   -1,  261,   -1,  263,
+        264,  298,  299,   -1,  268,  269,  270,  271,  272,  273,
+        298,  299,   -1,   -1,  298,   -1,   -1,   -1,  298,  299,
+        261,   -1,  263,  264,   -1,   -1,   -1,  268,  269,  270,
+        271,  272,  273,   -1,  298,  299,   -1,  261,   -1,  263,
+        264,   -1,   -1,   -1,  268,  269,  270,  271,  272,  273,
+         -1,   -1,   -1,   -1,   -1,   -1,   -1,  298,  299,  261,
+         -1,  263,  264,   -1,   -1,   -1,  268,  269,  270,  271,
+        272,  273,   -1,   -1,  298,  299,  261,   -1,  263,  264,
+         -1,   -1,   -1,  268,  269,  261,   -1,  263,  264,   -1,
+         -1,   -1,  268,  269,   -1,   -1,  298,  299,   -1,   -1,
+         -1,   -1,   -1,   -1,   -1,   -1,  261,   -1,  263,  264,
+         -1,   -1,   -1,  298,  299,   -1,   -1,  261,   -1,  263,
+        264,   -1,  298,  299,  268,  269,   -1,   -1,   -1,   -1,
+         -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+         -1,   -1,   -1,  298,   -1,   -1,   -1,   -1,   -1,   -1,
+         -1,   -1,   -1,   -1,  298,  299,
+    };
+  } /* End of class YyCheckClass */
+
+
+//t  protected static final class YyRuleClass {
+
+//t    public static final String yyRule [] = {
+//t    "$accept : expr",
+//t    "expr : or_expr",
+//t    "location_path : relative_location_path",
+//t    "location_path : absolute_location_path",
+//t    "absolute_location_path : SLASH",
+//t    "absolute_location_path : SLASH relative_location_path",
+//t    "absolute_location_path : DOUBLE_SLASH relative_location_path",
+//t    "relative_location_path : step",
+//t    "relative_location_path : relative_location_path SLASH step",
+//t    "relative_location_path : relative_location_path DOUBLE_SLASH step",
+//t    "step : step_node_test",
+//t    "step : AT step_node_test",
+//t    "step : axis_name DOUBLE_COLON step_node_test",
+//t    "step : DOT",
+//t    "step : DOUBLE_DOT",
+//t    "step_node_test : node_test",
+//t    "step_node_test : step_node_test predicate",
+//t    "axis_name : ANCESTOR",
+//t    "axis_name : ANCESTOR_OR_SELF",
+//t    "axis_name : ATTRIBUTE",
+//t    "axis_name : CHILD",
+//t    "axis_name : DESCENDANT",
+//t    "axis_name : DESCENDANT_OR_SELF",
+//t    "axis_name : FOLLOWING",
+//t    "axis_name : FOLLOWING_SIBLING",
+//t    "axis_name : NAMESPACE",
+//t    "axis_name : PARENT",
+//t    "axis_name : PRECEDING",
+//t    "axis_name : PRECEDING_SIBLING",
+//t    "axis_name : SELF",
+//t    "node_test : name_test",
+//t    "node_test : PROCESSING_INSTRUCTION LITERAL RP",
+//t    "node_test : node_type RP",
+//t    "predicate : LB expr RB",
+//t    "primary_expr : variable_reference",
+//t    "primary_expr : LP expr RP",
+//t    "primary_expr : LITERAL",
+//t    "primary_expr : number",
+//t    "primary_expr : function_call",
+//t    "function_call : function_name LP RP",
+//t    "function_call : function_name LP argument_list RP",
+//t    "argument_list : expr",
+//t    "argument_list : expr COMMA argument_list",
+//t    "union_expr : path_expr",
+//t    "union_expr : union_expr PIPE path_expr",
+//t    "path_expr : location_path",
+//t    "path_expr : filter_expr",
+//t    "path_expr : filter_expr SLASH relative_location_path",
+//t    "path_expr : filter_expr DOUBLE_SLASH relative_location_path",
+//t    "filter_expr : primary_expr",
+//t    "filter_expr : filter_expr predicate",
+//t    "or_expr : and_expr",
+//t    "or_expr : or_expr OR and_expr",
+//t    "and_expr : equality_expr",
+//t    "and_expr : and_expr AND equality_expr",
+//t    "equality_expr : relational_expr",
+//t    "equality_expr : equality_expr EQ relational_expr",
+//t    "equality_expr : equality_expr NE relational_expr",
+//t    "relational_expr : additive_expr",
+//t    "relational_expr : relational_expr LT additive_expr",
+//t    "relational_expr : relational_expr GT additive_expr",
+//t    "relational_expr : relational_expr LTE additive_expr",
+//t    "relational_expr : relational_expr GTE additive_expr",
+//t    "additive_expr : multiplicative_expr",
+//t    "additive_expr : additive_expr PLUS multiplicative_expr",
+//t    "additive_expr : additive_expr MINUS multiplicative_expr",
+//t    "multiplicative_expr : unary_expr",
+//t    "multiplicative_expr : multiplicative_expr STAR unary_expr",
+//t    "multiplicative_expr : multiplicative_expr DIV unary_expr",
+//t    "multiplicative_expr : multiplicative_expr MOD unary_expr",
+//t    "unary_expr : union_expr",
+//t    "unary_expr : MINUS unary_expr",
+//t    "number : DIGITS",
+//t    "number : DIGITS DOT",
+//t    "number : DIGITS DOT DIGITS",
+//t    "number : DOT DIGITS",
+//t    "function_name : qname",
+//t    "variable_reference : DOLLAR qname",
+//t    "name_test : STAR",
+//t    "name_test : NAME COLON STAR",
+//t    "name_test : qname",
+//t    "qname : NAME",
+//t    "qname : NAME COLON NAME",
+//t    "node_type : COMMENT",
+//t    "node_type : TEXT",
+//t    "node_type : PROCESSING_INSTRUCTION",
+//t    "node_type : NODE",
+//t    };
+//t  } /* End of class YyRuleClass */
+
+  protected static final class YyNameClass {
+
+    public static final String yyName [] = {    
+    "end-of-file",null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,"LITERAL","DIGITS","NAME","LP",
+    "RP","LB","RB","COMMA","PIPE","SLASH","DOUBLE_SLASH","EQ","NE","GT",
+    "LT","GTE","LTE","PLUS","MINUS","AT","STAR","DOLLAR","COLON",
+    "DOUBLE_COLON","DOT","DOUBLE_DOT","ANCESTOR","ANCESTOR_OR_SELF",
+    "ATTRIBUTE","CHILD","DESCENDANT","DESCENDANT_OR_SELF","FOLLOWING",
+    "FOLLOWING_SIBLING","NAMESPACE","PARENT","PRECEDING",
+    "PRECEDING_SIBLING","SELF","DIV","MOD","OR","AND","COMMENT",
+    "PROCESSING_INSTRUCTION","TEXT","NODE","UNARY",
+    };
+  } /* End of class YyNameClass */
+
+
+                                       // line 781 "XPathParser.y"
+
+}
+                                       // line 1461 "-"
diff --git a/libjava/gnu/xml/xpath/XPathParser.y b/libjava/gnu/xml/xpath/XPathParser.y
new file mode 100644 (file)
index 0000000..8af7cb8
--- /dev/null
+++ b/libjava/gnu/xml/xpath/XPathParser.y
@@ -0,0 +1,782 @@
+%{
+/* XPathParser.java -- An XPath 1.0 parser.
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.namespace.QName;
+import javax.xml.xpath.XPathFunctionResolver;
+import javax.xml.xpath.XPathVariableResolver;
+import org.w3c.dom.Node;
+
+/**
+ * An XPath 1.0 parser.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class XPathParser
+{
+
+  NamespaceContext namespaceContext;
+  XPathVariableResolver variableResolver;
+  XPathFunctionResolver functionResolver;
+
+  QName getQName(String name)
+  {
+    QName qName = QName.valueOf(name);
+    if (namespaceContext != null)
+      {
+        String prefix = qName.getPrefix();
+        String uri = qName.getNamespaceURI();
+        if (prefix != null && (uri == null || uri.length() == 0))
+          {
+            uri = namespaceContext.getNamespaceURI(prefix);
+            String localName = qName.getLocalPart();
+            qName = new QName(uri, localName, prefix);
+          }
+      }
+    return qName;
+  }
+
+  Expr lookupFunction(String name, List args)
+  {
+    int arity = args.size();
+    if ("position".equals(name) && arity == 0)
+      {
+        return new PositionFunction();
+      }
+    else if ("last".equals(name) && arity == 0)
+      {
+        return new LastFunction();
+      }
+    else if ("string".equals(name) && (arity == 1 || arity == 0))
+      {
+        return new StringFunction(args);
+      }
+    else if ("number".equals(name) && (arity == 1 || arity == 0))
+      {
+        return new NumberFunction(args);
+      }
+    else if ("boolean".equals(name) && arity == 1)
+      {
+        return new BooleanFunction(args);
+      }
+    else if ("count".equals(name) && arity == 1)
+      {
+        return new CountFunction(args);
+      }
+    else if ("not".equals(name) && arity == 1)
+      {
+        return new NotFunction(args);
+      }
+    else if ("id".equals(name) && arity == 1)
+      {
+        return new IdFunction(args);
+      }
+    else if ("concat".equals(name) && arity > 1)
+      {
+        return new ConcatFunction(args);
+      }
+    else if ("true".equals(name) && arity == 0)
+      {
+        return new TrueFunction();
+      }
+    else if ("false".equals(name) && arity == 0)
+      {
+        return new FalseFunction();
+      }
+    else if ("name".equals(name) && (arity == 1 || arity == 0))
+      {
+        return new NameFunction(args);
+      }
+    else if ("local-name".equals(name) && (arity == 1 || arity == 0))
+      {
+        return new LocalNameFunction(args);
+      }
+    else if ("namespace-uri".equals(name) && (arity == 1 || arity == 0))
+      {
+        return new NamespaceUriFunction(args);
+      }
+    else if ("starts-with".equals(name) && arity == 2)
+      {
+        return new StartsWithFunction(args);
+      }
+    else if ("contains".equals(name) && arity == 2)
+      {
+        return new ContainsFunction(args);
+      }
+    else if ("string-length".equals(name) && (arity == 1 || arity == 0))
+      {
+        return new StringLengthFunction(args);
+      }
+    else if ("translate".equals(name) && arity == 3)
+      {
+        return new TranslateFunction(args);
+      }
+    else if ("normalize-space".equals(name) && (arity == 1 || arity == 0))
+      {
+        return new NormalizeSpaceFunction(args);
+      }
+    else if ("substring".equals(name) && (arity == 2 || arity == 3))
+      {
+        return new SubstringFunction(args);
+      }
+    else if ("substring-before".equals(name) && arity == 2)
+      {
+        return new SubstringBeforeFunction(args);
+      }
+    else if ("substring-after".equals(name) && arity == 2)
+      {
+        return new SubstringAfterFunction(args);
+      }
+    else if ("lang".equals(name) && arity == 1)
+      {
+        return new LangFunction(args);
+      }
+    else if ("sum".equals(name) && arity == 1)
+      {
+        return new SumFunction(args);
+      }
+    else if ("floor".equals(name) && arity == 1)
+      {
+        return new FloorFunction(args);
+      }
+    else if ("ceiling".equals(name) && arity == 1)
+      {
+        return new CeilingFunction(args);
+      }
+    else if ("round".equals(name) && arity == 1)
+      {
+        return new RoundFunction(args);
+      }
+    else if (functionResolver != null)
+      {
+        QName qName = QName.valueOf(name);
+        Object function = functionResolver.resolveFunction(qName, arity);
+        if (function != null &&
+            function instanceof Function &&
+            function instanceof Expr)
+          {
+            Function f = (Function) function;
+            f.setArguments(args);
+            return (Expr) function;
+          }
+      }
+    return new FunctionCall(functionResolver, name, args);
+  }
+
+%}
+
+%token LITERAL
+%token DIGITS
+%token NAME
+
+%token LP // '('
+%token RP // ')'
+%token LB // '['
+%token RB // ']'
+%token COMMA // ','
+%token PIPE // '|'
+%token SLASH // '/'
+%token DOUBLE_SLASH // '//'
+%token EQ // '='
+%token NE // '!='
+%token GT // '>'
+%token LT // '<'
+%token GTE // '>='
+%token LTE // '<='
+%token PLUS // '+'
+%token MINUS // '-'
+%token AT // '@'
+%token STAR // '*'
+%token DOLLAR // '$'
+%token COLON // ':'
+%token DOUBLE_COLON // '::'
+%token DOT // '.'
+%token DOUBLE_DOT // '..'
+
+%token ANCESTOR
+%token ANCESTOR_OR_SELF
+%token ATTRIBUTE
+%token CHILD
+%token DESCENDANT
+%token DESCENDANT_OR_SELF
+%token FOLLOWING
+%token FOLLOWING_SIBLING
+%token NAMESPACE
+%token PARENT
+%token PRECEDING
+%token PRECEDING_SIBLING
+%token SELF
+%token DIV
+%token MOD
+%token OR
+%token AND
+%token COMMENT
+%token PROCESSING_INSTRUCTION
+%token TEXT
+%token NODE
+
+%right UNARY
+
+%start expr
+
+%%
+
+expr:
+  or_expr
+  ;
+
+location_path:
+  relative_location_path
+  | absolute_location_path
+  ;
+
+absolute_location_path:
+  SLASH
+    {
+      $$ = new Root();
+    }
+  | SLASH relative_location_path
+    {
+      Steps steps;
+      if ($2 instanceof Steps)
+        {
+          steps = (Steps) $2;
+        }
+      else
+        {
+          steps = new Steps();
+          steps.path.addFirst($2);
+        }
+      steps.path.addFirst(new Root());
+      $$ = steps;
+      //$$ = new Step(new Root(), (Path) $2);
+    }
+  | DOUBLE_SLASH relative_location_path
+    {
+      Test nt = new NodeTypeTest((short) 0);
+      Selector s = new Selector(Selector.DESCENDANT_OR_SELF,
+                                Collections.singletonList (nt));
+      Steps steps;
+      if ($2 instanceof Steps)
+        {
+          steps = (Steps) $2;
+        }
+      else
+        {
+          steps = new Steps();
+          steps.path.addFirst($2);
+        }
+      steps.path.addFirst(s);
+      steps.path.addFirst(new Root());
+      $$ = steps;
+      //Step step = new Step(s, (Path) $2);
+      //$$ = new Step(new Root(), step);
+    }
+  ;
+
+relative_location_path:
+  step
+  | relative_location_path SLASH step
+    {
+      Steps steps;
+      if ($1 instanceof Steps)
+        {
+          steps = (Steps) $1;
+        }
+      else
+        {
+          steps = new Steps();
+          steps.path.addFirst($1);
+        }
+      steps.path.addLast($3);
+      $$ = steps;
+      //$$ = new Step((Expr) $1, (Path) $3);
+    }
+  | relative_location_path DOUBLE_SLASH step
+    {
+      Test nt = new NodeTypeTest((short) 0);
+      Selector s = new Selector(Selector.DESCENDANT_OR_SELF,
+                                Collections.singletonList (nt));
+      Steps steps;
+      if ($1 instanceof Steps)
+        {
+          steps = (Steps) $1;
+        }
+      else
+        {
+          steps = new Steps();
+          steps.path.addFirst($1);
+        }
+      steps.path.addLast(s);
+      steps.path.addLast($3);
+      $$ = steps;
+      //Step step = new Step(s, (Path) $3);
+      //$$ = new Step((Expr) $1, step);
+    }
+  ;
+
+step:
+  step_node_test
+    {
+      $$ = new Selector (Selector.CHILD, (List) $1);
+    }
+  | AT step_node_test
+    {
+      $$ = new Selector (Selector.ATTRIBUTE, (List) $2);
+    }
+  | axis_name DOUBLE_COLON step_node_test
+    {
+      $$ = new Selector (((Integer) $1).intValue (), (List) $3);
+    }
+  | DOT
+    {
+      $$ = new Selector (Selector.SELF, Collections.EMPTY_LIST);
+    }
+  | DOUBLE_DOT
+    {
+      $$ = new Selector (Selector.PARENT, Collections.EMPTY_LIST);
+    }
+  ;
+
+step_node_test:
+  node_test
+    {
+      List list = new ArrayList();
+      list.add($1);
+      $$ = list;
+    }
+  | step_node_test predicate
+    {
+      List list = (List)$1;
+      list.add($2);
+      $$ = list;
+    }
+  ;
+
+/*predicate_list:
+  predicate
+    {
+      List list = new ArrayList ();
+      list.add ($1);
+      $$ = list;
+    }
+  | predicate predicate_list
+    {
+      List list = (List) $3;
+      list.add (0, $1);
+      $$ = list;
+    }
+  ;*/
+
+axis_name:
+  ANCESTOR
+    {
+      $$ = new Integer(Selector.ANCESTOR);
+    }
+  | ANCESTOR_OR_SELF
+    {
+      $$ = new Integer(Selector.ANCESTOR_OR_SELF);
+    }
+  | ATTRIBUTE
+    {
+      $$ = new Integer(Selector.ATTRIBUTE);
+    }
+  | CHILD
+    {
+      $$ = new Integer(Selector.CHILD);
+    }
+  | DESCENDANT
+    {
+      $$ = new Integer(Selector.DESCENDANT);
+    }
+  | DESCENDANT_OR_SELF
+    {
+      $$ = new Integer(Selector.DESCENDANT_OR_SELF);
+    }
+  | FOLLOWING
+    {
+      $$ = new Integer(Selector.FOLLOWING);
+    }
+  | FOLLOWING_SIBLING
+    {
+      $$ = new Integer(Selector.FOLLOWING_SIBLING);
+    }
+  | NAMESPACE
+    {
+      $$ = new Integer(Selector.NAMESPACE);
+    }
+  | PARENT
+    {
+      $$ = new Integer(Selector.PARENT);
+    }
+  | PRECEDING
+    {
+      $$ = new Integer(Selector.PRECEDING);
+    }
+  | PRECEDING_SIBLING
+    {
+      $$ = new Integer(Selector.PRECEDING_SIBLING);
+    }
+  | SELF
+    {
+      $$ = new Integer(Selector.SELF);
+    }
+  ;
+
+node_test:
+  name_test
+  /*| PROCESSING_INSTRUCTION LP LITERAL RP*/
+  | PROCESSING_INSTRUCTION LITERAL RP
+    {
+      $$ = new NodeTypeTest(Node.PROCESSING_INSTRUCTION_NODE, (String) $2);
+    }
+  /*| node_type LP RP*/
+  | node_type RP
+    {
+      $$ = new NodeTypeTest(((Short) $1).shortValue());
+    }
+  ;
+
+predicate:
+  LB expr RB
+    {
+      $$ = new Predicate((Expr) $2);
+    }
+  ;
+
+primary_expr:
+  variable_reference
+  | LP expr RP
+    {
+      $$ = new ParenthesizedExpr((Expr) $2);
+    }
+  | LITERAL
+    {
+      $$ = new Constant($1);
+    }
+  | number
+    {
+      $$ = new Constant($1);
+    }
+  | function_call
+  ;
+
+function_call:
+  function_name LP RP
+    {
+      $$ = lookupFunction((String) $1, Collections.EMPTY_LIST);
+    }
+  | function_name LP argument_list RP
+    {
+      $$ = lookupFunction((String) $1, (List) $3);
+    }
+  ;
+
+argument_list:
+  expr
+    {
+      List list = new ArrayList();
+      list.add($1);
+      $$ = list;
+    }
+  | expr COMMA argument_list
+    {
+      List list = (List) $3;
+      list.add(0, $1);
+      $$ = list;
+    }
+  ;
+
+union_expr:
+  path_expr
+  | union_expr PIPE path_expr
+    {
+      $$ = new UnionExpr((Expr) $1, (Expr) $3);
+    }
+  ;
+
+path_expr:
+  location_path
+  | filter_expr
+  | filter_expr SLASH relative_location_path
+    {
+      Steps steps;
+      if ($3 instanceof Steps)
+        {
+          steps = (Steps) $3;
+        }
+      else
+        {
+          steps = new Steps();
+          steps.path.addFirst($3);
+        }
+      steps.path.addFirst($1);
+      $$ = steps;
+      //$$ = new Step ((Expr) $1, (Path) $3);
+    }
+  | filter_expr DOUBLE_SLASH relative_location_path
+    {
+      Test nt = new NodeTypeTest((short) 0);
+      Selector s = new Selector(Selector.DESCENDANT_OR_SELF,
+                                Collections.singletonList(nt));
+      Steps steps;
+      if ($3 instanceof Steps)
+        {
+          steps = (Steps) $3;
+        }
+      else
+        {
+          steps = new Steps();
+          steps.path.addFirst($3);
+        }
+      steps.path.addFirst(s);
+      steps.path.addFirst($1);
+      $$ = steps;
+      //Step step = new Step (s, (Path) $3);
+      //$$ = new Step ((Expr) $1, step);
+    }
+  ;
+
+filter_expr:
+  primary_expr
+  | filter_expr predicate
+    {
+      Predicate filter = (Predicate) $2;
+      Selector s = new Selector(Selector.SELF,
+                                Collections.singletonList(filter));
+      Steps steps;
+      if ($1 instanceof Steps)
+        {
+          steps = (Steps) $1;
+        }
+      else
+        {
+          steps = new Steps();
+          steps.path.addFirst($1);
+        }
+      steps.path.addLast(s);
+      $$ = steps;
+      //$$ = new Step ((Expr) $1, s);
+    }
+  ;
+
+or_expr:
+  and_expr
+  | or_expr OR and_expr
+    {
+      $$ = new OrExpr((Expr) $1, (Expr) $3);
+    }
+  ;
+
+and_expr:
+  equality_expr
+  | and_expr AND equality_expr
+    {
+      $$ = new AndExpr((Expr) $1, (Expr) $3);
+    }
+  ;
+
+equality_expr:
+  relational_expr
+  | equality_expr EQ relational_expr
+    {
+      $$ = new EqualityExpr((Expr) $1, (Expr) $3, false);
+    }
+  | equality_expr NE relational_expr
+    {
+      $$ = new EqualityExpr((Expr) $1, (Expr) $3, true);
+    }
+  ;
+
+relational_expr:
+  additive_expr
+  | relational_expr LT additive_expr
+    {
+      $$ = new RelationalExpr((Expr) $1, (Expr) $3, true, false);
+    }
+  | relational_expr GT additive_expr
+    {
+      $$ = new RelationalExpr((Expr) $1, (Expr) $3, false, false);
+    }
+  | relational_expr LTE additive_expr
+    {
+      $$ = new RelationalExpr((Expr) $1, (Expr) $3, true, true);
+    }
+  | relational_expr GTE additive_expr
+    {
+      $$ = new RelationalExpr((Expr) $1, (Expr) $3, false, true);
+    }
+  ;
+
+additive_expr:
+  multiplicative_expr
+  | additive_expr PLUS multiplicative_expr
+    {
+      $$ = new ArithmeticExpr((Expr) $1, (Expr) $3, ArithmeticExpr.ADD);
+    }
+  | additive_expr MINUS multiplicative_expr
+    {
+      $$ = new ArithmeticExpr((Expr) $1, (Expr) $3, ArithmeticExpr.SUBTRACT);
+    }
+  ;
+
+multiplicative_expr:
+  unary_expr
+  | multiplicative_expr STAR unary_expr
+    {
+      $$ = new ArithmeticExpr((Expr) $1, (Expr) $3, ArithmeticExpr.MULTIPLY);
+    }
+  | multiplicative_expr DIV unary_expr
+    {
+      $$ = new ArithmeticExpr((Expr) $1, (Expr) $3, ArithmeticExpr.DIVIDE);
+    }
+  | multiplicative_expr MOD unary_expr
+    {
+      $$ = new ArithmeticExpr((Expr) $1, (Expr) $3, ArithmeticExpr.MODULO);
+    }
+  ;
+
+unary_expr:
+  union_expr
+  | MINUS unary_expr %prec UNARY
+    {
+      $$ = new NegativeExpr((Expr) $2);
+    }
+  ;
+
+number:
+  DIGITS
+    {
+      $$ = new Double((String) $1 + ".0");
+    }
+  | DIGITS DOT
+    {
+      $$ = new Double((String) $1 + ".0");
+    }
+  | DIGITS DOT DIGITS
+    {
+      $$ = new Double((String) $1 + "." + (String) $3);
+    }
+  | DOT DIGITS
+    {
+      $$ = new Double("0." + (String) $2);
+    }
+  ;
+
+function_name:
+  qname
+/*  | node_type
+    {
+      switch (((Short) $1).shortValue ())
+        {
+        case Node.COMMENT_NODE:
+          $$ = "comment";
+          break;
+        case Node.TEXT_NODE:
+          $$ = "text";
+          break;
+        case Node.PROCESSING_INSTRUCTION_NODE:
+          $$ = "processing-instruction";
+          break;
+        default:
+          $$ = "node";
+          break;
+        }
+    }*/
+  ;
+
+variable_reference:
+  DOLLAR qname
+    {
+      $$ = new VariableReference(variableResolver, (String) $2);
+    }
+  ;
+
+name_test:
+  STAR
+    {
+      $$ = new NameTest(null, true, true);
+    }
+  | NAME COLON STAR
+    {
+      QName qName = getQName((String) $1);
+      $$ = new NameTest(qName, true, false);
+    }
+  | qname
+    {
+      QName qName = getQName((String) $1);
+      $$ = new NameTest(qName, false, false);
+    }
+  ;
+
+qname:
+  NAME
+  | NAME COLON NAME
+    {
+      $$ = (String) $1 + ':' + (String) $3;
+    }
+  ;
+
+node_type:
+  COMMENT
+    {
+      $$ = new Short(Node.COMMENT_NODE);
+    }
+  | TEXT
+    {
+      $$ = new Short(Node.TEXT_NODE);
+    }
+  | PROCESSING_INSTRUCTION
+    {
+      $$ = new Short(Node.PROCESSING_INSTRUCTION_NODE);
+    }
+  | NODE
+    {
+      $$ = new Short((short) 0);
+    }
+  ;
+
+%%
+
+}
diff --git a/libjava/gnu/xml/xpath/XPathTokenizer.java b/libjava/gnu/xml/xpath/XPathTokenizer.java
new file mode 100644 (file)
index 0000000..6bf31fd
--- /dev/null
+++ b/libjava/gnu/xml/xpath/XPathTokenizer.java
@@ -0,0 +1,592 @@
+/* XPathTokenizer.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.xml.xpath;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.Map;
+import java.util.TreeMap;
+
+/*import antlr.Token;
+import antlr.TokenStream;
+import antlr.TokenStreamException;
+import antlr.TokenStreamIOException;*/
+
+/**
+ * XPath 1.0 expression tokenizer.
+ * 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class XPathTokenizer
+implements XPathParser.yyInput
+//implements TokenStream
+{
+
+  static class XPathToken
+  //extends Token
+  {
+
+    int type;
+    String val;
+
+    XPathToken (int type)
+    {
+      this (type, null);
+    }
+
+    XPathToken (int type, String val)
+    {
+      //super (type);
+      this.type = type;
+      this.val = val;
+    }
+
+    public String getText ()
+    {
+      return val;
+    }
+
+    public String toString ()
+    {
+      return val;
+    }
+    
+  }
+
+  static final Map keywords = new TreeMap ();
+  static
+  {
+    keywords.put ("ancestor", new Integer (XPathParser.ANCESTOR));
+    keywords.put ("ancestor-or-self", new Integer (XPathParser.ANCESTOR_OR_SELF));
+    keywords.put ("attribute", new Integer (XPathParser.ATTRIBUTE));
+    keywords.put ("child", new Integer (XPathParser.CHILD));
+    keywords.put ("descendant", new Integer (XPathParser.DESCENDANT));
+    keywords.put ("descendant-or-self", new Integer (XPathParser.DESCENDANT_OR_SELF));
+    keywords.put ("following", new Integer (XPathParser.FOLLOWING));
+    keywords.put ("following-sibling", new Integer (XPathParser.FOLLOWING_SIBLING));
+    keywords.put ("namespace", new Integer (XPathParser.NAMESPACE));
+    keywords.put ("parent", new Integer (XPathParser.PARENT));
+    keywords.put ("preceding", new Integer (XPathParser.PRECEDING));
+    keywords.put ("preceding-sibling", new Integer (XPathParser.PRECEDING_SIBLING));
+    keywords.put ("self", new Integer (XPathParser.SELF));
+    keywords.put ("div", new Integer (XPathParser.DIV));
+    keywords.put ("mod", new Integer (XPathParser.MOD));
+    keywords.put ("or", new Integer (XPathParser.OR));
+    keywords.put ("and", new Integer (XPathParser.AND));
+    keywords.put ("comment", new Integer (XPathParser.COMMENT));
+    keywords.put ("processing-instruction", new Integer (XPathParser.PROCESSING_INSTRUCTION));
+    keywords.put ("text", new Integer (XPathParser.TEXT));
+    keywords.put ("node", new Integer (XPathParser.NODE));
+  }
+
+  Reader in;
+  XPathToken token;
+  XPathToken lastToken;
+
+  public XPathTokenizer (String expr)
+  {
+    this (new StringReader (expr));
+  }
+
+  XPathTokenizer (Reader in)
+  {
+    this.in = in.markSupported () ? in : new BufferedReader (in);
+  }
+
+  /* Begin ANTLR specific *
+
+  public Token nextToken ()
+    throws TokenStreamException
+  {
+    try
+      {
+        if (!advance ())
+          {
+            throw new TokenStreamException ("eof");
+          }
+        token ();
+        return token;
+      }
+    catch (IOException e)
+      {
+        throw new TokenStreamIOException (e);
+      }
+  }
+  
+  * End ANTLR specific */
+
+  public boolean advance ()
+    throws IOException
+  {
+    lastToken = token;
+    int c = in.read ();
+    switch (c)
+      {
+      case -1: // eof
+        return false;
+      case 0x20:
+      case 0x09:
+      case 0x0d:
+      case 0x0a: // skip whitespace
+        return advance ();
+      case 0x22: // "
+      case 0x27: // '
+        token = consume_literal (c);
+        break;
+      case 0x28: // (
+        token = new XPathToken (XPathParser.LP);
+        break;
+      case 0x29: // )
+        token = new XPathToken (XPathParser.RP);
+        break;
+      case 0x5b: // [
+        token = new XPathToken (XPathParser.LB);
+        break;
+      case 0x5d: // ]
+        token = new XPathToken (XPathParser.RB);
+        break;
+      case 0x2c: // ,
+        token = new XPathToken (XPathParser.COMMA);
+        break;
+      case 0x7c: // |
+        token = new XPathToken (XPathParser.PIPE);
+        break;
+      case 0x2f: // /
+        in.mark (1);
+        int d1 = in.read ();
+        if (d1 == 0x2f)
+          {
+            token = new XPathToken (XPathParser.DOUBLE_SLASH);
+          }
+        else
+          {
+            in.reset ();
+            token = new XPathToken (XPathParser.SLASH);
+          }
+        break;
+      case 0x3d: // =
+        token = new XPathToken (XPathParser.EQ);
+        break;
+      case 0x21: // !
+        in.mark (1);
+        int d2 = in.read ();
+        if (d2 == 0x3d) // =
+          {
+            token = new XPathToken (XPathParser.NE);
+          }
+        else
+          {
+            in.reset ();
+            token = new XPathToken (XPathParser.yyErrorCode);
+          }
+        break;
+      case 0x3e: // >
+        in.mark (1);
+        int d3 = in.read ();
+        if (d3 == 0x3d) // =
+          {
+            token = new XPathToken (XPathParser.GTE);
+          }
+        else
+          {
+            in.reset ();
+            token = new XPathToken (XPathParser.GT);
+          }
+        break;
+      case 0x3c: // <
+        in.mark (1);
+        int d4 = in.read ();
+        if (d4 == 0x3d) // =
+          {
+            token = new XPathToken (XPathParser.LTE);
+          }
+        else
+          {
+            in.reset ();
+            token = new XPathToken (XPathParser.LT);
+          }
+        break;
+      case 0x2b: // +
+        token = new XPathToken (XPathParser.PLUS);
+        break;
+      case 0x2d: // -
+        token = new XPathToken (XPathParser.MINUS);
+        break;
+      case 0x40: // @
+        token = new XPathToken (XPathParser.AT);
+        break;
+      case 0x2a: // *
+        token = new XPathToken (XPathParser.STAR);
+        break;
+      case 0x24: // $
+        token = new XPathToken (XPathParser.DOLLAR);
+        break;
+      case 0x3a: // :
+        in.mark (1);
+        int d5 = in.read ();
+        if (d5 == 0x3a)
+          {
+            token = new XPathToken (XPathParser.DOUBLE_COLON);
+          }
+        else
+          {
+            in.reset ();
+            token = new XPathToken (XPathParser.COLON);
+          }
+        break;
+      case 0x2e: // .
+        in.mark (1);
+        int d6 = in.read ();
+        if (d6 == 0x2e)
+          {
+            token = new XPathToken (XPathParser.DOUBLE_DOT);
+          }
+        else
+          {
+            in.reset ();
+            token = new XPathToken (XPathParser.DOT);
+          }
+        break;
+      default:
+        if (c >= 0x30 && c <= 0x39)
+          {
+            token = consume_digits (c);
+          }
+        else if (c == 0x5f || Character.isLetter ((char) c))
+          {
+            token = consume_name (c);
+          }
+        else
+          {
+            token = new XPathToken (XPathParser.yyErrorCode);
+          }
+      }
+    return true;
+  }
+
+  public int token ()
+  {
+    return token.type;
+  }
+
+  public Object value ()
+  {
+    return token.val;
+  }
+
+  XPathToken consume_literal (int delimiter)
+    throws IOException
+  {
+    StringBuffer buf = new StringBuffer ();
+    while (true)
+      {
+        int c = in.read ();
+        if (c == -1)
+          {
+            return new XPathToken (XPathParser.yyErrorCode);
+          }
+        else if (c == delimiter)
+          {
+            return new XPathToken (XPathParser.LITERAL, buf.toString ());
+          }
+        else
+          {
+            buf.append ((char) c);
+          }
+      }
+  }
+
+  XPathToken consume_digits (int c)
+    throws IOException
+  {
+    StringBuffer buf = new StringBuffer ();
+    buf.append ((char) c);
+    while (true)
+      {
+        in.mark (1);
+        c = in.read ();
+        if (c >= 0x30 && c <= 0x39)
+          {
+            buf.append ((char) c);
+          }
+        else
+          {
+            in.reset ();
+            return new XPathToken (XPathParser.DIGITS, buf.toString ());
+          }
+      }
+  }
+
+  XPathToken consume_name (int c)
+    throws IOException
+  {
+    StringBuffer buf = new StringBuffer ();
+    buf.append ((char) c);
+    while (true)
+      {
+        in.mark (1);
+        c = in.read ();
+        if (isNameChar (c))
+          {
+            buf.append ((char) c);
+          }
+        else
+          {
+            in.reset ();
+            String name = buf.toString ();
+            Integer keyword = (Integer) keywords.get (name);
+            if (keyword == null)
+              {
+                return new XPathToken (XPathParser.NAME, name);
+              }
+            else
+              {
+                int val = keyword.intValue ();
+                switch (val)
+                  {
+                  case XPathParser.NODE:
+                  case XPathParser.COMMENT:
+                  case XPathParser.TEXT:
+                  case XPathParser.PROCESSING_INSTRUCTION:
+                    // Consume subsequent (
+                    in.mark (1);
+                    do
+                      {
+                        c = in.read ();
+                      }
+                    while (c == 0x20 || c == 0x09);
+                    if (c != 0x28)
+                      {
+                        in.reset ();
+                        return new XPathToken (XPathParser.NAME, name);
+                      }
+                    break;
+                  case XPathParser.CHILD:
+                  case XPathParser.PARENT:
+                  case XPathParser.SELF:
+                  case XPathParser.DESCENDANT:
+                  case XPathParser.ANCESTOR:
+                  case XPathParser.DESCENDANT_OR_SELF:
+                  case XPathParser.ANCESTOR_OR_SELF:
+                  case XPathParser.ATTRIBUTE:
+                  case XPathParser.NAMESPACE:
+                  case XPathParser.FOLLOWING:
+                  case XPathParser.FOLLOWING_SIBLING:
+                  case XPathParser.PRECEDING:
+                  case XPathParser.PRECEDING_SIBLING:
+                    // Check that this is an axis specifier
+                    in.mark(1);
+                    do
+                      {
+                        c = in.read();
+                      }
+                    while (c == 0x20 || c == 0x09);
+                    if (c == 0x3a)
+                      {
+                        c = in.read();
+                        if (c == 0x3a)
+                          {
+                            in.reset();
+                            return new XPathToken(val);
+                          }
+                      }
+                    in.reset();
+                    return new XPathToken(XPathParser.NAME, name);
+                  case XPathParser.DIV:
+                  case XPathParser.MOD:
+                    // May be a name
+                    if (lastToken == null)
+                      {
+                        return new XPathToken(XPathParser.NAME, name);
+                      }
+                    switch (lastToken.type)
+                      {
+                      case XPathParser.LP:
+                      case XPathParser.LB:
+                      case XPathParser.COMMA:
+                      case XPathParser.PIPE:
+                      case XPathParser.EQ:
+                      case XPathParser.NE:
+                      case XPathParser.GT:
+                      case XPathParser.LT:
+                      case XPathParser.GTE:
+                      case XPathParser.LTE:
+                      case XPathParser.PLUS:
+                      case XPathParser.MINUS:
+                      case XPathParser.STAR:
+                      case XPathParser.AT:
+                      case XPathParser.DOLLAR:
+                      case XPathParser.COLON:
+                      case XPathParser.DOUBLE_COLON:
+                      case XPathParser.DIV:
+                      case XPathParser.MOD:
+                      case XPathParser.OR:
+                      case XPathParser.AND:
+                      case XPathParser.SLASH:
+                        return new XPathToken(XPathParser.NAME, name);
+                      }
+                    break;
+                  }
+                return new XPathToken (val);
+              }
+          }
+      }
+  }
+
+  boolean isNameChar (int c)
+  {
+    /* Name */
+    return (c == 0x5f
+            || c == 0x2d
+            || c == 0x2e
+            || (c >= 0x30 && c <= 0x39)
+            /* CombiningChar */
+            || (c >= 0x0300 && c <= 0x0345)
+            || (c >= 0x0360 && c <= 0x0361)
+            || (c >= 0x0483 && c <= 0x0486)
+            || (c >= 0x0591 && c <= 0x05A1)
+            || (c >= 0x05A3 && c <= 0x05B9)
+            || (c >= 0x05BB && c <= 0x05BD)
+            || c == 0x05BF
+            || (c >= 0x05C1 && c <= 0x05C2)
+            || c == 0x05C4
+            || (c >= 0x064B && c <= 0x0652)
+            || c == 0x0670
+            || (c >= 0x06D6 && c <= 0x06DC)
+            || (c >= 0x06DD && c <= 0x06DF)
+            || (c >= 0x06E0 && c <= 0x06E4)
+            || (c >= 0x06E7 && c <= 0x06E8)
+            || (c >= 0x06EA && c <= 0x06ED)
+            || (c >= 0x0901 && c <= 0x0903)
+            || c == 0x093C
+            || (c >= 0x093E && c <= 0x094C)
+            || c == 0x094D
+            || (c >= 0x0951 && c <= 0x0954)
+            || (c >= 0x0962 && c <= 0x0963)
+            || (c >= 0x0981 && c <= 0x0983)
+            || c == 0x09BC
+            || c == 0x09BE
+            || c == 0x09BF
+            || (c >= 0x09C0 && c <= 0x09C4)
+            || (c >= 0x09C7 && c <= 0x09C8)
+            || (c >= 0x09CB && c <= 0x09CD)
+            || c == 0x09D7
+            || (c >= 0x09E2 && c <= 0x09E3)
+            || c == 0x0A02
+            || c == 0x0A3C
+            || c == 0x0A3E
+            || c == 0x0A3F
+            || (c >= 0x0A40 && c <= 0x0A42)
+            || (c >= 0x0A47 && c <= 0x0A48)
+            || (c >= 0x0A4B && c <= 0x0A4D)
+            || (c >= 0x0A70 && c <= 0x0A71)
+            || (c >= 0x0A81 && c <= 0x0A83)
+            || c == 0x0ABC
+            || (c >= 0x0ABE && c <= 0x0AC5)
+            || (c >= 0x0AC7 && c <= 0x0AC9)
+            || (c >= 0x0ACB && c <= 0x0ACD)
+            || (c >= 0x0B01 && c <= 0x0B03)
+            || c == 0x0B3C
+            || (c >= 0x0B3E && c <= 0x0B43)
+            || (c >= 0x0B47 && c <= 0x0B48)
+            || (c >= 0x0B4B && c <= 0x0B4D)
+            || (c >= 0x0B56 && c <= 0x0B57)
+            || (c >= 0x0B82 && c <= 0x0B83)
+            || (c >= 0x0BBE && c <= 0x0BC2)
+            || (c >= 0x0BC6 && c <= 0x0BC8)
+            || (c >= 0x0BCA && c <= 0x0BCD)
+            || c == 0x0BD7
+            || (c >= 0x0C01 && c <= 0x0C03)
+            || (c >= 0x0C3E && c <= 0x0C44)
+            || (c >= 0x0C46 && c <= 0x0C48)
+            || (c >= 0x0C4A && c <= 0x0C4D)
+            || (c >= 0x0C55 && c <= 0x0C56)
+            || (c >= 0x0C82 && c <= 0x0C83)
+            || (c >= 0x0CBE && c <= 0x0CC4)
+            || (c >= 0x0CC6 && c <= 0x0CC8)
+            || (c >= 0x0CCA && c <= 0x0CCD)
+            || (c >= 0x0CD5 && c <= 0x0CD6)
+            || (c >= 0x0D02 && c <= 0x0D03)
+            || (c >= 0x0D3E && c <= 0x0D43)
+            || (c >= 0x0D46 && c <= 0x0D48)
+            || (c >= 0x0D4A && c <= 0x0D4D)
+            || c == 0x0D57
+            || c == 0x0E31
+            || (c >= 0x0E34 && c <= 0x0E3A)
+            || (c >= 0x0E47 && c <= 0x0E4E)
+            || c == 0x0EB1
+            || (c >= 0x0EB4 && c <= 0x0EB9)
+            || (c >= 0x0EBB && c <= 0x0EBC)
+            || (c >= 0x0EC8 && c <= 0x0ECD)
+            || (c >= 0x0F18 && c <= 0x0F19)
+            || c == 0x0F35
+            || c == 0x0F37
+            || c == 0x0F39
+            || c == 0x0F3E
+            || c == 0x0F3F
+            || (c >= 0x0F71 && c <= 0x0F84)
+            || (c >= 0x0F86 && c <= 0x0F8B)
+            || (c >= 0x0F90 && c <= 0x0F95)
+            || c == 0x0F97
+            || (c >= 0x0F99 && c <= 0x0FAD)
+            || (c >= 0x0FB1 && c <= 0x0FB7)
+            || c == 0x0FB9
+            || (c >= 0x20D0 && c <= 0x20DC)
+            || c == 0x20E1
+            || (c >= 0x302A && c <= 0x302F)
+            || c == 0x3099
+            || c == 0x309A
+            /* Extender */
+            || c == 0x00B7
+            || c == 0x02D0
+            || c == 0x02D1
+            || c == 0x0387
+            || c == 0x0640
+            || c == 0x0E46
+            || c == 0x0EC6
+            || c == 0x3005
+            || (c >= 0x3031 && c <= 0x3035)
+            || (c >= 0x309D && c <= 0x309E)
+            || (c >= 0x30FC && c <= 0x30FE)
+            /* Name */
+            || Character.isLetter ((char) c));
+  }
+
+}
diff --git a/libjava/javax/xml/XMLConstants.java b/libjava/javax/xml/XMLConstants.java
new file mode 100644 (file)
index 0000000..4b9b066
--- /dev/null
+++ b/libjava/javax/xml/XMLConstants.java
@@ -0,0 +1,126 @@
+/* XMLConstants.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml;
+
+/**
+ * Repository for well-known XML constants.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public final class XMLConstants
+{
+
+  /**
+   * Dummy namespace URI indicating that there is no namespace.
+   * @see http://www.w3.org/TR/REC-xml-names/#defaulting
+   */
+  public static final String NULL_NS_URI = "";
+
+  /**
+   * Dummy namespace prefix indicating that there is no namespace.
+   * @see http://www.w3.org/TR/REC-xml-names/#ns-qualnames
+   */
+  public static final String DEFAULT_NS_PREFIX = "";
+
+  /**
+   * The XML Namespace URI.
+   * @see http://www.w3.org/TR/REC-xml-names/#ns-qualnames
+   */
+  public static final String XML_NS_URI =
+               "http://www.w3.org/XML/1998/namespace";
+
+  /**
+   * The XML Namespace prefix.
+   * @see http://www.w3.org/TR/REC-xml-names/#ns-qualnames
+   */
+  public static final String XML_NS_PREFIX = "xml";
+
+  /**
+   * The XML Namespace declaration URI.
+   * @see http://www.w3.org/TR/REC-xml-names/#ns-qualnames
+   */
+  public static final String XMLNS_ATTRIBUTE_NS_URI =
+               "http://www.w3.org/2000/xmlns/";
+
+  /**
+   * The XML Namespace declaration attribute.
+   * @see http://www.w3.org/TR/REC-xml-names/#ns-qualnames
+   */
+  public static final String XMLNS_ATTRIBUTE = "xmlns";
+
+  /**
+   * The XML Schema (XSD) namespace URI.
+   * @see http://www.w3.org/TR/xmlschema-1/#Instance_Document_Constructions
+   */
+  public static final String W3C_XML_SCHEMA_NS_URI =
+               "http://www.w3.org/2001/XMLSchema";
+
+  /**
+   * The XML Schema Instance (XSI) namespace URI.
+   * @see http://www.w3.org/TR/xmlschema-1/#Instance_Document_Constructions
+   */
+  public static final String W3C_XML_SCHEMA_INSTANCE_NS_URI =
+               "http://www.w3.org/2001/XMLSchema-instance";
+
+  /**
+   * The XPath 2.0 datatypes namespace URI.
+   * @see http://www.w3.org/TR/xpath-datamodel
+   */
+  public static final String W3C_XPATH_DATATYPE_NS_URI =
+               "http://www.w3.org/2003/11/xpath-datatypes";
+
+  /**
+   * The XML DTD namespace URI.
+   */
+  public static final String XML_DTD_NS_URI = "http://www.w3.org/TR/REC-xml";
+
+  /**
+   * The RELAX NG Namespace URI.
+   * @see http://relaxng.org/spec-20011203.html
+   */
+  public static final String RELAXNG_NS_URI =
+               "http://relaxng.org/ns/structure/1.0";
+
+  /**
+   * DOM feature for secure processing.
+   */
+  public static final String FEATURE_SECURE_PROCESSING =
+               "http://javax.xml.XMLConstants/feature/secure-processing";
+  
+}
diff --git a/libjava/javax/xml/datatype/DatatypeConfigurationException.java b/libjava/javax/xml/datatype/DatatypeConfigurationException.java
new file mode 100644 (file)
index 0000000..1544079
--- /dev/null
+++ b/libjava/javax/xml/datatype/DatatypeConfigurationException.java
@@ -0,0 +1,70 @@
+/* DatatypeConfigurationException.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.datatype;
+
+/**
+ * A serious error during datatype configuration.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public class DatatypeConfigurationException
+  extends Exception
+{
+
+  public DatatypeConfigurationException()
+  {
+    super();
+  }
+
+  public DatatypeConfigurationException(String message)
+  {
+    super(message);
+  }
+
+  public DatatypeConfigurationException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+  public DatatypeConfigurationException(Throwable cause)
+  {
+    super(cause);
+  }
+  
+}
diff --git a/libjava/javax/xml/datatype/DatatypeConstants.java b/libjava/javax/xml/datatype/DatatypeConstants.java
new file mode 100644 (file)
index 0000000..a761f88
--- /dev/null
+++ b/libjava/javax/xml/datatype/DatatypeConstants.java
@@ -0,0 +1,259 @@
+/* DatatypeConstants.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.datatype;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Basic data type constants.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public final class DatatypeConstants
+{
+
+  /**
+   * Typesafe enumerated class representing the six fields of the
+   * <a href='Duration.html'>Duration</a> class.
+   */
+  public static final class Field
+  {
+
+    final int id;
+    final String name;
+
+    Field(int id, String name)
+    {
+      this.id = id;
+      this.name = name;
+    }
+
+    public int getId()
+    {
+      return id;
+    }
+    
+    public String toString()
+    {
+      return name;
+    }
+    
+  }
+
+  /**
+   * Value for January.
+   */
+  public static final int JANUARY = 1;
+  
+  /**
+   * Value for February.
+   */
+  public static final int FEBRUARY = 2;
+  
+  /**
+   * Value for March.
+   */
+  public static final int MARCH = 3;
+  
+  /**
+   * Value for April.
+   */
+  public static final int APRIL = 4;
+  
+  /**
+   * Value for May.
+   */
+  public static final int MAY = 5;
+  
+  /**
+   * Value for June.
+   */
+  public static final int JUNE = 6;
+  
+  /**
+   * Value for July.
+   */
+  public static final int JULY = 7;
+  
+  /**
+   * Value for August.
+   */
+  public static final int AUGUST = 8;
+  
+  /**
+   * Value for September.
+   */
+  public static final int SEPTEMBER = 9;
+  
+  /**
+   * Value for October.
+   */
+  public static final int OCTOBER = 10;
+  
+  /**
+   * Value for November.
+   */
+  public static final int NOVEMBER = 11;
+  
+  /**
+   * Value for December.
+   */
+  public static final int DECEMBER = 12;
+  
+  /**
+   * Comparison result.
+   */
+  public static final int LESSER = -1;
+  
+  /**
+   * Comparison result.
+   */
+  public static final int EQUAL = 0;
+  
+  /**
+   * Comparison result.
+   */
+  public static final int GREATER = 1;
+  
+  /**
+   * Comparison result.
+   */
+  public static final int INDETERMINATE = 2;
+  
+  /**
+   * Comparison result.
+   */
+  public static final int FIELD_UNDEFINED = -2147483648;
+
+  /**
+   * Constant that represents the years field.
+   */
+  public static final Field YEARS = new Field(1, "YEARS");
+  
+  /**
+   * Constant that represents the months field.
+   */
+  public static final Field MONTHS = new Field(2, "MONTHS");
+  
+  /**
+   * Constant that represents the days field.
+   */
+  public static final Field DAYS = new Field(3, "DAYS");
+  
+  /**
+   * Constant that represents the hours field.
+   */
+  public static final Field HOURS = new Field(4, "HOURS");
+  
+  /**
+   * Constant that represents the minutes field.
+   */
+  public static final Field MINUTES = new Field(5, "MINUTES");
+  
+  /**
+   * Constant that represents the seconds field.
+   */
+  public static final Field SECONDS = new Field(6, "SECONDS");
+
+  /**
+   * The qualified-name for the <code>dateTime</code> data type.
+   */
+  public static final QName DATETIME = new QName ("http://www.w3.org/2001/XMLSchema#dateTime", "");
+  
+  /**
+   * The qualified-name for the <code>time</code> data type.
+   */
+  public static final QName TIME = new QName ("http://www.w3.org/2001/XMLSchema#time", "");
+  
+  /**
+   * The qualified-name for the <code>date</code> data type.
+   */
+  public static final QName DATE = new QName ("http://www.w3.org/2001/XMLSchema#date", "");
+  
+  /**
+   * The qualified-name for the <code>gYearMonth</code> data type.
+   */
+  public static final QName GYEARMONTH = new QName ("http://www.w3.org/2001/XMLSchema#gYearMonth", "");
+  
+  /**
+   * The qualified-name for the <code>gMonthDay</code> data type.
+   */
+  public static final QName GMONTHDAY = new QName ("http://www.w3.org/2001/XMLSchema#gMonthDay", "");
+  
+  /**
+   * The qualified-name for the <code>gYear</code> data type.
+   */
+  public static final QName GYEAR = new QName ("http://www.w3.org/2001/XMLSchema#gYear", "");
+  
+  /**
+   * The qualified-name for the <code>gMonth</code> data type.
+   */
+  public static final QName GMONTH = new QName ("http://www.w3.org/2001/XMLSchema#gMonth", "");
+  
+  /**
+   * The qualified-name for the <code>gDay</code> data type.
+   */
+  public static final QName GDAY = new QName ("http://www.w3.org/2001/XMLSchema#gDay", "");
+  
+  /**
+   * The qualified-name for the <code>duration</code> data type.
+   */
+  public static final QName DURATION = new QName ("http://www.w3.org/2001/XMLSchema#duration", "");
+  
+  /**
+   * The qualified-name for the <code>dayTimeDuration</code> data type.
+   */
+  public static final QName DURATION_DAYTIME = new QName ("http://www.w3.org/2001/XMLSchema#dayTimeDuration", "");
+  
+  /**
+   * The qualified-name for the <code>yearMonthDuration</code> data type.
+   */
+  public static final QName DURATION_YEARMONTH = new QName ("http://www.w3.org/2001/XMLSchema#yearMonthDuration", "");
+
+  /**
+   * XML Schema maximum timezone offset, in minutes.
+   */
+  public static final int MAX_TIMEZONE_OFFSET = -840;
+  
+  /**
+   * XML Schema minimum timezone offset, in minutes.
+   */
+  public static final int MIN_TIMEZONE_OFFSET = 840;
+  
+}
diff --git a/libjava/javax/xml/datatype/DatatypeFactory.java b/libjava/javax/xml/datatype/DatatypeFactory.java
new file mode 100644 (file)
index 0000000..2299435
--- /dev/null
+++ b/libjava/javax/xml/datatype/DatatypeFactory.java
@@ -0,0 +1,401 @@
+/* DatatypeFactory.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.datatype;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.GregorianCalendar;
+
+/**
+ * Factory class to create new datatype objects mapping XML to and from Java
+ * objects.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public abstract class DatatypeFactory
+{
+
+  /**
+   * JAXP 1.3 default property name.
+   */
+  public static final String DATATYPEFACTORY_PROPERTY = "javax.xml.datatype.DatatypeFactory";
+
+  /**
+   * JAXP 1.3 default implementation class name.
+   */
+  public static final java.lang.String DATATYPEFACTORY_IMPLEMENTATION_CLASS = "gnu.xml.datatype.JAXPDatatypeFactory";
+
+  protected DatatypeFactory()
+  {
+  }
+
+  /**
+   * Returns a new factory instance.
+   */
+  public static DatatypeFactory newInstance()
+    throws DatatypeConfigurationException
+  {
+    try
+      {
+        Class t = Class.forName(DATATYPEFACTORY_IMPLEMENTATION_CLASS);
+        return (DatatypeFactory) t.newInstance();
+      }
+    catch (Exception e)
+      {
+        throw new DatatypeConfigurationException (e);
+      }
+  }
+
+  /**
+   * Returns a new duration from its string representation.
+   * @param lexicalRepresentation the lexical representation of the
+   * duration, as specified in XML Schema 1.0 section 3.2.6.1.
+   */
+  public abstract Duration newDuration(String lexicalRepresentation);
+
+  /**
+   * Returns a new duration.
+   * @param durationInMilliseconds the duration in milliseconds
+   */
+  public abstract Duration newDuration(long durationInMilliSeconds);
+
+  /**
+   * Returns a new duration by specifying the individual components.
+   * @param isPositive whether the duration is positive
+   * @param years the number of years
+   * @param months the number of months
+   * @param days the number of days
+   * @param hours the number of hours
+   * @param minutes th number of minutes
+   * @param seconds the number of seconds
+   */
+  public abstract Duration newDuration(boolean isPositive,
+                                       BigInteger years,
+                                       BigInteger months,
+                                       BigInteger days,
+                                       BigInteger hours,
+                                       BigInteger minutes,
+                                       BigDecimal seconds);
+
+  /**
+   * Returns a new duration by specifying the individual components.
+   * @param isPositive whether the duration is positive
+   * @param years the number of years
+   * @param months the number of months
+   * @param days the number of days
+   * @param hours the number of hours
+   * @param minutes th number of minutes
+   * @param seconds the number of seconds
+   */
+  public Duration newDuration(boolean isPositive,
+                              int years,
+                              int months,
+                              int days,
+                              int hours,
+                              int minutes,
+                              int seconds)
+  {
+    return newDuration(isPositive,
+                       BigInteger.valueOf((long) years),
+                       BigInteger.valueOf((long) months),
+                       BigInteger.valueOf((long) days),
+                       BigInteger.valueOf((long) hours),
+                       BigInteger.valueOf((long) minutes),
+                       BigDecimal.valueOf((long) seconds));
+  }
+
+  /**
+   * Returns a new dayTimeDuration from its string representation.
+   * @param lexicalRepresentation the lexical representation of the
+   * duration, as specified in XML Schema 1.0 section 3.2.6.1.
+   */
+  public Duration newDurationDayTime(String lexicalRepresentation)
+  {
+    return newDuration(lexicalRepresentation);
+  }
+
+  /**
+   * Returns a new dayTimeDuration.
+   * @param durationInMilliseconds the duration in milliseconds
+   */
+  public Duration newDurationDayTime(long durationInMilliseconds)
+  {
+    // TODO xmlSchemaType
+    return newDuration(durationInMilliseconds);
+  }
+
+  /**
+   * Returns a new dayTimeDuration by specifying the individual components.
+   * @param isPositive whether the duration is positive
+   * @param days the number of days
+   * @param hours the number of hours
+   * @param minutes th number of minutes
+   * @param seconds the number of seconds
+   */
+  public Duration newDurationDayTime(boolean isPositive,
+                                     BigInteger days,
+                                     BigInteger hours,
+                                     BigInteger minutes,
+                                     BigDecimal seconds)
+  {
+    return newDuration(isPositive,
+                       null,
+                       null,
+                       days,
+                       hours,
+                       minutes,
+                       seconds);
+  }
+
+  /**
+   * Returns a new dayTimeDuration by specifying the individual components.
+   * @param isPositive whether the duration is positive
+   * @param days the number of days
+   * @param hours the number of hours
+   * @param minutes th number of minutes
+   * @param seconds the number of seconds
+   */
+  public Duration newDurationDayTime(boolean isPositive,
+                                     int days,
+                                     int hours,
+                                     int minutes,
+                                     int seconds)
+  {
+    return newDuration(isPositive,
+                       null,
+                       null,
+                       BigInteger.valueOf((long) days),
+                       BigInteger.valueOf((long) hours),
+                       BigInteger.valueOf((long) minutes),
+                       BigDecimal.valueOf((long) seconds));
+  }
+
+  /**
+   * Returns a new yearMonthDuration from its string representation.
+   * @param lexicalRepresentation the lexical representation of the
+   * duration, as specified in XML Schema 1.0 section 3.2.6.1.
+   */
+  public Duration newDurationYearMonth(String lexicalRepresentation)
+  {
+    return newDuration(lexicalRepresentation);
+  }
+
+  /**
+   * Returns a new yearMonthDuration.
+   * @param durationInMilliseconds the duration in milliseconds
+   */
+  public Duration newDurationYearMonth(long durationInMilliseconds)
+  {
+    // TODO xmlSchemaType
+    return newDuration(durationInMilliseconds);
+  }
+
+  /**
+   * Returns a new yearMonthDuration by specifying the individual components.
+   * @param isPositive whether the duration is positive
+   * @param years the number of years
+   * @param months the number of months
+   * @param days the number of days
+   * @param hours the number of hours
+   * @param minutes th number of minutes
+   * @param seconds the number of seconds
+   */
+  public Duration newDurationYearMonth(boolean isPositive,
+                                       BigInteger years,
+                                       BigInteger months)
+  {
+    return newDuration(isPositive,
+                       years,
+                       months,
+                       null,
+                       null,
+                       null,
+                       null);
+  }
+
+  /**
+   * Returns a new yearMonthDuration by specifying the individual components.
+   * @param isPositive whether the duration is positive
+   * @param years the number of years
+   * @param months the number of months
+   * @param days the number of days
+   * @param hours the number of hours
+   * @param minutes th number of minutes
+   * @param seconds the number of seconds
+   */
+  public Duration newDurationYearMonth(boolean isPositive,
+                                       int years,
+                                       int months)
+  {
+    return newDuration(isPositive,
+                       BigInteger.valueOf((long) years),
+                       BigInteger.valueOf((long) months),
+                       null,
+                       null,
+                       null,
+                       null);
+  }
+
+  /**
+   * Returns a new XMLGregorianCalendar with no fields initialized.
+   */
+  public abstract XMLGregorianCalendar newXMLGregorianCalendar();
+
+  /**
+   * Returns a new XMLGregorianCalendar from a string representation.
+   * @param lexicalRepresentation the lexical representation as specified in
+   * XML Schema 1.0 Part 2, section 3.2.[7-14].1.
+   */
+  public abstract XMLGregorianCalendar newXMLGregorianCalendar(String lexicalRepresentation);
+  
+  /**
+   * Returns a new XMLGregorianCalendar based on the specified Gregorian
+   * calendar.
+   */
+  public abstract XMLGregorianCalendar newXMLGregorianCalendar(GregorianCalendar cal);
+
+  /**
+   * Returns a new XMLGregorianCalendar with the specified components.
+   */
+  public abstract XMLGregorianCalendar newXMLGregorianCalendar(BigInteger year,
+                                                               int month,
+                                                               int day,
+                                                               int hour,
+                                                               int minute,
+                                                               int second,
+                                                               BigDecimal fractionalSecond,
+                                                               int timezone);
+
+  /**
+   * Returns a new XMLGregorianCalendar with the specified components.
+   */
+  public XMLGregorianCalendar newXMLGregorianCalendar(int year,
+                                                      int month,
+                                                      int day,
+                                                      int hour,
+                                                      int minute,
+                                                      int second,
+                                                      int millisecond,
+                                                      int timezone)
+  {
+    return newXMLGregorianCalendar(BigInteger.valueOf((long) year),
+                                   month,
+                                   day,
+                                   hour,
+                                   minute,
+                                   second,
+                                   new BigDecimal(((double) millisecond) / 1000.0),
+                                   timezone);
+  }
+
+  /**
+   * Returns a new XMLGregorianCalendar with the specified components.
+   */
+  public XMLGregorianCalendar newXMLGregorianCalendarDate(int year,
+                                                          int month,
+                                                          int day,
+                                                          int timezone)
+  {
+    return newXMLGregorianCalendar(BigInteger.valueOf((long) year),
+                                   month,
+                                   day,
+                                   DatatypeConstants.FIELD_UNDEFINED,
+                                   DatatypeConstants.FIELD_UNDEFINED,
+                                   DatatypeConstants.FIELD_UNDEFINED,
+                                   null,
+                                   timezone);
+  }
+
+  /**
+   * Returns a new XMLGregorianCalendar with the specified components.
+   */
+  public XMLGregorianCalendar newXMLGregorianCalendarTime(int hours,
+                                                          int minutes,
+                                                          int seconds,
+                                                          int timezone)
+  {
+    return newXMLGregorianCalendar(null,
+                                   DatatypeConstants.FIELD_UNDEFINED,
+                                   DatatypeConstants.FIELD_UNDEFINED,
+                                   hours,
+                                   minutes,
+                                   seconds,
+                                   null,
+                                   timezone);
+  }
+
+  /**
+   * Returns a new XMLGregorianCalendar with the specified components.
+   */
+  public XMLGregorianCalendar newXMLGregorianCalendarTime(int hours,
+                                                          int minutes,
+                                                          int seconds,
+                                                          BigDecimal fractionalSecond,
+                                                          int timezone)
+  {
+    return newXMLGregorianCalendar(null,
+                                   DatatypeConstants.FIELD_UNDEFINED,
+                                   DatatypeConstants.FIELD_UNDEFINED,
+                                   hours,
+                                   minutes,
+                                   seconds,
+                                   fractionalSecond,
+                                   timezone);
+  }
+
+  /**
+   * Returns a new XMLGregorianCalendar with the specified components.
+   */
+  public XMLGregorianCalendar newXMLGregorianCalendarTime(int hours,
+                                                          int minutes,
+                                                          int seconds,
+                                                          int milliseconds,
+                                                          int timezone)
+  {
+    return newXMLGregorianCalendar(null,
+                                   DatatypeConstants.FIELD_UNDEFINED,
+                                   DatatypeConstants.FIELD_UNDEFINED,
+                                   hours,
+                                   minutes,
+                                   seconds,
+                                   new BigDecimal(((double) milliseconds) / 1000.0),
+                                   timezone);
+  }
+    
+}
diff --git a/libjava/javax/xml/datatype/Duration.java b/libjava/javax/xml/datatype/Duration.java
new file mode 100644 (file)
index 0000000..ed1221d
--- /dev/null
+++ b/libjava/javax/xml/datatype/Duration.java
@@ -0,0 +1,295 @@
+/* Duration.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.datatype;
+
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import javax.xml.datatype.DatatypeConstants;
+import javax.xml.namespace.QName;
+
+/**
+ * An immutable time space as specified in XML Schema 1.0.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public abstract class Duration
+{
+
+  /**
+   * Returns the name of the XML Schema data type this value maps to.
+   */
+  public QName getXMLSchemaType()
+  {
+    int state = 0;
+    state |= isSet(DatatypeConstants.YEARS) ? 32 : 0;
+    state |= isSet(DatatypeConstants.MONTHS) ? 16 : 0;
+    state |= isSet(DatatypeConstants.DAYS) ? 8 : 0;
+    state |= isSet(DatatypeConstants.HOURS) ? 4 : 0;
+    state |= isSet(DatatypeConstants.MINUTES) ? 2 : 0;
+    state |= isSet(DatatypeConstants.SECONDS) ? 1 : 0;
+    switch (state)
+      {
+      case 63:
+        return DatatypeConstants.DURATION;
+      case 15:
+        return DatatypeConstants.DURATION_DAYTIME;
+      case 48:
+        return DatatypeConstants.DURATION_YEARMONTH;
+      default:
+        throw new IllegalStateException();
+      }
+  }
+
+  /**
+   * Returns the sign of this value.
+   */
+  public abstract int getSign();
+
+  /**
+   * Returns the years in this duration as an int, or 0 if not present.
+   */
+  public int getYears()
+  {
+    Number val = getField(DatatypeConstants.YEARS);
+    return (val == null) ? 0 : val.intValue();
+  }
+  
+  /**
+   * Returns the months in this duration as an int, or 0 if not present.
+   */
+  public int getMonths()
+  {
+    Number val = getField(DatatypeConstants.MONTHS);
+    return (val == null) ? 0 : val.intValue();
+  }
+  
+  /**
+   * Returns the days in this duration as an int, or 0 if not present.
+   */
+  public int getDays()
+  {
+    Number val = getField(DatatypeConstants.DAYS);
+    return (val == null) ? 0 : val.intValue();
+  }
+  
+  /**
+   * Returns the hours in this duration as an int, or 0 if not present.
+   */
+  public int getHours()
+  {
+    Number val = getField(DatatypeConstants.HOURS);
+    return (val == null) ? 0 : val.intValue();
+  }
+  
+  /**
+   * Returns the minutes in this duration as an int, or 0 if not present.
+   */
+  public int getMinutes()
+  {
+    Number val = getField(DatatypeConstants.MINUTES);
+    return (val == null) ? 0 : val.intValue();
+  }
+  
+  /**
+   * Returns the seconds in this duration as an int, or 0 if not present.
+   */
+  public int getSeconds()
+  {
+    Number val = getField(DatatypeConstants.SECONDS);
+    return (val == null) ? 0 : val.intValue();
+  }
+
+  /**
+   * Returns the duration length in milliseconds.
+   * Because the length of a month or year may vary depending on the year,
+   * the <code>startInstant</code> parameter is used to specify the duration
+   * offset.
+   */
+  public long getTimeInMillis(Calendar startInstant)
+  {
+    Calendar cal = (Calendar) startInstant.clone();
+    long t1 = cal.getTimeInMillis();
+    addTo(cal);
+    long t2 = cal.getTimeInMillis();
+    return t2 - t1;
+  }
+
+  /**
+   * Returns the duration length in milliseconds.
+   * Because the length of a month or year may vary depending on the year,
+   * the <code>startInstant</code> parameter is used to specify the duration
+   * offset.
+   */
+  public long getTimeInMillis(Date startInstant)
+  {
+    Date date = (Date) startInstant.clone();
+    long t1 = date.getTime();
+    addTo(date);
+    long t2 = date.getTime();
+    return t2 - t1;
+  }
+
+  /**
+   * Returns the value of the specified field, or <code>null</code> if the
+   * field is undefined.
+   */
+  public abstract Number getField(DatatypeConstants.Field field);
+
+  /**
+   * Indicates whether the specified field is set.
+   */
+  public abstract boolean isSet(DatatypeConstants.Field field);
+
+  /**
+   * Returns the result of adding the specified duration to this duration.
+   */
+  public abstract Duration add(Duration rhs);
+
+  /**
+   * Adds this duration to the specified calendar.
+   */
+  public abstract void addTo(Calendar calendar);
+  /*{
+    switch (getSign())
+      {
+      case -1:
+        calendar.add(Calendar.YEAR, -getYears());
+        calendar.add(Calendar.MONTH, -getMonths());
+        calendar.add(Calendar.DATE, -getDays());
+        calendar.add(Calendar.HOUR, -getHours());
+        calendar.add(Calendar.MINUTE, -getMinutes());
+        calendar.add(Calendar.SECOND, -getSeconds());
+        break;
+      case 1:
+        calendar.add(Calendar.YEAR, getYears());
+        calendar.add(Calendar.MONTH, getMonths());
+        calendar.add(Calendar.DATE, getDays());
+        calendar.add(Calendar.HOUR, getHours());
+        calendar.add(Calendar.MINUTE, getMinutes());
+        calendar.add(Calendar.SECOND, getSeconds());
+      }
+  }*/
+  
+  /**
+   * Adds this duration to the specified date.
+   */
+  public void addTo(Date date)
+  {
+    Calendar calendar = new GregorianCalendar();
+    calendar.setTimeInMillis(date.getTime());
+    addTo(calendar);
+    date.setTime(calendar.getTimeInMillis());
+  }
+
+  /**
+   * Returns the result of subtracting the given duration from this
+   * duration.
+   */
+  public Duration subtract(Duration rhs)
+  {
+    // TODO
+    throw new UnsupportedOperationException();
+  }
+
+  /**
+   * Returns the result of multiplying this duration by the given factor.
+   */
+  public Duration multiply(int factor)
+  {
+    return multiply(BigDecimal.valueOf((long) factor));
+  }
+
+  /**
+   * Returns the result of multiplying this duration by the given factor.
+   */
+  public Duration multiply(BigDecimal factor)
+  {
+    // TODO
+    throw new UnsupportedOperationException();
+  }
+
+  /**
+   * Returns the unary negative of this duration.
+   */
+  public abstract Duration negate();
+  
+  /**
+   * Converts the years and months fields into the days field using a
+   * specific time instant as the reference point.
+   */
+  public abstract Duration normalizeWith(Calendar startTimeInstant);
+
+  /**
+   * Partial order relation comparison with this duration, in accordance
+   * with XML Schema 1.0 Part 2, Section 3.2.7.6.2.
+   */
+  public abstract int compare(Duration duration);
+
+  public boolean isLongerThan(Duration duration)
+  {
+    // TODO
+    throw new UnsupportedOperationException();
+  }
+
+  public boolean isShorterThan(Duration duration)
+  {
+    // TODO
+    throw new UnsupportedOperationException();
+  }
+
+  public boolean equals(java.lang.Object duration)
+  {
+    // TODO
+    throw new UnsupportedOperationException();
+  }
+  
+  public abstract int hashCode();
+
+  /**
+   * Returns the lexical representation of this duration.
+   */
+  public String toString()
+  {
+    // TODO
+    throw new UnsupportedOperationException();
+  }
+  
+}
diff --git a/libjava/javax/xml/datatype/XMLGregorianCalendar.java b/libjava/javax/xml/datatype/XMLGregorianCalendar.java
new file mode 100644 (file)
index 0000000..c3585a4
--- /dev/null
+++ b/libjava/javax/xml/datatype/XMLGregorianCalendar.java
@@ -0,0 +1,217 @@
+/* XMLGregorianCalendar.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.datatype;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.TimeZone;
+import javax.xml.namespace.QName;
+
+/**
+ * An XML Schema 1.0 date/time data type.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public abstract class XMLGregorianCalendar
+  implements Cloneable
+{
+
+  /**
+   * Resets all fields to undefined.
+   */
+  public abstract void clear();
+
+  /**
+   * Resets all fields to their original values.
+   */
+  public abstract void reset();
+
+  public abstract void setYear(BigInteger year);
+
+  public abstract void setYear(int year);
+
+  public abstract void setMonth(int month);
+
+  public abstract void setDay(int day);
+
+  public abstract void setTimezone(int offset);
+
+  public void setTime(int hour, int minute, int second)
+  {
+    setHour(hour);
+    setMinute(minute);
+    setSecond(second);
+  }
+
+  public abstract void setHour(int hour);
+
+  public abstract void setMinute(int minute);
+
+  public abstract void setSecond(int second);
+
+  public abstract void setMillisecond(int millisecond);
+
+  public abstract void setFractionalSecond(BigDecimal fractional);
+
+  public void setTime(int hour, int minute, int second, BigDecimal fractional)
+  {
+    setHour(hour);
+    setMinute(minute);
+    setSecond(second);
+    setFractionalSecond(fractional);
+  }
+
+  public void setTime(int hour, int minute, int second, int millisecond)
+  {
+    setHour(hour);
+    setMinute(minute);
+    setSecond(second);
+    setMillisecond(millisecond);
+  }
+
+  public abstract BigInteger getEon();
+
+  public abstract int getYear();
+
+  public abstract BigInteger getEonAndYear();
+
+  public abstract int getMonth();
+
+  public abstract int getDay();
+
+  public abstract int getTimezone();
+
+  public abstract int getHour();
+
+  public abstract int getMinute();
+
+  public abstract int getSecond();
+
+  public int getMillisecond()
+  {
+    BigDecimal factor = BigDecimal.valueOf(1000L);
+    BigDecimal val = getFractionalSecond().multiply(factor);
+    return val.intValue();
+  }
+
+  public abstract BigDecimal getFractionalSecond();
+
+  public abstract int compare(XMLGregorianCalendar xmlGregorianCalendar);
+
+  public abstract XMLGregorianCalendar normalize();
+
+  public boolean equals(Object obj)
+  {
+    if (obj instanceof XMLGregorianCalendar)
+      {
+        XMLGregorianCalendar xgc = (XMLGregorianCalendar) obj;
+        BigInteger y1 = getEonAndYear();
+        BigInteger y2 = xgc.getEonAndYear();
+        BigDecimal f1 = getFractionalSecond();
+        BigDecimal f2 = xgc.getFractionalSecond();
+        return ((y1 == null && y2 == null) || (y1 != null && y1.equals(y2))) &&
+          getMonth() == xgc.getMonth() &&
+          getDay() == xgc.getDay() &&
+          getTimezone() == xgc.getTimezone() &&
+          getHour() == xgc.getHour() &&
+          getMinute() == xgc.getMinute() &&
+          getSecond() == xgc.getSecond() &&
+          ((f1 == null && f2 == null) || (f1 != null && f1.equals(f2)));
+      }
+    return false;
+  }
+
+  public int hashCode()
+  {
+    int hash = 0;
+    BigInteger y = getEonAndYear();
+    BigDecimal f = getFractionalSecond();
+    if (y != null)
+      {
+        hash *= 31 + y.hashCode();
+      }
+    hash *= 31 + getMonth();
+    hash *= 31 + getDay();
+    hash *= 31 + getTimezone();
+    hash *= 31 + getHour();
+    hash *= 31 + getMinute();
+    hash *= 31 + getSecond();
+    if (f != null)
+      {
+        hash *= 31 + f.hashCode();
+      }
+    return hash;
+  }
+
+  /**
+   * Returns the XML Schema lexical representation of this calendar.
+   */
+  public abstract String toXMLFormat();
+
+  public abstract QName getXMLSchemaType();
+
+  public String toString()
+  {
+    return toXMLFormat();
+  }
+
+  /**
+   * Determines the validity of this calendar by
+   * <code>getXMLSchemaType</code> constraints.
+   */
+  public abstract boolean isValid();
+
+  /**
+   * Adds the specified duration to this calendar.
+   */
+  public abstract void add(Duration duration);
+
+  public abstract GregorianCalendar toGregorianCalendar();
+
+  public abstract GregorianCalendar toGregorianCalendar(TimeZone timezone,
+                                                        Locale locale,
+                                                        XMLGregorianCalendar defaults);
+
+  public abstract TimeZone getTimeZone(int defaultZoneoffset);
+
+  public abstract Object clone();
+  
+}
diff --git a/libjava/javax/xml/datatype/package.html b/libjava/javax/xml/datatype/package.html
new file mode 100644 (file)
index 0000000..ffd850c
--- /dev/null
+++ b/libjava/javax/xml/datatype/package.html
@@ -0,0 +1,57 @@
+<body>
+
+<div>
+This package provides type mappings between XML and Java data types.
+</div>
+
+<table summary='XML Schema type mappings'>
+  <tr>
+    <th>XML Schema data type</th><th>Java data type</th>
+  </tr>
+  <tr>
+    <td>xs:date</td><td><a href='XMLGregorianCalendar.html'>XMLGregorianCalendar</a></td>
+  </tr>
+  <tr>
+    <td>xs:dateTime</td><td><a href='XMLGregorianCalendar.html'>XMLGregorianCalendar</a></td>
+  </tr>
+  <tr>
+    <td>xs:duration</td><td><a href='Duration.html'>Duration</a></td>
+  </tr>
+  <tr>
+    <td>xs:gDay</td><td><a href='XMLGregorianCalendar.html'>XMLGregorianCalendar</a></td>
+  </tr>
+  <tr>
+    <td>xs:gMonth</td><td><a href='XMLGregorianCalendar.html'>XMLGregorianCalendar</a></td>
+  </tr>
+  <tr>
+    <td>xs:gMonthDay</td><td><a href='XMLGregorianCalendar.html'>XMLGregorianCalendar</a></td>
+  </tr>
+  <tr>
+    <td>xs:gYear</td><td><a href='XMLGregorianCalendar.html'>XMLGregorianCalendar</a></td>
+  </tr>
+  <tr>
+    <td>xs:gYearMonth</td><td><a href='XMLGregorianCalendar.html'>XMLGregorianCalendar</a></td>
+  </tr>
+  <tr>
+    <td>xs:time</td><td><a href='XMLGregorianCalendar.html'>XMLGregorianCalendar</a></td>
+  </tr>
+</table>
+
+<table summary='XPath 2.0 data type mappings'>
+  <tr>
+    <th>XPath 2.0 data type</th><th>Java data type</th>
+  </tr>
+  <tr>
+    <td>xdt:dayTimeDuration</td><td><a href='Duration.html'>Duration</a></td>
+  </tr>
+  <tr>
+    <td>xdt:yearMonthDuration</td><td><a href='Duration.html'>Duration</a></td>
+  </tr>
+</table>
+
+<div>
+Other XML Schema data types are considered to have a <q>natural</q> mapping to
+Java types, which are defined by the Java Architecture for XML Binding (JAXB).
+</div>
+
+</body>
diff --git a/libjava/javax/xml/namespace/NamespaceContext.java b/libjava/javax/xml/namespace/NamespaceContext.java
new file mode 100644 (file)
index 0000000..2e79065
--- /dev/null
+++ b/libjava/javax/xml/namespace/NamespaceContext.java
@@ -0,0 +1,66 @@
+/* NamespaceContext.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.namespace;
+
+import java.util.Iterator;
+
+/**
+ * Interface by which namespace properties are made available.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public interface NamespaceContext
+{
+
+  /**
+   * Returns the namespace URI currently bound to the given prefix.
+   */
+  public String getNamespaceURI(String prefix);
+
+  /**
+   * Returns the prefix currently bound to the given namespace URI.
+   */
+  public String getPrefix(String namespaceURI);
+
+  /**
+   * Returns all the prefixes currently bound to the given namespace URI.
+   */
+  public Iterator getPrefixes(String namespaceURI);
+  
+}
diff --git a/libjava/javax/xml/namespace/QName.java b/libjava/javax/xml/namespace/QName.java
new file mode 100644 (file)
index 0000000..62dc8cd
--- /dev/null
+++ b/libjava/javax/xml/namespace/QName.java
@@ -0,0 +1,160 @@
+/* QName.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.namespace;
+
+import javax.xml.XMLConstants;
+
+/**
+ * An XML
+ * <a href='http://www.w3.org/TR/REC-xml-names/#ns-qualnames'>qualified name</a>.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public class QName
+{
+
+  private final String namespaceURI;
+  private final String localPart;
+  private final String prefix;
+  private final String qName;
+
+  public QName(String namespaceURI, String localPart)
+  {
+    this(namespaceURI, localPart, null);
+  }
+
+  public QName(String namespaceURI, String localPart, String prefix)
+  {
+    if (namespaceURI == null)
+      {
+        namespaceURI = XMLConstants.NULL_NS_URI;
+      }
+    if (localPart == null)
+      {
+        throw new IllegalArgumentException();
+      }
+    if (prefix == null)
+      {
+        prefix = XMLConstants.DEFAULT_NS_PREFIX;
+      }
+    this.namespaceURI = namespaceURI;
+    this.localPart = localPart;
+    this.prefix = prefix;
+    
+    StringBuffer buf = new StringBuffer();
+    if (namespaceURI != null && namespaceURI.length() > 0)
+      {
+        buf.append('{');
+        buf.append(namespaceURI);
+        buf.append('}');
+      }
+    if (prefix != null && prefix.length() > 0)
+      {
+        buf.append(prefix);
+        buf.append(':');
+      }
+    buf.append(localPart);
+    qName = buf.toString();
+  }
+
+  public QName(String localPart)
+  {
+    this(null, localPart, null);
+  }
+
+  public String getNamespaceURI()
+  {
+    return namespaceURI;
+  }
+
+  public String getLocalPart()
+  {
+    return localPart;
+  }
+
+  public String getPrefix()
+  {
+    return prefix;
+  }
+
+  public boolean equals(Object obj)
+  {
+    if (obj instanceof QName)
+      {
+        QName qname = (QName) obj;
+        return qname.getLocalPart().equals(localPart) &&
+          qname.getNamespaceURI().equals(namespaceURI);
+      }
+    return false;
+  }
+
+  public final int hashCode()
+  {
+    return qName.hashCode();
+  }
+
+  public String toString()
+  {
+    return qName;
+  }
+
+  public static QName valueOf(String qNameAsString)
+  {
+    String namespaceUri = "", prefix = null;
+    int start = qNameAsString.indexOf('{');
+    int end = qNameAsString.indexOf('}');
+    if (start != -1)
+      {
+        if (end < start)
+          {
+            throw new IllegalArgumentException(qNameAsString);
+          }
+        namespaceUri = qNameAsString.substring(start + 1, end);
+        qNameAsString = qNameAsString.substring(end + 1);
+      }
+    start = qNameAsString.indexOf(':');
+    if (start != -1)
+      {
+        prefix = qNameAsString.substring(0, start);
+        qNameAsString = qNameAsString.substring(start + 1);
+      }
+    return new QName(namespaceUri, qNameAsString, prefix);
+  }
+  
+}
diff --git a/libjava/javax/xml/namespace/package.html b/libjava/javax/xml/namespace/package.html
new file mode 100644 (file)
index 0000000..00929f8
--- /dev/null
+++ b/libjava/javax/xml/namespace/package.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+
+<div>
+<a href='http://www.w3.org/TR/REC-xml-names'>XML Namespace</a> processing.
+</div>
+
+</body>
+</html>
diff --git a/libjava/javax/xml/parsers/DocumentBuilder.java b/libjava/javax/xml/parsers/DocumentBuilder.java
new file mode 100644 (file)
index 0000000..13d7658
--- /dev/null
+++ b/libjava/javax/xml/parsers/DocumentBuilder.java
@@ -0,0 +1,204 @@
+/* DocumentBuilder.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.parsers;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import javax.xml.validation.Schema;
+import org.w3c.dom.Document;
+import org.w3c.dom.DOMImplementation;
+import org.xml.sax.InputSource;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * Convenience class for parsing an XML document into a W3C DOM object
+ * graph.
+ * Instances of this class are <em>not</em> guaranteed to be thread safe.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public abstract class DocumentBuilder
+{
+
+  protected DocumentBuilder()
+  {
+  }
+
+  /**
+   * Parse the specified input stream and return a DOM Document.
+   * Prefer the version of this method that specifies a system ID, in order
+   * to resolve external references correctly.
+   * @param is an XML input stream
+   * @exception IllegalArgumentException if the input stream is null
+   */
+  public Document parse(InputStream is) 
+    throws SAXException, IOException
+  {
+    if (is == null)
+      {
+        throw new IllegalArgumentException("input stream is null");
+      }
+    return parse(new InputSource(is));
+  }
+
+  /**
+   * Parse the specified input stream and return a DOM Document.
+   * @param is an XML input stream
+   * @param systemId the system ID of the XML document
+   * @exception IllegalArgumentException if the input stream is null
+   */
+  public Document parse(InputStream is, String systemId) 
+    throws SAXException, IOException
+  {
+    if (is == null)
+      {
+        throw new IllegalArgumentException("input stream is null");
+      }
+    InputSource  source = new InputSource(is);
+    source.setSystemId(systemId);
+    return parse(source);
+  }
+
+  /**
+   * Parse the content of the specified URI and return a DOM Document.
+   * @param uri an XML system ID
+   * @exception IllegalArgumentException if the URI is null
+   */
+  public Document parse(String uri) 
+    throws SAXException, IOException
+  {
+    if (uri == null)
+      {
+        throw new IllegalArgumentException("URI is null");
+      }
+    return parse(new InputSource(uri));
+  }
+
+  /**
+   * Parse the specified file and return a DOM Document.
+   * @param f the XML file
+   * @exception IllegalArgumentException if the file is null
+   */
+  public Document parse(File f) 
+    throws SAXException, IOException
+  {
+    if (f == null)
+      {
+        throw new IllegalArgumentException("file is null");
+      }
+    InputSource  source = new InputSource(new FileInputStream(f));
+    source.setSystemId(f.toURL().toString());
+    return parse(source);
+  }
+
+  /**
+   * Parse the specified input source and return a DOM Document.
+   * @param is the input source
+   * @exception IllegalArgumentException if the input source is null
+   */
+  public abstract Document parse(InputSource source) 
+    throws SAXException, IOException;
+
+  /**
+   * Indicates whether this document builder is XML Namespace aware.
+   */
+  public abstract boolean isNamespaceAware();
+
+  /**
+   * Indicates whether this document builder will validate its input.
+   */
+  public abstract boolean isValidating();
+
+  /**
+   * Sets the SAX entity resolver callback used to resolve external entities
+   * in the XML document(s) to parse.
+   * @param er an entity resolver
+   */
+  public abstract void setEntityResolver(EntityResolver er);
+
+  /**
+   * Sets the SAX error handler callback used to report parsing errors.
+   * @param eh the error handler
+   */
+  public abstract void setErrorHandler(ErrorHandler eh);
+
+  /**
+   * Creates a new, empty DOM Document.
+   * To create a document with a root element and optional doctype, use the
+   * <code>DOMImplementation</code> instead.
+   * @see org.w3c.dom.DOMImplementation#createDocument
+   */
+  public abstract Document newDocument();
+
+  /**
+   * Returns the DOM implementation.
+   */
+  public abstract DOMImplementation getDOMImplementation();
+
+  // -- JAXP 1.3 methods --
+  
+  /**
+   * Reset this document builder to its original configuration.
+   * @since 1.3
+   */
+  public void reset()
+  {
+  }
+
+  /**
+   * Returns the schema in use by the XML processor.
+   */
+  public Schema getSchema()
+  {
+    return null;
+  }
+
+  /**
+   * Returns the XInclude processing mode in use by the parser.
+   */
+  public boolean isXIncludeAware()
+  {
+    return false;
+  }
+  
+}
diff --git a/libjava/javax/xml/parsers/DocumentBuilderFactory.java b/libjava/javax/xml/parsers/DocumentBuilderFactory.java
new file mode 100644 (file)
index 0000000..c531005
--- /dev/null
+++ b/libjava/javax/xml/parsers/DocumentBuilderFactory.java
@@ -0,0 +1,349 @@
+/* DocumentBuilderFactory.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.parsers;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.util.Properties;
+import javax.xml.validation.Schema;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+
+/**
+ * Factory for obtaining document builders.
+ * Instances of this class are <em>not</em> guaranteed to be thread safe.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public abstract class DocumentBuilderFactory
+{
+
+  private boolean namespaceAware;
+  private boolean validating;
+  private boolean ignoringElementContentWhitespace;
+  private boolean expandEntityReferences = true;
+  private boolean ignoringComments;
+  private boolean coalescing;
+  private Schema schema;
+  private boolean xIncludeAware;
+
+  protected DocumentBuilderFactory()
+  {
+  }
+
+  /**
+   * Creates a new factory instance.
+   * The implementation class to load is the first found in the following
+   * locations:
+   * <ol>
+   * <li>the <code>javax.xml.parsers.DocumentBuilderFactory</code> system
+   * property</li>
+   * <li>the above named property value in the
+   * <code><i>$JAVA_HOME</i>/lib/jaxp.properties</code> file</li>
+   * <li>the class name specified in the
+   * <code>META-INF/services/javax.xml.parsers.DocumentBuilderFactory</code>
+   * system resource</li>
+   * <li>the default factory class</li>
+   * </ol>
+   */
+  public static DocumentBuilderFactory newInstance()
+  {
+    ClassLoader loader = Thread.currentThread().getContextClassLoader();
+    if (loader == null)
+      {
+        loader = DocumentBuilderFactory.class.getClassLoader();
+      }
+    String className = null;
+    int count = 0;
+    do
+      {
+        className = getFactoryClassName(loader, count++);
+        if (className != null)
+          {
+            try
+              {
+                Class t = (loader != null) ? loader.loadClass(className) :
+                  Class.forName(className);
+                return (DocumentBuilderFactory) t.newInstance();
+              }
+            catch (ClassNotFoundException e)
+              {
+                className = null;
+              }
+            catch (Exception e)
+              {
+                throw new FactoryConfigurationError(e,
+                    "error instantiating class " + className);
+              } 
+          }
+      }
+    while (className == null && count < 3);
+    return new gnu.xml.dom.DomDocumentBuilderFactory();
+  }
+  
+  private static String getFactoryClassName(ClassLoader loader, int attempt)
+  {
+    final String propertyName = "javax.xml.parsers.DocumentBuilderFactory";
+    switch (attempt)
+      {
+        case 0:
+          return System.getProperty(propertyName);
+        case 1:
+          try
+            {
+              File file = new File(System.getProperty("java.home"));
+              file = new File(file, "lib");
+              file = new File(file, "jaxp.properties");
+              InputStream in = new FileInputStream(file);
+              Properties props = new Properties();
+              props.load(in);
+              in.close();
+              return props.getProperty(propertyName);
+            }
+          catch (IOException e)
+            {
+              return null;
+            }
+        case 2: 
+          try
+            {
+              String serviceKey = "/META-INF/services/" + propertyName;
+              InputStream in = (loader != null) ?
+                loader.getResourceAsStream(serviceKey) :
+                DocumentBuilderFactory.class.getResourceAsStream(serviceKey);
+              if (in != null)
+                {
+                  BufferedReader r =
+                    new BufferedReader(new InputStreamReader(in));
+                  String ret = r.readLine();
+                  r.close();
+                  return ret;
+                }
+            }
+          catch (IOException e)
+            {
+            }
+          return null;
+        default:
+          return null;
+      }
+  }
+
+  /**
+   * Creates a new document builder instance using the currently specified
+   * factory configuration.
+   * @exception ParserConfigurationException if the specified configuration
+   * is not supported
+   */
+  public abstract DocumentBuilder newDocumentBuilder()
+    throws ParserConfigurationException;
+
+  /**
+   * Sets whether document builders obtained from this factory will be XML
+   * Namespace aware.
+   */
+  public void setNamespaceAware(boolean awareness)
+  {
+    namespaceAware = awareness;
+  }
+
+  /**
+   * Sets whether document builders obtained from this factory will validate
+   * their input.
+   */
+  public void setValidating(boolean validating)
+  {
+    this.validating = validating;
+  }
+
+  /**
+   * Sets whether document builders obtained from this factory will
+   * eliminate whitespace within elements that have an element-only content
+   * model.
+   */
+  public void setIgnoringElementContentWhitespace(boolean whitespace)
+  {
+    ignoringElementContentWhitespace = whitespace;
+  }
+
+  /**
+   * Sets whether document builders obtained from this factory will expand
+   * entity reference nodes.
+   */
+  public void setExpandEntityReferences(boolean expandEntityRef)
+  {
+    expandEntityReferences = expandEntityRef;
+  }
+
+  /**
+   * Sets whether document builders obtained from this factory will discard
+   * comment nodes.
+   */
+  public void setIgnoringComments(boolean ignoreComments)
+  {
+    ignoringComments = ignoreComments;
+  }
+
+  /**
+   * Sets whether document builders obtained from this factory will convert
+   * CDATA sections to text nodes and normalize adjacent text nodes into a
+   * single text node.
+   */
+  public void setCoalescing(boolean coalescing)
+  {
+    this.coalescing = coalescing;
+  }
+
+  /**
+   * Indicates whether document builders obtained from this factory will be
+   * XML Namespace aware.
+   */
+  public boolean isNamespaceAware()
+  {
+    return namespaceAware;
+  }
+
+  /**
+   * Indicates whether document builders obtained from this factory will
+   * validate their input.
+   */
+  public boolean isValidating()
+  {
+    return validating;
+  }
+
+  /**
+   * Indicates whether document builders obtained from this factory will
+   * eliminate whitespace within elements that have an element-only content
+   * model.
+   */
+  public boolean isIgnoringElementContentWhitespace()
+  {
+    return ignoringElementContentWhitespace;
+  }
+
+  /**
+   * Indicates whether document builders obtained from this factory will
+   * expand entity reference nodes.
+   */
+  public boolean isExpandEntityReferences()
+  {
+    return expandEntityReferences;
+  }
+
+  /**
+   * Indicates whether document builders obtained from this factory will
+   * discard comment nodes.
+   */
+  public boolean isIgnoringComments()
+  {
+    return ignoringComments;
+  }
+
+  /**
+   * Indicates whether document builders obtained from this factory will
+   * convert CDATA sections to text nodes and normalize adjacent text nodes
+   * into a single text node.
+   */
+  public boolean isCoalescing()
+  {
+    return coalescing;
+  }
+
+  /**
+   * Set the named attribute on the underlying implementation.
+   * @param name the name of the attribute
+   * @param value the new value
+   * @exception IllegalArgumentException if the attribute is not recognized
+   */
+  public abstract void setAttribute(String name, Object value) 
+    throws IllegalArgumentException;
+
+  /**
+   * Retrieves the named attribute value from the underlying implementation.
+   * @param name the name of the attribute
+   * @exception IllegalArgumentException if the attribute is not recognized
+   */
+  public abstract Object getAttribute(String name) 
+    throws IllegalArgumentException;
+
+  // -- JAXP 1.3 methods --
+
+  /**
+   * Returns the schema.
+   * @see #setSchema
+   */
+  public Schema getSchema()
+  {
+    return schema;
+  }
+
+  /**
+   * Sets the schema.
+   * @see #getSchema
+   */
+  public void setSchema(Schema schema)
+  {
+    this.schema = schema;
+  }
+
+  /**
+   * Indicates whether parsers obtained from this factory will be XInclude
+   * aware.
+   * @since 1.3
+   */
+  public boolean isXIncludeAware()
+  {
+    return xIncludeAware;
+  }
+
+  /**
+   * Sets whether parsers obtained from this factory will be XInclude aware.
+   * @since 1.3
+   */
+  public void setXIncludeAware(boolean state)
+  {
+    xIncludeAware = state;
+  }
+  
+}
diff --git a/libjava/javax/xml/parsers/FactoryConfigurationError.java b/libjava/javax/xml/parsers/FactoryConfigurationError.java
new file mode 100644 (file)
index 0000000..e7ff57e
--- /dev/null
+++ b/libjava/javax/xml/parsers/FactoryConfigurationError.java
@@ -0,0 +1,113 @@
+/* FactoryConfigurationError.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.parsers;
+
+/**
+ * An error occurred during configuration of the parser factory.
+ * 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class FactoryConfigurationError
+  extends Error
+{
+
+  /**
+   * The underlying cause of this exception, if any.
+   */
+  private Exception  exception;
+
+  /**
+   * Constructor with no detail message.
+   */
+  public FactoryConfigurationError()
+  {
+    super();
+  }
+
+  /**
+   * Constructor with the specified detail message.
+   * @param msg the detail message
+   */
+  public FactoryConfigurationError(String msg)
+  {
+    super(msg);
+  }
+
+  /**
+   * Constructor with the specified underlying cause.
+   * @param e the underlying cause of this exception
+   */
+  public FactoryConfigurationError(Exception e)
+  {
+    super(e);
+    exception = e;
+  }
+
+  /**
+   * Constructor with the specified underlying cause and detail message.
+   * @param e the underlying cause of this exception
+   * @param msg the detail message
+   */
+  public FactoryConfigurationError(Exception e, String msg)
+  {
+    super(msg, e);
+    exception = e;
+  }
+
+  /**
+   * Returns the message for this error, if any.
+   */
+  public String getMessage()
+  {
+    String message = super.getMessage();
+    if (message == null && exception != null)
+      {
+        message = exception.getMessage();
+      }
+    return message;
+  }
+
+  /**
+   * Returns the underlying cause of this exception, if any.
+   */
+  public Exception getException()
+  {
+    return exception;
+  }
+
+}
diff --git a/libjava/javax/xml/parsers/ParserConfigurationException.java b/libjava/javax/xml/parsers/ParserConfigurationException.java
new file mode 100644 (file)
index 0000000..d7b54cf
--- /dev/null
+++ b/libjava/javax/xml/parsers/ParserConfigurationException.java
@@ -0,0 +1,66 @@
+/* ParserConfigurationException.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.parsers;
+
+/**
+ * An exception occurred during configuration of the XML parser.
+ * 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class ParserConfigurationException
+  extends Exception
+{
+
+  /**
+   * Constructor with no detail message.
+   */
+  public ParserConfigurationException()
+  {
+    super();
+  }
+
+  /**
+   * Constructor with the specified detail message.
+   * @param msg the detail message
+   */
+  public ParserConfigurationException(String msg)
+  {
+    super(msg);
+  }
+
+}
diff --git a/libjava/javax/xml/parsers/SAXParser.java b/libjava/javax/xml/parsers/SAXParser.java
new file mode 100644 (file)
index 0000000..10289dc
--- /dev/null
+++ b/libjava/javax/xml/parsers/SAXParser.java
@@ -0,0 +1,340 @@
+/* SAXParser.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.parsers;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import javax.xml.validation.Schema;
+import org.xml.sax.HandlerBase;
+import org.xml.sax.InputSource;
+import org.xml.sax.Parser;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * Convenience class for using or accessing a SAX version 1 or 2 parser.
+ * Instances of this class are <em>not</em> guaranteed to be thread safe.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public abstract class SAXParser
+{
+  
+  protected SAXParser()
+  {
+  }
+
+  /**
+   * Parse the specifed input stream, reporting SAX1 events to the given
+   * handler.
+   * Prefer the SAX2 version of this method, since the HandlerBase class is
+   * now deprecated.
+   * Also prefer the version of this method that specifies a system ID, in
+   * order to resolve external references correctly.
+   * @param is an XML input stream
+   * @param hb the SAX1 handler
+   * @exception IllegalArgumentException if the input stream is null
+   * @see #parse(java.io.InputStream,org.xml.sax.helpers.DefaultHandler)
+   */
+  public void parse(InputStream is, HandlerBase hb) 
+    throws SAXException, IOException
+  {
+    if (is == null)
+      {
+        throw new IllegalArgumentException("input stream is null");
+      }
+    parse(new InputSource(is), hb);
+  }
+
+  /**
+   * Parse the specified input stream, reporting SAX1 events to the given
+   * handler.
+   * Prefer the SAX2 version of this method, since the HandlerBase class is
+   * now deprecated.
+   * @param is an XML input stream
+   * @param hb the SAX1 handler
+   * @param systemId the system ID of the XML document
+   * @exception IllegalArgumentException if the input stream is null
+   * @see #parse(java.io.InputStream,org.xml.sax.helpers.DefaultHandler,java.lang.String)
+   */
+  public void parse(InputStream is, HandlerBase hb, String systemId)
+     throws SAXException, IOException
+  {
+    if (is == null)
+      {
+        throw new IllegalArgumentException("input stream is null");
+      }
+    InputSource  source = new InputSource(is);
+    source.setSystemId(systemId);
+    parse(source, hb);
+  }
+
+  /**
+   * Parse the specified input stream, reporting SAX2 events to the given
+   * handler.
+   * Prefer the version of this method that specifies a system ID, in
+   * order to resolve external references correctly.
+   * @param is an XML input stream
+   * @param dh the SAX2 handler
+   * @exception IllegalArgumentException if the input stream is null
+   */
+  public void parse(InputStream is, DefaultHandler dh) 
+    throws SAXException, IOException
+  {
+    if (is == null)
+      {
+        throw new IllegalArgumentException("input stream is null");
+      }
+    parse(new InputSource(is), dh);
+  }
+
+  /**
+   * Parse the specified input stream, reporting SAX2 events to the given
+   * handler.
+   * @param is an XML input stream
+   * @param dh the SAX2 handler
+   * @param systemId the system ID of the XML document
+   * @exception IllegalArgumentException if the input stream is null
+   */
+  public void parse (InputStream is, DefaultHandler dh, String systemId)
+     throws SAXException, IOException
+  {
+    if (is == null)
+      {
+        throw new IllegalArgumentException("input stream is null");
+      }
+    InputSource  source = new InputSource(is);
+    source.setSystemId(systemId);
+    parse(source, dh);
+  }
+
+  /**
+   * Parse the content of the specified URI, reporting SAX1 events to the
+   * given handler.
+   * Prefer the SAX2 version of this method, since the HandlerBase class is
+   * now deprecated.
+   * @param uri an XML system ID
+   * @param hb the SAX1 handler
+   * @exception IllegalArgumentException if the URI is null
+   * @see #parse(java.lang.String,org.xml.sax.helpers.DefaultHandler)
+   */
+  public void parse(String uri, HandlerBase hb) 
+    throws SAXException, IOException
+  {
+    if (uri == null)
+      {
+        throw new IllegalArgumentException("URI is null");
+      }
+    parse(new InputSource(uri), hb);
+  }
+
+  /**
+   * Parse the content of the specified URI, reporting SAX2 events to the
+   * given handler.
+   * @param uri an XML system ID
+   * @param dh the SAX2 handler
+   * @exception IllegalArgumentException if the URI is null
+   */
+  public void parse(String uri, DefaultHandler dh) 
+    throws SAXException, IOException
+  {
+    if (uri == null)
+      {
+        throw new IllegalArgumentException("URI is null");
+      }
+    parse(new InputSource(uri), dh);
+  }
+
+  /**
+   * Parse the content of the specified file, reporting SAX1 events to the
+   * given handler.
+   * Prefer the SAX2 version of this method, since the HandlerBase class is
+   * now deprecated.
+   * @param f an XML file
+   * @param hb the SAX1 handler
+   * @exception IllegalArgumentException if the file is null
+   * @see #parse(java.io.File,org.xml.sax.helpers.DefaultHandler)
+   */
+  public void parse(File f, HandlerBase hb) 
+    throws SAXException, IOException
+  {
+    if (f == null)
+      {
+        throw new IllegalArgumentException("file is null");
+      }
+    InputSource source = new InputSource(new FileInputStream(f));
+    source.setSystemId(f.toURL().toString());
+    parse(source, hb);
+  }
+
+  /**
+   * Parse the content of the specified file, reporting SAX2 events to the
+   * given handler.
+   * @param f an XML file
+   * @param dh the SAX2 handler
+   * @exception IllegalArgumentException if the file is null
+   */
+  public void parse(File f, DefaultHandler dh) 
+    throws SAXException, IOException
+  {
+    if (f == null)
+      {
+        throw new IllegalArgumentException("file is null");
+      }
+    InputSource source = new InputSource(new FileInputStream(f));
+    source.setSystemId(f.toURL().toString());
+    parse(source, dh);
+  }
+
+  /**
+   * Parse the specified input source, reporting SAX1 events to the
+   * given handler.
+   * Prefer the SAX2 version of this method, since the HandlerBase class is
+   * now deprecated.
+   * @param is the SAX input source
+   * @param hb the SAX1 handler
+   * @exception IllegalArgumentException if the input source is null
+   * @see #parse(org.xml.sax.InputSource,org.xml.sax.helpers.DefaultHandler)
+   */
+  public void parse(InputSource is, HandlerBase hb) 
+    throws SAXException, IOException
+  {
+    if (is == null)
+      {
+        throw new IllegalArgumentException("input source is null");
+      }
+    Parser parser = getParser();
+    parser.setDocumentHandler(hb);
+    parser.setDTDHandler(hb);
+    parser.setEntityResolver(hb);
+    parser.setErrorHandler(hb);
+    parser.parse(is);
+  }
+
+  /**
+   * Parse the specified input source, reporting SAX2 events to the
+   * given handler.
+   * @param f an XML file
+   * @param dh the SAX2 handler
+   * @exception IllegalArgumentException if the input source is null
+   */
+  public void parse(InputSource is, DefaultHandler dh) 
+    throws SAXException, IOException
+  {
+    if (is == null)
+      {
+        throw new IllegalArgumentException("input source is null");
+      }
+    XMLReader reader = getXMLReader();
+    reader.setContentHandler(dh);
+    reader.setDTDHandler(dh);
+    reader.setEntityResolver(dh);
+    reader.setErrorHandler(dh);
+    reader.parse(is);
+  }
+
+  /**
+   * Returns the underlying SAX1 parser.
+   */
+  public abstract Parser getParser() throws SAXException;
+
+  /**
+   * Returns the underlying SAX2 parser.
+   * @since 1.1
+   */
+  public abstract XMLReader getXMLReader() throws SAXException;
+
+  /**
+   * Indicates whether this parser is XML Namespace aware.
+   */
+  public abstract boolean isNamespaceAware();
+
+  /**
+   * Indicates whether this parser will validate its input.
+   */
+  public abstract boolean isValidating();
+
+  /**
+   * Sets the specified SAX2 parser property.
+   * @param name the name of the property
+   * @param value the value of the property
+   */
+  public abstract void setProperty(String name, Object value) 
+    throws SAXNotRecognizedException, SAXNotSupportedException;
+
+  /**
+   * Returns the value of the specified SAX2 parser property.
+   * @param name the name of the property
+   */
+  public abstract Object getProperty(String name) 
+    throws SAXNotRecognizedException, SAXNotSupportedException;
+
+  // -- JAXP 1.3 methods --
+
+  /**
+   * Resets this parser to its original configuration.
+   * @since 1.3
+   */
+  public void reset()
+  {
+  }
+
+  /**
+   * Returns the schema in use by this parser.
+   * @since 1.3
+   */
+  public Schema getSchema()
+  {
+    return null;
+  }
+
+  /**
+   * Indicates whether this parser is XInclude-aware.
+   * @since 1.3
+   */
+  public boolean isXIncludeAware()
+  {
+    return false;
+  }
+  
+}
diff --git a/libjava/javax/xml/parsers/SAXParserFactory.java b/libjava/javax/xml/parsers/SAXParserFactory.java
new file mode 100644 (file)
index 0000000..143ee62
--- /dev/null
+++ b/libjava/javax/xml/parsers/SAXParserFactory.java
@@ -0,0 +1,273 @@
+/* SAXParserFactory.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.parsers;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.util.Properties;
+import javax.xml.validation.Schema;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+
+/**
+ * Factory for obtaining SAX parsers.
+ * Instances of this class are <em>not</em> guaranteed to be thread safe.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public abstract class SAXParserFactory
+{
+
+  private boolean validating;
+  private boolean namespaceAware;
+  private Schema schema;
+  private boolean xIncludeAware;
+
+  protected SAXParserFactory()
+  {
+  }
+
+  /**
+   * Creates a new factory instance.
+   * The implementation class to load is the first found in the following
+   * locations:
+   * <ol>
+   * <li>the <code>javax.xml.parsers.SAXParserFactory</code> system
+   * property</li>
+   * <li>the above named property value in the
+   * <code><i>$JAVA_HOME</i>/lib/jaxp.properties</code> file</li>
+   * <li>the class name specified in the
+   * <code>META-INF/services/javax.xml.parsers.SAXParserFactory</code>
+   * system resource</li>
+   * <li>the default factory class</li>
+   * </ol>
+   */
+  public static SAXParserFactory newInstance()
+    throws FactoryConfigurationError
+  {
+    ClassLoader loader = Thread.currentThread().getContextClassLoader();
+    if (loader == null)
+      {
+        loader = SAXParserFactory.class.getClassLoader();
+      }
+    String className = null;
+    int count = 0;
+    do
+      {
+        className = getFactoryClassName(loader, count++);
+        if (className != null)
+          {
+            try
+              {
+                Class t = (loader != null) ? loader.loadClass(className) :
+                  Class.forName(className);
+                return (SAXParserFactory) t.newInstance();
+              }
+            catch (ClassNotFoundException e)
+              {
+                className = null;
+              }
+            catch (Exception e)
+              {
+                throw new FactoryConfigurationError(e,
+                     "error instantiating class " + className);
+              }
+          }
+      }
+    while (className == null && count < 3);
+    return new gnu.xml.aelfred2.JAXPFactory();
+  }
+
+  private static String getFactoryClassName(ClassLoader loader, int attempt)
+  {
+    final String propertyName = "javax.xml.parsers.SAXParserFactory";
+    switch (attempt)
+      {
+        case 0:
+          return System.getProperty(propertyName);
+        case 1:
+          try
+            {
+              File file = new File(System.getProperty("java.home"));
+              file = new File(file, "lib");
+              file = new File(file, "jaxp.properties");
+              InputStream in = new FileInputStream(file);
+              Properties props = new Properties();
+              props.load(in);
+              in.close();
+              return props.getProperty(propertyName);
+            }
+          catch (IOException e)
+            {
+              return null;
+            }
+        case 2:
+          try
+            {
+              String serviceKey = "/META-INF/services/" + propertyName;
+              InputStream in = (loader != null) ?
+                 loader.getResourceAsStream(serviceKey) :
+                SAXParserFactory.class.getResourceAsStream(serviceKey);
+              if (in != null)
+                {
+                  BufferedReader r =
+                     new BufferedReader(new InputStreamReader(in));
+                  String ret = r.readLine();
+                  r.close();
+                  return ret;
+                }
+            }
+          catch (IOException e)
+            {
+            }
+          return null;
+        default:
+          return null;
+      }
+  }
+
+  /**
+   * Creates a new parser instance using the currently specified factory
+   * configuration.
+   * @exception ParserConfigurationException if the specified configuration
+   * is not supported
+   */
+  public abstract SAXParser newSAXParser()
+    throws ParserConfigurationException, SAXException;
+
+  /**
+   * Sets whether parsers obtained from this factory will be XML Namespace
+   * aware.
+   */
+  public void setNamespaceAware(boolean awareness)
+  {
+    namespaceAware = awareness;
+  }
+
+  /**
+   * Sets whether parsers obtained from this factory will validate their
+   * input.
+   */
+  public void setValidating(boolean validating)
+  {
+    this.validating = validating;
+  }
+
+  /**
+   * Indicates whether parsers obtained from this factory will be XML
+   * Namespace aware.
+   */
+  public boolean isNamespaceAware()
+  {
+    return namespaceAware;
+  }
+
+  /**
+   * Indicates whether parsers obtained from this factory will validate
+   * their input.
+   */
+  public boolean isValidating()
+  {
+    return validating;
+  }
+
+  /**
+   * Sets the specified feature for SAX2 parsers obtained from this factory.
+   * @param name the feature name
+   * @param value the featurevalue
+   */
+  public abstract void setFeature(String name, boolean value) 
+    throws ParserConfigurationException, SAXNotRecognizedException, 
+           SAXNotSupportedException;
+
+  /**
+   * Returns the specified feature for SAX2 parsers obtained from this
+   * factory.
+   * @param name the feature name
+   */
+  public abstract boolean getFeature(String name) 
+    throws ParserConfigurationException, SAXNotRecognizedException, 
+           SAXNotSupportedException;
+
+  // -- JAXP 1.3 methods --
+
+  /**
+   * Returns the schema.
+   * @since 1.3
+   * @see #setSchema
+   */
+  public Schema getSchema()
+  {
+    return schema;
+  }
+
+  /**
+   * Sets the schema.
+   * @since 1.3
+   * @see #getSchema
+   */
+  public void setSchema(Schema schema)
+  {
+    this.schema = schema;
+  }
+
+  /**
+   * Indicates whether parsers obtained from this factory will be XInclude
+   * aware.
+   * @since 1.3
+   */
+  public boolean isXIncludeAware()
+  {
+    return xIncludeAware;
+  }
+
+  /**
+   * Sets whether parsers obtained from this factory will be XInclude aware.
+   * @since 1.3
+   */
+  public void setXIncludeAware(boolean state)
+  {
+    xIncludeAware = state;
+  }
+
+}
diff --git a/libjava/javax/xml/parsers/package.html b/libjava/javax/xml/parsers/package.html
new file mode 100644 (file)
index 0000000..71739b9
--- /dev/null
+++ b/libjava/javax/xml/parsers/package.html
@@ -0,0 +1,16 @@
+<html><head>javax.xml.parsers</head><body>
+
+<p>Bootstrapping APIs for JAXP parsers.
+This is the first portable API defined for bootstrapping DOM.
+
+<p>JAXP parsers bootstrap in two stages.
+First is getting a factory, and configuring it.
+Second is asking that factory for a parser.
+
+<p>The SAX bootstrapping support corresponds to functionality
+found in the <em>org.xml.sax.helpers</em> package, except
+that it uses the JAXP two stage bootstrap paradigm and
+that the parser that's bootstrapped is normally wrapping
+a SAX parser rather than exposing it for direct use.
+
+</body></html>
diff --git a/libjava/javax/xml/transform/ErrorListener.java b/libjava/javax/xml/transform/ErrorListener.java
new file mode 100644 (file)
index 0000000..f2021cd
--- /dev/null
+++ b/libjava/javax/xml/transform/ErrorListener.java
@@ -0,0 +1,66 @@
+/* ErrorListener.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+package javax.xml.transform;
+
+/**
+ * Error reporting callback handler.
+ * Equivalent to the SAX ErrorHandler.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public interface ErrorListener
+{
+
+  /**
+   * Reports a warning condition.
+   */
+  public void warning(TransformerException exception)
+    throws TransformerException;
+
+  /**
+   * Reports a recoverable error.
+   */
+  public void error(TransformerException exception)
+    throws TransformerException;
+
+  /**
+   * Reports a fatal error.
+   */
+  public void fatalError(TransformerException exception)
+    throws TransformerException;
+
+}
diff --git a/libjava/javax/xml/transform/OutputKeys.java b/libjava/javax/xml/transform/OutputKeys.java
new file mode 100644 (file)
index 0000000..784194c
--- /dev/null
+++ b/libjava/javax/xml/transform/OutputKeys.java
@@ -0,0 +1,103 @@
+/* OutputKeys.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.transform;
+
+/**
+ * Constants for XSLT output attributes.
+ * 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class OutputKeys
+{
+
+  /**
+   * The output method (xml, html, or text).
+   */
+  public static final String METHOD = "method";
+  
+  /**
+   * The version of the output method.
+   */
+  public static final String VERSION = "version";
+  
+  /**
+   * The preferred output character encoding.
+   */
+  public static final String ENCODING = "encoding";
+  
+  /**
+   * Whether not to output an XML declaration (yes or no).
+   */
+  public static final String OMIT_XML_DECLARATION = "omit-xml-declaration";
+  
+  /**
+   * Whether to output a standalone document declaration (yes or no).
+   */
+  public static final String STANDALONE = "standalone";
+ 
+   /**
+   * The public ID to output in the doctype declaration.
+   */
+  public static final String DOCTYPE_PUBLIC = "doctype-public";
+  
+  /**
+   * The system ID to output in the doctype declaration.
+   */
+  public static final String DOCTYPE_SYSTEM = "doctype-system";
+  
+  /**
+   * Whitespace-separated list of element names for which text children
+   * should be output as CDATA sections.
+   */
+  public static final String CDATA_SECTION_ELEMENTS = "cdata-section-elements";
+  
+  /**
+   * Whether to indent the result tree (yes or no).
+   */
+  public static final String INDENT = "indent";
+  
+  /**
+   * The MIME content type of the output data.
+   */
+  public static final String MEDIA_TYPE = "media-type";
+  
+  private OutputKeys()
+  {
+  }
+
+}
diff --git a/libjava/javax/xml/transform/Result.java b/libjava/javax/xml/transform/Result.java
new file mode 100644 (file)
index 0000000..ec9420f
--- /dev/null
+++ b/libjava/javax/xml/transform/Result.java
@@ -0,0 +1,72 @@
+/* Result.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+package javax.xml.transform;
+
+/**
+ * The result of an XSL transformation.
+ * 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public interface Result
+{
+
+  /**
+   * Constant for the processing instruction sent when the result disables
+   * output escaping.
+   */
+  public static final String PI_DISABLE_OUTPUT_ESCAPING =
+    "javax.xml.transform.disable-output-escaping";
+
+  /**
+   * Constant for the processing instruction sent when the result enables
+   * output escaping.
+   */
+  public static final String PI_ENABLE_OUTPUT_ESCAPING =
+    "javax.xml.transform.enable-output-escaping";
+
+  /**
+   * Sets the XML system ID for this result.
+   * @param systemId the system ID URI
+   */
+  public void setSystemId(String systemId);
+
+  /**
+   * Returns the system ID for this result.
+   */
+  public String getSystemId();
+
+}
diff --git a/libjava/javax/xml/transform/Source.java b/libjava/javax/xml/transform/Source.java
new file mode 100644 (file)
index 0000000..4d6002b
--- /dev/null
+++ b/libjava/javax/xml/transform/Source.java
@@ -0,0 +1,60 @@
+/* Source.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+package javax.xml.transform;
+
+/**
+ * An XML input source.
+ * This is equivalent to a SAX InputSource.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public interface Source
+{
+
+  /**
+   * Sets the XML system ID for this source.
+   * This can be used to resolve external entities in the source.
+   * @param systemID the system ID URI
+   */
+  public void setSystemId(String systemId);
+
+  /**
+   * Returns the system ID for this source.
+   */
+  public String getSystemId();
+
+}
diff --git a/libjava/javax/xml/transform/SourceLocator.java b/libjava/javax/xml/transform/SourceLocator.java
new file mode 100644 (file)
index 0000000..dfeea46
--- /dev/null
+++ b/libjava/javax/xml/transform/SourceLocator.java
@@ -0,0 +1,70 @@
+/* SourceLocator.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+package javax.xml.transform;
+
+/**
+ * The location in an XML resource at which an event occurred.
+ * Tis is equivalent to the SAX Locator.
+ * 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public interface SourceLocator
+{
+
+  /**
+   * Returns the XML public ID for the document.
+   */
+  public String getPublicId();
+
+  /**
+   * Returns the XML system ID for the document.
+   */
+  public String getSystemId();
+
+  /**
+   * Returns the line number at which the event occurred.
+   * @return the line number, or -1 if not available
+   */
+  public int getLineNumber();
+
+  /**
+   * Returns the column number at which the event occurred.
+   * @return the column number, or -1 if not available
+   */
+  public int getColumnNumber();
+
+}
diff --git a/libjava/javax/xml/transform/Templates.java b/libjava/javax/xml/transform/Templates.java
new file mode 100644 (file)
index 0000000..3e9293e
--- /dev/null
+++ b/libjava/javax/xml/transform/Templates.java
@@ -0,0 +1,67 @@
+/* Templates.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.transform;
+
+import java.util.Properties;
+
+/**
+ * A compiled, reusable XSL transformation.
+ * Implementations of this class are guaranteed to be thread safe.
+ * 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public interface Templates
+{
+
+  /**
+   * Creates a new transformer based on this transformation.
+   */
+  public Transformer newTransformer()
+    throws TransformerConfigurationException;
+
+  /**
+   * Returns the static properties for the <code>xsl:output</code>
+   * instruction. Missing properties are defaulted according the
+   * <a href='http://www.w3.org/TR/xslt#output'>XSLT Recommendation, section
+   * 16</a>: <code>getProperty(String)</code> returns all properties
+   * including defaulted ones, and <code>get(Object)</code> returns only the
+   * properties explicitly set in the stylesheet.
+   */
+  public Properties getOutputProperties();
+
+}
diff --git a/libjava/javax/xml/transform/Transformer.java b/libjava/javax/xml/transform/Transformer.java
new file mode 100644 (file)
index 0000000..3bf1e88
--- /dev/null
+++ b/libjava/javax/xml/transform/Transformer.java
@@ -0,0 +1,164 @@
+/* Transformer.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.transform;
+
+import java.util.Properties;
+
+/**
+ * An XSL transformation.
+ * Instances of this class may be reused, but the same instance may not be
+ * used concurrently by different threads.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public abstract class Transformer
+{
+
+  protected Transformer()
+  {
+  }
+
+  /**
+   * Transforms the source XML to a result tree.
+   * @param xmlSource the XML source
+   * @param outputTarget the result of the transformation
+   */
+  public abstract void transform(Source xmlSource, Result outputTarget) 
+    throws TransformerException;
+  
+  /**
+   * Sets a parameter value for the transformation.
+   * Parameters may be referenced in the XSLT stylesheet.
+   * @param name the parameter name (an XML Name, or a namespace-prefixed
+   * XML Name of the form <code>{<i>namespaceURI</i>}<i>localName</i></code>
+   * @param value the value to assign
+   */
+  public abstract void setParameter(String name, Object value);
+
+  /**
+   * Returns the specified parameter value.
+   * @param name the parameter name (an XML Name, or a namespace-prefixed
+   * XML Name of the form <code>{<i>namespaceURI</i>}<i>localName</i></code>
+   */
+  public abstract Object getParameter(String name);
+
+  /**
+   * Clears all parameter values.
+   */
+  public abstract void clearParameters();
+
+  /**
+   * Sets the callback used to resolve entities referenced by
+   * <code>xsl:include</code>, <code>xsl:import</code>, or the XPath
+   * <code>document()</code> function.
+   */
+  public abstract void setURIResolver(URIResolver resolver);
+
+  /**
+   * Returns the callback used to resolve entities referenced by
+   * <code>xsl:include</code>, <code>xsl:import</code>, or the XPath
+   * <code>document()</code> function.
+   */
+  public abstract URIResolver getURIResolver();
+
+  /**
+   * Sets the output properties for the transformation, overriding any
+   * properties defined in the stylesheet.
+   * The format of property keys is as in the
+   * {@link #setOutputProperty(java.lang.String,java.lang.String)} method.
+   * @param oformat a set of output properties, or null to reset all the
+   * properties to their default values
+   */
+  public abstract void setOutputProperties(Properties oformat) 
+    throws IllegalArgumentException;
+
+  /**
+   * Returns a copy of the output properties for the transformation.
+   * Missing properties are defaulted according the
+   * <a href='http://www.w3.org/TR/xslt#output'>XSLT Recommendation, section
+   * 16</a>: <code>getProperty(String)</code> returns all properties
+   * including defaulted ones, and <code>get(Object)</code> returns only the
+   * properties explicitly set in the stylesheet.
+   */
+  public abstract Properties getOutputProperties();
+
+  /**
+   * Sets an output property for the transformation, overriding any property
+   * of the same name defined in the stylesheet.
+   * @param name the property name (an XML Name, or a namespace-prefixed
+   * XML Name of the form <code>{<i>namespaceURI</i>}<i>localName</i></code>
+   * @param value the string value of the property
+   * @exception IllegalArgumentException if the property is not supported
+   */
+  public abstract void setOutputProperty(String name, String value) 
+    throws IllegalArgumentException;
+
+  /**
+   * Returns the value of an output property for the transformation.
+   * Only explicit properties set programmatically or defined in the
+   * stylesheet, not defaulted properties, are returned by this method.
+   * @param name the property name (an XML Name, or a namespace-prefixed
+   * XML Name of the form <code>{<i>namespaceURI</i>}<i>localName</i></code>
+   * @exception IllegalArgumentException if the property is not supported
+   */
+  public abstract String getOutputProperty(String name) 
+    throws IllegalArgumentException;
+
+  /**
+   * Sets the callback used to report errors during the transformation.
+   *  @exception IllegalArgumentException if the listener is null
+   */
+  public abstract void setErrorListener(ErrorListener listener)
+    throws IllegalArgumentException;
+  
+  /**
+   * Returns the callback used to report errors during the transformation.
+   */
+  public abstract ErrorListener getErrorListener();
+
+  // -- JAXP 1.3 methods --
+
+  /**
+   * Reset this Transformer to its original configuration.
+   * @since 1.3
+   */
+  public void reset()
+  {
+  }
+
+}
diff --git a/libjava/javax/xml/transform/TransformerConfigurationException.java b/libjava/javax/xml/transform/TransformerConfigurationException.java
new file mode 100644 (file)
index 0000000..006fc2f
--- /dev/null
+++ b/libjava/javax/xml/transform/TransformerConfigurationException.java
@@ -0,0 +1,103 @@
+/* TransformerConfigurationException.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.transform;
+
+/**
+ * An exception occurred during configuration of the transformer.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class TransformerConfigurationException
+  extends TransformerException
+{
+
+  private SourceLocator locator;
+  
+  /**
+   * Constructor with no detail message.
+   */
+  public TransformerConfigurationException()
+  {
+    this(null, null, null);
+  }
+
+  /**
+   * Constructor with a detail message.
+   */
+  public TransformerConfigurationException(String msg)
+  {
+    this(msg, null, null);
+  }
+
+  /**
+   * Constructor with underlying cause.
+   */
+  public TransformerConfigurationException(Throwable e)
+  {
+    this(e.getMessage(), null, e);
+  }
+
+  /**
+   * Constructor with detail message and underlyinmg cause.
+   */
+  public TransformerConfigurationException(String msg, Throwable e)
+  {
+    this(msg, null, e);
+  }
+
+  /**
+   * Constructor with detail message and locator.
+   */
+  public TransformerConfigurationException(String message,
+                                           SourceLocator locator)
+  {
+    this(message, locator, null);
+  }
+
+  /**
+   * Constructor with detail message, locator and underlying cause.
+   */
+  public TransformerConfigurationException(String message,
+                                           SourceLocator locator,
+                                           Throwable e)
+  {
+    super(message, e);
+    this.locator = locator;
+  }  
+
+}
diff --git a/libjava/javax/xml/transform/TransformerException.java b/libjava/javax/xml/transform/TransformerException.java
new file mode 100644 (file)
index 0000000..c10fa8a
--- /dev/null
+++ b/libjava/javax/xml/transform/TransformerException.java
@@ -0,0 +1,241 @@
+/* TransformerException.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+package javax.xml.transform;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
+/**
+ * An exception occurred during the transformation process.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class TransformerException
+  extends Exception
+{
+
+  private SourceLocator  locator;
+  private Throwable  cause;
+
+  /**
+   * Constructor with a detail message.
+   */
+  public TransformerException(String msg)
+  {
+    this(msg, null, null);
+  }
+
+  /**
+   * Constructor with an underlying cause.
+   */
+  public TransformerException(Throwable cause)
+  {
+    this(cause.getMessage(), null, cause);
+  }
+
+  /**
+   * Constructor with a detail message and underlying cause.
+   */
+  public TransformerException(String msg, Throwable cause)
+  {
+    this(msg, null, cause);
+  }
+
+  /**
+   * Constructor with a detail message and locator.
+   */
+  public TransformerException(String msg, SourceLocator locator)
+  {
+    this(msg, locator, null);
+  }
+
+  /**
+   * Constructor with detail message, locator and underlying cause.
+   */
+  public TransformerException(String msg, SourceLocator locator, 
+                              Throwable cause)
+  {
+    super(msg);
+    this.locator = locator;
+    if (cause != null)
+      {
+        initCause(cause);
+        this.cause = cause;
+      }
+  }
+
+  /**
+   * Returns a locator indicating where the error occurred.
+   */
+  public SourceLocator getLocator()
+  {
+    return locator;
+  }
+
+  /**
+   * Sets the locator indicating where the error occurred.
+   */
+  public void setLocator(SourceLocator location)
+  {
+    locator = location;
+  }
+
+  /**
+   * Returns the underlying cause of this exception.
+   */
+  public Throwable getException()
+  {
+    return cause;
+  }
+
+  /**
+   * Returns the underlying cause of this exception.
+   */
+  public Throwable getCause()
+  {
+    return cause;
+  }
+
+  /**
+   * Initializes the root cause of this exception.
+   * This method may be called only once, and will be called by the
+   * constructor if a non-null cause is specified.
+   * Really phenomenally poor API design.
+   * @param cause the underlying cause
+   * @exception IllegalArgumentException if this exception is passed as the
+   * argument
+   * @exception IllegalStateException if a cause has already been
+   * initialized
+   */
+  public Throwable initCause(Throwable cause)
+  {
+    if (this.cause != null)
+      {
+        throw new IllegalStateException();
+      }
+    if (cause == this)
+      {
+        throw new IllegalArgumentException();
+      }
+    this.cause = cause;
+    return this;
+  }
+
+  /**
+   * Returns the exception message with location information appended.
+   */
+  public String getMessageAndLocation()
+  {
+    return (locator == null) ? getMessage() :
+      getMessage() + ": " + getLocationAsString();
+  }
+
+  /**
+   * Returns the location information as a string.
+   */
+  public String getLocationAsString()
+  {
+    if (locator == null)
+      {
+        return null;
+      }
+    String publicId = locator.getPublicId();
+    String systemId = locator.getSystemId();
+    int lineNumber = locator.getLineNumber();
+    int columnNumber = locator.getColumnNumber();
+    StringBuffer buffer = new StringBuffer ();
+    if (publicId != null)
+      {
+        buffer.append ("publicId=");
+        buffer.append (publicId);
+      }
+    if (systemId != null)
+      {
+        if (buffer.length() > 0)
+          {
+            buffer.append(' ');
+          }
+        buffer.append ("systemId=");
+        buffer.append (systemId);
+      }
+    if (lineNumber != -1)
+      {
+        if (buffer.length() > 0)
+          {
+            buffer.append(' ');
+          }
+        buffer.append ("lineNumber=");
+        buffer.append (lineNumber);
+      }
+    if (columnNumber != -1)
+      {
+        if (buffer.length() > 0)
+          {
+            buffer.append(' ');
+          }
+        buffer.append ("columnNumber=");
+        buffer.append (columnNumber);
+      }
+    return buffer.toString();
+  }
+
+  public void printStackTrace()
+  {
+    printStackTrace(System.out);
+  }
+
+  public void printStackTrace(PrintStream s)
+  {
+    super.printStackTrace(s);
+    if (cause != null)
+      {
+        s.print("caused by ");
+        cause.printStackTrace(s);
+      }
+  }
+
+  public void printStackTrace(PrintWriter s)
+  {
+    super.printStackTrace(s);
+    if (cause != null)
+      {
+        s.print("caused by ");
+        cause.printStackTrace(s);
+      }
+  }
+
+}
diff --git a/libjava/javax/xml/transform/TransformerFactory.java b/libjava/javax/xml/transform/TransformerFactory.java
new file mode 100644 (file)
index 0000000..a1f50fc
--- /dev/null
+++ b/libjava/javax/xml/transform/TransformerFactory.java
@@ -0,0 +1,284 @@
+/* TransformerFactory.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.transform;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.util.Properties;
+
+/**
+ * Factory for obtaining transformation contexts.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public abstract class TransformerFactory
+{
+
+  protected TransformerFactory()
+  {
+  }
+
+  /**
+   * Creates a new factory instance.
+   * The implementation class to load is the first found in the following
+   * locations:
+   * <ol>
+   * <li>the <code>javax.xml.transform.TransformerFactory</code> system
+   * property</li>
+   * <li>the above named property value in the
+   * <code><i>$JAVA_HOME</i>/lib/jaxp.properties</code> file</li>
+   * <li>the class name specified in the
+   * <code>META-INF/services/javax.xml.parsers.DocumentBuilderFactory</code>
+   * system resource</li>
+   * <li>the default factory class</li>
+   * </ol>
+   */
+  public static TransformerFactory newInstance() 
+    throws TransformerFactoryConfigurationError
+  {
+    ClassLoader loader = Thread.currentThread().getContextClassLoader();
+    if (loader == null)
+      {
+        loader = TransformerFactory.class.getClassLoader();
+      }
+    String className = null;
+    int count = 0;
+    do
+      {
+        className = getFactoryClassName(loader, count++);
+        if (className != null)
+          {
+            try
+              {
+                Class t = (loader != null) ? loader.loadClass(className) :
+                  Class.forName(className);
+                return (TransformerFactory) t.newInstance();
+              }
+            catch (ClassNotFoundException e)
+              {
+                className = null;
+              }
+            catch (Exception e)
+              { 
+                throw new TransformerFactoryConfigurationError(e,
+                    "error instantiating class " + className);
+              } 
+          }
+      }
+    while (className == null && count < 3);
+    try
+      {
+        Class t =
+          Class.forName("gnu.xml.transform.TransformerFactoryImpl");
+        return (TransformerFactory) t.newInstance();
+      }
+    catch (Exception e)
+      {
+        throw new TransformerFactoryConfigurationError(e);
+      }
+  }
+  
+  private static String getFactoryClassName(ClassLoader loader, int attempt)
+  {
+    final String propertyName = "javax.xml.transform.TransformerFactory";
+    switch (attempt)
+      {
+        case 0:
+          return System.getProperty(propertyName);
+        case 1:
+          try
+            {
+              File file = new File(System.getProperty("java.home"));
+              file = new File(file, "lib");
+              file = new File(file, "jaxp.properties");
+              InputStream in = new FileInputStream(file);
+              Properties props = new Properties();
+              props.load(in);
+              in.close();
+              return props.getProperty(propertyName);
+            }
+          catch (IOException e)
+            {
+              return null;
+            }
+        case 2: 
+          try
+            {
+              String serviceKey = "/META-INF/services/" + propertyName;
+              InputStream in = (loader != null) ?
+                loader.getResourceAsStream(serviceKey) :
+                TransformerFactory.class.getResourceAsStream(serviceKey);
+              if (in != null)
+                {
+                  BufferedReader r =
+                    new BufferedReader(new InputStreamReader(in));
+                  String ret = r.readLine();
+                  r.close();
+                  return ret;
+                }
+            }
+          catch (IOException e)
+            {
+            }
+          return null;
+        default:
+          return null;
+      }
+  }
+  
+  /**
+   * Creates a new transformer using the specified stylesheet.
+   * @param source the source of an <a href='http://www.w3.org/TR/xslt'>XSLT
+   * stylesheet</a> specifying the transformation to apply
+   */
+  public abstract Transformer newTransformer(Source source) 
+    throws TransformerConfigurationException;
+
+  /**
+   * Creates a new transformer that applies the identity transform.
+   */
+  public abstract Transformer newTransformer() 
+    throws TransformerConfigurationException;
+
+  /**
+   * Creates a new compiled transformation using the specified stylesheet.
+   * @param source the source of an <a href='http://www.w3.org/TR/xslt'>XSLT
+   * stylesheet</a> specifying the transformation to apply
+   */
+  public abstract Templates newTemplates(Source source) 
+    throws TransformerConfigurationException;
+
+  /**
+   * Returns a source object representing the XML resource specified by the
+   * <a href='http://www.w3.org/TR/xml-stylesheet/'>xml-stylesheet</a>
+   * processing instruction and matching the given criteria.
+   * Note that if multiple stylesheets are selected, the source represents a
+   * stylesheet composed of a list of imports.
+   * @param source the source XML document
+   * @param media the media attribute to match, or <code>null</code> to match
+   * the preferred templates
+   * @param title the title attribute to match, or <code>null</code> to match
+   * any
+   * @param charset the charset attribute to match, or <code>null</code> to
+   * match any
+   */
+  public abstract Source getAssociatedStylesheet(Source source, 
+                                                 String media,
+                                                 String title,
+                                                 String charset) 
+    throws TransformerConfigurationException;
+
+  /**
+   * Set the resolver callback to be used by transformers obtained from
+   * this factory.
+   */
+  public abstract void setURIResolver(URIResolver resolver);
+
+  /**
+   * Returns the resolver callback to be used by transformers obtained from
+   * this factory.
+   */
+  public abstract URIResolver getURIResolver();
+
+  /**
+   * Sets a feature of transformers and templates obtained from this
+   * factory.
+   * Feature names are fully qualified URIs, and may depend on the factory
+   * implementation.
+   * @param name the name of the feature
+   * @param value the feature state
+   * @exception TransformerConfigurationException if the feature is
+   * unsupported
+   */
+  public abstract void setFeature(String name, boolean value)
+    throws TransformerConfigurationException;
+
+  /**
+   * Returns the state of a feature in the factory implementation.
+   * Feature names are fully qualified URIs, and may depend on the factory
+   * implementation. JAXP also predefines several features, including the
+   * constants in {@link javax.xml.XMLConstants} and
+   * <ul>
+   * <li>{@link javax.xml.transform.dom.DOMSource#FEATURE}</li>
+   * <li>{@link javax.xml.transform.dom.DOMResult#FEATURE}</li>
+   * <li>{@link javax.xml.transform.sax.SAXSource#FEATURE}</li>
+   * <li>{@link javax.xml.transform.sax.SAXResult#FEATURE}</li>
+   * <li>{@link javax.xml.transform.sax.SAXTransformerFactory#FEATURE}</li>
+   * <li>{@link javax.xml.transform.sax.SAXTransformerFactory#FEATURE_XMLFILTER}</li>
+   * <li>{@link javax.xml.transform.stream.StreamSource#FEATURE}</li>
+   * <li>{@link javax.xml.transform.stream.StreamResult#FEATURE}</li>
+   * </ul>
+   * The latter expose various capabilities of the factory implementation.
+   */
+  public abstract boolean getFeature(String name);
+
+  /**
+   * Set a named attribute on the underlying implementation.
+   * @param name the attribute name
+   * @param value the value to assign
+   * @exception IllegalArgumentException if the attribute is not supported
+   */
+  public abstract void setAttribute(String name, Object value)
+    throws IllegalArgumentException;
+
+  /**
+   * Retrieve the specified named attribute value.
+   * @param name the attribute name
+   * @exception IllegalArgumentException if the attribute is not supported
+   */
+  public abstract Object getAttribute(String name) 
+    throws IllegalArgumentException;
+
+  /**
+   * Sets the callback to be used by transformers obtained from this factory
+   * to report transformation errors.
+   */
+  public abstract void setErrorListener(ErrorListener listener) 
+    throws IllegalArgumentException;
+
+  /**
+   * Returns the callback to be used by transformers obtained from this
+   * factory to report transformation errors.
+   */
+  public abstract ErrorListener getErrorListener();
+
+}
diff --git a/libjava/javax/xml/transform/TransformerFactoryConfigurationError.java b/libjava/javax/xml/transform/TransformerFactoryConfigurationError.java
new file mode 100644 (file)
index 0000000..3ec8809
--- /dev/null
+++ b/libjava/javax/xml/transform/TransformerFactoryConfigurationError.java
@@ -0,0 +1,104 @@
+/* TransformerFactoryConfigurationError.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+package javax.xml.transform;
+
+/**
+ * An error occurred during configuration of the transformer factory.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class TransformerFactoryConfigurationError
+  extends Error
+{
+  
+  private final Exception  exception;
+
+  /**
+   * Constructor with no detail message.
+   */
+  public TransformerFactoryConfigurationError()
+  {
+    this(null, null);
+  }
+
+  /**
+   * Constructor with a detail message.
+   */
+  public TransformerFactoryConfigurationError(String msg)
+  {
+    this(null, msg);
+  }
+
+  /**
+   * Constructor with an underlying cause.
+   */
+  public TransformerFactoryConfigurationError(Exception e)
+  {
+    this(e, null);
+  }
+
+  /**
+   * Constructor with an underlying cause and detail message.
+   */
+  public TransformerFactoryConfigurationError(Exception e, String msg)
+  {
+    super(msg);
+    exception = e;
+  }
+
+  /**
+   * Returns the detail message.
+   */
+  public String getMessage()
+  {
+    String message = super.getMessage();
+    if (message == null && exception != null)
+      {
+        message = exception.getMessage();
+      }
+    return message;
+  }
+
+  /**
+   * Returns the underlying cause.
+   */
+  public Exception getException()
+  {
+    return exception;
+  }
+  
+}
diff --git a/libjava/javax/xml/transform/URIResolver.java b/libjava/javax/xml/transform/URIResolver.java
new file mode 100644 (file)
index 0000000..7dca029
--- /dev/null
+++ b/libjava/javax/xml/transform/URIResolver.java
@@ -0,0 +1,58 @@
+/* URIResolver.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+package javax.xml.transform;
+
+/**
+ * Callback that can resolve a URI into source XML for transformation.
+ * Equivalent to the SAX EntityResolver.
+ * 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public interface URIResolver
+{
+
+  /**
+   * Resolves an <code>xsl:include</code>, <code>xsl:import</code>, or
+   * XPath <code>document()</code> function.
+   * @param href the URI to resolve (relative or absolute)
+   * @param base the base URI relative to which the URI is to be resolved
+   * @return a source, or null if the resource could not be found
+   */
+  public Source resolve(String href, String base)
+    throws TransformerException;
+
+}
diff --git a/libjava/javax/xml/transform/dom/DOMLocator.java b/libjava/javax/xml/transform/dom/DOMLocator.java
new file mode 100644 (file)
index 0000000..7e0f830
--- /dev/null
+++ b/libjava/javax/xml/transform/dom/DOMLocator.java
@@ -0,0 +1,57 @@
+/* DOMLocator.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.transform.dom;
+
+import javax.xml.transform.SourceLocator;
+import org.w3c.dom.Node;
+
+/**
+ * Locator for reporting a location in a W3C DOM object graph.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public interface DOMLocator
+  extends SourceLocator
+{
+
+  /**
+   * Returns the node on which the event originated.
+   */
+  public Node getOriginatingNode();
+
+}
diff --git a/libjava/javax/xml/transform/dom/DOMResult.java b/libjava/javax/xml/transform/dom/DOMResult.java
new file mode 100644 (file)
index 0000000..e62e30b
--- /dev/null
+++ b/libjava/javax/xml/transform/dom/DOMResult.java
@@ -0,0 +1,163 @@
+/* DOMResult.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.transform.dom;
+
+import javax.xml.transform.Result;
+import org.w3c.dom.Node;
+
+/**
+ * Output result specified as a W3C DOM object graph.
+ * The result tree may be appended to an existing tree.
+ * If no target node is specified, the result tree will be made available by
+ * the {@link #getNode} method after the transformation.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DOMResult
+  implements Result
+{
+
+  /**
+   * Factory feature indicating that DOM results are supported.
+   */
+  public static final String FEATURE =
+    "http://javax.xml.transform.dom.DOMResult/feature";
+
+  private Node node;
+  private Node nextSibling;
+  private String systemId;
+
+  /**
+   * Default constructor.
+   */
+  public DOMResult()
+  {
+    this(null, null, null);
+  }
+
+  /**
+   * Constructor with the node to append to.
+   */
+  public DOMResult(Node node)
+  {
+    this(node, null, null);
+  }
+
+  /**
+   * Constructor with the node to append to and the child node before which
+   * the result should be appended.
+   * @since 1.3
+   */
+  public DOMResult(Node node, Node nextSibling)
+  {
+    this(node, nextSibling, null);
+  }
+  
+  /**
+   * Constructor with the node to append to and the system ID.
+   */
+  public DOMResult(Node node, String systemID)
+  {
+    this(node, null, systemID);
+  }
+  
+  /**
+   * Constructor with the node to append to, the child node before which
+   * the result should be appended, and the system ID.
+   * @since 1.3
+   */
+  public DOMResult(Node node, Node nextSibling, String systemID)
+  {
+    this.node = node;
+    this.nextSibling = nextSibling;
+    this.systemId = systemID;
+  }
+
+  /**
+   * Sets the node to which the result tree will be appended.
+   * @param node the node
+   */
+  public void setNode(Node node)
+  {
+    this.node = node;
+  }
+
+  /**
+   * Returns the node to which the result tree is to be appended,
+   * or the result tree after transformation if no node was previously set.
+   */
+  public Node getNode()
+  {
+    return node;
+  }
+
+  /**
+   * Sets the child node before which the result nodes will be inserted.
+   * @since 1.3
+   */
+  public void setNextSibling(Node nextSibling)
+  {
+    this.nextSibling = nextSibling;
+  }
+
+  /**
+   * Returns the child node before which the result nodes will be inserted.
+   * @since 1.3
+   */
+  public Node getNextSibling()
+  {
+    return nextSibling;
+  }
+
+  /**
+   * Sets the system ID used to resolve external entities.
+   */
+  public void setSystemId(String systemId)
+  {
+    this.systemId = systemId;
+  }
+
+  /**
+   * Returns the system ID used to resolve external entities.
+   */
+  public String getSystemId()
+  {
+    return systemId;
+  }
+
+}
diff --git a/libjava/javax/xml/transform/dom/DOMSource.java b/libjava/javax/xml/transform/dom/DOMSource.java
new file mode 100644 (file)
index 0000000..e002dbf
--- /dev/null
+++ b/libjava/javax/xml/transform/dom/DOMSource.java
@@ -0,0 +1,118 @@
+/* DOMSource.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.transform.dom;
+
+import javax.xml.transform.Source;
+import org.w3c.dom.Node;
+
+/**
+ * An XML source specified as a W3C DOM node context.
+ * 
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class DOMSource
+  implements Source
+{
+
+  /**
+   * Factory feature indicating that DOM sources are supported.
+   */
+  public static final String FEATURE =
+    "http://javax.xml.transform.dom.DOMSource/feature";
+
+  private Node node;
+  private String systemId;
+
+  /**
+   * Default constructor.
+   */
+  public DOMSource()
+  {
+    this(null, null);
+  }
+
+  /**
+   * Constructor with a context node.
+   */
+  public DOMSource(Node node)
+  {
+    this(node, null);
+  }
+
+  /**
+   * Constructor with a context node and system ID.
+   */
+  public DOMSource(Node node, String systemId)
+  {
+    this.node = node;
+    this.systemId = systemId;
+  }
+
+  /**
+   * Sets the context node.
+   */
+  public void setNode(Node node)
+  {
+    this.node = node;
+  }
+
+  /**
+   * Returns the context node.
+   */
+  public Node getNode()
+  {
+    return node;
+  }
+
+  /**
+   * Sets the base URI to use as the context for resolving entities.
+   */
+  public void setSystemId(String systemId)
+  {
+    this.systemId = systemId;
+  }
+
+  /**
+   * Returns the base URI to use as the context for resolving entities.
+   */
+  public String getSystemId()
+  {
+    return systemId;
+  }
+
+}
diff --git a/libjava/javax/xml/transform/dom/package.html b/libjava/javax/xml/transform/dom/package.html
new file mode 100644 (file)
index 0000000..0600fc7
--- /dev/null
+++ b/libjava/javax/xml/transform/dom/package.html
@@ -0,0 +1,5 @@
+<html><head>trax for dom</head><body>
+
+<p>Support for DOM inputs and outputs to transformers.
+
+</body></html>
diff --git a/libjava/javax/xml/transform/package.html b/libjava/javax/xml/transform/package.html
new file mode 100644 (file)
index 0000000..bc67c2b
--- /dev/null
+++ b/libjava/javax/xml/transform/package.html
@@ -0,0 +1,38 @@
+<html><head>trax </head><body>
+
+<p>Base "TRAX" API for XSLT transformers.
+This API borrows many structural notions from SAX,
+such as the way error handling and external entity
+resolution are handled, although it does not reuse
+the corresponding SAX classes.
+To use XSLT transformers: <ul>
+
+<li>Start with <em>TransformerFactory.newInstance()</em>;
+
+<li>Then you may wish to configure that factory through
+its features and properties.  This includes modifying
+the way errors are handled and URIs are resolved.
+
+<li>Then you have several options for how to perform
+the XSLT transformations.  One generic option is to ask the
+factory for a <a href="Transformer.html">Transformer</a>
+and then use <em>Transformer.transform()</em> to pull
+input text onto output text.
+
+<li>Alternatively, most factories support flexible integration
+with SAX event streams.  You can cast such factories to a
+<a href="sax/SAXTransformerFactory.html">SAXTransformerFactory</a>
+and perform either push or pull mode transformations.
+
+</ul>
+
+<p>The <a href="OutputKeys.html">OutputKeys</a> class
+holds constants that can be used to configure output
+properties used with <em>Result</em> objects, as if
+they were specified in <em>xslt:output</em> attributes
+in the stylesheet specifying the transform.
+
+<p>The <a href="Templates.html">Templates</a> class
+accomodates the notion of "compiled" transforms.
+
+</body></html>
diff --git a/libjava/javax/xml/transform/sax/SAXResult.java b/libjava/javax/xml/transform/sax/SAXResult.java
new file mode 100644 (file)
index 0000000..d9bf9a5
--- /dev/null
+++ b/libjava/javax/xml/transform/sax/SAXResult.java
@@ -0,0 +1,132 @@
+/* SAXResult.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.transform.sax;
+
+import javax.xml.transform.Result;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.ext.LexicalHandler;
+
+/**
+ * Specifies SAX handlers to be used as a result sink during a
+ * transformation.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class SAXResult implements Result
+{
+  
+  /**
+   * Factory feature indicating that SAX results are supported.
+   */
+  public static final String FEATURE =
+    "http://javax.xml.transform.sax.SAXResult/feature";
+
+  private ContentHandler handler;
+  private LexicalHandler lexicalHandler;
+  private String systemId;
+
+  /**
+   * Default constructor.
+   */
+  public SAXResult()
+  {
+  }
+
+  /**
+   * Constructor specifying a content handler.
+   */
+  public SAXResult(ContentHandler handler)
+  {
+    this.handler = handler;
+  }
+
+  /**
+   * Sets the content handler to which result document events will be
+   * propagated.
+   */
+  public void setHandler(ContentHandler handler)
+  {
+    this.handler = handler;
+  }
+
+  /**
+   * Returns the content handler to which result document events will be
+   * propagated.
+   */
+  public ContentHandler getHandler()
+  {
+    return handler;
+  }
+
+  /**
+   * Sets the lexical handler to which lexical events will be propagated.
+   * If a lexical handler is not set, the transformer should attempt to cast
+   * the content handler to a lexical handler.
+   */
+  public void setLexicalHandler(LexicalHandler handler)
+  {
+    lexicalHandler = handler;
+  }
+  
+  /**
+   * Returns the lexical handler to which lexical events will be propagated.
+   * If a lexical handler is not set, the transformer should attempt to cast
+   * the content handler to a lexical handler.
+   */
+  public LexicalHandler getLexicalHandler()
+  {
+    return lexicalHandler;
+  }
+
+  /**
+   * Sets the system ID which this result represents.
+   */
+  public void setSystemId(String systemId)
+  {
+    this.systemId = systemId;
+  }
+
+  /**
+   * Returns the system ID which this result represnts.
+   */
+  public String getSystemId()
+  {
+    return systemId;
+  }
+
+}
diff --git a/libjava/javax/xml/transform/sax/SAXSource.java b/libjava/javax/xml/transform/sax/SAXSource.java
new file mode 100644 (file)
index 0000000..15df252
--- /dev/null
+++ b/libjava/javax/xml/transform/sax/SAXSource.java
@@ -0,0 +1,197 @@
+/* SAXSource.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.transform.sax;
+
+import java.io.InputStream;
+import java.io.Reader;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+
+/**
+ * Specifies a SAX XML source. This is a tuple of input source and SAX
+ * parser.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class SAXSource
+  implements Source
+{
+
+  /**
+   * Factory feature indicating that SAX sources are supported.
+   */
+  public static final String FEATURE =
+    "http://javax.xml.transform.sax.SAXSource/feature";
+
+  private XMLReader  xmlReader;
+  private InputSource  inputSource;
+
+  /**
+   * Default constructor.
+   */
+  public SAXSource()
+  {
+  }
+
+  /**
+   * Constructor with a SAX parser and input source.
+   */
+  public SAXSource(XMLReader reader, InputSource inputSource)
+  {
+    xmlReader = reader;
+    this.inputSource = inputSource;
+  }
+
+  /**
+   * Constructor with an input source.
+   * The SAX parser will be instantiated by the transformer.
+   */
+  public SAXSource(InputSource inputSource)
+  {
+    this.inputSource = inputSource;
+  }
+
+  /**
+   * Sets the SAX parser to be used by this source.
+   * If null, the transformer will instantiate its own parser.
+   */
+  public void setXMLReader(XMLReader reader)
+  {
+    xmlReader = reader;
+  }
+
+  /**
+   * Returns the SAX parser to be used by this source.
+   * If null, the transformer will instantiate its own parser.
+   */
+  public XMLReader getXMLReader()
+  {
+    return xmlReader;
+  }
+
+  /**
+   * Sets the input source to parse.
+   */
+  public void setInputSource(InputSource inputSource)
+  {
+    this.inputSource = inputSource;
+  }
+
+  /**
+   * Returns the input source to parse.
+   */
+  public InputSource getInputSource()
+  {
+    return inputSource;
+  }
+
+  /**
+   * Sets the system ID for this source.
+   */
+  public void setSystemId(String systemId)
+  {
+    if (inputSource != null)
+      {
+        inputSource.setSystemId(systemId);
+      }
+  }
+
+  /**
+   * Returns the system ID for this source.
+   */
+  public String getSystemId()
+  {
+    if (inputSource != null)
+      {
+        return inputSource.getSystemId();
+      }
+    return null;
+  }
+
+  /**
+   * Converts a source into a SAX input source.
+   * This method can use a StreamSource or the system ID.
+   * @return an input source or null
+   */
+  public static InputSource sourceToInputSource(Source source)
+  {
+    InputSource in = null;
+    if (source instanceof SAXSource)
+      {
+        in = ((SAXSource) source).getInputSource();
+      }
+    else if (source instanceof StreamSource)
+      {
+        StreamSource streamSource = (StreamSource) source;
+        InputStream inputStream = streamSource.getInputStream();
+        if (inputStream != null)
+          {
+            in = new InputSource(inputStream);
+          }
+        else
+          {
+            Reader reader = streamSource.getReader();
+            if (reader != null)
+              {
+                in = new InputSource(reader);
+              }
+          }
+        String publicId = streamSource.getPublicId();
+        if (publicId != null && in != null)
+          {
+            in.setPublicId(publicId);
+          }
+      }
+    String systemId = source.getSystemId();
+    if (systemId != null)
+      {
+        if (in == null)
+          {
+            in = new InputSource(systemId);
+          }
+        else
+          {
+            in.setSystemId(systemId);
+          }
+      }
+    return in;
+  }
+
+}
diff --git a/libjava/javax/xml/transform/sax/SAXTransformerFactory.java b/libjava/javax/xml/transform/sax/SAXTransformerFactory.java
new file mode 100644 (file)
index 0000000..66d5197
--- /dev/null
+++ b/libjava/javax/xml/transform/sax/SAXTransformerFactory.java
@@ -0,0 +1,118 @@
+/* SAXTransformerFactory.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.transform.sax;
+
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLFilter;
+
+/**
+ * Specialized transformer factory with support for SAX-specific factory
+ * methods.
+ * This factory provides SAX content handlers that can create transformation
+ * templates and transformers.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public abstract class SAXTransformerFactory extends TransformerFactory
+{
+
+  /**
+   * Factory feature indicating that the factory can be cast to this class.
+   */
+  public static final String FEATURE =
+    "http://javax.xml.transform.sax.SAXTransformerFactory/feature";
+
+  /**
+   * Factory feature indicating that this factory can create new XMLFilters.
+   */
+  public static final String FEATURE_XMLFILTER =
+    "http://javax.xml.transform.sax.SAXTransformerFactory/feature/xmlfilter";
+
+  protected SAXTransformerFactory()
+  {
+  }
+
+  /**
+   * Returns a content handler that can process SAX events into a result,
+   * using the specified transformation.
+   * @param src the source stylesheet
+   */
+  public abstract TransformerHandler newTransformerHandler(Source src)
+    throws TransformerConfigurationException;
+
+  /**
+   * Returns a content handler that can process SAX events into a result,
+   * using the specified transformation.
+   * @param templates the compiled stylesheet
+   */
+  public abstract TransformerHandler newTransformerHandler(Templates templates)
+    throws TransformerConfigurationException;
+
+  /**
+   * Returns a content handler that can process SAX events into a result,
+   * using the identity transform.
+   */
+  public abstract TransformerHandler newTransformerHandler()
+    throws TransformerConfigurationException;
+
+  /**
+   * Returns a content handler that can process SAX events into a
+   * transformation template.
+   */
+  public abstract TemplatesHandler newTemplatesHandler()
+    throws TransformerConfigurationException;
+
+  /**
+   * Creates an XML filter for the specified source.
+   */
+  public abstract XMLFilter newXMLFilter(Source src)
+    throws TransformerConfigurationException;
+
+  /**
+   * Creates an XML filter for the specified compiled stylesheet.
+   */
+  public abstract XMLFilter newXMLFilter(Templates templates)
+    throws TransformerConfigurationException;
+
+}
diff --git a/libjava/javax/xml/transform/sax/TemplatesHandler.java b/libjava/javax/xml/transform/sax/TemplatesHandler.java
new file mode 100644 (file)
index 0000000..8ee840d
--- /dev/null
+++ b/libjava/javax/xml/transform/sax/TemplatesHandler.java
@@ -0,0 +1,68 @@
+/* TemplatesHandler.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.transform.sax;
+
+import javax.xml.transform.Templates;
+import org.xml.sax.ContentHandler;
+
+/**
+ * A content handler that processes SAX parse events into a compiled
+ * transformation template.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public interface TemplatesHandler
+  extends ContentHandler
+{
+
+  /**
+   * Returns the templates object created by the parsing of the SAX events.
+   */
+  public Templates getTemplates();
+
+  /**
+   * Sets the system ID for the templates object created by this processor.
+   */
+  public void setSystemId(String systemId);
+
+  /**
+   * Returns the system ID for the templates object created by this processor.
+   */
+  public String getSystemId();
+
+}
diff --git a/libjava/javax/xml/transform/sax/TransformerHandler.java b/libjava/javax/xml/transform/sax/TransformerHandler.java
new file mode 100644 (file)
index 0000000..0b2b1bd
--- /dev/null
+++ b/libjava/javax/xml/transform/sax/TransformerHandler.java
@@ -0,0 +1,78 @@
+/* TransformerHandler.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.transform.sax;
+
+import javax.xml.transform.Result;
+import javax.xml.transform.Transformer;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.ext.LexicalHandler;
+
+/**
+ * A content handler that transforms SAX events into a result tree.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public interface TransformerHandler
+  extends ContentHandler, LexicalHandler, DTDHandler
+{
+  
+  /**
+   * Sets the result sink to be used as the output of the transformation.
+   * @exception IllegalArgumentException if the result is not a valid target
+   */
+  public void setResult(Result result) 
+    throws IllegalArgumentException;
+
+  /**
+   * Sets the system ID relative to which URLs will be resolved.
+   */
+  public void setSystemId(String systemID);
+
+  /**
+   * Returns the system ID relative to which URLs will be resolved.
+   */
+  public String getSystemId();
+
+  /**
+   * Returns the transformer associated with this handler in order to set
+   * parameters and output properties.
+   */
+  public Transformer getTransformer();
+
+}
diff --git a/libjava/javax/xml/transform/sax/package.html b/libjava/javax/xml/transform/sax/package.html
new file mode 100644 (file)
index 0000000..b2d2978
--- /dev/null
+++ b/libjava/javax/xml/transform/sax/package.html
@@ -0,0 +1,9 @@
+<html><head>trax for sax</head><body>
+
+<p>Support for SAX2-based XSLT transformers.
+Normally you would cast a TransformerFactory to a
+<a href="SAXTransformerFactory.html">SAXTransformerFactory</a>
+and use that to in any of the various modes supported
+(such as push or pull).
+
+</body></html>
diff --git a/libjava/javax/xml/transform/stream/StreamResult.java b/libjava/javax/xml/transform/stream/StreamResult.java
new file mode 100644 (file)
index 0000000..fe4462d
--- /dev/null
+++ b/libjava/javax/xml/transform/stream/StreamResult.java
@@ -0,0 +1,173 @@
+/* StreamResult.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.transform.stream;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+import javax.xml.transform.Result;
+
+/**
+ * Specifies a stream to which to write the transformation result.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class StreamResult
+  implements Result
+{
+
+  /**
+   * Factory feature indicating that stream results are supported.
+   */
+  public static final String FEATURE =
+    "http://javax.xml.transform.stream.StreamResult/feature";
+
+  private String systemId;
+  private OutputStream outputStream;
+  private Writer writer;
+
+  /**
+   * Default constructor.
+   */
+  public StreamResult()
+  {
+  }
+
+  /**
+   * Constructor with an output stream.
+   */
+  public StreamResult(OutputStream stream)
+  {
+    this.outputStream = stream;
+  }
+
+  /**
+   * Constructor with a writer.
+   * Prefer to use an output stream rather than a writer, so that the
+   * output encoding can be controlled by transformation properties.
+   */
+  public StreamResult(Writer writer)
+  {
+    this.writer = writer;
+  }
+
+  /**
+   * Constructor with a system ID.
+   */
+  public StreamResult(String systemID)
+  {
+    this.systemId = systemID;
+  }
+
+  /**
+   * Constructor with a system ID specified as a File object.
+   */
+  public StreamResult(File file)
+  {
+    setSystemId(file);
+  }
+
+  /**
+   * Sets the target output stream.
+   */
+  public void setOutputStream(OutputStream outputStream)
+  {
+    this.outputStream = outputStream;
+  }
+
+  /**
+   * Returns the target output stream.
+   */
+  public OutputStream getOutputStream()
+  {
+    return outputStream;
+  }
+
+  /**
+   * Sets the target writer.
+   * Prefer to use an output stream rather than a writer, so that the
+   * output encoding can be controlled by transformation properties.
+   */
+  public void setWriter(Writer writer)
+  {
+    this.writer = writer;
+  }
+
+  /**
+   * Returns the target writer.
+   */
+  public Writer getWriter()
+  {
+    return writer;
+  }
+
+  /**
+   * Sets the system ID.
+   * If neither the out stream nor the writer have been specified, the
+   * system ID will be treated as a URL for writing to.
+   */
+  public void setSystemId(String systemID)
+  {
+    this.systemId = systemID;
+  }
+
+  /**
+   * Sets the system ID from a File reference.
+   */
+  public void setSystemId(File f)
+  {
+    try
+      {
+        systemId = f.toURL().toString();
+      }
+    catch (IOException e)
+      {
+        throw new RuntimeException(e.getMessage(), e);
+      }
+  }
+
+  /**
+   * Returns the system ID.
+   */
+  public String getSystemId()
+  {
+    return systemId;
+  }
+
+}
diff --git a/libjava/javax/xml/transform/stream/StreamSource.java b/libjava/javax/xml/transform/stream/StreamSource.java
new file mode 100644 (file)
index 0000000..d65dcaf
--- /dev/null
+++ b/libjava/javax/xml/transform/stream/StreamSource.java
@@ -0,0 +1,210 @@
+/* StreamSource.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.transform.stream;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.Reader;
+import javax.xml.transform.Source;
+
+/**
+ * Specifies a stream from which to read the source XML data.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ */
+public class StreamSource
+  implements Source
+{
+
+  /**
+   * Factory feature indicating that stream sources are supported.
+   */
+  public static final String FEATURE =
+    "http://javax.xml.transform.stream.StreamSource/feature";
+
+  private String publicId;
+  private String systemId;
+  private InputStream inputStream;
+  private Reader reader;
+
+  /**
+   * Default constructor.
+   */
+  public StreamSource()
+  {
+  }
+
+  /**
+   * Constructor with an input stream.
+   */
+  public StreamSource(InputStream stream)
+  {
+    this.inputStream = stream;
+  }
+
+  /**
+   * Constructor with an input stream and system ID.
+   */
+  public StreamSource(InputStream stream, String systemId)
+  {
+    this.inputStream = stream;
+    this.systemId = systemId;
+  }
+
+  /**
+   * Constructor with a reader.
+   * Prefer an input stream to a reader, so that the parser can use the
+   * character encoding specified in the XML.
+   */
+  public StreamSource(Reader reader)
+  {
+    this.reader = reader;
+  }
+
+  /**
+   * Constructor with a reader and system ID.
+   * Prefer an input stream to a reader, so that the parser can use the
+   * character encoding specified in the XML.
+   */
+  public StreamSource(Reader reader, String systemId)
+  {
+    this.reader = reader;
+    this.systemId = systemId;
+  }
+
+  /**
+   * Constructor with a system ID.
+   */
+  public StreamSource(String systemId)
+  {
+    this.systemId = systemId;
+  }
+
+  /**
+   * Constructor with a system ID specified as a File reference.
+   */
+  public StreamSource(File file)
+  {
+    setSystemId(file);
+  }
+
+  /**
+   * Sets the source input stream.
+   */
+  public void setInputStream(InputStream stream)
+  {
+    this.inputStream = stream;
+  }
+
+  /**
+   * Returns the source input stream.
+   */
+  public InputStream getInputStream()
+  {
+    return inputStream;
+  }
+
+  /**
+   * Sets the source reader.
+   * Prefer an input stream to a reader, so that the parser can use the
+   * character encoding specified in the XML.
+   */
+  public void setReader(Reader reader)
+  {
+    this.reader = reader;
+  }
+
+  /**
+   * Returns the source reader.
+   */
+  public Reader getReader()
+  {
+    return reader;
+  }
+
+  /**
+   * Sets the public ID for this source.
+   */
+  public void setPublicId(String publicId)
+  {
+    this.publicId = publicId;
+  }
+
+  /**
+   * Returns the public ID for this source.
+   */
+  public String getPublicId()
+  {
+    return publicId;
+  }
+
+  /**
+   * Sets the system ID for this source.
+   * If the input stream and reader are absent, the system ID will be used
+   * as a readable URL to locate the source data.
+   */
+  public void setSystemId(String systemId)
+  {
+    this.systemId = systemId;
+  }
+
+  /**
+   * Returns the system ID for this source.
+   */
+  public String getSystemId()
+  {
+    return systemId;
+  }
+
+  /**
+   * Sets the system ID using a File reference.
+   */
+  public void setSystemId(File f)
+  {
+    try
+      {
+        this.systemId = f.toURL().toString();
+      }
+    catch (IOException e)
+      {
+        throw new RuntimeException(e.getMessage(), e);
+      }
+  }
+
+}
diff --git a/libjava/javax/xml/transform/stream/package.html b/libjava/javax/xml/transform/stream/package.html
new file mode 100644 (file)
index 0000000..f9d052b
--- /dev/null
+++ b/libjava/javax/xml/transform/stream/package.html
@@ -0,0 +1,6 @@
+<html><head>trax for streams</head><body>
+
+<p>Support for text stream inputs and outputs to transformers.
+
+</body></html>
+
diff --git a/libjava/javax/xml/validation/Schema.java b/libjava/javax/xml/validation/Schema.java
new file mode 100644 (file)
index 0000000..099a77e
--- /dev/null
+++ b/libjava/javax/xml/validation/Schema.java
@@ -0,0 +1,61 @@
+/* Schema.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.validation;
+
+/**
+ * An immutable grammar.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public abstract class Schema
+{
+
+  protected Schema()
+  {
+  }
+
+  /**
+   * Returns a new validator that can check the set of constraints this
+   * schema represents.
+   */
+  public abstract Validator newValidator();
+
+  public abstract ValidatorHandler newValidatorHandler();
+  
+}
diff --git a/libjava/javax/xml/validation/SchemaFactory.java b/libjava/javax/xml/validation/SchemaFactory.java
new file mode 100644 (file)
index 0000000..4310cc5
--- /dev/null
+++ b/libjava/javax/xml/validation/SchemaFactory.java
@@ -0,0 +1,168 @@
+/* SchemaFactory.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.validation;
+
+import java.io.File;
+import java.net.URL;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+import org.w3c.dom.ls.LSResourceResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+
+/**
+ * Factory for obtaining schemata.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public abstract class SchemaFactory
+{
+
+  ErrorHandler errorHandler;
+
+  protected SchemaFactory()
+  {
+  }
+
+  /**
+   * Returns an implementation of <code>SchemaFactory</code> that supports
+   * the specified schema language.
+   * @param schemaLanguage the URI of a schema language (see
+   * <code>XMLConstants</code>)
+   */
+  public static final SchemaFactory newInstance(String schemaLanguage)
+  {
+    // TODO
+    throw new IllegalArgumentException(schemaLanguage);
+  }
+
+  /**
+   * Indicates whether the specified schema language is supported.
+   * @param schemaLanguage the URI of a schema language (see
+   * <code>XMLConstants</code>)
+   */
+  public abstract boolean isSchemaLanguageSupported(String schemaLanguage);
+
+  public boolean getFeature(String name)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+  {
+    throw new SAXNotRecognizedException(name);
+  }
+  
+  public void setFeature(String name, boolean value)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+  {
+    throw new SAXNotRecognizedException(name);
+  }
+  
+  public Object getProperty(String name)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+  {
+    throw new SAXNotRecognizedException(name);
+  }
+  
+  public void setProperty(String name, Object value)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+  {
+    throw new SAXNotRecognizedException(name);
+  }
+  
+  public ErrorHandler getErrorHandler()
+  {
+    return errorHandler;
+  }
+  
+  public void setErrorHandler(ErrorHandler errorHandler)
+  {
+    this.errorHandler = errorHandler;
+  }
+
+  public abstract LSResourceResolver getResourceResolver();
+
+  public abstract void setResourceResolver(LSResourceResolver resourceResolver);
+  
+  /**
+   * Returns a schema based on the specified source resource.
+   * @param schema the source resource
+   */
+  public Schema newSchema(Source schema)
+    throws SAXException
+  {
+    return newSchema(new Source[] { schema });
+  }
+
+  /**
+   * Returns a schema based on the specified source file.
+   * @param schema the source resource
+   */
+  public Schema newSchema(File schema)
+    throws SAXException
+  {
+    return newSchema(new StreamSource(schema));
+  }
+  
+  /**
+   * Returns a schema based on the specified URL.
+   * @param schema the source resource
+   */
+  public Schema newSchema(URL schema)
+    throws SAXException
+  {
+    return newSchema(new StreamSource(schema.toString()));
+  }
+  
+  /**
+   * Parses the specified sources, and combine them into a single schema.
+   * The exact procedure and semantics of this depends on the schema
+   * language.
+   * @param schemata the schema resources to load
+   */
+  public abstract Schema newSchema(Source[] schemata)
+    throws SAXException;
+  
+  /**
+   * Creates a special schema.
+   * The exact semantics of this depends on the schema language.
+   */
+  public abstract Schema newSchema()
+    throws SAXException;
+  
+}
diff --git a/libjava/javax/xml/validation/TypeInfoProvider.java b/libjava/javax/xml/validation/TypeInfoProvider.java
new file mode 100644 (file)
index 0000000..bec632c
--- /dev/null
+++ b/libjava/javax/xml/validation/TypeInfoProvider.java
@@ -0,0 +1,83 @@
+/* TypeInfoProvider.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.validation;
+
+import org.w3c.dom.TypeInfo;
+
+/**
+ * Provides access to the PSVI type info supplied by
+ * <code>ValidatorHandler</code>.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public abstract class TypeInfoProvider
+{
+
+  protected TypeInfoProvider()
+  {
+  }
+
+  /**
+   * Returns the type information for the current element.
+   */
+  public abstract TypeInfo getElementTypeInfo();
+
+  /**
+   * Returns the type information for the specified attribute of the current
+   * element.
+   * @param index the attribute index as for the Attributes object passed to
+   * the startElement callback
+   */
+  public abstract TypeInfo getAttributeTypeInfo(int index);
+
+  /**
+   * Indicates if the attribute at the specified index is of the ID type.
+   * @param index the attribute index as for the Attributes object passed to
+   * the startElement callback
+   */
+  public abstract boolean isIdAttribute(int index);
+
+  /**
+   * Returns false if the attribute was defaulted (added by the validator).
+   * @param index the attribute index as for the Attributes object passed to
+   * the startElement callback
+   */
+  public abstract boolean isSpecified(int index);
+  
+}
diff --git a/libjava/javax/xml/validation/Validator.java b/libjava/javax/xml/validation/Validator.java
new file mode 100644 (file)
index 0000000..291bcbd
--- /dev/null
+++ b/libjava/javax/xml/validation/Validator.java
@@ -0,0 +1,117 @@
+/* Validator.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.validation;
+
+import java.io.IOException;
+import javax.xml.transform.Source;
+import javax.xml.transform.Result;
+import org.w3c.dom.ls.LSResourceResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+
+/**
+ * A processor that validates a document against a schema.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public abstract class Validator
+{
+
+  protected Validator()
+  {
+  }
+
+  /**
+   * Reset this validator to its original state.
+   */
+  public abstract void reset();
+
+  /**
+   * Validate the specified input.
+   * @param source the document to validate
+   */
+  public void validate(Source source)
+    throws SAXException, IOException
+  {
+    validate(source, null);
+  }
+
+  /**
+   * Validate the specified input.
+   * @param source the document to validate
+   * @param result the PSVI document to output
+   */
+  public abstract void validate(Source source, Result result)
+    throws SAXException, IOException;
+  
+  public abstract void setErrorHandler(ErrorHandler errorHandler);
+
+  public abstract ErrorHandler getErrorHandler();
+
+  public abstract void setResourceResolver(LSResourceResolver resourceResolver);
+
+  public abstract LSResourceResolver getResourceResolver();
+
+  public boolean getFeature(String name)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+  {
+    throw new SAXNotRecognizedException(name);
+  }
+  
+  public void setFeature(String name, boolean value)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+  {
+    throw new SAXNotRecognizedException(name);
+  }
+  
+  public Object getProperty(String name)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+  {
+    throw new SAXNotRecognizedException(name);
+  }
+  
+  public void setProperty(String name, Object value)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+  {
+    throw new SAXNotRecognizedException(name);
+  }
+  
+}
diff --git a/libjava/javax/xml/validation/ValidatorHandler.java b/libjava/javax/xml/validation/ValidatorHandler.java
new file mode 100644 (file)
index 0000000..dc36909
--- /dev/null
+++ b/libjava/javax/xml/validation/ValidatorHandler.java
@@ -0,0 +1,115 @@
+/* ValidatorHandler.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.validation;
+
+import org.w3c.dom.ls.LSResourceResolver;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+
+/**
+ * A streaming validator that operates on a SAX event stream.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public abstract class ValidatorHandler
+  implements ContentHandler
+{
+
+  static final String NS_FEATURE =
+    "http://xml.org/sax/features/namespace-prefixes";
+
+  protected ValidatorHandler()
+  {
+  }
+
+  /**
+   * Sets the ContentHandler to receive PSVI SAX events.
+   */
+  public abstract void setContentHandler(ContentHandler receiver);
+
+  /**
+   * Returns the ContentHandler to receive PSVI SAX events.
+   */
+  public abstract ContentHandler getContentHandler();
+
+  public abstract void setErrorHandler(ErrorHandler errorHandler);
+
+  public abstract ErrorHandler getErrorHandler();
+  
+  public abstract void setResourceResolver(LSResourceResolver resourceResolver);
+
+  public abstract LSResourceResolver getResourceResolver();
+
+  public abstract TypeInfoProvider getTypeInfoProvider();
+
+  public boolean getFeature(String name)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+  {
+    if (name.equals(NS_FEATURE))
+      {
+        return true;
+      }
+    throw new SAXNotRecognizedException(name);
+  }
+  
+  public void setFeature(String name, boolean value)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+  {
+    if (name.equals(NS_FEATURE))
+      {
+        throw new SAXNotSupportedException();
+      }
+    throw new SAXNotRecognizedException(name);
+  }
+  
+  public Object getProperty(String name)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+  {
+    throw new SAXNotRecognizedException(name);
+  }
+  
+  public void setProperty(String name, Object value)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+  {
+    throw new SAXNotRecognizedException(name);
+  }
+    
+}
diff --git a/libjava/javax/xml/validation/package.html b/libjava/javax/xml/validation/package.html
new file mode 100644 (file)
index 0000000..b4daa14
--- /dev/null
+++ b/libjava/javax/xml/validation/package.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+
+<div>
+API for the validation of XML documents using a range of schema languages.
+</div>
+
+</body>
+</html>
diff --git a/libjava/javax/xml/xpath/XPath.java b/libjava/javax/xml/xpath/XPath.java
new file mode 100644 (file)
index 0000000..d451c5a
--- /dev/null
+++ b/libjava/javax/xml/xpath/XPath.java
@@ -0,0 +1,115 @@
+/* XPath.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.xpath;
+
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.namespace.QName;
+import org.xml.sax.InputSource;
+
+/**
+ * Interface to the XPath evaluation environment.
+ * @since 1.3
+ */
+public interface XPath
+{
+
+  /**
+   * Resets the environment.
+   */
+  void reset();
+
+  void setXPathVariableResolver(XPathVariableResolver resolver);
+
+  XPathVariableResolver getXPathVariableResolver();
+
+  void setXPathFunctionResolver(XPathFunctionResolver resolver);
+
+  XPathFunctionResolver getXPathFunctionResolver();
+
+  void setNamespaceContext(NamespaceContext nsContext);
+
+  NamespaceContext getNamespaceContext();
+
+  /**
+   * Compiles an XPath expression for future evaluation.
+   * @param expression the expression
+   */
+  XPathExpression compile(String expression)
+    throws XPathExpressionException;
+
+  /**
+   * Evaluates an expression.
+   * @param expression the expression
+   * @param item the expression context
+   * @param returnType the desired return type
+   */
+  Object evaluate(String expression,
+                  Object item,
+                  QName returnType)
+    throws XPathExpressionException;
+
+  /**
+   * Evaluates an expression and returns the result as a string.
+   * @param expression the expression
+   * @param item the expression context
+   */
+  String evaluate(String expression,
+                  Object item)
+    throws XPathExpressionException;
+
+  /**
+   * Evaluates an expression.
+   * @param expression the expression
+   * @param source the source to load the expression context from
+   * @param returnType the desired return type
+   */
+  Object evaluate(String expression,
+                  InputSource source,
+                  QName returnType)
+    throws XPathExpressionException;
+
+  /**
+   * Evaluates an expression and returns the result as a string.
+   * @param expression the expression
+   * @param source the source to load the expression context from
+   */
+  String evaluate(String expression,
+                  InputSource source)
+    throws XPathExpressionException;
+  
+}
diff --git a/libjava/javax/xml/xpath/XPathConstants.java b/libjava/javax/xml/xpath/XPathConstants.java
new file mode 100644 (file)
index 0000000..a4b0b16
--- /dev/null
+++ b/libjava/javax/xml/xpath/XPathConstants.java
@@ -0,0 +1,87 @@
+/* XPathConstants.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.xpath;
+
+import javax.xml.namespace.QName;
+
+/**
+ * XPath constants.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public class XPathConstants
+{
+
+  /**
+   * The XPath 1.0 number data type.
+   */
+  public static final QName NUMBER =
+    new QName("http://java.sun.com/jaxp/xpath/dom#number", "");
+  
+  /**
+   * The XPath 1.0 string data type.
+   */
+  public static final QName STRING =
+    new QName("http://java.sun.com/jaxp/xpath/dom#string", "");
+  
+  /**
+   * The XPath 1.0 boolean data type.
+   */
+  public static final QName BOOLEAN =
+    new QName("http://java.sun.com/jaxp/xpath/dom#boolean", "");
+  
+  /**
+   * The XPath 1.0 node-set data type.
+   */
+  public static final QName NODESET =
+    new QName("http://java.sun.com/jaxp/xpath/dom#node-set", "");
+  
+  /**
+   * The XPath 1.0 node data type.
+   */
+  public static final QName NODE =
+    new QName("http://java.sun.com/jaxp/xpath/dom#node", "");
+
+  /**
+   * The URL for the JAXP DOM object model.
+   */
+  public static final String DOM_OBJECT_MODEL =
+    "http://java.sun.com/jaxp/xpath/dom";
+  
+}
diff --git a/libjava/javax/xml/xpath/XPathException.java b/libjava/javax/xml/xpath/XPathException.java
new file mode 100644 (file)
index 0000000..4ca992b
--- /dev/null
+++ b/libjava/javax/xml/xpath/XPathException.java
@@ -0,0 +1,86 @@
+/* XPathException.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.xpath;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
+/**
+ * A generic XPath exception.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public class XPathException
+  extends Exception
+{
+
+  Throwable cause;
+
+  public XPathException(String message)
+  {
+    super(message);
+  }
+  
+  public XPathException(Throwable cause)
+  {
+    super(cause);
+    this.cause = cause;
+  }
+
+  public Throwable getCause()
+  {
+    return cause;
+  }
+
+  public void printStackTrace()
+  {
+    super.printStackTrace();
+  }
+
+  public void printStackTrace(PrintStream out)
+  {
+    super.printStackTrace(out);
+  }
+
+  public void printStackTrace(PrintWriter out)
+  {
+    super.printStackTrace(out);
+  }
+
+}
diff --git a/libjava/javax/xml/xpath/XPathExpression.java b/libjava/javax/xml/xpath/XPathExpression.java
new file mode 100644 (file)
index 0000000..b7af8f6
--- /dev/null
+++ b/libjava/javax/xml/xpath/XPathExpression.java
@@ -0,0 +1,86 @@
+/* XPathExpression.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.xpath;
+
+import javax.xml.namespace.QName;
+import org.xml.sax.InputSource;
+
+/**
+ * An XPath expression.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public interface XPathExpression
+{
+
+  /**
+   * Evaluates this expression against the specified context.
+   * @param item the evaluation context
+   * @param returnType the desired return type
+   */
+  Object evaluate(Object item,
+                  QName returnType)
+    throws XPathExpressionException;
+
+  /**
+   * Evaluates this expression against the specified context, returning the
+   * result as a string.
+   * @param item the evaluation context
+   */
+  String evaluate(Object item)
+    throws XPathExpressionException;
+
+  /**
+   * Evaluates this expression against the specified context.
+   * @param source the source to load the context from
+   * @param returnType the desired return type
+   */
+  Object evaluate(InputSource source,
+                  QName returnType)
+    throws XPathExpressionException;
+
+  /**
+   * Evaluates this expression against the specified context, returning the
+   * result as a string.
+   * @param source the source to load the context from
+   */
+  String evaluate(InputSource source)
+    throws XPathExpressionException;
+
+}
diff --git a/libjava/javax/xml/xpath/XPathExpressionException.java b/libjava/javax/xml/xpath/XPathExpressionException.java
new file mode 100644 (file)
index 0000000..4ba1991
--- /dev/null
+++ b/libjava/javax/xml/xpath/XPathExpressionException.java
@@ -0,0 +1,60 @@
+/* XPathExpressionException.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.xpath;
+
+/**
+ * An exception in an XPath expression.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public class XPathExpressionException
+  extends XPathException
+{
+
+  public XPathExpressionException(String message)
+  {
+    super(message);
+  }
+
+  public XPathExpressionException(Throwable cause)
+  {
+    super(cause);
+  }
+
+}
diff --git a/libjava/javax/xml/xpath/XPathFactory.java b/libjava/javax/xml/xpath/XPathFactory.java
new file mode 100644 (file)
index 0000000..64076f5
--- /dev/null
+++ b/libjava/javax/xml/xpath/XPathFactory.java
@@ -0,0 +1,227 @@
+/* XPathFactory.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.xpath;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.util.Properties;
+
+/**
+ * Factory for creating XPath environments.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public abstract class XPathFactory
+{
+
+  /**
+   * The default property name according to the JAXP specification.
+   */
+  public static final String DEFAULT_PROPERTY_NAME =
+               "javax.xml.xpath.XPathFactory";
+
+  /**
+   * The default object model URI.
+   */
+  public static final String DEFAULT_OBJECT_MODEL_URI =
+    XPathConstants.DOM_OBJECT_MODEL;
+
+  protected XPathFactory()
+  {
+  }
+
+  /**
+   * Returns a new factory for the default (DOM) object model.
+   */
+  public static final XPathFactory newInstance()
+  {
+    try
+      {
+        return newInstance(DEFAULT_OBJECT_MODEL_URI);
+      }
+    catch (XPathFactoryConfigurationException e)
+      {
+        throw new RuntimeException(e.getMessage());
+      }
+  }
+
+  /**
+   * Returns a new factory for the given object model URI.
+   * The implementation class to load is the first found in the following
+   * locations that advertises support for the given model URI:
+   * <ol>
+   * <li>the <code>javax.xml.xpath.XPathFactory</code> system property</li>
+   * <li>the above named property value in the
+   * <code><i>$JAVA_HOME</i>/lib/jaxp.properties</code> file</li>
+   * <li>the class name specified in the
+   * <code>META-INF/services/javax.xml.xpath.XPathFactory</code> system
+   * resource</li>
+   * <li>the default factory class</li>
+   * </ol>
+   * @param uri the object model URI
+   */
+  public static final XPathFactory newInstance(String uri)
+    throws XPathFactoryConfigurationException
+  {
+    ClassLoader loader = Thread.currentThread().getContextClassLoader();
+    if (loader == null)
+      {
+        loader = XPathFactory.class.getClassLoader();
+      }
+    String className = null;
+    int count = 0;
+    do
+      {
+        className = getFactoryClassName(loader, count++);
+        if (className != null)
+          {
+            try
+              {
+                Class t = (loader != null) ? loader.loadClass(className) :
+                  Class.forName(className);
+                XPathFactory ret = (XPathFactory) t.newInstance();
+                if (ret.isObjectModelSupported(uri))
+                  {
+                    return ret;
+                  }
+                className = null;
+              }
+            catch (ClassNotFoundException e)
+              {
+                className = null;
+              }
+            catch (Exception e)
+              {
+                throw new XPathFactoryConfigurationException(e);
+              }
+          }
+      }
+    while (className == null && count < 4);
+    String msg = "no factories with support for " + uri;
+    throw new XPathFactoryConfigurationException(msg);
+  }
+
+  private static String getFactoryClassName(ClassLoader loader, int attempt)
+  {
+    final String propertyName = DEFAULT_PROPERTY_NAME;
+    switch (attempt)
+      {
+        case 0:
+          return System.getProperty(propertyName);
+        case 1:
+          try
+            {
+              File file = new File(System.getProperty("java.home"));
+              file = new File(file, "lib");
+              file = new File(file, "jaxp.properties");
+              InputStream in = new FileInputStream(file);
+              Properties props = new Properties();
+              props.load(in);
+              in.close();
+              return props.getProperty(propertyName);
+            }
+          catch (IOException e)
+            {
+              return null;
+            }
+        case 2:
+          try
+            {
+              String serviceKey = "/META-INF/services/" + propertyName;
+              InputStream in = (loader != null) ?
+                loader.getResourceAsStream(serviceKey) :
+                XPathFactory.class.getResourceAsStream(serviceKey);
+              if (in != null)
+                {
+                  BufferedReader r =
+                    new BufferedReader(new InputStreamReader(in));
+                  String ret = r.readLine();
+                  r.close();
+                  return ret;
+                }
+            }
+          catch (IOException e)
+            {
+            }
+          return null;
+        case 3:
+          return "gnu.xml.xpath.XPathFactoryImpl";
+        default:
+          return null;
+      }
+  }
+
+  /**
+   * Indicates whether the specified object model URI is supported by
+   * this factory.
+   */
+  public abstract boolean isObjectModelSupported(String objectModel);
+
+  /**
+   * Sets the state of the named feature.
+   */
+  public abstract void setFeature(String name, boolean value)
+    throws XPathFactoryConfigurationException;
+
+  /**
+   * Returns the state of the named feature.
+   */
+  public abstract boolean getFeature(String name)
+    throws XPathFactoryConfigurationException;
+
+  /**
+   * Sets the XPath variable resolver calback.
+   */
+  public abstract void setXPathVariableResolver(XPathVariableResolver resolver);
+
+  /**
+   * Sets the XPath extension function resolver calback.
+   */
+  public abstract void setXPathFunctionResolver(XPathFunctionResolver resolver);
+
+  /**
+   * Returns a new XPath evaluation environment.
+   */
+  public abstract XPath newXPath();
+  
+}
diff --git a/libjava/javax/xml/xpath/XPathFactoryConfigurationException.java b/libjava/javax/xml/xpath/XPathFactoryConfigurationException.java
new file mode 100644 (file)
index 0000000..56c45d1
--- /dev/null
+++ b/libjava/javax/xml/xpath/XPathFactoryConfigurationException.java
@@ -0,0 +1,60 @@
+/* XPathFactoryConfigurationException.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.xpath;
+
+/**
+ * A configuration exception in an XPath factory environment.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public class XPathFactoryConfigurationException
+  extends XPathException
+{
+
+  public XPathFactoryConfigurationException(String message)
+  {
+    super(message);
+  }
+
+  public XPathFactoryConfigurationException(Throwable cause)
+  {
+    super(cause);
+  }
+
+}
diff --git a/libjava/javax/xml/xpath/XPathFunction.java b/libjava/javax/xml/xpath/XPathFunction.java
new file mode 100644 (file)
index 0000000..a071eb5
--- /dev/null
+++ b/libjava/javax/xml/xpath/XPathFunction.java
@@ -0,0 +1,58 @@
+/* XPathFunction.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.xpath;
+
+import java.util.List;
+
+/**
+ * An XPath extension function.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public interface XPathFunction
+{
+
+  /**
+   * Evaluate the function with the specified arguments.
+   * @param args the list of arguments
+   */
+  Object evaluate(List args)
+    throws XPathFunctionException;
+  
+}
diff --git a/libjava/javax/xml/xpath/XPathFunctionException.java b/libjava/javax/xml/xpath/XPathFunctionException.java
new file mode 100644 (file)
index 0000000..9a6751a
--- /dev/null
+++ b/libjava/javax/xml/xpath/XPathFunctionException.java
@@ -0,0 +1,60 @@
+/* XPathFunctionException.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.xpath;
+
+/**
+ * An exception in an XPath function.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public class XPathFunctionException
+  extends XPathExpressionException
+{
+
+  public XPathFunctionException(String message)
+  {
+    super(message);
+  }
+
+  public XPathFunctionException(Throwable cause)
+  {
+    super(cause);
+  }
+
+}
diff --git a/libjava/javax/xml/xpath/XPathFunctionResolver.java b/libjava/javax/xml/xpath/XPathFunctionResolver.java
new file mode 100644 (file)
index 0000000..8fb0bd4
--- /dev/null
+++ b/libjava/javax/xml/xpath/XPathFunctionResolver.java
@@ -0,0 +1,59 @@
+/* XPathFunctionResolver.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.xpath;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Interface providing the means to access XPath extension functions.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @since 1.3
+ */
+public interface XPathFunctionResolver
+{
+
+  /**
+   * Returns the function with the specified name and arity.
+   * @param functionName the function name
+   * @param arity the number of arguments
+   */
+  XPathFunction resolveFunction(QName functionName,
+                                int arity);
+  
+}
diff --git a/libjava/javax/xml/xpath/XPathVariableResolver.java b/libjava/javax/xml/xpath/XPathVariableResolver.java
new file mode 100644 (file)
index 0000000..d0f4f57
--- /dev/null
+++ b/libjava/javax/xml/xpath/XPathVariableResolver.java
@@ -0,0 +1,52 @@
+/* XPathVariableResolver.java -- 
+   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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.xml.xpath;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Interface providing the means to access the values of XPath variable
+ * references.
+ * @since 1.3
+ */
+public interface XPathVariableResolver
+{
+
+  Object resolveVariable(QName variableName);
+  
+}
diff --git a/libjava/javax/xml/xpath/package.html b/libjava/javax/xml/xpath/package.html
new file mode 100644 (file)
index 0000000..458cff8
--- /dev/null
+++ b/libjava/javax/xml/xpath/package.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+
+<div>
+This package provides access to an XPath evaluation environment and expressions.
+</div>
+
+</body>
+</html>
diff --git a/libjava/org/w3c/dom/Attr.java b/libjava/org/w3c/dom/Attr.java
deleted file mode 100644 (file)
index f54467f..0000000
--- a/libjava/org/w3c/dom/Attr.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- *  The <code>Attr</code> interface represents an attribute in an \r
- * <code>Element</code> object. Typically the allowable values for the \r
- * attribute are defined in a document type definition.\r
- * <p><code>Attr</code> objects inherit the <code>Node</code> interface, but \r
- * since they are not actually child nodes of the element they describe, the \r
- * DOM does not consider them part of the document tree. Thus, the \r
- * <code>Node</code> attributes <code>parentNode</code>, \r
- * <code>previousSibling</code>, and <code>nextSibling</code> have a \r
- * <code>null</code> value for <code>Attr</code> objects. The DOM takes the \r
- * view that attributes are properties of elements rather than having a \r
- * separate identity from the elements they are associated with; this should \r
- * make it more efficient to implement such features as default attributes \r
- * associated with all elements of a given type. Furthermore, \r
- * <code>Attr</code> nodes may not be immediate children of a \r
- * <code>DocumentFragment</code>. However, they can be associated with \r
- * <code>Element</code> nodes contained within a \r
- * <code>DocumentFragment</code>. In short, users and implementors of the \r
- * DOM need to be aware that <code>Attr</code> nodes have some things in \r
- * common with other objects inheriting the <code>Node</code> interface, but \r
- * they also are quite distinct.\r
- * <p> The attribute's effective value is determined as follows: if this \r
- * attribute has been explicitly assigned any value, that value is the \r
- * attribute's effective value; otherwise, if there is a declaration for \r
- * this attribute, and that declaration includes a default value, then that \r
- * default value is the attribute's effective value; otherwise, the \r
- * attribute does not exist on this element in the structure model until it \r
- * has been explicitly added. Note that the <code>nodeValue</code> attribute \r
- * on the <code>Attr</code> instance can also be used to retrieve the string \r
- * version of the attribute's value(s). \r
- * <p>In XML, where the value of an attribute can contain entity references, \r
- * the child nodes of the <code>Attr</code> node may be either \r
- * <code>Text</code> or <code>EntityReference</code> nodes (when these are \r
- * in use; see the description of <code>EntityReference</code> for \r
- * discussion). Because the DOM Core is not aware of attribute types, it \r
- * treats all attribute values as simple strings, even if the DTD or schema \r
- * declares them as having tokenized types. \r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface Attr extends Node {\r
-    /**\r
-     * Returns the name of this attribute. \r
-     */\r
-    public String getName();\r
-\r
-    /**\r
-     * If this attribute was explicitly given a value in the original \r
-     * document, this is <code>true</code>; otherwise, it is \r
-     * <code>false</code>. Note that the implementation is in charge of this \r
-     * attribute, not the user. If the user changes the value of the \r
-     * attribute (even if it ends up having the same value as the default \r
-     * value) then the <code>specified</code> flag is automatically flipped \r
-     * to <code>true</code>. To re-specify the attribute as the default \r
-     * value from the DTD, the user must delete the attribute. The \r
-     * implementation will then make a new attribute available with \r
-     * <code>specified</code> set to <code>false</code> and the default \r
-     * value (if one exists).\r
-     * <br>In summary:  If the attribute has an assigned value in the document \r
-     * then <code>specified</code> is <code>true</code>, and the value is \r
-     * the assigned value.  If the attribute has no assigned value in the \r
-     * document and has a default value in the DTD, then \r
-     * <code>specified</code> is <code>false</code>, and the value is the \r
-     * default value in the DTD. If the attribute has no assigned value in \r
-     * the document and has a value of #IMPLIED in the DTD, then the \r
-     * attribute does not appear in the structure model of the document. If \r
-     * the <code>ownerElement</code> attribute is <code>null</code> (i.e. \r
-     * because it was just created or was set to <code>null</code> by the \r
-     * various removal and cloning operations) <code>specified</code> is \r
-     * <code>true</code>. \r
-     */\r
-    public boolean getSpecified();\r
-\r
-    /**\r
-     * On retrieval, the value of the attribute is returned as a string. \r
-     * Character and general entity references are replaced with their \r
-     * values. See also the method <code>getAttribute</code> on the \r
-     * <code>Element</code> interface.\r
-     * <br>On setting, this creates a <code>Text</code> node with the unparsed \r
-     * contents of the string. I.e. any characters that an XML processor \r
-     * would recognize as markup are instead treated as literal text. See \r
-     * also the method <code>setAttribute</code> on the <code>Element</code> \r
-     * interface.\r
-     * @exception DOMException\r
-     *   NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.\r
-     */\r
-    public String getValue();\r
-    public void setValue(String value)\r
-                            throws DOMException;\r
-\r
-    /**\r
-     * The <code>Element</code> node this attribute is attached to or \r
-     * <code>null</code> if this attribute is not in use.\r
-     * @since DOM Level 2\r
-     */\r
-    public Element getOwnerElement();\r
-\r
-}\r
diff --git a/libjava/org/w3c/dom/CDATASection.java b/libjava/org/w3c/dom/CDATASection.java
deleted file mode 100644 (file)
index d9972ef..0000000
--- a/libjava/org/w3c/dom/CDATASection.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * CDATA sections are used to escape blocks of text containing characters that \r
- * would otherwise be regarded as markup. The only delimiter that is \r
- * recognized in a CDATA section is the "]]&gt;" string that ends the CDATA \r
- * section. CDATA sections cannot be nested. Their primary purpose is for \r
- * including material such as XML fragments, without needing to escape all \r
- * the delimiters.\r
- * <p>The <code>DOMString</code> attribute of the <code>Text</code> node holds \r
- * the text that is contained by the CDATA section. Note that this may \r
- * contain characters that need to be escaped outside of CDATA sections and \r
- * that, depending on the character encoding ("charset") chosen for \r
- * serialization, it may be impossible to write out some characters as part \r
- * of a CDATA section. \r
- * <p> The <code>CDATASection</code> interface inherits from the \r
- * <code>CharacterData</code> interface through the <code>Text</code> \r
- * interface. Adjacent <code>CDATASection</code> nodes are not merged by use \r
- * of the <code>normalize</code> method of the <code>Node</code> interface.\r
- * Because no markup is recognized within a <code>CDATASection</code>, \r
- * character numeric references cannot be used as an escape mechanism when \r
- * serializing. Therefore, action needs to be taken when serializing a \r
- * <code>CDATASection</code> with a character encoding where some of the \r
- * contained characters cannot be represented. Failure to do so would not \r
- * produce well-formed XML.One potential solution in the serialization \r
- * process is to end the CDATA section before the character, output the \r
- * character using a character reference or entity reference, and open a new \r
- * CDATA section for any further characters in the text node. Note, however, \r
- * that some code conversion libraries at the time of writing do not return \r
- * an error or exception when a character is missing from the encoding, \r
- * making the task of ensuring that data is not corrupted on serialization \r
- * more difficult.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface CDATASection extends Text {\r
-}\r
diff --git a/libjava/org/w3c/dom/DOMImplementation.java b/libjava/org/w3c/dom/DOMImplementation.java
deleted file mode 100644 (file)
index b11d715..0000000
--- a/libjava/org/w3c/dom/DOMImplementation.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * The <code>DOMImplementation</code> interface provides a number of methods \r
- * for performing operations that are independent of any particular instance \r
- * of the document object model.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface DOMImplementation {\r
-    /**\r
-     * Test if the DOM implementation implements a specific feature.\r
-     * @param featureThe name of the feature to test (case-insensitive). The \r
-     *   values used by DOM features are defined throughout the DOM Level 2 \r
-     *   specifications and listed in the  section. The name must be an XML \r
-     *   name. To avoid possible conflicts, as a convention, names referring \r
-     *   to features defined outside the DOM specification should be made \r
-     *   unique by reversing the name of the Internet domain name of the \r
-     *   person (or the organization that the person belongs to) who defines \r
-     *   the feature, component by component, and using this as a prefix. \r
-     *   For instance, the W3C SVG Working Group defines the feature \r
-     *   "org.w3c.dom.svg".\r
-     * @param versionThis is the version number of the feature to test. In \r
-     *   Level 2, the string can be either "2.0" or "1.0". If the version is \r
-     *   not specified, supporting any version of the feature causes the \r
-     *   method to return <code>true</code>.\r
-     * @return <code>true</code> if the feature is implemented in the \r
-     *   specified version, <code>false</code> otherwise.\r
-     */\r
-    public boolean hasFeature(String feature, \r
-                              String version);\r
-\r
-    /**\r
-     * Creates an empty <code>DocumentType</code> node. Entity declarations \r
-     * and notations are not made available. Entity reference expansions and \r
-     * default attribute additions do not occur. It is expected that a \r
-     * future version of the DOM will provide a way for populating a \r
-     * <code>DocumentType</code>.\r
-     * <br>HTML-only DOM implementations do not need to implement this method.\r
-     * @param qualifiedNameThe qualified name of the document type to be \r
-     *   created. \r
-     * @param publicIdThe external subset public identifier.\r
-     * @param systemIdThe external subset system identifier.\r
-     * @return A new <code>DocumentType</code> node with \r
-     *   <code>Node.ownerDocument</code> set to <code>null</code>.\r
-     * @exception DOMException\r
-     *   INVALID_CHARACTER_ERR: Raised if the specified qualified name \r
-     *   contains an illegal character.\r
-     *   <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is \r
-     *   malformed.\r
-     * @since DOM Level 2\r
-     */\r
-    public DocumentType createDocumentType(String qualifiedName, \r
-                                           String publicId, \r
-                                           String systemId)\r
-                                           throws DOMException;\r
-\r
-    /**\r
-     * Creates an XML <code>Document</code> object of the specified type with \r
-     * its document element. HTML-only DOM implementations do not need to \r
-     * implement this method.\r
-     * @param namespaceURIThe namespace URI of the document element to create.\r
-     * @param qualifiedNameThe qualified name of the document element to be \r
-     *   created.\r
-     * @param doctypeThe type of document to be created or <code>null</code>.\r
-     *   When <code>doctype</code> is not <code>null</code>, its \r
-     *   <code>Node.ownerDocument</code> attribute is set to the document \r
-     *   being created.\r
-     * @return A new <code>Document</code> object.\r
-     * @exception DOMException\r
-     *   INVALID_CHARACTER_ERR: Raised if the specified qualified name \r
-     *   contains an illegal character.\r
-     *   <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is \r
-     *   malformed, if the <code>qualifiedName</code> has a prefix and the \r
-     *   <code>namespaceURI</code> is <code>null</code>, or if the \r
-     *   <code>qualifiedName</code> has a prefix that is "xml" and the \r
-     *   <code>namespaceURI</code> is different from "\r
-     *   http://www.w3.org/XML/1998/namespace" .\r
-     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>doctype</code> has already \r
-     *   been used with a different document or was created from a different \r
-     *   implementation.\r
-     * @since DOM Level 2\r
-     */\r
-    public Document createDocument(String namespaceURI, \r
-                                   String qualifiedName, \r
-                                   DocumentType doctype)\r
-                                   throws DOMException;\r
-\r
-}\r
diff --git a/libjava/org/w3c/dom/Document.java b/libjava/org/w3c/dom/Document.java
deleted file mode 100644 (file)
index 2db27c9..0000000
--- a/libjava/org/w3c/dom/Document.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * The <code>Document</code> interface represents the entire HTML or XML \r
- * document. Conceptually, it is the root of the document tree, and provides \r
- * the primary access to the document's data.\r
- * <p>Since elements, text nodes, comments, processing instructions, etc. \r
- * cannot exist outside the context of a <code>Document</code>, the \r
- * <code>Document</code> interface also contains the factory methods needed \r
- * to create these objects. The <code>Node</code> objects created have a \r
- * <code>ownerDocument</code> attribute which associates them with the \r
- * <code>Document</code> within whose context they were created.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface Document extends Node {\r
-    /**\r
-     * The Document Type Declaration (see <code>DocumentType</code>) \r
-     * associated with this document. For HTML documents as well as XML \r
-     * documents without a document type declaration this returns \r
-     * <code>null</code>. The DOM Level 2 does not support editing the \r
-     * Document Type Declaration. <code>docType</code> cannot be altered in \r
-     * any way, including through the use of methods inherited from the \r
-     * <code>Node</code> interface, such as <code>insertNode</code> or \r
-     * <code>removeNode</code>.\r
-     */\r
-    public DocumentType getDoctype();\r
-\r
-    /**\r
-     * The <code>DOMImplementation</code> object that handles this document. A \r
-     * DOM application may use objects from multiple implementations.\r
-     */\r
-    public DOMImplementation getImplementation();\r
-\r
-    /**\r
-     * This is a convenience attribute that allows direct access to the child \r
-     * node that is the root element of the document. For HTML documents, \r
-     * this is the element with the tagName "HTML".\r
-     */\r
-    public Element getDocumentElement();\r
-\r
-    /**\r
-     * Creates an element of the type specified. Note that the instance \r
-     * returned implements the <code>Element</code> interface, so attributes \r
-     * can be specified directly on the returned object.\r
-     * <br>In addition, if there are known attributes with default values, \r
-     * <code>Attr</code> nodes representing them are automatically created \r
-     * and attached to the element.\r
-     * <br>To create an element with a qualified name and namespace URI, use \r
-     * the <code>createElementNS</code> method.\r
-     * @param tagNameThe name of the element type to instantiate. For XML, \r
-     *   this is case-sensitive. For HTML, the <code>tagName</code> \r
-     *   parameter may be provided in any case, but it must be mapped to the \r
-     *   canonical uppercase form by the DOM implementation. \r
-     * @return A new <code>Element</code> object with the \r
-     *   <code>nodeName</code> attribute set to <code>tagName</code>, and \r
-     *   <code>localName</code>, <code>prefix</code>, and \r
-     *   <code>namespaceURI</code> set to <code>null</code>.\r
-     * @exception DOMException\r
-     *   INVALID_CHARACTER_ERR: Raised if the specified name contains an \r
-     *   illegal character.\r
-     */\r
-    public Element createElement(String tagName)\r
-                                 throws DOMException;\r
-\r
-    /**\r
-     * Creates an empty <code>DocumentFragment</code> object. \r
-     * @return A new <code>DocumentFragment</code>.\r
-     */\r
-    public DocumentFragment createDocumentFragment();\r
-\r
-    /**\r
-     * Creates a <code>Text</code> node given the specified string.\r
-     * @param dataThe data for the node.\r
-     * @return The new <code>Text</code> object.\r
-     */\r
-    public Text createTextNode(String data);\r
-\r
-    /**\r
-     * Creates a <code>Comment</code> node given the specified string.\r
-     * @param dataThe data for the node.\r
-     * @return The new <code>Comment</code> object.\r
-     */\r
-    public Comment createComment(String data);\r
-\r
-    /**\r
-     * Creates a <code>CDATASection</code> node whose value is the specified \r
-     * string.\r
-     * @param dataThe data for the <code>CDATASection</code> contents.\r
-     * @return The new <code>CDATASection</code> object.\r
-     * @exception DOMException\r
-     *   NOT_SUPPORTED_ERR: Raised if this document is an HTML document.\r
-     */\r
-    public CDATASection createCDATASection(String data)\r
-                                           throws DOMException;\r
-\r
-    /**\r
-     * Creates a <code>ProcessingInstruction</code> node given the specified \r
-     * name and data strings.\r
-     * @param targetThe target part of the processing instruction.\r
-     * @param dataThe data for the node.\r
-     * @return The new <code>ProcessingInstruction</code> object.\r
-     * @exception DOMException\r
-     *   INVALID_CHARACTER_ERR: Raised if the specified target contains an \r
-     *   illegal character.\r
-     *   <br>NOT_SUPPORTED_ERR: Raised if this document is an HTML document.\r
-     */\r
-    public ProcessingInstruction createProcessingInstruction(String target, \r
-                                                             String data)\r
-                                                             throws DOMException;\r
-\r
-    /**\r
-     * Creates an <code>Attr</code> of the given name. Note that the \r
-     * <code>Attr</code> instance can then be set on an <code>Element</code> \r
-     * using the <code>setAttributeNode</code> method. \r
-     * <br>To create an attribute with a qualified name and namespace URI, use \r
-     * the <code>createAttributeNS</code> method.\r
-     * @param nameThe name of the attribute.\r
-     * @return A new <code>Attr</code> object with the <code>nodeName</code> \r
-     *   attribute set to <code>name</code>, and <code>localName</code>, \r
-     *   <code>prefix</code>, and <code>namespaceURI</code> set to \r
-     *   <code>null</code>. The value of the attribute is the empty string.\r
-     * @exception DOMException\r
-     *   INVALID_CHARACTER_ERR: Raised if the specified name contains an \r
-     *   illegal character.\r
-     */\r
-    public Attr createAttribute(String name)\r
-                                throws DOMException;\r
-\r
-    /**\r
-     * Creates an <code>EntityReference</code> object. In addition, if the \r
-     * referenced entity is known, the child list of the \r
-     * <code>EntityReference</code> node is made the same as that of the \r
-     * corresponding <code>Entity</code> node.If any descendant of the \r
-     * <code>Entity</code> node has an unbound namespace prefix, the \r
-     * corresponding descendant of the created <code>EntityReference</code> \r
-     * node is also unbound; (its <code>namespaceURI</code> is \r
-     * <code>null</code>). The DOM Level 2 does not support any mechanism to \r
-     * resolve namespace prefixes.\r
-     * @param nameThe name of the entity to reference. \r
-     * @return The new <code>EntityReference</code> object.\r
-     * @exception DOMException\r
-     *   INVALID_CHARACTER_ERR: Raised if the specified name contains an \r
-     *   illegal character.\r
-     *   <br>NOT_SUPPORTED_ERR: Raised if this document is an HTML document.\r
-     */\r
-    public EntityReference createEntityReference(String name)\r
-                                                 throws DOMException;\r
-\r
-    /**\r
-     * Returns a <code>NodeList</code> of all the <code>Elements</code> with a \r
-     * given tag name in the order in which they are encountered in a \r
-     * preorder traversal of the <code>Document</code> tree. \r
-     * @param tagnameThe name of the tag to match on. The special value "*" \r
-     *   matches all tags.\r
-     * @return A new <code>NodeList</code> object containing all the matched \r
-     *   <code>Elements</code>.\r
-     */\r
-    public NodeList getElementsByTagName(String tagname);\r
-\r
-    /**\r
-     * Imports a node from another document to this document. The returned \r
-     * node has no parent; (<code>parentNode</code> is <code>null</code>). \r
-     * The source node is not altered or removed from the original document; \r
-     * this method creates a new copy of the source node.\r
-     * <br>For all nodes, importing a node creates a node object owned by the \r
-     * importing document, with attribute values identical to the source \r
-     * node's <code>nodeName</code> and <code>nodeType</code>, plus the \r
-     * attributes related to namespaces (<code>prefix</code>, \r
-     * <code>localName</code>, and <code>namespaceURI</code>). As in the \r
-     * <code>cloneNode</code> operation on a <code>Node</code>, the source \r
-     * node is not altered.\r
-     * <br>Additional information is copied as appropriate to the \r
-     * <code>nodeType</code>, attempting to mirror the behavior expected if \r
-     * a fragment of XML or HTML source was copied from one document to \r
-     * another, recognizing that the two documents may have different DTDs \r
-     * in the XML case. The following list describes the specifics for each \r
-     * type of node. \r
-     * <dl>\r
-     * <dt>ATTRIBUTE_NODE</dt>\r
-     * <dd>The <code>ownerElement</code> attribute \r
-     * is set to <code>null</code> and the <code>specified</code> flag is \r
-     * set to <code>true</code> on the generated <code>Attr</code>. The \r
-     * descendants of the source <code>Attr</code> are recursively imported \r
-     * and the resulting nodes reassembled to form the corresponding subtree.\r
-     * Note that the <code>deep</code> parameter has no effect on \r
-     * <code>Attr</code> nodes; they always carry their children with them \r
-     * when imported.</dd>\r
-     * <dt>DOCUMENT_FRAGMENT_NODE</dt>\r
-     * <dd>If the <code>deep</code> option \r
-     * was set to <code>true</code>, the descendants of the source element \r
-     * are recursively imported and the resulting nodes reassembled to form \r
-     * the corresponding subtree. Otherwise, this simply generates an empty \r
-     * <code>DocumentFragment</code>.</dd>\r
-     * <dt>DOCUMENT_NODE</dt>\r
-     * <dd><code>Document</code> \r
-     * nodes cannot be imported.</dd>\r
-     * <dt>DOCUMENT_TYPE_NODE</dt>\r
-     * <dd><code>DocumentType</code> \r
-     * nodes cannot be imported.</dd>\r
-     * <dt>ELEMENT_NODE</dt>\r
-     * <dd>Specified attribute nodes of the \r
-     * source element are imported, and the generated <code>Attr</code> \r
-     * nodes are attached to the generated <code>Element</code>. Default \r
-     * attributes are not copied, though if the document being imported into \r
-     * defines default attributes for this element name, those are assigned. \r
-     * If the <code>importNode</code> <code>deep</code> parameter was set to \r
-     * <code>true</code>, the descendants of the source element are \r
-     * recursively imported and the resulting nodes reassembled to form the \r
-     * corresponding subtree.</dd>\r
-     * <dt>ENTITY_NODE</dt>\r
-     * <dd><code>Entity</code> nodes can be \r
-     * imported, however in the current release of the DOM the \r
-     * <code>DocumentType</code> is readonly. Ability to add these imported \r
-     * nodes to a <code>DocumentType</code> will be considered for addition \r
-     * to a future release of the DOM.On import, the <code>publicId</code>, \r
-     * <code>systemId</code>, and <code>notationName</code> attributes are \r
-     * copied. If a <code>deep</code> import is requested, the descendants \r
-     * of the the source <code>Entity</code> are recursively imported and \r
-     * the resulting nodes reassembled to form the corresponding subtree.</dd>\r
-     * <dt>\r
-     * ENTITY_REFERENCE_NODE</dt>\r
-     * <dd>Only the <code>EntityReference</code> itself is \r
-     * copied, even if a <code>deep</code> import is requested, since the \r
-     * source and destination documents might have defined the entity \r
-     * differently. If the document being imported into provides a \r
-     * definition for this entity name, its value is assigned.</dd>\r
-     * <dt>NOTATION_NODE</dt>\r
-     * <dd>\r
-     * <code>Notation</code> nodes can be imported, however in the current \r
-     * release of the DOM the <code>DocumentType</code> is readonly. Ability \r
-     * to add these imported nodes to a <code>DocumentType</code> will be \r
-     * considered for addition to a future release of the DOM.On import, the \r
-     * <code>publicId</code> and <code>systemId</code> attributes are copied.\r
-     * Note that the <code>deep</code> parameter has no effect on \r
-     * <code>Notation</code> nodes since they never have any children.</dd>\r
-     * <dt>\r
-     * PROCESSING_INSTRUCTION_NODE</dt>\r
-     * <dd>The imported node copies its \r
-     * <code>target</code> and <code>data</code> values from those of the \r
-     * source node.</dd>\r
-     * <dt>TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE</dt>\r
-     * <dd>These three \r
-     * types of nodes inheriting from <code>CharacterData</code> copy their \r
-     * <code>data</code> and <code>length</code> attributes from those of \r
-     * the source node.</dd>\r
-     *  \r
-     * @param importedNodeThe node to import.\r
-     * @param deepIf <code>true</code>, recursively import the subtree under \r
-     *   the specified node; if <code>false</code>, import only the node \r
-     *   itself, as explained above. This has no effect on <code>Attr</code>\r
-     *   , <code>EntityReference</code>, and <code>Notation</code> nodes.\r
-     * @return The imported node that belongs to this <code>Document</code>.\r
-     * @exception DOMException\r
-     *   NOT_SUPPORTED_ERR: Raised if the type of node being imported is not \r
-     *   supported.\r
-     * @since DOM Level 2\r
-     */\r
-    public Node importNode(Node importedNode, \r
-                           boolean deep)\r
-                           throws DOMException;\r
-\r
-    /**\r
-     * Creates an element of the given qualified name and namespace URI. \r
-     * HTML-only DOM implementations do not need to implement this method.\r
-     * @param namespaceURIThe namespace URI of the element to create.\r
-     * @param qualifiedNameThe qualified name of the element type to \r
-     *   instantiate.\r
-     * @return A new <code>Element</code> object with the following \r
-     *   attributes:AttributeValue<code>Node.nodeName</code>\r
-     *   <code>qualifiedName</code><code>Node.namespaceURI</code>\r
-     *   <code>namespaceURI</code><code>Node.prefix</code>prefix, extracted \r
-     *   from <code>qualifiedName</code>, or <code>null</code> if there is \r
-     *   no prefix<code>Node.localName</code>local name, extracted from \r
-     *   <code>qualifiedName</code><code>Element.tagName</code>\r
-     *   <code>qualifiedName</code>\r
-     * @exception DOMException\r
-     *   INVALID_CHARACTER_ERR: Raised if the specified qualified name \r
-     *   contains an illegal character.\r
-     *   <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is \r
-     *   malformed, if the <code>qualifiedName</code> has a prefix and the \r
-     *   <code>namespaceURI</code> is <code>null</code>, or if the \r
-     *   <code>qualifiedName</code> has a prefix that is "xml" and the \r
-     *   <code>namespaceURI</code> is different from "\r
-     *   http://www.w3.org/XML/1998/namespace" .\r
-     * @since DOM Level 2\r
-     */\r
-    public Element createElementNS(String namespaceURI, \r
-                                   String qualifiedName)\r
-                                   throws DOMException;\r
-\r
-    /**\r
-     * Creates an attribute of the given qualified name and namespace URI. \r
-     * HTML-only DOM implementations do not need to implement this method.\r
-     * @param namespaceURIThe namespace URI of the attribute to create.\r
-     * @param qualifiedNameThe qualified name of the attribute to instantiate.\r
-     * @return A new <code>Attr</code> object with the following attributes:\r
-     *   AttributeValue<code>Node.nodeName</code>qualifiedName\r
-     *   <code>Node.namespaceURI</code><code>namespaceURI</code>\r
-     *   <code>Node.prefix</code>prefix, extracted from \r
-     *   <code>qualifiedName</code>, or <code>null</code> if there is no \r
-     *   prefix<code>Node.localName</code>local name, extracted from \r
-     *   <code>qualifiedName</code><code>Attr.name</code>\r
-     *   <code>qualifiedName</code><code>Node.nodeValue</code>the empty \r
-     *   string\r
-     * @exception DOMException\r
-     *   INVALID_CHARACTER_ERR: Raised if the specified qualified name \r
-     *   contains an illegal character.\r
-     *   <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is \r
-     *   malformed, if the <code>qualifiedName</code> has a prefix and the \r
-     *   <code>namespaceURI</code> is <code>null</code>, if the \r
-     *   <code>qualifiedName</code> has a prefix that is "xml" and the \r
-     *   <code>namespaceURI</code> is different from "\r
-     *   http://www.w3.org/XML/1998/namespace", or if the \r
-     *   <code>qualifiedName</code> is "xmlns" and the \r
-     *   <code>namespaceURI</code> is different from "\r
-     *   http://www.w3.org/2000/xmlns/".\r
-     * @since DOM Level 2\r
-     */\r
-    public Attr createAttributeNS(String namespaceURI, \r
-                                  String qualifiedName)\r
-                                  throws DOMException;\r
-\r
-    /**\r
-     * Returns a <code>NodeList</code> of all the <code>Elements</code> with a \r
-     * given local name and namespace URI in the order in which they are \r
-     * encountered in a preorder traversal of the <code>Document</code> tree.\r
-     * @param namespaceURIThe namespace URI of the elements to match on. The \r
-     *   special value "*" matches all namespaces.\r
-     * @param localNameThe local name of the elements to match on. The \r
-     *   special value "*" matches all local names.\r
-     * @return A new <code>NodeList</code> object containing all the matched \r
-     *   <code>Elements</code>.\r
-     * @since DOM Level 2\r
-     */\r
-    public NodeList getElementsByTagNameNS(String namespaceURI, \r
-                                           String localName);\r
-\r
-    /**\r
-     * Returns the <code>Element</code> whose <code>ID</code> is given by \r
-     * <code>elementId</code>. If no such element exists, returns \r
-     * <code>null</code>. Behavior is not defined if more than one element \r
-     * has this <code>ID</code>. The DOM implementation must have \r
-     * information that says which attributes are of type ID. Attributes \r
-     * with the name "ID" are not of type ID unless so defined. \r
-     * Implementations that do not know whether attributes are of type ID or \r
-     * not are expected to return <code>null</code>.\r
-     * @param elementIdThe unique <code>id</code> value for an element.\r
-     * @return The matching element.\r
-     * @since DOM Level 2\r
-     */\r
-    public Element getElementById(String elementId);\r
-\r
-}\r
diff --git a/libjava/org/w3c/dom/Element.java b/libjava/org/w3c/dom/Element.java
deleted file mode 100644 (file)
index 85277fa..0000000
--- a/libjava/org/w3c/dom/Element.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * The <code>Element</code> interface represents an element in an HTML or XML \r
- * document. Elements may have attributes associated with them; since the \r
- * <code>Element</code> interface inherits from <code>Node</code>, the \r
- * generic <code>Node</code> interface attribute <code>attributes</code> may \r
- * be used to retrieve the set of all attributes for an element. There are \r
- * methods on the <code>Element</code> interface to retrieve either an \r
- * <code>Attr</code> object by name or an attribute value by name. In XML, \r
- * where an attribute value may contain entity references, an \r
- * <code>Attr</code> object should be retrieved to examine the possibly \r
- * fairly complex sub-tree representing the attribute value. On the other \r
- * hand, in HTML, where all attributes have simple string values, methods to \r
- * directly access an attribute value can safely be used as a convenience.In \r
- * DOM Level 2, the method <code>normalize</code> is inherited from the \r
- * <code>Node</code> interface where it was moved.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface Element extends Node {\r
-    /**\r
-     * The name of the element. For example, in: \r
-     * <pre> &lt;elementExample \r
-     * id="demo"&gt; ... &lt;/elementExample&gt; , </pre>\r
-     *  <code>tagName</code> has \r
-     * the value <code>"elementExample"</code>. Note that this is \r
-     * case-preserving in XML, as are all of the operations of the DOM. The \r
-     * HTML DOM returns the <code>tagName</code> of an HTML element in the \r
-     * canonical uppercase form, regardless of the case in the source HTML \r
-     * document. \r
-     */\r
-    public String getTagName();\r
-\r
-    /**\r
-     * Retrieves an attribute value by name.\r
-     * @param nameThe name of the attribute to retrieve.\r
-     * @return The <code>Attr</code> value as a string, or the empty string \r
-     *   if that attribute does not have a specified or default value.\r
-     */\r
-    public String getAttribute(String name);\r
-\r
-    /**\r
-     * Adds a new attribute. If an attribute with that name is already present \r
-     * in the element, its value is changed to be that of the value \r
-     * parameter. This value is a simple string; it is not parsed as it is \r
-     * being set. So any markup (such as syntax to be recognized as an \r
-     * entity reference) is treated as literal text, and needs to be \r
-     * appropriately escaped by the implementation when it is written out. \r
-     * In order to assign an attribute value that contains entity \r
-     * references, the user must create an <code>Attr</code> node plus any \r
-     * <code>Text</code> and <code>EntityReference</code> nodes, build the \r
-     * appropriate subtree, and use <code>setAttributeNode</code> to assign \r
-     * it as the value of an attribute.\r
-     * <br>To set an attribute with a qualified name and namespace URI, use \r
-     * the <code>setAttributeNS</code> method.\r
-     * @param nameThe name of the attribute to create or alter.\r
-     * @param valueValue to set in string form.\r
-     * @exception DOMException\r
-     *   INVALID_CHARACTER_ERR: Raised if the specified name contains an \r
-     *   illegal character.\r
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.\r
-     */\r
-    public void setAttribute(String name, \r
-                             String value)\r
-                             throws DOMException;\r
-\r
-    /**\r
-     * Removes an attribute by name. If the removed attribute is known to have \r
-     * a default value, an attribute immediately appears containing the \r
-     * default value as well as the corresponding namespace URI, local name, \r
-     * and prefix when applicable.\r
-     * <br>To remove an attribute by local name and namespace URI, use the \r
-     * <code>removeAttributeNS</code> method.\r
-     * @param nameThe name of the attribute to remove.\r
-     * @exception DOMException\r
-     *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.\r
-     */\r
-    public void removeAttribute(String name)\r
-                                throws DOMException;\r
-\r
-    /**\r
-     * Retrieves an attribute node by name.\r
-     * <br>To retrieve an attribute node by qualified name and namespace URI, \r
-     * use the <code>getAttributeNodeNS</code> method.\r
-     * @param nameThe name (<code>nodeName</code>) of the attribute to \r
-     *   retrieve.\r
-     * @return The <code>Attr</code> node with the specified name (\r
-     *   <code>nodeName</code>) or <code>null</code> if there is no such \r
-     *   attribute.\r
-     */\r
-    public Attr getAttributeNode(String name);\r
-\r
-    /**\r
-     * Adds a new attribute node. If an attribute with that name (\r
-     * <code>nodeName</code>) is already present in the element, it is \r
-     * replaced by the new one.\r
-     * <br>To add a new attribute node with a qualified name and namespace \r
-     * URI, use the <code>setAttributeNodeNS</code> method.\r
-     * @param newAttrThe <code>Attr</code> node to add to the attribute list.\r
-     * @return If the <code>newAttr</code> attribute replaces an existing \r
-     *   attribute, the replaced <code>Attr</code> node is returned, \r
-     *   otherwise <code>null</code> is returned.\r
-     * @exception DOMException\r
-     *   WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a \r
-     *   different document than the one that created the element.\r
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.\r
-     *   <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an \r
-     *   attribute of another <code>Element</code> object. The DOM user must \r
-     *   explicitly clone <code>Attr</code> nodes to re-use them in other \r
-     *   elements.\r
-     */\r
-    public Attr setAttributeNode(Attr newAttr)\r
-                                 throws DOMException;\r
-\r
-    /**\r
-     * Removes the specified attribute node. If the removed <code>Attr</code> \r
-     * has a default value it is immediately replaced. The replacing \r
-     * attribute has the same namespace URI and local name, as well as the \r
-     * original prefix, when applicable.\r
-     * @param oldAttrThe <code>Attr</code> node to remove from the attribute \r
-     *   list.\r
-     * @return The <code>Attr</code> node that was removed.\r
-     * @exception DOMException\r
-     *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.\r
-     *   <br>NOT_FOUND_ERR: Raised if <code>oldAttr</code> is not an attribute \r
-     *   of the element.\r
-     */\r
-    public Attr removeAttributeNode(Attr oldAttr)\r
-                                    throws DOMException;\r
-\r
-    /**\r
-     * Returns a <code>NodeList</code> of all descendant <code>Elements</code> \r
-     * with a given tag name, in the order in which they are encountered in \r
-     * a preorder traversal of this <code>Element</code> tree.\r
-     * @param nameThe name of the tag to match on. The special value "*" \r
-     *   matches all tags.\r
-     * @return A list of matching <code>Element</code> nodes.\r
-     */\r
-    public NodeList getElementsByTagName(String name);\r
-\r
-    /**\r
-     * Retrieves an attribute value by local name and namespace URI. HTML-only \r
-     * DOM implementations do not need to implement this method.\r
-     * @param namespaceURIThe namespace URI of the attribute to retrieve.\r
-     * @param localNameThe local name of the attribute to retrieve.\r
-     * @return The <code>Attr</code> value as a string, or the empty string \r
-     *   if that attribute does not have a specified or default value.\r
-     * @since DOM Level 2\r
-     */\r
-    public String getAttributeNS(String namespaceURI, \r
-                                 String localName);\r
-\r
-    /**\r
-     * Adds a new attribute. If an attribute with the same local name and \r
-     * namespace URI is already present on the element, its prefix is \r
-     * changed to be the prefix part of the <code>qualifiedName</code>, and \r
-     * its value is changed to be the <code>value</code> parameter. This \r
-     * value is a simple string; it is not parsed as it is being set. So any \r
-     * markup (such as syntax to be recognized as an entity reference) is \r
-     * treated as literal text, and needs to be appropriately escaped by the \r
-     * implementation when it is written out. In order to assign an \r
-     * attribute value that contains entity references, the user must create \r
-     * an <code>Attr</code> node plus any <code>Text</code> and \r
-     * <code>EntityReference</code> nodes, build the appropriate subtree, \r
-     * and use <code>setAttributeNodeNS</code> or \r
-     * <code>setAttributeNode</code> to assign it as the value of an \r
-     * attribute.\r
-     * <br>HTML-only DOM implementations do not need to implement this method.\r
-     * @param namespaceURIThe namespace URI of the attribute to create or \r
-     *   alter.\r
-     * @param qualifiedNameThe qualified name of the attribute to create or \r
-     *   alter.\r
-     * @param valueThe value to set in string form.\r
-     * @exception DOMException\r
-     *   INVALID_CHARACTER_ERR: Raised if the specified qualified name \r
-     *   contains an illegal character.\r
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.\r
-     *   <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is \r
-     *   malformed, if the <code>qualifiedName</code> has a prefix and the \r
-     *   <code>namespaceURI</code> is <code>null</code>, if the \r
-     *   <code>qualifiedName</code> has a prefix that is "xml" and the \r
-     *   <code>namespaceURI</code> is different from "\r
-     *   http://www.w3.org/XML/1998/namespace", or if the \r
-     *   <code>qualifiedName</code> is "xmlns" and the \r
-     *   <code>namespaceURI</code> is different from "\r
-     *   http://www.w3.org/2000/xmlns/".\r
-     * @since DOM Level 2\r
-     */\r
-    public void setAttributeNS(String namespaceURI, \r
-                               String qualifiedName, \r
-                               String value)\r
-                               throws DOMException;\r
-\r
-    /**\r
-     * Removes an attribute by local name and namespace URI. If the removed \r
-     * attribute has a default value it is immediately replaced. The \r
-     * replacing attribute has the same namespace URI and local name, as \r
-     * well as the original prefix.\r
-     * <br>HTML-only DOM implementations do not need to implement this method.\r
-     * @param namespaceURIThe namespace URI of the attribute to remove.\r
-     * @param localNameThe local name of the attribute to remove.\r
-     * @exception DOMException\r
-     *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.\r
-     * @since DOM Level 2\r
-     */\r
-    public void removeAttributeNS(String namespaceURI, \r
-                                  String localName)\r
-                                  throws DOMException;\r
-\r
-    /**\r
-     * Retrieves an <code>Attr</code> node by local name and namespace URI. \r
-     * HTML-only DOM implementations do not need to implement this method.\r
-     * @param namespaceURIThe namespace URI of the attribute to retrieve.\r
-     * @param localNameThe local name of the attribute to retrieve.\r
-     * @return The <code>Attr</code> node with the specified attribute local \r
-     *   name and namespace URI or <code>null</code> if there is no such \r
-     *   attribute.\r
-     * @since DOM Level 2\r
-     */\r
-    public Attr getAttributeNodeNS(String namespaceURI, \r
-                                   String localName);\r
-\r
-    /**\r
-     * Adds a new attribute. If an attribute with that local name and that \r
-     * namespace URI is already present in the element, it is replaced by \r
-     * the new one.\r
-     * <br>HTML-only DOM implementations do not need to implement this method.\r
-     * @param newAttrThe <code>Attr</code> node to add to the attribute list.\r
-     * @return If the <code>newAttr</code> attribute replaces an existing \r
-     *   attribute with the same local name and namespace URI, the replaced \r
-     *   <code>Attr</code> node is returned, otherwise <code>null</code> is \r
-     *   returned.\r
-     * @exception DOMException\r
-     *   WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a \r
-     *   different document than the one that created the element.\r
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.\r
-     *   <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an \r
-     *   attribute of another <code>Element</code> object. The DOM user must \r
-     *   explicitly clone <code>Attr</code> nodes to re-use them in other \r
-     *   elements.\r
-     * @since DOM Level 2\r
-     */\r
-    public Attr setAttributeNodeNS(Attr newAttr)\r
-                                   throws DOMException;\r
-\r
-    /**\r
-     * Returns a <code>NodeList</code> of all the descendant \r
-     * <code>Elements</code> with a given local name and namespace URI in \r
-     * the order in which they are encountered in a preorder traversal of \r
-     * this <code>Element</code> tree.\r
-     * <br>HTML-only DOM implementations do not need to implement this method.\r
-     * @param namespaceURIThe namespace URI of the elements to match on. The \r
-     *   special value "*" matches all namespaces.\r
-     * @param localNameThe local name of the elements to match on. The \r
-     *   special value "*" matches all local names.\r
-     * @return A new <code>NodeList</code> object containing all the matched \r
-     *   <code>Elements</code>.\r
-     * @since DOM Level 2\r
-     */\r
-    public NodeList getElementsByTagNameNS(String namespaceURI, \r
-                                           String localName);\r
-\r
-    /**\r
-     * Returns <code>true</code> when an attribute with a given name is \r
-     * specified on this element or has a default value, <code>false</code> \r
-     * otherwise.\r
-     * @param nameThe name of the attribute to look for.\r
-     * @return <code>true</code> if an attribute with the given name is \r
-     *   specified on this element or has a default value, <code>false</code>\r
-     *    otherwise.\r
-     * @since DOM Level 2\r
-     */\r
-    public boolean hasAttribute(String name);\r
-\r
-    /**\r
-     * Returns <code>true</code> when an attribute with a given local name and \r
-     * namespace URI is specified on this element or has a default value, \r
-     * <code>false</code> otherwise. HTML-only DOM implementations do not \r
-     * need to implement this method.\r
-     * @param namespaceURIThe namespace URI of the attribute to look for.\r
-     * @param localNameThe local name of the attribute to look for.\r
-     * @return <code>true</code> if an attribute with the given local name \r
-     *   and namespace URI is specified or has a default value on this \r
-     *   element, <code>false</code> otherwise.\r
-     * @since DOM Level 2\r
-     */\r
-    public boolean hasAttributeNS(String namespaceURI, \r
-                                  String localName);\r
-\r
-}\r
diff --git a/libjava/org/w3c/dom/Entity.java b/libjava/org/w3c/dom/Entity.java
deleted file mode 100644 (file)
index 51a69cb..0000000
--- a/libjava/org/w3c/dom/Entity.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * This interface represents an entity, either parsed or unparsed, in an XML \r
- * document. Note that this models the entity itself not the entity \r
- * declaration. <code>Entity</code> declaration modeling has been left for a \r
- * later Level of the DOM specification.\r
- * <p>The <code>nodeName</code> attribute that is inherited from \r
- * <code>Node</code> contains the name of the entity.\r
- * <p>An XML processor may choose to completely expand entities before the \r
- * structure model is passed to the DOM; in this case there will be no \r
- * <code>EntityReference</code> nodes in the document tree.\r
- * <p>XML does not mandate that a non-validating XML processor read and \r
- * process entity declarations made in the external subset or declared in \r
- * external parameter entities. This means that parsed entities declared in \r
- * the external subset need not be expanded by some classes of applications, \r
- * and that the replacement value of the entity may not be available. When \r
- * the replacement value is available, the corresponding <code>Entity</code> \r
- * node's child list represents the structure of that replacement text. \r
- * Otherwise, the child list is empty.\r
- * <p>The DOM Level 2 does not support editing <code>Entity</code> nodes; if a \r
- * user wants to make changes to the contents of an <code>Entity</code>, \r
- * every related <code>EntityReference</code> node has to be replaced in the \r
- * structure model by a clone of the <code>Entity</code>'s contents, and \r
- * then the desired changes must be made to each of those clones instead. \r
- * <code>Entity</code> nodes and all their descendants are readonly.\r
- * <p>An <code>Entity</code> node does not have any parent.If the entity \r
- * contains an unbound namespace prefix, the <code>namespaceURI</code> of \r
- * the corresponding node in the <code>Entity</code> node subtree is \r
- * <code>null</code>. The same is true for <code>EntityReference</code> \r
- * nodes that refer to this entity, when they are created using the \r
- * <code>createEntityReference</code> method of the <code>Document</code> \r
- * interface. The DOM Level 2 does not support any mechanism to resolve \r
- * namespace prefixes.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface Entity extends Node {\r
-    /**\r
-     * The public identifier associated with the entity, if specified. If the \r
-     * public identifier was not specified, this is <code>null</code>.\r
-     */\r
-    public String getPublicId();\r
-\r
-    /**\r
-     * The system identifier associated with the entity, if specified. If the \r
-     * system identifier was not specified, this is <code>null</code>.\r
-     */\r
-    public String getSystemId();\r
-\r
-    /**\r
-     * For unparsed entities, the name of the notation for the entity. For \r
-     * parsed entities, this is <code>null</code>. \r
-     */\r
-    public String getNotationName();\r
-\r
-}\r
diff --git a/libjava/org/w3c/dom/EntityReference.java b/libjava/org/w3c/dom/EntityReference.java
deleted file mode 100644 (file)
index 31c854d..0000000
--- a/libjava/org/w3c/dom/EntityReference.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * <code>EntityReference</code> objects may be inserted into the structure \r
- * model when an entity reference is in the source document, or when the \r
- * user wishes to insert an entity reference. Note that character references \r
- * and references to predefined entities are considered to be expanded by \r
- * the HTML or XML processor so that characters are represented by their \r
- * Unicode equivalent rather than by an entity reference. Moreover, the XML \r
- * processor may completely expand references to entities while building the \r
- * structure model, instead of providing <code>EntityReference</code> \r
- * objects. If it does provide such objects, then for a given \r
- * <code>EntityReference</code> node, it may be that there is no \r
- * <code>Entity</code> node representing the referenced entity. If such an \r
- * <code>Entity</code> exists, then the subtree of the \r
- * <code>EntityReference</code> node is in general a copy of the \r
- * <code>Entity</code> node subtree. However, this may not be true when an \r
- * entity contains an unbound namespace prefix. In such a case, because the \r
- * namespace prefix resolution depends on where the entity reference is, the \r
- * descendants of the <code>EntityReference</code> node may be bound to \r
- * different namespace URIs.\r
- * <p>As for <code>Entity</code> nodes, <code>EntityReference</code> nodes and \r
- * all their descendants are readonly.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface EntityReference extends Node {\r
-}\r
diff --git a/libjava/org/w3c/dom/Node.java b/libjava/org/w3c/dom/Node.java
deleted file mode 100644 (file)
index ef650a2..0000000
--- a/libjava/org/w3c/dom/Node.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * The <code>Node</code> interface is the primary datatype for the entire \r
- * Document Object Model. It represents a single node in the document tree. \r
- * While all objects implementing the <code>Node</code> interface expose \r
- * methods for dealing with children, not all objects implementing the \r
- * <code>Node</code> interface may have children. For example, \r
- * <code>Text</code> nodes may not have children, and adding children to \r
- * such nodes results in a <code>DOMException</code> being raised.\r
- * <p>The attributes <code>nodeName</code>, <code>nodeValue</code> and \r
- * <code>attributes</code> are included as a mechanism to get at node \r
- * information without casting down to the specific derived interface. In \r
- * cases where there is no obvious mapping of these attributes for a \r
- * specific <code>nodeType</code> (e.g., <code>nodeValue</code> for an \r
- * <code>Element</code> or <code>attributes</code> for a <code>Comment</code>\r
- * ), this returns <code>null</code>. Note that the specialized interfaces \r
- * may contain additional and more convenient mechanisms to get and set the \r
- * relevant information.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface Node {\r
-    // NodeType\r
-    /**\r
-     * The node is an <code>Element</code>.\r
-     */\r
-    public static final short ELEMENT_NODE              = 1;\r
-    /**\r
-     * The node is an <code>Attr</code>.\r
-     */\r
-    public static final short ATTRIBUTE_NODE            = 2;\r
-    /**\r
-     * The node is a <code>Text</code> node.\r
-     */\r
-    public static final short TEXT_NODE                 = 3;\r
-    /**\r
-     * The node is a <code>CDATASection</code>.\r
-     */\r
-    public static final short CDATA_SECTION_NODE        = 4;\r
-    /**\r
-     * The node is an <code>EntityReference</code>.\r
-     */\r
-    public static final short ENTITY_REFERENCE_NODE     = 5;\r
-    /**\r
-     * The node is an <code>Entity</code>.\r
-     */\r
-    public static final short ENTITY_NODE               = 6;\r
-    /**\r
-     * The node is a <code>ProcessingInstruction</code>.\r
-     */\r
-    public static final short PROCESSING_INSTRUCTION_NODE = 7;\r
-    /**\r
-     * The node is a <code>Comment</code>.\r
-     */\r
-    public static final short COMMENT_NODE              = 8;\r
-    /**\r
-     * The node is a <code>Document</code>.\r
-     */\r
-    public static final short DOCUMENT_NODE             = 9;\r
-    /**\r
-     * The node is a <code>DocumentType</code>.\r
-     */\r
-    public static final short DOCUMENT_TYPE_NODE        = 10;\r
-    /**\r
-     * The node is a <code>DocumentFragment</code>.\r
-     */\r
-    public static final short DOCUMENT_FRAGMENT_NODE    = 11;\r
-    /**\r
-     * The node is a <code>Notation</code>.\r
-     */\r
-    public static final short NOTATION_NODE             = 12;\r
-\r
-    /**\r
-     * The name of this node, depending on its type; see the table above. \r
-     */\r
-    public String getNodeName();\r
-\r
-    /**\r
-     * The value of this node, depending on its type; see the table above. \r
-     * When it is defined to be <code>null</code>, setting it has no effect.\r
-     * @exception DOMException\r
-     *   NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.\r
-     * @exception DOMException\r
-     *   DOMSTRING_SIZE_ERR: Raised when it would return more characters than \r
-     *   fit in a <code>DOMString</code> variable on the implementation \r
-     *   platform.\r
-     */\r
-    public String getNodeValue()\r
-                                 throws DOMException;\r
-    public void setNodeValue(String nodeValue)\r
-                                 throws DOMException;\r
-\r
-    /**\r
-     * A code representing the type of the underlying object, as defined above.\r
-     */\r
-    public short getNodeType();\r
-\r
-    /**\r
-     * The parent of this node. All nodes, except <code>Attr</code>, \r
-     * <code>Document</code>, <code>DocumentFragment</code>, \r
-     * <code>Entity</code>, and <code>Notation</code> may have a parent. \r
-     * However, if a node has just been created and not yet added to the \r
-     * tree, or if it has been removed from the tree, this is \r
-     * <code>null</code>.\r
-     */\r
-    public Node getParentNode();\r
-\r
-    /**\r
-     * A <code>NodeList</code> that contains all children of this node. If \r
-     * there are no children, this is a <code>NodeList</code> containing no \r
-     * nodes.\r
-     */\r
-    public NodeList getChildNodes();\r
-\r
-    /**\r
-     * The first child of this node. If there is no such node, this returns \r
-     * <code>null</code>.\r
-     */\r
-    public Node getFirstChild();\r
-\r
-    /**\r
-     * The last child of this node. If there is no such node, this returns \r
-     * <code>null</code>.\r
-     */\r
-    public Node getLastChild();\r
-\r
-    /**\r
-     * The node immediately preceding this node. If there is no such node, \r
-     * this returns <code>null</code>.\r
-     */\r
-    public Node getPreviousSibling();\r
-\r
-    /**\r
-     * The node immediately following this node. If there is no such node, \r
-     * this returns <code>null</code>.\r
-     */\r
-    public Node getNextSibling();\r
-\r
-    /**\r
-     * A <code>NamedNodeMap</code> containing the attributes of this node (if \r
-     * it is an <code>Element</code>) or <code>null</code> otherwise. \r
-     */\r
-    public NamedNodeMap getAttributes();\r
-\r
-    /**\r
-     * The <code>Document</code> object associated with this node. This is \r
-     * also the <code>Document</code> object used to create new nodes. When \r
-     * this node is a <code>Document</code> or a <code>DocumentType</code> \r
-     * which is not used with any <code>Document</code> yet, this is \r
-     * <code>null</code>.\r
-     * @version DOM Level 2\r
-     */\r
-    public Document getOwnerDocument();\r
-\r
-    /**\r
-     * Inserts the node <code>newChild</code> before the existing child node \r
-     * <code>refChild</code>. If <code>refChild</code> is <code>null</code>, \r
-     * insert <code>newChild</code> at the end of the list of children.\r
-     * <br>If <code>newChild</code> is a <code>DocumentFragment</code> object, \r
-     * all of its children are inserted, in the same order, before \r
-     * <code>refChild</code>. If the <code>newChild</code> is already in the \r
-     * tree, it is first removed.\r
-     * @param newChildThe node to insert.\r
-     * @param refChildThe reference node, i.e., the node before which the new \r
-     *   node must be inserted.\r
-     * @return The node being inserted.\r
-     * @exception DOMException\r
-     *   HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not \r
-     *   allow children of the type of the <code>newChild</code> node, or if \r
-     *   the node to insert is one of this node's ancestors.\r
-     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>newChild</code> was created \r
-     *   from a different document than the one that created this node.\r
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly or \r
-     *   if the parent of the node being inserted is readonly.\r
-     *   <br>NOT_FOUND_ERR: Raised if <code>refChild</code> is not a child of \r
-     *   this node.\r
-     */\r
-    public Node insertBefore(Node newChild, \r
-                             Node refChild)\r
-                             throws DOMException;\r
-\r
-    /**\r
-     * Replaces the child node <code>oldChild</code> with <code>newChild</code>\r
-     *  in the list of children, and returns the <code>oldChild</code> node.\r
-     * <br>If <code>newChild</code> is a <code>DocumentFragment</code> object, \r
-     * <code>oldChild</code> is replaced by all of the \r
-     * <code>DocumentFragment</code> children, which are inserted in the \r
-     * same order. If the <code>newChild</code> is already in the tree, it \r
-     * is first removed.\r
-     * @param newChildThe new node to put in the child list.\r
-     * @param oldChildThe node being replaced in the list.\r
-     * @return The node replaced.\r
-     * @exception DOMException\r
-     *   HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not \r
-     *   allow children of the type of the <code>newChild</code> node, or if \r
-     *   the node to put in is one of this node's ancestors.\r
-     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>newChild</code> was created \r
-     *   from a different document than the one that created this node.\r
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node or the parent of \r
-     *   the new node is readonly.\r
-     *   <br>NOT_FOUND_ERR: Raised if <code>oldChild</code> is not a child of \r
-     *   this node.\r
-     */\r
-    public Node replaceChild(Node newChild, \r
-                             Node oldChild)\r
-                             throws DOMException;\r
-\r
-    /**\r
-     * Removes the child node indicated by <code>oldChild</code> from the list \r
-     * of children, and returns it.\r
-     * @param oldChildThe node being removed.\r
-     * @return The node removed.\r
-     * @exception DOMException\r
-     *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.\r
-     *   <br>NOT_FOUND_ERR: Raised if <code>oldChild</code> is not a child of \r
-     *   this node.\r
-     */\r
-    public Node removeChild(Node oldChild)\r
-                            throws DOMException;\r
-\r
-    /**\r
-     * Adds the node <code>newChild</code> to the end of the list of children \r
-     * of this node. If the <code>newChild</code> is already in the tree, it \r
-     * is first removed.\r
-     * @param newChildThe node to add.If it is a <code>DocumentFragment</code>\r
-     *    object, the entire contents of the document fragment are moved \r
-     *   into the child list of this node\r
-     * @return The node added.\r
-     * @exception DOMException\r
-     *   HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not \r
-     *   allow children of the type of the <code>newChild</code> node, or if \r
-     *   the node to append is one of this node's ancestors.\r
-     *   <br>WRONG_DOCUMENT_ERR: Raised if <code>newChild</code> was created \r
-     *   from a different document than the one that created this node.\r
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.\r
-     */\r
-    public Node appendChild(Node newChild)\r
-                            throws DOMException;\r
-\r
-    /**\r
-     * Returns whether this node has any children.\r
-     * @return  <code>true</code> if this node has any children, \r
-     *   <code>false</code> otherwise.\r
-     */\r
-    public boolean hasChildNodes();\r
-\r
-    /**\r
-     * Returns a duplicate of this node, i.e., serves as a generic copy \r
-     * constructor for nodes. The duplicate node has no parent; (\r
-     * <code>parentNode</code> is <code>null</code>.).\r
-     * <br>Cloning an <code>Element</code> copies all attributes and their \r
-     * values, including those generated by the XML processor to represent \r
-     * defaulted attributes, but this method does not copy any text it \r
-     * contains unless it is a deep clone, since the text is contained in a \r
-     * child <code>Text</code> node. Cloning an <code>Attribute</code> \r
-     * directly, as opposed to be cloned as part of an <code>Element</code> \r
-     * cloning operation, returns a specified attribute (\r
-     * <code>specified</code> is <code>true</code>). Cloning any other type \r
-     * of node simply returns a copy of this node.\r
-     * <br>Note that cloning an immutable subtree results in a mutable copy, \r
-     * but the children of an <code>EntityReference</code> clone are readonly\r
-     * . In addition, clones of unspecified <code>Attr</code> nodes are \r
-     * specified. And, cloning <code>Document</code>, \r
-     * <code>DocumentType</code>, <code>Entity</code>, and \r
-     * <code>Notation</code> nodes is implementation dependent.\r
-     * @param deepIf <code>true</code>, recursively clone the subtree under \r
-     *   the specified node; if <code>false</code>, clone only the node \r
-     *   itself (and its attributes, if it is an <code>Element</code>). \r
-     * @return The duplicate node.\r
-     */\r
-    public Node cloneNode(boolean deep);\r
-\r
-    /**\r
-     * Puts all <code>Text</code> nodes in the full depth of the sub-tree \r
-     * underneath this <code>Node</code>, including attribute nodes, into a \r
-     * "normal" form where only structure (e.g., elements, comments, \r
-     * processing instructions, CDATA sections, and entity references) \r
-     * separates <code>Text</code> nodes, i.e., there are neither adjacent \r
-     * <code>Text</code> nodes nor empty <code>Text</code> nodes. This can \r
-     * be used to ensure that the DOM view of a document is the same as if \r
-     * it were saved and re-loaded, and is useful when operations (such as \r
-     * XPointer  lookups) that depend on a particular document tree \r
-     * structure are to be used.In cases where the document contains \r
-     * <code>CDATASections</code>, the normalize operation alone may not be \r
-     * sufficient, since XPointers do not differentiate between \r
-     * <code>Text</code> nodes and <code>CDATASection</code> nodes.\r
-     * @version DOM Level 2\r
-     */\r
-    public void normalize();\r
-\r
-    /**\r
-     * Tests whether the DOM implementation implements a specific feature and \r
-     * that feature is supported by this node.\r
-     * @param featureThe name of the feature to test. This is the same name \r
-     *   which can be passed to the method <code>hasFeature</code> on \r
-     *   <code>DOMImplementation</code>.\r
-     * @param versionThis is the version number of the feature to test. In \r
-     *   Level 2, version 1, this is the string "2.0". If the version is not \r
-     *   specified, supporting any version of the feature will cause the \r
-     *   method to return <code>true</code>.\r
-     * @return Returns <code>true</code> if the specified feature is \r
-     *   supported on this node, <code>false</code> otherwise.\r
-     * @since DOM Level 2\r
-     */\r
-    public boolean isSupported(String feature, \r
-                               String version);\r
-\r
-    /**\r
-     * The namespace URI of this node, or <code>null</code> if it is \r
-     * unspecified.\r
-     * <br>This is not a computed value that is the result of a namespace \r
-     * lookup based on an examination of the namespace declarations in \r
-     * scope. It is merely the namespace URI given at creation time.\r
-     * <br>For nodes of any type other than <code>ELEMENT_NODE</code> and \r
-     * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1 \r
-     * method, such as <code>createElement</code> from the \r
-     * <code>Document</code> interface, this is always <code>null</code>.Per \r
-     * the Namespaces in XML Specification  an attribute does not inherit \r
-     * its namespace from the element it is attached to. If an attribute is \r
-     * not explicitly given a namespace, it simply has no namespace.\r
-     * @since DOM Level 2\r
-     */\r
-    public String getNamespaceURI();\r
-\r
-    /**\r
-     * The namespace prefix of this node, or <code>null</code> if it is \r
-     * unspecified.\r
-     * <br>Note that setting this attribute, when permitted, changes the \r
-     * <code>nodeName</code> attribute, which holds the qualified name, as \r
-     * well as the <code>tagName</code> and <code>name</code> attributes of \r
-     * the <code>Element</code> and <code>Attr</code> interfaces, when \r
-     * applicable.\r
-     * <br>Note also that changing the prefix of an attribute that is known to \r
-     * have a default value, does not make a new attribute with the default \r
-     * value and the original prefix appear, since the \r
-     * <code>namespaceURI</code> and <code>localName</code> do not change.\r
-     * <br>For nodes of any type other than <code>ELEMENT_NODE</code> and \r
-     * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1 \r
-     * method, such as <code>createElement</code> from the \r
-     * <code>Document</code> interface, this is always <code>null</code>.\r
-     * @exception DOMException\r
-     *   INVALID_CHARACTER_ERR: Raised if the specified prefix contains an \r
-     *   illegal character.\r
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.\r
-     *   <br>NAMESPACE_ERR: Raised if the specified <code>prefix</code> is \r
-     *   malformed, if the <code>namespaceURI</code> of this node is \r
-     *   <code>null</code>, if the specified prefix is "xml" and the \r
-     *   <code>namespaceURI</code> of this node is different from "\r
-     *   http://www.w3.org/XML/1998/namespace", if this node is an attribute \r
-     *   and the specified prefix is "xmlns" and the \r
-     *   <code>namespaceURI</code> of this node is different from "\r
-     *   http://www.w3.org/2000/xmlns/", or if this node is an attribute and \r
-     *   the <code>qualifiedName</code> of this node is "xmlns" .\r
-     * @since DOM Level 2\r
-     */\r
-    public String getPrefix();\r
-    public void setPrefix(String prefix)\r
-                               throws DOMException;\r
-\r
-    /**\r
-     * Returns the local part of the qualified name of this node.\r
-     * <br>For nodes of any type other than <code>ELEMENT_NODE</code> and \r
-     * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1 \r
-     * method, such as <code>createElement</code> from the \r
-     * <code>Document</code> interface, this is always <code>null</code>.\r
-     * @since DOM Level 2\r
-     */\r
-    public String getLocalName();\r
-\r
-    /**\r
-     * Returns whether this node (if it is an element) has any attributes.\r
-     * @return <code>true</code> if this node has any attributes, \r
-     *   <code>false</code> otherwise.\r
-     * @since DOM Level 2\r
-     */\r
-    public boolean hasAttributes();\r
-\r
-}\r
diff --git a/libjava/org/w3c/dom/Notation.java b/libjava/org/w3c/dom/Notation.java
deleted file mode 100644 (file)
index 284e015..0000000
--- a/libjava/org/w3c/dom/Notation.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * This interface represents a notation declared in the DTD. A notation either \r
- * declares, by name, the format of an unparsed entity (see section 4.7 of \r
- * the XML 1.0 specification ), or is used for formal declaration of \r
- * processing instruction targets (see section 2.6 of the XML 1.0 \r
- * specification ). The <code>nodeName</code> attribute inherited from \r
- * <code>Node</code> is set to the declared name of the notation.\r
- * <p>The DOM Level 1 does not support editing <code>Notation</code> nodes; \r
- * they are therefore readonly.\r
- * <p>A <code>Notation</code> node does not have any parent.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface Notation extends Node {\r
-    /**\r
-     * The public identifier of this notation. If the public identifier was \r
-     * not specified, this is <code>null</code>.\r
-     */\r
-    public String getPublicId();\r
-\r
-    /**\r
-     * The system identifier of this notation. If the system identifier was \r
-     * not specified, this is <code>null</code>.\r
-     */\r
-    public String getSystemId();\r
-\r
-}\r
diff --git a/libjava/org/w3c/dom/ProcessingInstruction.java b/libjava/org/w3c/dom/ProcessingInstruction.java
deleted file mode 100644 (file)
index e3cfd1b..0000000
--- a/libjava/org/w3c/dom/ProcessingInstruction.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * The <code>ProcessingInstruction</code> interface represents a "processing \r
- * instruction", used in XML as a way to keep processor-specific information \r
- * in the text of the document.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface ProcessingInstruction extends Node {\r
-    /**\r
-     * The target of this processing instruction. XML defines this as being \r
-     * the first token following the markup that begins the processing \r
-     * instruction.\r
-     */\r
-    public String getTarget();\r
-\r
-    /**\r
-     * The content of this processing instruction. This is from the first non \r
-     * white space character after the target to the character immediately \r
-     * preceding the <code>?&gt;</code>.\r
-     * @exception DOMException\r
-     *   NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.\r
-     */\r
-    public String getData();\r
-    public void setData(String data)\r
-                          throws DOMException;\r
-\r
-}\r
diff --git a/libjava/org/w3c/dom/Text.java b/libjava/org/w3c/dom/Text.java
deleted file mode 100644 (file)
index c7c9971..0000000
--- a/libjava/org/w3c/dom/Text.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*\r
- * Copyright (c) 2000 World Wide Web Consortium,\r
- * (Massachusetts Institute of Technology, Institut National de\r
- * Recherche en Informatique et en Automatique, Keio University). All\r
- * Rights Reserved. This program is distributed under the W3C's Software\r
- * Intellectual Property License. This program is distributed in the\r
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even\r
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
- * PURPOSE.\r
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-\r
-package org.w3c.dom;\r
-\r
-/**\r
- * The <code>Text</code> interface inherits from <code>CharacterData</code> \r
- * and represents the textual content (termed character data in XML) of an \r
- * <code>Element</code> or <code>Attr</code>. If there is no markup inside \r
- * an element's content, the text is contained in a single object \r
- * implementing the <code>Text</code> interface that is the only child of \r
- * the element. If there is markup, it is parsed into the information items \r
- * (elements, comments, etc.) and <code>Text</code> nodes that form the list \r
- * of children of the element.\r
- * <p>When a document is first made available via the DOM, there is only one \r
- * <code>Text</code> node for each block of text. Users may create adjacent \r
- * <code>Text</code> nodes that represent the contents of a given element \r
- * without any intervening markup, but should be aware that there is no way \r
- * to represent the separations between these nodes in XML or HTML, so they \r
- * will not (in general) persist between DOM editing sessions. The \r
- * <code>normalize()</code> method on <code>Node</code> merges any such \r
- * adjacent <code>Text</code> objects into a single node for each block of \r
- * text.\r
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>Document Object Model (DOM) Level 2 Core Specification</a>.\r
- */\r
-public interface Text extends CharacterData {\r
-    /**\r
-     * Breaks this node into two nodes at the specified <code>offset</code>, \r
-     * keeping both in the tree as siblings. After being split, this node \r
-     * will contain all the content up to the <code>offset</code> point. A \r
-     * new node of the same type, which contains all the content at and \r
-     * after the <code>offset</code> point, is returned. If the original \r
-     * node had a parent node, the new node is inserted as the next sibling \r
-     * of the original node. When the <code>offset</code> is equal to the \r
-     * length of this node, the new node has no data.\r
-     * @param offsetThe 16-bit unit offset at which to split, starting from \r
-     *   <code>0</code>.\r
-     * @return The new node, of the same type as this node.\r
-     * @exception DOMException\r
-     *   INDEX_SIZE_ERR: Raised if the specified offset is negative or greater \r
-     *   than the number of 16-bit units in <code>data</code>.\r
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.\r
-     */\r
-    public Text splitText(int offset)\r
-                          throws DOMException;\r
-\r
-}\r
diff --git a/libjava/org/xml/sax/package.html b/libjava/org/xml/sax/package.html
deleted file mode 100644 (file)
index 25f4b86..0000000
--- a/libjava/org/xml/sax/package.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<html><head>
-
-<!-- $Id: package.html,v 1.2.2.2 2002/01/12 21:42:21 dbrownell Exp $ -->
-
-</head><body>
-
-<p> This package provides the core SAX APIs.
-Some SAX1 APIs are deprecated to encourage integration of
-namespace-awareness into designs of new applications
-and into maintainance of existing infrastructure. </p>
-
-<p>See <a href='http://www.saxproject.org'>http://www.saxproject.org</a>
-for more information about SAX.</p>
-
-
-<h2> SAX2 Standard Feature Flags </h2>
-
-<p> One of the essential characteristics of SAX2 is that it added
-feature flags which can be used to examine and perhaps modify
-parser modes, in particular modes such as validation.
-Since features are identified by (absolute) URIs, anyone
-can define such features.   
-Currently defined standard feature URIs have the prefix
-<code>http://xml.org/sax/features/</code> before an identifier such as
-<code>validation</code>.  Turn features on or off using
-<em>setFeature</em>.  Those standard identifiers are: </p>
-
-
-<table border="1" cellpadding="3" cellspacing="0" width="100%">
-    <tr align="center" bgcolor="#ccccff">
-       <th>Feature ID</th>
-       <th>Default</th>
-       <th>Description</th>
-       </tr>
-
-    <tr>
-       <td>external-general-entities</td>
-       <td><em>unspecified</em></td>
-       <td> Reports whether this parser processes external
-           general entities; always true if validating</td>
-       </tr>
-
-    <tr>
-       <td>external-parameter-entities</td>
-       <td><em>unspecified</em></td>
-       <td> Reports whether this parser processes external
-           parameter entities; always true if validating</td>
-       </tr>
-
-    <tr>
-       <td>lexical-handler/parameter-entities</td>
-       <td><em>unspecified</em></td>
-       <td> true indicates that the LexicalHandler will report the
-           beginning and end of parameter entities
-           </td>
-       </tr>
-
-    <tr>
-       <td>namespaces</td>
-       <td>true</td>
-       <td> true indicates namespace URIs and unprefixed local names
-           for element and attribute names will be available </td>
-       </tr>
-
-    <tr>
-       <td>namespace-prefixes</td>
-       <td>false</td>
-       <td> true indicates XML 1.0 names (with prefixes) and attributes
-           (including <em>xmlns*</em> attributes) will be available </td>
-       </tr>
-
-    <tr>
-       <td>string-interning</td>
-       <td><em>unspecified</em></td>
-       <td> true if all XML names (for elements, prefixes, attributes,
-           entities, notations, and local names),
-           as well as Namespace URIs, will have been interned
-           using <em>java.lang.String.intern</em>. This supports fast
-           testing of equality/inequality against string constants.</td>
-       </tr>
-
-    <tr>
-       <td>validation</td>
-       <td><em>unspecified</em></td>
-       <td> controls whether the parser is reporting all validity
-           errors; if true, all external entities will be read.  </td>
-       </tr>
-
-</table>
-
-<p> Support for the default values of the
-<em>namespaces</em> and <em>namespace-prefixes</em>
-properties is required.
-</p>
-
-<p> For default values not specified by SAX2,
-each XMLReader implementation specifies its default,
-or may choose not to expose the feature flag.
-Unless otherwise specified here,
-implementations may support changing current values
-of these standard feature flags, but not while parsing.
-</p>
-
-<h2> SAX2 Standard Handler and Property IDs </h2>
-
-<p> For parser interface characteristics that are described
-as objects, a separate namespace is defined.  The
-objects in this namespace are again identified by URI, and
-the standard property URIs have the prefix
-<code>http://xml.org/sax/properties/</code> before an identifier such as
-<code>lexical-handler</code> or
-<code>dom-node</code>.  Manage those properties using
-<em>setProperty()</em>.  Those identifiers are: </p>
-
-<table border="1" cellpadding="3" cellspacing="0" width="100%">
-    <tr align="center" bgcolor="#ccccff">
-       <th>Property ID</th>
-       <th>Description</th>
-       </tr>
-
-    <tr>
-       <td>declaration-handler</td>
-       <td> Used to see most DTD declarations except those treated
-           as lexical ("document element name is ...") or which are
-           mandatory for all SAX parsers (<em>DTDHandler</em>).
-           The Object must implement <a href="ext/DeclHandler.html"
-           ><em>org.xml.sax.ext.DeclHandler</em></a>.
-           </td>
-       </tr>
-
-    <tr>
-       <td>dom-node</td>
-       <td> For "DOM Walker" style parsers, which ignore their
-           <em>parser.parse()</em> parameters, this is used to
-           specify the DOM (sub)tree being walked by the parser.
-           The Object must implement the
-           <em>org.w3c.dom.Node</em> interface.
-           </td>
-       </tr>
-
-    <tr>
-       <td>lexical-handler</td>
-       <td> Used to see some syntax events that are essential in some
-           applications:  comments, CDATA delimeters, selected general
-           entity inclusions, and the start and end of the DTD
-           (and declaration of document element name).
-           The Object must implement <a href="ext/LexicalHandler.html"
-           ><em>org.xml.sax.ext.LexicalHandler</em></a>.
-           </td>
-       </tr>
-
-    <tr>
-       <td>xml-string</td>
-       <td> Readable only during a parser callback, this exposes a <b>TBS</b>
-           chunk of characters responsible for the current event. </td>
-       </tr>
-
-</table>
-
-<p> All of these standard properties are optional;
-XMLReader implementations need not support them.
-</p>
-
-</body></html>
Domain: System / Toolchain;