PatchSet 5018 Date: 2004/07/26 02:40:47 Author: dalibor Branch: HEAD Tag: (none) Log: Resynced with GNU JAXP
2004-07-25 Dalibor Topic <[EMAIL PROTECTED]> * include/Makefile.am (LIBXMLJ_JNI_HDRS) Updated. * include/Makefile.in, libraries/javalib/Makefile.am, libraries/javalib/Makefile.in, libraries/javalib/all.files: Regenerated. * kaffe/scripts/javadoc.in, kaffe/scripts/compat/javadoc.in: Updated for libxslt transformer. * libraries/clib/libxmlj/xmlj_dom.c, libraries/clib/libxmlj/xmlj_dom.h, libraries/clib/libxmlj/xmlj_error.c, libraries/clib/libxmlj/xmlj_io.c, libraries/clib/libxmlj/xmlj_io.h, libraries/clib/libxmlj/xmlj_node.c, libraries/clib/libxmlj/xmlj_sax.c, libraries/clib/libxmlj/xmlj_sax.h, libraries/clib/libxmlj/xmlj_transform.c, libraries/clib/libxmlj/xmlj_util.c, libraries/clib/libxmlj/xmlj_util.h, libraries/clib/libxmlj/xmlj_xpath.c, libraries/javalib/gnu/xml/aelfred2/SAXDriver.java, libraries/javalib/gnu/xml/aelfred2/XmlParser.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeAttr.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeCDATASection.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeCharacterData.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeComment.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocument.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentBuilderFactory.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentFragment.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentType.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeElement.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeEntity.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeEntityReference.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeNode.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeNodeList.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeNotation.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeText.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeXPathExpression.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeXPathNSResolver.java, libraries/javalib/gnu/xml/libxmlj/dom/GnomeXPathResult.java, libraries/javalib/gnu/xml/libxmlj/sax/GnomeLocator.java, libraries/javalib/gnu/xml/libxmlj/sax/GnomeSAXParser.java, libraries/javalib/gnu/xml/libxmlj/sax/GnomeSAXParserFactory.java, libraries/javalib/gnu/xml/libxmlj/sax/GnomeXMLReader.java, libraries/javalib/gnu/xml/libxmlj/sax/Namespaces.java, libraries/javalib/gnu/xml/libxmlj/sax/StringArrayAttributes.java, libraries/javalib/gnu/xml/libxmlj/sax/XMLName.java, libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java, libraries/javalib/gnu/xml/libxmlj/transform/JavaContext.java, libraries/javalib/gnu/xml/libxmlj/transform/LibxsltStylesheet.java, libraries/javalib/gnu/xml/libxmlj/transform/TransformTest.java, libraries/javalib/gnu/xml/libxmlj/util/EmptyNodeList.java, libraries/javalib/gnu/xml/libxmlj/util/NamedInputStream.java, libraries/javalib/gnu/xml/libxmlj/util/StandaloneDocumentType.java, libraries/javalib/gnu/xml/libxmlj/util/StandaloneLocator.java, libraries/javalib/gnu/xml/libxmlj/util/XMLJ.java: Resynced with GNU JAXP. 2004-07-21 Chris Burdess <[EMAIL PROTECTED]> * GnomeTransformerFactory.java: getFeature supports stream features. * dom: Added traversal function. 2004-07-12 Chris Burdess <[EMAIL PROTECTED]> * dom: Entities and notations NamedNodeMaps. 2004-07-06 Chris Burdess <[EMAIL PROTECTED]> * xpath: Permit wildcards in getElementsByTagName[NS]. 2004-07-04 Chris Burdess <[EMAIL PROTECTED]> * dom: Skeleton DOMConfiguration implementation. 2004-07-03 Chris Burdess <[EMAIL PROTECTED]> * dom: Corrected GnomeElement attribute methods and isEqualNode. 2004-07-01 Chris Burdess <[EMAIL PROTECTED]> * dom: Corrected implementation of getElementsByTagName. 2004-06-29 Chris Burdess <[EMAIL PROTECTED]> * dom: Added implementation of DOMImplementationSource. 2004-06-28 Chris Burdess <[EMAIL PROTECTED]> * dom: Fixed name matching. 2004-06-26 Chris Burdess <[EMAIL PROTECTED]> * dom: Added GnomeTypeInfo. 2004-06-25 Chris Burdess <[EMAIL PROTECTED]> * xmlj_sax.c: Revert to calling ignorableWhitespace. 2004-06-23 Chris Burdess <[EMAIL PROTECTED]> * all: Use RawData for native pointers. * xmlj_sax.c: Fixed entity resolution. * xmlj_io.c: Fixed race condition closing input stream context. 2004-07-25 Musachy Barroso <[EMAIL PROTECTED]> * XmlParser.java: Fixed end-of-line handling to comply with sec 2.11. 2004-07-11 Musachy Barroso <[EMAIL PROTECTED]> * XmlParser.java: Handle empty documents. 2004-07-11 Musachy Barroso <[EMAIL PROTECTED]> * XmlParser.java: Call StartDocument at the right time. 2004-07-11 Musachy Barroso <[EMAIL PROTECTED]> * XmlParser.java: Disable LIT_DISABLE_CREF flag on entities parsing. 2004-07-11 Musachy Barroso <[EMAIL PROTECTED]> * SAXDriver.java: Refactoring of various attributes lists into a single list. 2004-06-24 Chris Burdess <[EMAIL PROTECTED]> * SAXDriver.java: Introduced reset method to reset state before new parse. Thanks to Musachy Barroso. Members: ChangeLog:1.2577->1.2578 include/Makefile.am:1.66->1.67 include/Makefile.in:1.176->1.177 kaffe/scripts/javadoc.in:1.5->1.6 kaffe/scripts/compat/javadoc.in:1.6->1.7 libraries/clib/libxmlj/xmlj_dom.c:1.3->1.4 libraries/clib/libxmlj/xmlj_dom.h:1.2->1.3 libraries/clib/libxmlj/xmlj_error.c:1.3->1.4 libraries/clib/libxmlj/xmlj_io.c:1.4->1.5 libraries/clib/libxmlj/xmlj_io.h:1.3->1.4 libraries/clib/libxmlj/xmlj_node.c:1.3->1.4 libraries/clib/libxmlj/xmlj_sax.c:1.3->1.4 libraries/clib/libxmlj/xmlj_sax.h:1.1->1.2 libraries/clib/libxmlj/xmlj_transform.c:1.3->1.4 libraries/clib/libxmlj/xmlj_util.c:1.2->1.3 libraries/clib/libxmlj/xmlj_util.h:1.2->1.3 libraries/clib/libxmlj/xmlj_xpath.c:1.2->1.3 libraries/javalib/Makefile.am:1.207->1.208 libraries/javalib/Makefile.in:1.283->1.284 libraries/javalib/all.files:1.7->1.8 libraries/javalib/gnu/xml/aelfred2/SAXDriver.java:1.8->1.9 libraries/javalib/gnu/xml/aelfred2/XmlParser.java:1.7->1.8 libraries/javalib/gnu/xml/dom/ImplementationList.java:INITIAL->1.1 libraries/javalib/gnu/xml/dom/ImplementationSource.java:INITIAL->1.1 libraries/javalib/gnu/xml/libxmlj/RawData.java:INITIAL->1.1 libraries/javalib/gnu/xml/libxmlj/RawData32.java:INITIAL->1.1 libraries/javalib/gnu/xml/libxmlj/RawData64.java:INITIAL->1.1 libraries/javalib/gnu/xml/libxmlj/dom/GnomeAttr.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/dom/GnomeCDATASection.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/dom/GnomeCharacterData.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/dom/GnomeComment.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/dom/GnomeDOMException.java:INITIAL->1.1 libraries/javalib/gnu/xml/libxmlj/dom/GnomeDOMStringList.java:INITIAL->1.1 libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocument.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentBuilderFactory.java:1.3->1.4 libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentFragment.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentType.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/dom/GnomeElement.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/dom/GnomeEntity.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/dom/GnomeEntityReference.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/dom/GnomeNode.java:1.3->1.4 libraries/javalib/gnu/xml/libxmlj/dom/GnomeNodeIterator.java:INITIAL->1.1 libraries/javalib/gnu/xml/libxmlj/dom/GnomeNodeList.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/dom/GnomeNotation.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/dom/GnomeText.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/dom/GnomeTypeInfo.java:INITIAL->1.1 libraries/javalib/gnu/xml/libxmlj/dom/GnomeXPathExpression.java:1.1->1.2 libraries/javalib/gnu/xml/libxmlj/dom/GnomeXPathNSResolver.java:1.1->1.2 libraries/javalib/gnu/xml/libxmlj/dom/GnomeXPathNodeList.java:INITIAL->1.1 libraries/javalib/gnu/xml/libxmlj/dom/GnomeXPathResult.java:1.1->1.2 libraries/javalib/gnu/xml/libxmlj/dom/MatchingNodeList.java:1.2->1.3(DEAD) libraries/javalib/gnu/xml/libxmlj/sax/GnomeLocator.java:1.1->1.2 libraries/javalib/gnu/xml/libxmlj/sax/GnomeSAXParser.java:1.1->1.2 libraries/javalib/gnu/xml/libxmlj/sax/GnomeSAXParserFactory.java:1.1->1.2 libraries/javalib/gnu/xml/libxmlj/sax/GnomeXMLReader.java:1.1->1.2 libraries/javalib/gnu/xml/libxmlj/sax/Namespaces.java:1.1->1.2 libraries/javalib/gnu/xml/libxmlj/sax/StringArrayAttributes.java:1.1->1.2 libraries/javalib/gnu/xml/libxmlj/sax/XMLName.java:1.1->1.2 libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java:1.1->1.2 libraries/javalib/gnu/xml/libxmlj/transform/JavaContext.java:1.3->1.4 libraries/javalib/gnu/xml/libxmlj/transform/LibxsltStylesheet.java:1.3->1.4 libraries/javalib/gnu/xml/libxmlj/transform/TransformTest.java:1.3->1.4 libraries/javalib/gnu/xml/libxmlj/util/EmptyNodeList.java:1.1->1.2 libraries/javalib/gnu/xml/libxmlj/util/NamedInputStream.java:1.1->1.2 libraries/javalib/gnu/xml/libxmlj/util/StandaloneDocumentType.java:1.1->1.2 libraries/javalib/gnu/xml/libxmlj/util/StandaloneLocator.java:1.2->1.3 libraries/javalib/gnu/xml/libxmlj/util/XMLJ.java:1.1->1.2 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.2577 kaffe/ChangeLog:1.2578 --- kaffe/ChangeLog:1.2577 Sun Jul 25 22:46:12 2004 +++ kaffe/ChangeLog Mon Jul 26 02:40:47 2004 @@ -1,5 +1,145 @@ 2004-07-25 Dalibor Topic <[EMAIL PROTECTED]> + * include/Makefile.am + (LIBXMLJ_JNI_HDRS) Updated. + + * include/Makefile.in, + libraries/javalib/Makefile.am, + libraries/javalib/Makefile.in, + libraries/javalib/all.files: + Regenerated. + + * kaffe/scripts/javadoc.in, + kaffe/scripts/compat/javadoc.in: + Updated for libxslt transformer. + + * libraries/clib/libxmlj/xmlj_dom.c, + libraries/clib/libxmlj/xmlj_dom.h, + libraries/clib/libxmlj/xmlj_error.c, + libraries/clib/libxmlj/xmlj_io.c, + libraries/clib/libxmlj/xmlj_io.h, + libraries/clib/libxmlj/xmlj_node.c, + libraries/clib/libxmlj/xmlj_sax.c, + libraries/clib/libxmlj/xmlj_sax.h, + libraries/clib/libxmlj/xmlj_transform.c, + libraries/clib/libxmlj/xmlj_util.c, + libraries/clib/libxmlj/xmlj_util.h, + libraries/clib/libxmlj/xmlj_xpath.c, + libraries/javalib/gnu/xml/aelfred2/SAXDriver.java, + libraries/javalib/gnu/xml/aelfred2/XmlParser.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeAttr.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeCDATASection.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeCharacterData.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeComment.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocument.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentBuilderFactory.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentFragment.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentType.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeElement.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeEntity.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeEntityReference.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeNode.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeNodeList.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeNotation.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeText.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeXPathExpression.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeXPathNSResolver.java, + libraries/javalib/gnu/xml/libxmlj/dom/GnomeXPathResult.java, + libraries/javalib/gnu/xml/libxmlj/sax/GnomeLocator.java, + libraries/javalib/gnu/xml/libxmlj/sax/GnomeSAXParser.java, + libraries/javalib/gnu/xml/libxmlj/sax/GnomeSAXParserFactory.java, + libraries/javalib/gnu/xml/libxmlj/sax/GnomeXMLReader.java, + libraries/javalib/gnu/xml/libxmlj/sax/Namespaces.java, + libraries/javalib/gnu/xml/libxmlj/sax/StringArrayAttributes.java, + libraries/javalib/gnu/xml/libxmlj/sax/XMLName.java, + libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java, + libraries/javalib/gnu/xml/libxmlj/transform/JavaContext.java, + libraries/javalib/gnu/xml/libxmlj/transform/LibxsltStylesheet.java, + libraries/javalib/gnu/xml/libxmlj/transform/TransformTest.java, + libraries/javalib/gnu/xml/libxmlj/util/EmptyNodeList.java, + libraries/javalib/gnu/xml/libxmlj/util/NamedInputStream.java, + libraries/javalib/gnu/xml/libxmlj/util/StandaloneDocumentType.java, + libraries/javalib/gnu/xml/libxmlj/util/StandaloneLocator.java, + libraries/javalib/gnu/xml/libxmlj/util/XMLJ.java: + Resynced with GNU JAXP. + + 2004-07-21 Chris Burdess <[EMAIL PROTECTED]> + + * GnomeTransformerFactory.java: getFeature supports stream features. + * dom: Added traversal function. + + 2004-07-12 Chris Burdess <[EMAIL PROTECTED]> + + * dom: Entities and notations NamedNodeMaps. + + 2004-07-06 Chris Burdess <[EMAIL PROTECTED]> + + * xpath: Permit wildcards in getElementsByTagName[NS]. + + 2004-07-04 Chris Burdess <[EMAIL PROTECTED]> + + * dom: Skeleton DOMConfiguration implementation. + + 2004-07-03 Chris Burdess <[EMAIL PROTECTED]> + + * dom: Corrected GnomeElement attribute methods and isEqualNode. + + 2004-07-01 Chris Burdess <[EMAIL PROTECTED]> + + * dom: Corrected implementation of getElementsByTagName. + + 2004-06-29 Chris Burdess <[EMAIL PROTECTED]> + + * dom: Added implementation of DOMImplementationSource. + + 2004-06-28 Chris Burdess <[EMAIL PROTECTED]> + + * dom: Fixed name matching. + + 2004-06-26 Chris Burdess <[EMAIL PROTECTED]> + + * dom: Added GnomeTypeInfo. + + 2004-06-25 Chris Burdess <[EMAIL PROTECTED]> + + * xmlj_sax.c: Revert to calling ignorableWhitespace. + + 2004-06-23 Chris Burdess <[EMAIL PROTECTED]> + + * all: Use RawData for native pointers. + * xmlj_sax.c: Fixed entity resolution. + * xmlj_io.c: Fixed race condition closing input stream context. + + 2004-07-25 Musachy Barroso <[EMAIL PROTECTED]> + + * XmlParser.java: Fixed end-of-line handling to comply with sec 2.11. + + 2004-07-11 Musachy Barroso <[EMAIL PROTECTED]> + + * XmlParser.java: Handle empty documents. + + 2004-07-11 Musachy Barroso <[EMAIL PROTECTED]> + + * XmlParser.java: Call StartDocument at the right time. + + 2004-07-11 Musachy Barroso <[EMAIL PROTECTED]> + + * XmlParser.java: Disable LIT_DISABLE_CREF flag on entities parsing. + + 2004-07-11 Musachy Barroso <[EMAIL PROTECTED]> + + * SAXDriver.java: Refactoring of various attributes lists into a single list. + + 2004-06-24 Chris Burdess <[EMAIL PROTECTED]> + + * SAXDriver.java: Introduced reset method to reset state before + new parse. Thanks to Musachy Barroso. + +2004-07-25 Dalibor Topic <[EMAIL PROTECTED]> + Added support for https connections. * libraries/clib/security/java.security: Index: kaffe/include/Makefile.am diff -u kaffe/include/Makefile.am:1.66 kaffe/include/Makefile.am:1.67 --- kaffe/include/Makefile.am:1.66 Sun Jul 25 07:59:52 2004 +++ kaffe/include/Makefile.am Mon Jul 26 02:40:53 2004 @@ -170,10 +170,15 @@ gnu_xml_libxmlj_dom_GnomeNode.h \ gnu_xml_libxmlj_dom_GnomeNodeList.h \ gnu_xml_libxmlj_dom_GnomeProcessingInstruction.h \ - gnu_xml_libxmlj_dom_MatchingNodeList.h \ + gnu_xml_libxmlj_dom_GnomeTypeInfo.h \ gnu_xml_libxmlj_sax_GnomeLocator.h \ gnu_xml_libxmlj_sax_GnomeXMLReader.h \ + gnu_xml_libxmlj_dom_GnomeXPathExpression.h \ + gnu_xml_libxmlj_dom_GnomeXPathNodeList.h \ + gnu_xml_libxmlj_dom_GnomeXPathNSResolver.h \ + gnu_xml_libxmlj_dom_GnomeXPathResult.h \ gnu_xml_libxmlj_transform_LibxsltStylesheet.h \ + gnu_xml_libxmlj_transform_GnomeTransformerFactory.h \ gnu_xml_libxmlj_transform_JavaContext.h LIBGTKPEER_JNI_HDRS = \ Index: kaffe/include/Makefile.in diff -u kaffe/include/Makefile.in:1.176 kaffe/include/Makefile.in:1.177 --- kaffe/include/Makefile.in:1.176 Sun Jul 25 07:59:52 2004 +++ kaffe/include/Makefile.in Mon Jul 26 02:40:54 2004 @@ -491,10 +491,15 @@ gnu_xml_libxmlj_dom_GnomeNode.h \ gnu_xml_libxmlj_dom_GnomeNodeList.h \ gnu_xml_libxmlj_dom_GnomeProcessingInstruction.h \ - gnu_xml_libxmlj_dom_MatchingNodeList.h \ + gnu_xml_libxmlj_dom_GnomeTypeInfo.h \ gnu_xml_libxmlj_sax_GnomeLocator.h \ gnu_xml_libxmlj_sax_GnomeXMLReader.h \ + gnu_xml_libxmlj_dom_GnomeXPathExpression.h \ + gnu_xml_libxmlj_dom_GnomeXPathNodeList.h \ + gnu_xml_libxmlj_dom_GnomeXPathNSResolver.h \ + gnu_xml_libxmlj_dom_GnomeXPathResult.h \ gnu_xml_libxmlj_transform_LibxsltStylesheet.h \ + gnu_xml_libxmlj_transform_GnomeTransformerFactory.h \ gnu_xml_libxmlj_transform_JavaContext.h LIBGTKPEER_JNI_HDRS = \ Index: kaffe/kaffe/scripts/javadoc.in diff -u kaffe/kaffe/scripts/javadoc.in:1.5 kaffe/kaffe/scripts/javadoc.in:1.6 --- kaffe/kaffe/scripts/javadoc.in:1.5 Fri May 21 14:39:32 2004 +++ kaffe/kaffe/scripts/javadoc.in Mon Jul 26 02:40:55 2004 @@ -3,6 +3,6 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ export CLASSPATH=$CLASSPATH:@prefix@/lib/gjdoc.jar -exec @bindir@/@kaffe_TRANSF@ -Djavax.xml.transform.TransformerFactory=gnu.xml.libxmlj.transform.TransformerFactoryImpl $JAVA_OPTS gnu.classpath.tools.gjdoc.Main ${1+"$@"} +exec @bindir@/@kaffe_TRANSF@ -Djavax.xml.transform.TransformerFactory=gnu.xml.libxmlj.transform.GnomeTransformerFactory $JAVA_OPTS gnu.classpath.tools.gjdoc.Main ${1+"$@"} exit $? Index: kaffe/kaffe/scripts/compat/javadoc.in diff -u kaffe/kaffe/scripts/compat/javadoc.in:1.6 kaffe/kaffe/scripts/compat/javadoc.in:1.7 --- kaffe/kaffe/scripts/compat/javadoc.in:1.6 Fri May 21 14:39:33 2004 +++ kaffe/kaffe/scripts/compat/javadoc.in Mon Jul 26 02:40:56 2004 @@ -3,5 +3,5 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ export CLASSPATH=$CLASSPATH:@prefix@/lib/gjdoc.jar -exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS -Djavax.xml.transform.TransformerFactory=gnu.xml.libxmlj.transform.TransformerFactoryImpl gnu.classpath.tools.gjdoc.Main ${1+"$@"} +exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS -Djavax.xml.transform.TransformerFactory=gnu.xml.libxmlj.transform.GnomeTransformerFactory gnu.classpath.tools.gjdoc.Main ${1+"$@"} exit $? Index: kaffe/libraries/clib/libxmlj/xmlj_dom.c diff -u kaffe/libraries/clib/libxmlj/xmlj_dom.c:1.3 kaffe/libraries/clib/libxmlj/xmlj_dom.c:1.4 --- kaffe/libraries/clib/libxmlj/xmlj_dom.c:1.3 Sat Jun 5 18:12:19 2004 +++ kaffe/libraries/clib/libxmlj/xmlj_dom.c Mon Jul 26 02:40:56 2004 @@ -36,14 +36,149 @@ #include <fcntl.h> #include <unistd.h> -resolveEntitySAXFunc defaultResolveEntity; -warningSAXFunc defaultWarning; -errorSAXFunc defaultError; -fatalErrorSAXFunc defaultFatalError; - JNIEnv *dom_cb_env; jobject dom_cb_obj; +typedef struct +{ + int index; + int count; + xmlNodePtr node; +} +xmljHashScanData; + +/* + * Determines whether a child node is suitable for insertion in the list of + * children for a given parent node. + * Returns 0 on success, a DOMException code otherwise. + */ +void +xmljValidateChildNode (JNIEnv *env, xmlNodePtr parent, xmlNodePtr child) +{ + xmlNodePtr cur; + + if (child == NULL || parent == NULL) + { + xmljThrowDOMException (env, 8, NULL); /* NOT_FOUND_ERR */ + return; + } + if (child->doc != parent->doc) + { + xmljThrowDOMException (env, 4, NULL); /* WRONG_DOCUMENT_ERR */ + return; + } + /* Check that new parent is of an allowed type */ + switch (parent->type) + { + case XML_CDATA_SECTION_NODE: + case XML_COMMENT_NODE: + case XML_TEXT_NODE: + case XML_ENTITY_NODE: + case XML_ENTITY_REF_NODE: + case XML_NOTATION_NODE: + case XML_PI_NODE: + /* these can't have any children */ + /* HIERARCHY_REQUEST_ERR */ + xmljThrowDOMException (env, 3, "parent type does not allow children"); + return; + case XML_ATTRIBUTE_NODE: + if (child->type != XML_TEXT_NODE && + child->type != XML_ENTITY_REF_NODE) + { + /* HIERARCHY_REQUEST_ERR */ + xmljThrowDOMException (env, 3, "attributes may only contain text or entity reference nodes"); + return; + } + break; + case XML_DOCUMENT_FRAG_NODE: + case XML_ELEMENT_NODE: + if (child->type == XML_DTD_NODE || + child->type == XML_DOCUMENT_TYPE_NODE || + child->type == XML_ENTITY_NODE || + child->type == XML_NOTATION_NODE || + child->type == XML_PI_NODE) + { + /* HIERARCHY_REQUEST_ERR */ + xmljThrowDOMException (env, 3, "parent type does not allow child of this type"); + return; + } + /* fall through */ + default: + if (child->type == XML_ATTRIBUTE_NODE || + child->type == XML_DOCUMENT_NODE || + child->type == XML_DOCUMENT_FRAG_NODE) + { + /* HIERARCHY_REQUEST_ERR */ + xmljThrowDOMException (env, 3, "node type may not be a child"); + return; + } + /* TODO others? */ + } + /* Check that new parent is not self or an ancestor */ + for (cur = parent; cur != NULL; cur = cur->parent) + { + if (cur == child) + { + /* HIERARCHY_REQUEST_ERR */ + xmljThrowDOMException (env, 3, "child cannot be an ancestor of itself"); + return; + } + } + /* Check that new parent does not add a second doctype or root element + * to a document parent */ + if (parent->type == XML_DOCUMENT_NODE) + { + cur = parent->children; + while (cur != NULL) + { + if (cur->type == XML_DTD_NODE || + cur->type == XML_DOCUMENT_TYPE_NODE || + (cur->type == XML_ELEMENT_NODE && + parent->type == XML_DOCUMENT_NODE)) + { + if (child->type == cur->type && child != cur) + { + /* HIERARCHY_REQUEST_ERR */ + xmljThrowDOMException (env, 3, "cannot add a second doctype or root element"); + return; + } + } + cur = cur->next; + } + } +} + +/* + * Adds the specified attribute node to the list of attributes for the given + * element. + */ +void +xmljAddAttribute (xmlNodePtr node, xmlAttrPtr attr) +{ + xmlAttrPtr cur = node->properties; + + if (cur == NULL) + { + node->properties = attr; + attr->prev = NULL; + attr->next = NULL; + attr->parent = node; + attr->doc = node->doc; + } + else + { + while (cur->next != NULL) + { + cur = cur->next; + } + cur->next = attr; + attr->prev = cur; + attr->next = NULL; + attr->parent = node; + attr->doc = node->doc; + } +} + /* -- GnomeAttr -- */ JNIEXPORT jboolean JNICALL @@ -59,14 +194,16 @@ Java_gnu_xml_libxmlj_dom_GnomeAttr_getValue (JNIEnv * env, jobject self) { xmlNodePtr node; - xmlBufferPtr buf; + xmlChar *text; jstring ret; node = xmljGetNodeID (env, self); - buf = xmlBufferCreate (); - xmlNodeBufGetContent (buf, node); - ret = xmljNewString (env, buf->content); - xmlFree (buf); + text = xmlNodeGetContent (node); + ret = xmljNewString (env, (const xmlChar *) text); + if (text != NULL) + { + xmlFree (text); + } return ret; } @@ -95,11 +232,11 @@ JNIEXPORT void JNICALL Java_gnu_xml_libxmlj_dom_GnomeDocument_free (JNIEnv * env, - jobject self, jlong id) + jobject self, jobject id) { xmlDocPtr doc; - doc = (xmlDocPtr) xmljAsPointer (id); + doc = (xmlDocPtr) xmljAsPointer (env, id); xmljFreeDoc (env, doc); xmlFree (doc); } @@ -112,6 +249,10 @@ doc = (xmlDocPtr) xmljGetNodeID (env, self); dtd = doc->extSubset; + if (dtd == NULL) + { + dtd = doc->intSubset; + } return xmljGetNodeInstance (env, (xmlNodePtr) dtd); } @@ -227,20 +368,22 @@ { xmlDocPtr doc; xmlNodePtr node; - xmlNodePtr ret; doc = (xmlDocPtr) xmljGetNodeID (env, self); node = xmljGetNodeID (env, importedNode); - ret = xmlDocCopyNode (node, doc, deep); - if (ret == NULL) + if (node == NULL) { - xmljThrowDOMException (env, 9, NULL); /* NOT_SUPPORTED_ERR */ + xmljThrowDOMException (env, 8, NULL); /* NOT_FOUND_ERR */ return NULL; } - else + if (node->type == XML_DOCUMENT_NODE || + node->type == XML_DOCUMENT_TYPE_NODE) { - return xmljGetNodeInstance (env, ret); + xmljThrowDOMException (env, 9, NULL); /* NOT_SUPPORTED_ERR */ + return NULL; } + node = xmlDocCopyNode (node, doc, deep); + return xmljGetNodeInstance (env, node); } JNIEXPORT jobject JNICALL @@ -251,7 +394,7 @@ { xmlDocPtr doc; xmlNodePtr element; - xmlNsPtr ns; + xmlNsPtr ns = NULL; const xmlChar *s_uri; const xmlChar *s_qName; const xmlChar *s_prefix; @@ -259,16 +402,19 @@ doc = (xmlDocPtr) xmljGetNodeID (env, self); s_qName = xmljGetStringChars (env, qName); + if (xmlValidateQName (s_qName, 0)) + { + xmljThrowDOMException (env, 5, NULL); /* INVALID_CHARACTER_ERR */ + return NULL; + } if (uri != NULL) { s_uri = xmljGetStringChars (env, uri); s_prefix = xmljGetPrefix (s_qName); s_localName = xmljGetLocalName (s_qName); ns = xmlNewNs ((xmlNodePtr) doc, s_uri, s_prefix); - element = xmlNewDocNode (doc, ns, s_localName, NULL); } - else - element = xmlNewDocNode (doc, NULL, s_qName, NULL); + element = xmlNewDocNode (doc, ns, s_qName, NULL); return xmljGetNodeInstance (env, element); } @@ -280,7 +426,7 @@ { xmlDocPtr doc; xmlNodePtr attr; - xmlNsPtr ns; + xmlNsPtr ns = NULL; const xmlChar *s_uri; const xmlChar *s_qName; const xmlChar *s_prefix; @@ -288,17 +434,20 @@ doc = (xmlDocPtr) xmljGetNodeID (env, self); s_qName = xmljGetStringChars (env, qName); + if (xmlValidateQName (s_qName, 0)) + { + xmljThrowDOMException (env, 5, NULL); /* INVALID_CHARACTER_ERR */ + return NULL; + } if (uri != NULL) { s_uri = xmljGetStringChars (env, uri); s_prefix = xmljGetPrefix (s_qName); s_localName = xmljGetLocalName (s_qName); ns = xmlNewNs ((xmlNodePtr) doc, s_uri, s_prefix); - attr = - (xmlNodePtr) xmlNewNsProp ((xmlNodePtr) doc, ns, s_localName, NULL); } - else - attr = (xmlNodePtr) xmlNewNsProp ((xmlNodePtr) doc, NULL, s_qName, NULL); + attr = (xmlNodePtr) xmlNewNsProp ((xmlNodePtr) doc, ns, s_qName, NULL); + attr->parent = NULL; return xmljGetNodeInstance (env, attr); } @@ -308,6 +457,7 @@ jstring elementId) { /* TODO */ + xmljThrowDOMException (env, 9, NULL); /* NOT_SUPPORTED_ERR */ return NULL; } @@ -366,7 +516,13 @@ } else { - doc->version = xmljGetStringChars (env, xmlVersion); + const xmlChar *version = xmljGetStringChars (env, xmlVersion); + if (!xmlStrEqual (version, BAD_CAST "1.0")) + { + xmljThrowDOMException (env, 9, NULL); /* NOT_SUPPORTED_ERR */ + return; + } + doc->version = version; } } @@ -400,29 +556,85 @@ } JNIEXPORT jobject JNICALL +Java_gnu_xml_libxmlj_dom_GnomeDocument_doAdoptNode (JNIEnv *env, + jobject self, + jobject jnode) +{ + xmlDocPtr doc; + xmlNodePtr node; + + doc = (xmlDocPtr) xmljGetNodeID (env, self); + node = xmljGetNodeID (env, jnode); + + if (node == NULL) + { + xmljThrowDOMException (env, 8, NULL); /* NOT_FOUND_ERR */ + return NULL; + } + if (node->type == XML_DOCUMENT_NODE || + node->type == XML_DOCUMENT_TYPE_NODE || + node->type == XML_ENTITY_NODE || + node->type == XML_NOTATION_NODE) + { + xmljThrowDOMException (env, 9, NULL); /* NOT_SUPPORTED_ERR */ + return NULL; + } + xmlUnlinkNode (node); + node = xmlDocCopyNode (node, doc, 1); + return xmljGetNodeInstance (env, node); +} + +JNIEXPORT jobject JNICALL Java_gnu_xml_libxmlj_dom_GnomeDocument_renameNode (JNIEnv * env, jobject self, jobject n, jstring namespaceURI, - jstring qualifiedName) + jstring qName) { xmlNodePtr node; + xmlNsPtr ns; + const xmlChar *s_qName; const xmlChar *href; const xmlChar *prefix; + int *len; node = xmljGetNodeID (env, n); - xmlNodeSetName (node, xmljGetStringChars (env, qualifiedName)); + if (node == NULL) + { + xmljThrowDOMException (env, 8, NULL); /* NOT_FOUND_ERR */ + return NULL; + } + s_qName = xmljGetStringChars (env, qName); + if (xmlValidateQName (s_qName, 0)) + { + xmljThrowDOMException (env, 5, NULL); /* INVALID_CHARACTER_ERR */ + return NULL; + } + xmlNodeSetName (node, s_qName); + href = xmljGetStringChars (env, namespaceURI); - prefix = xmlSplitQName3 (node->name, NULL); - if (node->ns == NULL) + len = (int *) malloc (sizeof (int)); + prefix = xmlSplitQName3 (s_qName, len); + ns = node->ns; + if (ns == NULL) { - node->ns = xmlNewNs (node, href, prefix); + if (href != NULL) + { + ns = xmlNewNs (node, href, prefix); + xmlSetNs (node, ns); + } } else { - node->ns->href = href; - node->ns->prefix = prefix; + node->ns = NULL; + /*xmlFreeNs (ns); FIXME this can segfault (?) */ + if (href != NULL) + { + ns = xmlNewNs (node, href, prefix); + xmlSetNs (node, ns); + } } + free (len); return n; } @@ -436,6 +648,7 @@ detectBuffer, jstring publicId, jstring systemId, + jstring base, jboolean validate, jboolean coalesce, jboolean @@ -453,6 +666,7 @@ detectBuffer, publicId, systemId, + base, validate, coalesce, expandEntities, @@ -467,61 +681,95 @@ } JNIEXPORT jobject JNICALL -Java_gnu_xml_libxmlj_dom_GnomeDocumentBuilder_createDocument (JNIEnv * env, - jobject self, - jstring - namespaceURI, - jstring - qualifiedName, - jobject doctype) +Java_gnu_xml_libxmlj_dom_GnomeDocumentBuilder_createDocument +(JNIEnv * env, + jobject self, + jstring namespaceURI, + jstring qualifiedName, + jobject doctype) { xmlDocPtr doc; xmlNodePtr root; xmlNsPtr ns; const xmlChar *href; const xmlChar *prefix; - const xmlChar *version; + const xmlChar *qName; + qName = xmljGetStringChars (env, qualifiedName); + href = xmljGetStringChars (env, namespaceURI); + if (qName == NULL) + { + prefix = NULL; + } + else + { + int *len; + + len = (int *) malloc (sizeof (int)); + prefix = xmlSplitQName3 (qName, len); + free (len); + } + /* Create the document node */ - version = xmlCharStrdup ("1.0"); - doc = xmlNewDoc (version); + doc = xmlNewDoc (BAD_CAST "1.0"); /* doctype */ if (doctype != NULL) { jclass cls; jmethodID method; + jstring ret; const xmlChar *name; const xmlChar *publicId; const xmlChar *systemId; const xmlChar *internalSubset; xmlDtdPtr dtd; - cls = (*env)->GetObjectClass (env, doctype); + cls = (*env)->FindClass (env, "org/w3c/dom/DocumentType"); + if (cls == NULL) + { + return NULL; + } + /* name */ method = (*env)->GetMethodID (env, cls, "getName", "()Ljava/lang/String;"); - name = - xmljGetStringChars (env, (*env)->CallObjectMethod (env, - doctype, - method)); + if (method == NULL) + { + return NULL; + } + ret = (jstring) (*env)->CallObjectMethod (env, doctype, method); + name = xmljGetStringChars (env, ret); + + /* publicId */ method = (*env)->GetMethodID (env, cls, "getPublicId", "()Ljava/lang/String;"); - publicId = - xmljGetStringChars (env, (*env)->CallObjectMethod (env, - doctype, - method)); + if (method == NULL) + { + return NULL; + } + ret = (jstring) (*env)->CallObjectMethod (env, doctype, method); + publicId = xmljGetStringChars (env, ret); + + /* systemId */ method = (*env)->GetMethodID (env, cls, "getSystemId", "()Ljava/lang/String;"); - systemId = - xmljGetStringChars (env, (*env)->CallObjectMethod (env, - doctype, - method)); + if (method == NULL) + { + return NULL; + } + ret = (jstring) (*env)->CallObjectMethod (env, doctype, method); + systemId = xmljGetStringChars (env, ret); + + /* internalSubset */ method = (*env)->GetMethodID (env, cls, "getInternalSubset", "()Ljava/lang/String;"); - internalSubset = - xmljGetStringChars (env, (*env)->CallObjectMethod (env, - doctype, - method)); + if (method == NULL) + { + return NULL; + } + ret = (jstring) (*env)->CallObjectMethod (env, doctype, method); + internalSubset = xmljGetStringChars (env, ret); + /* TODO notations */ /* TODO entities */ if (internalSubset == NULL) @@ -532,43 +780,22 @@ { dtd = xmlCreateIntSubset (doc, name, publicId, systemId); /* TODO parse internal subset? */ + xmljThrowDOMException (env, 9, NULL); /* NOT_SUPPORTED_ERR */ + return NULL; } } *** Patch too long, truncated *** _______________________________________________ kaffe mailing list [EMAIL PROTECTED] http://kaffe.org/cgi-bin/mailman/listinfo/kaffe