[kaffe] CVS kaffe (robilad): Resynced with GNU JAXP
Kaffe CVS
cvs-commits at kaffe.org
Sat Dec 4 13:57:22 PST 2004
PatchSet 5539
Date: 2004/12/04 21:12:15
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU JAXP
Members:
ChangeLog:1.3085->1.3086
libraries/clib/libxmlj/xmlj_dom.c:1.5->1.6
libraries/clib/libxmlj/xmlj_dom.h:1.4->1.5
libraries/clib/libxmlj/xmlj_io.c:1.6->1.7
libraries/clib/libxmlj/xmlj_node.c:1.4->1.5
libraries/clib/libxmlj/xmlj_sax.c:1.6->1.7
libraries/clib/libxmlj/xmlj_util.c:1.6->1.7
libraries/javalib/Makefile.am:1.267->1.268
libraries/javalib/Makefile.in:1.348->1.349
libraries/javalib/all.files:1.54->1.55
libraries/javalib/gnu/xml/aelfred2/ContentHandler2.java:1.1->1.2
libraries/javalib/gnu/xml/aelfred2/JAXPFactory.java:1.5->1.6
libraries/javalib/gnu/xml/aelfred2/SAXDriver.java:1.13->1.14
libraries/javalib/gnu/xml/aelfred2/XmlParser.java:1.11->1.12
libraries/javalib/gnu/xml/dom/Consumer.java:1.6->1.7
libraries/javalib/gnu/xml/dom/DTDAttributeTypeInfo.java:INITIAL->1.1
libraries/javalib/gnu/xml/dom/DTDElementTypeInfo.java:INITIAL->1.1
libraries/javalib/gnu/xml/dom/DomAttr.java:1.6->1.7
libraries/javalib/gnu/xml/dom/DomCDATA.java:1.6->1.7
libraries/javalib/gnu/xml/dom/DomCharacterData.java:1.6->1.7
libraries/javalib/gnu/xml/dom/DomComment.java:1.6->1.7
libraries/javalib/gnu/xml/dom/DomDoctype.java:1.6->1.7
libraries/javalib/gnu/xml/dom/DomDocument.java:1.8->1.9
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:INITIAL->1.1
libraries/javalib/gnu/xml/dom/DomDocumentBuilderFactory.java:INITIAL->1.1
libraries/javalib/gnu/xml/dom/DomDocumentConfiguration.java:INITIAL->1.1
libraries/javalib/gnu/xml/dom/DomElement.java:1.6->1.7
libraries/javalib/gnu/xml/dom/DomEntity.java:1.6->1.7
libraries/javalib/gnu/xml/dom/DomEntityReference.java:1.6->1.7
libraries/javalib/gnu/xml/dom/DomEx.java:1.5->1.6
libraries/javalib/gnu/xml/dom/DomExtern.java:1.6->1.7
libraries/javalib/gnu/xml/dom/DomFragment.java:1.6->1.7
libraries/javalib/gnu/xml/dom/DomImpl.java:1.7->1.8
libraries/javalib/gnu/xml/dom/DomIterator.java:1.5->1.6
libraries/javalib/gnu/xml/dom/DomNamedNodeMap.java:1.6->1.7
libraries/javalib/gnu/xml/dom/DomNode.java:1.8->1.9
libraries/javalib/gnu/xml/dom/DomNotation.java:1.6->1.7
libraries/javalib/gnu/xml/dom/DomNsNode.java:1.6->1.7
libraries/javalib/gnu/xml/dom/DomPI.java:1.6->1.7
libraries/javalib/gnu/xml/dom/DomText.java:1.6->1.7
libraries/javalib/gnu/xml/dom/ImplementationList.java:1.2->1.3
libraries/javalib/gnu/xml/dom/ImplementationSource.java:1.2->1.3
libraries/javalib/gnu/xml/dom/JAXPFactory.java:1.6->1.7
libraries/javalib/gnu/xml/dom/package.html:1.2->1.3
libraries/javalib/gnu/xml/dom/ls/DomLSEx.java:INITIAL->1.1
libraries/javalib/gnu/xml/dom/ls/DomLSInput.java:INITIAL->1.1
libraries/javalib/gnu/xml/dom/ls/DomLSOutput.java:INITIAL->1.1
libraries/javalib/gnu/xml/dom/ls/DomLSParser.java:INITIAL->1.1
libraries/javalib/gnu/xml/dom/ls/DomLSSerializer.java:INITIAL->1.1
libraries/javalib/gnu/xml/dom/ls/FilteredSAXEventSink.java:INITIAL->1.1
libraries/javalib/gnu/xml/dom/ls/ReaderInputStream.java:INITIAL->1.1
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:INITIAL->1.1
libraries/javalib/gnu/xml/dom/ls/WriterOutputStream.java:INITIAL->1.1
libraries/javalib/gnu/xml/libxmlj/dom/GnomeAttr.java:1.4->1.5
libraries/javalib/gnu/xml/libxmlj/dom/GnomeCDATASection.java:1.4->1.5
libraries/javalib/gnu/xml/libxmlj/dom/GnomeCharacterData.java:1.4->1.5
libraries/javalib/gnu/xml/libxmlj/dom/GnomeComment.java:1.4->1.5
libraries/javalib/gnu/xml/libxmlj/dom/GnomeDOMException.java:1.2->1.3
libraries/javalib/gnu/xml/libxmlj/dom/GnomeDOMStringList.java:1.2->1.3
libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocument.java:1.4->1.5
libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java:1.5->1.6
libraries/javalib/gnu/xml/libxmlj/dom/GnomeElement.java:1.5->1.6
libraries/javalib/gnu/xml/libxmlj/dom/GnomeNode.java:1.5->1.6
libraries/javalib/gnu/xml/libxmlj/dom/GnomeNodeIterator.java:1.2->1.3
libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformer.java:1.7->1.8
libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java:1.4->1.5
libraries/javalib/gnu/xml/libxmlj/util/XMLJ.java:1.6->1.7
libraries/javalib/gnu/xml/pipeline/DomConsumer.java:1.6->1.7
libraries/javalib/gnu/xml/pipeline/EventFilter.java:1.6->1.7
libraries/javalib/gnu/xml/transform/AbstractNumberNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/ApplyImportsNode.java:INITIAL->1.1
libraries/javalib/gnu/xml/transform/ApplyTemplatesNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/AttributeNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/AttributeSet.java:INITIAL->1.1
libraries/javalib/gnu/xml/transform/Bindings.java:1.1->1.2
libraries/javalib/gnu/xml/transform/CallTemplateNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/ChooseNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/CommentNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/CopyNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/CopyOfNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/CurrentFunction.java:INITIAL->1.1
libraries/javalib/gnu/xml/transform/DocumentFunction.java:1.1->1.2
libraries/javalib/gnu/xml/transform/DummyNode.java:1.1->1.2(DEAD)
libraries/javalib/gnu/xml/transform/ElementAvailableFunction.java:INITIAL->1.1
libraries/javalib/gnu/xml/transform/ElementNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/ForEachNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/FormatNumberFunction.java:INITIAL->1.1
libraries/javalib/gnu/xml/transform/FunctionAvailableFunction.java:INITIAL->1.1
libraries/javalib/gnu/xml/transform/GenerateIdFunction.java:INITIAL->1.1
libraries/javalib/gnu/xml/transform/IfNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/Key.java:INITIAL->1.1
libraries/javalib/gnu/xml/transform/KeyFunction.java:INITIAL->1.1
libraries/javalib/gnu/xml/transform/LiteralNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/MessageNode.java:INITIAL->1.1
libraries/javalib/gnu/xml/transform/NodeNumberNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/NumberNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/OtherwiseNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/ParameterNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/ProcessingInstructionNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/SAXSerializer.java:1.1->1.2
libraries/javalib/gnu/xml/transform/SortKey.java:1.1->1.2
libraries/javalib/gnu/xml/transform/StreamSerializer.java:1.1->1.2
libraries/javalib/gnu/xml/transform/Stylesheet.java:1.2->1.3
libraries/javalib/gnu/xml/transform/SystemPropertyFunction.java:INITIAL->1.1
libraries/javalib/gnu/xml/transform/Template.java:1.2->1.3
libraries/javalib/gnu/xml/transform/TemplateNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/TemplatesImpl.java:1.2->1.3
libraries/javalib/gnu/xml/transform/TextNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/TransformerFactoryImpl.java:1.2->1.3
libraries/javalib/gnu/xml/transform/TransformerImpl.java:1.2->1.3
libraries/javalib/gnu/xml/transform/TransformerOutputProperties.java:INITIAL->1.1
libraries/javalib/gnu/xml/transform/UnparsedEntityUriFunction.java:INITIAL->1.1
libraries/javalib/gnu/xml/transform/ValueOfNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/WhenNode.java:1.1->1.2
libraries/javalib/gnu/xml/transform/WithParam.java:1.1->1.2
libraries/javalib/gnu/xml/transform/XSLComparator.java:1.1->1.2
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.1->1.2
libraries/javalib/gnu/xml/transform/package.html:INITIAL->1.1
libraries/javalib/gnu/xml/xpath/AndExpr.java:1.2->1.3
libraries/javalib/gnu/xml/xpath/ArithmeticExpr.java:1.2->1.3
libraries/javalib/gnu/xml/xpath/BooleanFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/CeilingFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/ConcatFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/Constant.java:1.2->1.3
libraries/javalib/gnu/xml/xpath/ContainsFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/CountFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/DocumentOrderComparator.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/EqualityExpr.java:1.2->1.3
libraries/javalib/gnu/xml/xpath/Expr.java:1.5->1.6
libraries/javalib/gnu/xml/xpath/ExpressionTest.java:1.2->1.3(DEAD)
libraries/javalib/gnu/xml/xpath/FalseFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/FloorFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/Function.java:INITIAL->1.1
libraries/javalib/gnu/xml/xpath/FunctionCall.java:1.4->1.5
libraries/javalib/gnu/xml/xpath/IdFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/LangFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/LastFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/LocalNameFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/NameFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/NameTest.java:1.4->1.5
libraries/javalib/gnu/xml/xpath/NamespaceTest.java:INITIAL->1.1
libraries/javalib/gnu/xml/xpath/NamespaceUriFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/NegativeExpr.java:1.2->1.3
libraries/javalib/gnu/xml/xpath/NodeTypeTest.java:1.3->1.4
libraries/javalib/gnu/xml/xpath/NormalizeSpaceFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/NotFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/NumberFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/OrExpr.java:1.2->1.3
libraries/javalib/gnu/xml/xpath/ParenthesizedExpr.java:1.2->1.3
libraries/javalib/gnu/xml/xpath/Path.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/Pattern.java:INITIAL->1.1
libraries/javalib/gnu/xml/xpath/PositionFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/Predicate.java:INITIAL->1.1
libraries/javalib/gnu/xml/xpath/RelationalExpr.java:1.2->1.3
libraries/javalib/gnu/xml/xpath/Root.java:1.3->1.4
libraries/javalib/gnu/xml/xpath/RoundFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/Selector.java:1.3->1.4
libraries/javalib/gnu/xml/xpath/StartsWithFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/Step.java:1.3->1.4(DEAD)
libraries/javalib/gnu/xml/xpath/Steps.java:INITIAL->1.1
libraries/javalib/gnu/xml/xpath/StringFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/StringLengthFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/SubstringAfterFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/SubstringBeforeFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/SubstringFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/SumFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/Test.java:1.3->1.4
libraries/javalib/gnu/xml/xpath/TranslateFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/TrueFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/UnionExpr.java:1.3->1.4
libraries/javalib/gnu/xml/xpath/VariableReference.java:1.2->1.3
libraries/javalib/gnu/xml/xpath/XPathFactoryImpl.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/XPathImpl.java:1.2->1.3
libraries/javalib/gnu/xml/xpath/XPathParser.java:1.4->1.5
libraries/javalib/gnu/xml/xpath/XPathParser.y:1.3->1.4
libraries/javalib/gnu/xml/xpath/XPathTest.java:1.2->1.3
libraries/javalib/gnu/xml/xpath/XPathTokenizer.java:1.2->1.3
libraries/javalib/javax/xml/namespace/QName.java:1.3->1.4
libraries/javalib/javax/xml/parsers/DocumentBuilderFactory.java:1.9->1.10
libraries/javalib/javax/xml/transform/TransformerConfigurationException.java:1.6->1.7
libraries/javalib/javax/xml/transform/TransformerException.java:1.9->1.10
libraries/javalib/javax/xml/transform/TransformerFactory.java:1.9->1.10
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3085 kaffe/ChangeLog:1.3086
--- kaffe/ChangeLog:1.3085 Sat Dec 4 13:41:51 2004
+++ kaffe/ChangeLog Sat Dec 4 21:12:15 2004
@@ -1,3 +1,202 @@
+2004-12-04 Dalibor Topic <robilad at kaffe.org>
+
+ * libraries/javalib/Makefile.am,
+ libraries/javalib/Makefile.in,
+ libraries/javalib/all.files:
+ Updated for new GNU JAXP files.
+
+ * libraries/clib/libxmlj/xmlj_dom.c,
+ libraries/clib/libxmlj/xmlj_dom.h,
+ libraries/clib/libxmlj/xmlj_io.c,
+ libraries/clib/libxmlj/xmlj_node.c,
+ libraries/clib/libxmlj/xmlj_sax.c,
+ libraries/clib/libxmlj/xmlj_util.c,
+ libraries/javalib/gnu/xml/aelfred2/ContentHandler2.java,
+ libraries/javalib/gnu/xml/aelfred2/JAXPFactory.java,
+ libraries/javalib/gnu/xml/aelfred2/SAXDriver.java,
+ libraries/javalib/gnu/xml/aelfred2/XmlParser.java,
+ libraries/javalib/gnu/xml/dom/Consumer.java,
+ libraries/javalib/gnu/xml/dom/DTDAttributeTypeInfo.java,
+ libraries/javalib/gnu/xml/dom/DTDElementTypeInfo.java,
+ libraries/javalib/gnu/xml/dom/DomAttr.java,
+ libraries/javalib/gnu/xml/dom/DomCDATA.java,
+ libraries/javalib/gnu/xml/dom/DomCharacterData.java,
+ libraries/javalib/gnu/xml/dom/DomComment.java,
+ libraries/javalib/gnu/xml/dom/DomDoctype.java,
+ libraries/javalib/gnu/xml/dom/DomDocument.java,
+ libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java,
+ libraries/javalib/gnu/xml/dom/DomDocumentBuilderFactory.java,
+ libraries/javalib/gnu/xml/dom/DomDocumentConfiguration.java,
+ libraries/javalib/gnu/xml/dom/DomElement.java,
+ libraries/javalib/gnu/xml/dom/DomEntity.java,
+ libraries/javalib/gnu/xml/dom/DomEntityReference.java,
+ libraries/javalib/gnu/xml/dom/DomEx.java,
+ libraries/javalib/gnu/xml/dom/DomExtern.java,
+ libraries/javalib/gnu/xml/dom/DomFragment.java,
+ libraries/javalib/gnu/xml/dom/DomImpl.java,
+ libraries/javalib/gnu/xml/dom/DomIterator.java,
+ libraries/javalib/gnu/xml/dom/DomNamedNodeMap.java,
+ libraries/javalib/gnu/xml/dom/DomNode.java,
+ libraries/javalib/gnu/xml/dom/DomNotation.java,
+ libraries/javalib/gnu/xml/dom/DomNsNode.java,
+ libraries/javalib/gnu/xml/dom/DomPI.java,
+ libraries/javalib/gnu/xml/dom/DomText.java,
+ libraries/javalib/gnu/xml/dom/ImplementationList.java,
+ libraries/javalib/gnu/xml/dom/ImplementationSource.java,
+ libraries/javalib/gnu/xml/dom/JAXPFactory.java,
+ libraries/javalib/gnu/xml/dom/package.html,
+ libraries/javalib/gnu/xml/dom/ls/DomLSEx.java,
+ libraries/javalib/gnu/xml/dom/ls/DomLSInput.java,
+ libraries/javalib/gnu/xml/dom/ls/DomLSOutput.java,
+ libraries/javalib/gnu/xml/dom/ls/DomLSParser.java,
+ libraries/javalib/gnu/xml/dom/ls/DomLSSerializer.java,
+ libraries/javalib/gnu/xml/dom/ls/FilteredSAXEventSink.java,
+ libraries/javalib/gnu/xml/dom/ls/ReaderInputStream.java,
+ libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java,
+ libraries/javalib/gnu/xml/dom/ls/WriterOutputStream.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/GnomeDOMException.java,
+ libraries/javalib/gnu/xml/libxmlj/dom/GnomeDOMStringList.java,
+ libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocument.java,
+ libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java,
+ libraries/javalib/gnu/xml/libxmlj/dom/GnomeElement.java,
+ libraries/javalib/gnu/xml/libxmlj/dom/GnomeNode.java,
+ libraries/javalib/gnu/xml/libxmlj/dom/GnomeNodeIterator.java,
+ libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformer.java,
+ libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java,
+ libraries/javalib/gnu/xml/libxmlj/util/XMLJ.java,
+ libraries/javalib/gnu/xml/pipeline/DomConsumer.java,
+ libraries/javalib/gnu/xml/pipeline/EventFilter.java,
+ libraries/javalib/gnu/xml/transform/AbstractNumberNode.java,
+ libraries/javalib/gnu/xml/transform/ApplyImportsNode.java,
+ libraries/javalib/gnu/xml/transform/ApplyTemplatesNode.java,
+ libraries/javalib/gnu/xml/transform/AttributeNode.java,
+ libraries/javalib/gnu/xml/transform/AttributeSet.java,
+ libraries/javalib/gnu/xml/transform/Bindings.java,
+ libraries/javalib/gnu/xml/transform/CallTemplateNode.java,
+ libraries/javalib/gnu/xml/transform/ChooseNode.java,
+ libraries/javalib/gnu/xml/transform/CommentNode.java,
+ libraries/javalib/gnu/xml/transform/CopyNode.java,
+ libraries/javalib/gnu/xml/transform/CopyOfNode.java,
+ libraries/javalib/gnu/xml/transform/CurrentFunction.java,
+ libraries/javalib/gnu/xml/transform/DocumentFunction.java,
+ libraries/javalib/gnu/xml/transform/DummyNode.java,
+ libraries/javalib/gnu/xml/transform/ElementAvailableFunction.java,
+ libraries/javalib/gnu/xml/transform/ElementNode.java,
+ libraries/javalib/gnu/xml/transform/ForEachNode.java,
+ libraries/javalib/gnu/xml/transform/FormatNumberFunction.java,
+ libraries/javalib/gnu/xml/transform/FunctionAvailableFunction.java,
+ libraries/javalib/gnu/xml/transform/GenerateIdFunction.java,
+ libraries/javalib/gnu/xml/transform/IfNode.java,
+ libraries/javalib/gnu/xml/transform/Key.java,
+ libraries/javalib/gnu/xml/transform/KeyFunction.java,
+ libraries/javalib/gnu/xml/transform/LiteralNode.java,
+ libraries/javalib/gnu/xml/transform/MessageNode.java,
+ libraries/javalib/gnu/xml/transform/NodeNumberNode.java,
+ libraries/javalib/gnu/xml/transform/NumberNode.java,
+ libraries/javalib/gnu/xml/transform/OtherwiseNode.java,
+ libraries/javalib/gnu/xml/transform/ParameterNode.java,
+ libraries/javalib/gnu/xml/transform/ProcessingInstructionNode.java,
+ libraries/javalib/gnu/xml/transform/SAXSerializer.java,
+ libraries/javalib/gnu/xml/transform/SortKey.java,
+ libraries/javalib/gnu/xml/transform/StreamSerializer.java,
+ libraries/javalib/gnu/xml/transform/Stylesheet.java,
+ libraries/javalib/gnu/xml/transform/SystemPropertyFunction.java,
+ libraries/javalib/gnu/xml/transform/Template.java,
+ libraries/javalib/gnu/xml/transform/TemplateNode.java,
+ libraries/javalib/gnu/xml/transform/TemplatesImpl.java,
+ libraries/javalib/gnu/xml/transform/TextNode.java,
+ libraries/javalib/gnu/xml/transform/TransformerFactoryImpl.java,
+ libraries/javalib/gnu/xml/transform/TransformerImpl.java,
+ libraries/javalib/gnu/xml/transform/TransformerOutputProperties.java,
+ libraries/javalib/gnu/xml/transform/UnparsedEntityUriFunction.java,
+ libraries/javalib/gnu/xml/transform/ValueOfNode.java,
+ libraries/javalib/gnu/xml/transform/WhenNode.java,
+ libraries/javalib/gnu/xml/transform/WithParam.java,
+ libraries/javalib/gnu/xml/transform/XSLComparator.java,
+ libraries/javalib/gnu/xml/transform/XSLURIResolver.java,
+ libraries/javalib/gnu/xml/transform/package.html,
+ libraries/javalib/gnu/xml/xpath/AndExpr.java,
+ libraries/javalib/gnu/xml/xpath/ArithmeticExpr.java,
+ libraries/javalib/gnu/xml/xpath/BooleanFunction.java,
+ libraries/javalib/gnu/xml/xpath/CeilingFunction.java,
+ libraries/javalib/gnu/xml/xpath/ConcatFunction.java,
+ libraries/javalib/gnu/xml/xpath/Constant.java,
+ libraries/javalib/gnu/xml/xpath/ContainsFunction.java,
+ libraries/javalib/gnu/xml/xpath/CountFunction.java,
+ libraries/javalib/gnu/xml/xpath/DocumentOrderComparator.java,
+ libraries/javalib/gnu/xml/xpath/EqualityExpr.java,
+ libraries/javalib/gnu/xml/xpath/Expr.java,
+ libraries/javalib/gnu/xml/xpath/ExpressionTest.java,
+ libraries/javalib/gnu/xml/xpath/FalseFunction.java,
+ libraries/javalib/gnu/xml/xpath/FloorFunction.java,
+ libraries/javalib/gnu/xml/xpath/Function.java,
+ libraries/javalib/gnu/xml/xpath/FunctionCall.java,
+ libraries/javalib/gnu/xml/xpath/IdFunction.java,
+ libraries/javalib/gnu/xml/xpath/LangFunction.java,
+ libraries/javalib/gnu/xml/xpath/LastFunction.java,
+ libraries/javalib/gnu/xml/xpath/LocalNameFunction.java,
+ libraries/javalib/gnu/xml/xpath/NameFunction.java,
+ libraries/javalib/gnu/xml/xpath/NameTest.java,
+ libraries/javalib/gnu/xml/xpath/NamespaceTest.java,
+ libraries/javalib/gnu/xml/xpath/NamespaceUriFunction.java,
+ libraries/javalib/gnu/xml/xpath/NegativeExpr.java,
+ libraries/javalib/gnu/xml/xpath/NodeTypeTest.java,
+ libraries/javalib/gnu/xml/xpath/NormalizeSpaceFunction.java,
+ libraries/javalib/gnu/xml/xpath/NotFunction.java,
+ libraries/javalib/gnu/xml/xpath/NumberFunction.java,
+ libraries/javalib/gnu/xml/xpath/OrExpr.java,
+ libraries/javalib/gnu/xml/xpath/ParenthesizedExpr.java,
+ libraries/javalib/gnu/xml/xpath/Path.java,
+ libraries/javalib/gnu/xml/xpath/Pattern.java,
+ libraries/javalib/gnu/xml/xpath/PositionFunction.java,
+ libraries/javalib/gnu/xml/xpath/Predicate.java,
+ libraries/javalib/gnu/xml/xpath/RelationalExpr.java,
+ libraries/javalib/gnu/xml/xpath/Root.java,
+ libraries/javalib/gnu/xml/xpath/RoundFunction.java,
+ libraries/javalib/gnu/xml/xpath/Selector.java,
+ libraries/javalib/gnu/xml/xpath/StartsWithFunction.java,
+ libraries/javalib/gnu/xml/xpath/Step.java,
+ libraries/javalib/gnu/xml/xpath/Steps.java,
+ libraries/javalib/gnu/xml/xpath/StringFunction.java,
+ libraries/javalib/gnu/xml/xpath/StringLengthFunction.java,
+ libraries/javalib/gnu/xml/xpath/SubstringAfterFunction.java,
+ libraries/javalib/gnu/xml/xpath/SubstringBeforeFunction.java,
+ libraries/javalib/gnu/xml/xpath/SubstringFunction.java,
+ libraries/javalib/gnu/xml/xpath/SumFunction.java,
+ libraries/javalib/gnu/xml/xpath/Test.java,
+ libraries/javalib/gnu/xml/xpath/TranslateFunction.java,
+ libraries/javalib/gnu/xml/xpath/TrueFunction.java,
+ libraries/javalib/gnu/xml/xpath/UnionExpr.java,
+ libraries/javalib/gnu/xml/xpath/VariableReference.java,
+ libraries/javalib/gnu/xml/xpath/XPathFactoryImpl.java,
+ libraries/javalib/gnu/xml/xpath/XPathImpl.java,
+ libraries/javalib/gnu/xml/xpath/XPathParser.java,
+ libraries/javalib/gnu/xml/xpath/XPathParser.y,
+ libraries/javalib/gnu/xml/xpath/XPathTest.java,
+ libraries/javalib/gnu/xml/xpath/XPathTokenizer.java,
+ libraries/javalib/javax/xml/namespace/QName.java,
+ libraries/javalib/javax/xml/parsers/DocumentBuilderFactory.java,
+ libraries/javalib/javax/xml/transform/TransformerConfigurationException.java,
+ libraries/javalib/javax/xml/transform/TransformerException.java,
+ libraries/javalib/javax/xml/transform/TransformerFactory.java:
+ Resynced with GNU JAXP.
+
+ 2004-11-26 Chris Burdess <dog at gnu.org>
+
+ * xmlj_util.c: Check for exception in xmljNewString.
+
+ 2004-11-17 Chris Burdess <dog at gnu.org>
+
+ * dom: DOM Level 3 Core conformance testing.
+
+ 2004-11-12 Chris Burdess <dog at gnu.org>
+
+ * GnomeTransformerFactory.java: Implemented getAssociatedStylesheet.
+
2004-12-03 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/gnu/java/net/protocol/ftp/package.html,
Index: kaffe/libraries/clib/libxmlj/xmlj_dom.c
diff -u kaffe/libraries/clib/libxmlj/xmlj_dom.c:1.5 kaffe/libraries/clib/libxmlj/xmlj_dom.c:1.6
--- kaffe/libraries/clib/libxmlj/xmlj_dom.c:1.5 Mon Aug 16 02:43:43 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_dom.c Sat Dec 4 21:12:19 2004
@@ -231,7 +231,7 @@
}
JNIEXPORT jboolean JNICALL
-Java_gnu_xml_libxmlj_dom_GnomeAttr_isId (JNIEnv * env, jobject self)
+Java_gnu_xml_libxmlj_dom_GnomeAttr_xmljIsId (JNIEnv * env, jobject self)
{
xmlAttrPtr attr;
@@ -278,6 +278,24 @@
}
JNIEXPORT jobject JNICALL
+Java_gnu_xml_libxmlj_dom_GnomeDocument_createDocumentType (JNIEnv * env,
+ jobject self,
+ jstring name,
+ jstring publicId,
+ jstring systemId)
+{
+ xmlDocPtr doc;
+ xmlDtdPtr dtd;
+
+ doc = (xmlDocPtr) xmljGetNodeID (env, self);
+ dtd = xmlNewDtd (doc,
+ xmljGetStringChars (env, name),
+ xmljGetStringChars (env, publicId),
+ xmljGetStringChars (env, systemId));
+ return xmljGetNodeInstance (env, (xmlNodePtr) dtd);
+}
+
+JNIEXPORT jobject JNICALL
Java_gnu_xml_libxmlj_dom_GnomeDocument_createDocumentFragment (JNIEnv * env,
jobject self)
{
@@ -353,6 +371,7 @@
s_target = xmljGetStringChars (env, target);
s_data = xmljGetStringChars (env, data);
pi = xmlNewPI (s_target, s_data);
+ pi->doc = doc;
return xmljGetNodeInstance (env, pi);
}
@@ -372,10 +391,10 @@
}
JNIEXPORT jobject JNICALL
-Java_gnu_xml_libxmlj_dom_GnomeDocument_importNode (JNIEnv * env,
- jobject self,
- jobject importedNode,
- jboolean deep)
+Java_gnu_xml_libxmlj_dom_GnomeDocument_xmljImportNode (JNIEnv * env,
+ jobject self,
+ jobject importedNode,
+ jboolean deep)
{
xmlDocPtr doc;
xmlNodePtr node;
@@ -463,12 +482,65 @@
}
JNIEXPORT jobject JNICALL
-Java_gnu_xml_libxmlj_dom_GnomeDocument_getElementById (JNIEnv * env,
- jobject self,
- jstring elementId)
+Java_gnu_xml_libxmlj_dom_GnomeDocument_xmljGetElementById (JNIEnv * env,
+ jobject self,
+ jstring elementId)
{
- /* TODO */
- xmljThrowDOMException (env, 9, NULL); /* NOT_SUPPORTED_ERR */
+ xmlDocPtr doc;
+ xmlNodePtr ctx, tmp;
+ xmlAttrPtr attr;
+ const xmlChar *id;
+ const xmlChar *val;
+
+ doc = (xmlDocPtr) xmljGetNodeID (env, self);
+ id = xmljGetStringChars (env, elementId);
+
+ ctx = xmlDocGetRootElement (doc);
+ while (ctx && ctx != (xmlNodePtr) doc)
+ {
+ if (ctx->type == XML_ELEMENT_NODE)
+ {
+ for (attr = ctx->properties; attr;
+ attr = (xmlAttrPtr) attr->next)
+ {
+ if (xmlIsID (doc, ctx, attr))
+ {
+ val = xmlGetProp (ctx, attr->name);
+ if (val && xmlStrEqual (id, val))
+ {
+ return xmljGetNodeInstance (env, ctx);
+ }
+ }
+ }
+ }
+ if (ctx->children)
+ {
+ ctx = ctx->children;
+ }
+ else
+ {
+ tmp = ctx->next;
+ if (tmp)
+ {
+ ctx = tmp;
+ }
+ else
+ {
+ do
+ {
+ tmp = ctx->parent;
+ if (!tmp)
+ {
+ return NULL;
+ }
+ ctx = tmp;
+ tmp = ctx->next;
+ }
+ while (!tmp);
+ ctx = tmp;
+ }
+ }
+ }
return NULL;
}
@@ -479,7 +551,36 @@
xmlDocPtr doc;
doc = (xmlDocPtr) xmljGetNodeID (env, self);
- return (doc->encoding == NULL) ? NULL : xmljNewString (env, doc->encoding);
+ if (doc->encoding)
+ {
+ return xmljNewString (env, doc->encoding);
+ }
+ switch (doc->charset)
+ {
+ case XML_CHAR_ENCODING_ASCII:
+ return xmljNewString (env, BAD_CAST "US-ASCII");
+ case XML_CHAR_ENCODING_UTF16LE:
+ return xmljNewString (env, BAD_CAST "UTF-16LE");
+ case XML_CHAR_ENCODING_UTF16BE:
+ return xmljNewString (env, BAD_CAST "UTF-16BE");
+ case XML_CHAR_ENCODING_8859_1:
+ return xmljNewString (env, BAD_CAST "ISO-8859-1");
+ /* TODO others */
+ default:
+ return xmljNewString (env, BAD_CAST "UTF-8");
+ }
+}
+
+JNIEXPORT jstring JNICALL
+Java_gnu_xml_libxmlj_dom_GnomeDocument_getXmlEncoding (JNIEnv * env,
+ jobject self)
+{
+ xmlDocPtr doc;
+
+ doc = (xmlDocPtr) xmljGetNodeID (env, self);
+ return (doc->encoding == NULL) ?
+ xmljNewString (env, BAD_CAST "UTF-8") :
+ xmljNewString (env, doc->encoding);
}
JNIEXPORT jboolean JNICALL
@@ -510,7 +611,9 @@
xmlDocPtr doc;
doc = (xmlDocPtr) xmljGetNodeID (env, self);
- return (doc->version == NULL) ? NULL : xmljNewString (env, doc->version);
+ return (doc->version == NULL) ?
+ xmljNewString (env, BAD_CAST "1.0") :
+ xmljNewString (env, doc->version);
}
JNIEXPORT void JNICALL
@@ -528,7 +631,8 @@
else
{
const xmlChar *version = xmljGetStringChars (env, xmlVersion);
- if (!xmlStrEqual (version, BAD_CAST "1.0"))
+ if (!xmlStrEqual (version, BAD_CAST "1.0") &&
+ !xmlStrEqual (version, BAD_CAST "1.1"))
{
xmljThrowDOMException (env, 9, NULL); /* NOT_SUPPORTED_ERR */
return;
@@ -545,7 +649,7 @@
doc = (xmlDocPtr) xmljGetNodeID (env, self);
return (doc->name == NULL) ? NULL :
- xmljNewString (env, (const xmlChar *) doc->name);
+ xmljNewString (env, (const xmlChar *) doc->URL);
}
JNIEXPORT void JNICALL
@@ -558,18 +662,18 @@
doc = (xmlDocPtr) xmljGetNodeID (env, self);
if (documentURI == NULL)
{
- doc->name = NULL;
+ doc->URL = NULL;
}
else
{
- doc->name = (char *) xmljGetStringChars (env, documentURI);
+ doc->URL = xmljGetStringChars (env, documentURI);
}
}
JNIEXPORT jobject JNICALL
-Java_gnu_xml_libxmlj_dom_GnomeDocument_doAdoptNode (JNIEnv *env,
- jobject self,
- jobject jnode)
+Java_gnu_xml_libxmlj_dom_GnomeDocument_xmljAdoptNode (JNIEnv *env,
+ jobject self,
+ jobject jnode)
{
xmlDocPtr doc;
xmlNodePtr node;
@@ -1587,6 +1691,10 @@
{
case XML_DTD_NODE:
return XML_DOCUMENT_TYPE_NODE;
+ case XML_ATTRIBUTE_DECL:
+ return XML_ATTRIBUTE_NODE;
+ case XML_ENTITY_DECL:
+ return XML_ENTITY_NODE;
default:
return node->type;
}
@@ -1649,10 +1757,10 @@
}
JNIEXPORT jobject JNICALL
-Java_gnu_xml_libxmlj_dom_GnomeNode_insertBefore (JNIEnv * env,
- jobject self,
- jobject newChild,
- jobject refChild)
+Java_gnu_xml_libxmlj_dom_GnomeNode_xmljInsertBefore (JNIEnv * env,
+ jobject self,
+ jobject newChild,
+ jobject refChild)
{
xmlNodePtr node;
xmlNodePtr newChildNode;
@@ -1682,10 +1790,10 @@
}
JNIEXPORT jobject JNICALL
-Java_gnu_xml_libxmlj_dom_GnomeNode_replaceChild (JNIEnv * env,
- jobject self,
- jobject newChild,
- jobject oldChild)
+Java_gnu_xml_libxmlj_dom_GnomeNode_xmljReplaceChild (JNIEnv * env,
+ jobject self,
+ jobject newChild,
+ jobject oldChild)
{
xmlNodePtr node;
xmlNodePtr newChildNode;
@@ -1715,9 +1823,9 @@
}
JNIEXPORT jobject JNICALL
-Java_gnu_xml_libxmlj_dom_GnomeNode_removeChild (JNIEnv * env,
- jobject self,
- jobject oldChild)
+Java_gnu_xml_libxmlj_dom_GnomeNode_xmljRemoveChild (JNIEnv * env,
+ jobject self,
+ jobject oldChild)
{
xmlNodePtr node;
xmlNodePtr oldChildNode;
@@ -1737,9 +1845,9 @@
}
JNIEXPORT jobject JNICALL
-Java_gnu_xml_libxmlj_dom_GnomeNode_appendChild (JNIEnv * env,
- jobject self,
- jobject newChild)
+Java_gnu_xml_libxmlj_dom_GnomeNode_xmljAppendChild (JNIEnv * env,
+ jobject self,
+ jobject newChild)
{
xmlNodePtr node;
xmlNodePtr newChildNode;
@@ -1768,8 +1876,8 @@
}
JNIEXPORT jobject JNICALL
-Java_gnu_xml_libxmlj_dom_GnomeNode_cloneNode (JNIEnv * env,
- jobject self, jboolean deep)
+Java_gnu_xml_libxmlj_dom_GnomeNode_xmljCloneNode (JNIEnv * env,
+ jobject self, jboolean deep)
{
xmlNodePtr node;
xmlNodePtr clone;
@@ -2021,6 +2129,79 @@
return xmljNewString (env, ns->href);
}
+JNIEXPORT jint JNICALL
+Java_gnu_xml_libxmlj_dom_GnomeNode_xmljCompareTo (JNIEnv * env,
+ jobject self,
+ jobject other)
+{
+ xmlNodePtr n1, n2, x;
+ int d1, d2, delta, c;
+
+ n1 = xmljGetNodeID (env, self);
+ n2 = xmljGetNodeID (env, other);
+ if (n1->doc != n2->doc)
+ {
+ return 0;
+ }
+ if (n1->type == XML_ATTRIBUTE_NODE || n2->type == XML_ATTRIBUTE_NODE)
+ {
+ return 0;
+ }
+ d1 = 0;
+ for (x = n1->parent; x && x->type != XML_DOCUMENT_NODE; x = x->parent)
+ {
+ d1++;
+ }
+ d2 = 0;
+ for (x = n2->parent; x && x->type != XML_DOCUMENT_NODE; x = x->parent)
+ {
+ d2++;
+ }
+ delta = d1 - d2;
+ while (d1 > d2)
+ {
+ n1 = n1->parent;
+ d1--;
+ }
+ while (d2 > d1)
+ {
+ n2 = n2->parent;
+ d2--;
+ }
+ c = xmljCompare (n1, n2);
+ return (c != 0) ? c : delta;
+}
+
+/* Compare at same level */
+int
+xmljCompare (xmlNodePtr n1, xmlNodePtr n2)
+{
+ int c, i1, i2;
+
+ if (n1->parent == NULL || n1->type == XML_DOCUMENT_NODE ||
+ n2->parent == NULL || n2->type == XML_DOCUMENT_NODE ||
+ n1 == n2)
+ {
+ return 0;
+ }
+ c = xmljCompare (n1->parent, n2->parent);
+ if (c != 0)
+ {
+ return c;
+ }
+ i1 = 0;
+ for (n1 = n1->prev; n1; n1 = n1->prev)
+ {
+ i1++;
+ }
+ i2 = 0;
+ for (n2 = n2->prev; n2; n2 = n2->prev)
+ {
+ i2++;
+ }
+ return i1 - i2;
+}
+
int
xmljIsEqualNodeList (xmlNodePtr node1, xmlNodePtr node2)
{
@@ -2232,11 +2413,65 @@
/* -- GnomeTypeInfo -- */
+xmlDtdPtr xmljGetDtd (xmlDocPtr doc)
+{
+ xmlNodePtr ctx;
+
+ for (ctx = doc->children; ctx; ctx = ctx->next)
+ {
+ if (ctx->type == XML_DOCUMENT_TYPE_NODE)
+ {
+ return (xmlDtdPtr) ctx;
+ }
+ }
+ return NULL;
+}
+
JNIEXPORT jstring JNICALL
Java_gnu_xml_libxmlj_dom_GnomeTypeInfo_getTypeName (JNIEnv *env, jobject self)
{
+ xmlNodePtr node;
+ xmlDtdPtr dtd;
+ xmlAttributePtr attribute;
+
+ node = xmljGetNodeID (env, self);
+ dtd = xmljGetDtd (node->doc);
+ if (dtd)
+ {
+ switch (node->type)
+ {
+ case XML_ATTRIBUTE_NODE:
+ attribute = xmlGetDtdAttrDesc (dtd, node->parent->name, node->name);
+ if (attribute)
+ {
+ switch (attribute->type)
+ {
+ case XML_ATTRIBUTE_CDATA:
+ return xmljNewString (env, BAD_CAST "CDATA");
+ case XML_ATTRIBUTE_ID:
+ return xmljNewString (env, BAD_CAST "ID");
+ case XML_ATTRIBUTE_IDREF:
+ return xmljNewString (env, BAD_CAST "IDREF");
+ case XML_ATTRIBUTE_IDREFS:
+ return xmljNewString (env, BAD_CAST "IDREFS");
+ case XML_ATTRIBUTE_ENTITY:
+ return xmljNewString (env, BAD_CAST "ENTITY");
+ case XML_ATTRIBUTE_ENTITIES:
+ return xmljNewString (env, BAD_CAST "ENTITIES");
+ case XML_ATTRIBUTE_NMTOKEN:
+ return xmljNewString (env, BAD_CAST "NMTOKEN");
+ case XML_ATTRIBUTE_NMTOKENS:
+ return xmljNewString (env, BAD_CAST "NMTOKENS");
+ default:
+ return NULL;
+ }
+ }
+ return NULL;
+ default:
+ return NULL;
+ }
+ }
/* TODO when XML Schema support is available */
- xmljThrowDOMException (env, 9, NULL); /* NOT_SUPPORTED_ERR */
return NULL;
}
@@ -2244,8 +2479,29 @@
Java_gnu_xml_libxmlj_dom_GnomeTypeInfo_getTypeNamespace (JNIEnv *env,
jobject self)
{
+ xmlNodePtr node;
+ xmlDtdPtr dtd;
+ xmlAttributePtr attribute;
+
+ node = xmljGetNodeID (env, self);
+ dtd = xmljGetDtd (node->doc);
+ if (dtd)
+ {
+ switch (node->type)
+ {
+ case XML_ATTRIBUTE_NODE:
+ attribute = xmlGetDtdAttrDesc (dtd, node->parent->name, node->name);
+ if (attribute)
+ {
+ return xmljNewString (env,
+ BAD_CAST "http://www.w3.org/TR/REC-xml");
+ }
+ return NULL;
+ default:
+ return NULL;
+ }
+ }
/* TODO when XML Schema support is available */
- xmljThrowDOMException (env, 9, NULL); /* NOT_SUPPORTED_ERR */
return NULL;
}
@@ -2257,7 +2513,6 @@
jint method)
{
/* TODO when XML Schema support is available */
- xmljThrowDOMException (env, 9, NULL); /* NOT_SUPPORTED_ERR */
return 0;
}
@@ -2273,7 +2528,7 @@
jfieldID field;
jobject ret;
- if (doc == NULL)
+ if (!doc)
{
return NULL;
}
Index: kaffe/libraries/clib/libxmlj/xmlj_dom.h
diff -u kaffe/libraries/clib/libxmlj/xmlj_dom.h:1.4 kaffe/libraries/clib/libxmlj/xmlj_dom.h:1.5
--- kaffe/libraries/clib/libxmlj/xmlj_dom.h:1.4 Mon Aug 16 02:43:43 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_dom.h Sat Dec 4 21:12:19 2004
@@ -41,11 +41,14 @@
#include "gnu_xml_libxmlj_dom_GnomeTypeInfo.h"
#include <libxml/parser.h>
+#include <libxml/valid.h>
void xmljValidateChildNode (JNIEnv *env, xmlNodePtr parent, xmlNodePtr child);
int xmljIsEqualNode (xmlNodePtr node1, xmlNodePtr node2);
int xmljIsEqualNodeList (xmlNodePtr node1, xmlNodePtr node2);
void xmljNormalizeNode (xmlNodePtr node);
+xmlDtdPtr xmljGetDtd (xmlDocPtr doc);
+int xmljCompare (xmlNodePtr n1, xmlNodePtr n2);
/* Utility */
jobject xmljCreateDocument (JNIEnv * env, jobject self, xmlDocPtr doc);
Index: kaffe/libraries/clib/libxmlj/xmlj_io.c
diff -u kaffe/libraries/clib/libxmlj/xmlj_io.c:1.6 kaffe/libraries/clib/libxmlj/xmlj_io.c:1.7
--- kaffe/libraries/clib/libxmlj/xmlj_io.c:1.6 Mon Aug 16 02:43:43 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_io.c Sat Dec 4 21:12:19 2004
@@ -514,7 +514,7 @@
ret = xmlParseDocument (ctx);
doc = ctx->myDoc;
- if (ret)
+ if (ret || !doc)
{
const char *msg = ctx->lastError.message;
switch (mode)
Index: kaffe/libraries/clib/libxmlj/xmlj_node.c
diff -u kaffe/libraries/clib/libxmlj/xmlj_node.c:1.4 kaffe/libraries/clib/libxmlj/xmlj_node.c:1.5
--- kaffe/libraries/clib/libxmlj/xmlj_node.c:1.4 Mon Jul 26 02:40:57 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_node.c Sat Dec 4 21:12:19 2004
@@ -72,6 +72,7 @@
{
jclass cls;
jmethodID method;
+ xmlElementType type;
if (node == NULL)
return NULL;
@@ -89,10 +90,25 @@
{
return NULL;
}
+ type = node->type;
+ switch (type)
+ {
+ case XML_DTD_NODE:
+ type = XML_DOCUMENT_TYPE_NODE;
+ break;
+ case XML_ATTRIBUTE_DECL:
+ type = XML_ATTRIBUTE_NODE;
+ break;
+ case XML_ENTITY_DECL:
+ type = XML_ENTITY_NODE;
+ break;
+ default:
+ break;
+ }
return (*env)->CallStaticObjectMethod (env, cls, method,
xmljAsField (env, node->doc),
xmljAsField (env, node),
- node->type);
+ type);
}
void
Index: kaffe/libraries/clib/libxmlj/xmlj_sax.c
diff -u kaffe/libraries/clib/libxmlj/xmlj_sax.c:1.6 kaffe/libraries/clib/libxmlj/xmlj_sax.c:1.7
--- kaffe/libraries/clib/libxmlj/xmlj_sax.c:1.6 Mon Nov 1 15:37:57 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_sax.c Sat Dec 4 21:12:19 2004
@@ -345,7 +345,7 @@
xmljGetMethodID (env,
target,
"resolveEntity",
- "(Ljava/lang/String;Ljava/lang/String;)Ljava/io/InputStream;");
+ "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/io/InputStream;");
if (sax->resolveEntity == NULL)
{
return NULL;
@@ -359,7 +359,8 @@
target,
sax->resolveEntity,
j_publicId,
- j_systemId);
+ j_systemId,
+ sax->systemId);
/* Return an xmlParserInputPtr corresponding to the input stream */
if (inputStream != NULL)
Index: kaffe/libraries/clib/libxmlj/xmlj_util.c
diff -u kaffe/libraries/clib/libxmlj/xmlj_util.c:1.6 kaffe/libraries/clib/libxmlj/xmlj_util.c:1.7
--- kaffe/libraries/clib/libxmlj/xmlj_util.c:1.6 Sun Oct 31 13:36:31 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_util.c Sat Dec 4 21:12:19 2004
@@ -49,7 +49,7 @@
{
jstring ret;
- if (text == NULL)
+ if (text == NULL || (*env)->ExceptionOccurred (env))
*** Patch too long, truncated ***
More information about the kaffe
mailing list