[kaffe] CVS kaffe (robilad): Resynced with GNU JAXP: lots of XPath and transform progress

Kaffe CVS cvs-commits at kaffe.org
Wed Nov 10 19:57:02 PST 2004


PatchSet 5446 
Date: 2004/11/11 03:52:44
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU JAXP: lots of XPath and transform progress

Members: 
	libraries/javalib/Makefile.am:1.262->1.263 
	libraries/javalib/Makefile.in:1.342->1.343 
	libraries/javalib/all.files:1.50->1.51 
	libraries/javalib/gnu/xml/aelfred2/ContentHandler2.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/aelfred2/SAXDriver.java:1.12->1.13 
	libraries/javalib/gnu/xml/aelfred2/XmlParser.java:1.10->1.11 
	libraries/javalib/gnu/xml/dom/Consumer.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomAttr.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomCDATA.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomCharacterData.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomComment.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomDoctype.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomDocument.java:1.7->1.8 
	libraries/javalib/gnu/xml/dom/DomElement.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomEntity.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomEntityReference.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomEvent.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomExtern.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomFragment.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomNSResolverContext.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/dom/DomNamedNodeMap.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomNode.java:1.7->1.8 
	libraries/javalib/gnu/xml/dom/DomNotation.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomNsNode.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomPI.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomText.java:1.5->1.6 
	libraries/javalib/gnu/xml/dom/DomXPathExpression.java:1.3->1.4 
	libraries/javalib/gnu/xml/dom/JAXPFactory.java:1.5->1.6 
	libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformer.java:1.6->1.7 
	libraries/javalib/gnu/xml/pipeline/DomConsumer.java:1.5->1.6 
	libraries/javalib/gnu/xml/pipeline/EventFilter.java:1.5->1.6 
	libraries/javalib/gnu/xml/transform/AbstractNumberNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/ApplyTemplatesNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/AttributeNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/Bindings.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/CallTemplateNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/ChooseNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/CommentNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/CopyNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/CopyOfNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/DOMResultWrapper.java:1.1->1.2(DEAD) 
	libraries/javalib/gnu/xml/transform/DOMSerializer.java:1.1->1.2(DEAD) 
	libraries/javalib/gnu/xml/transform/DOMSourceWrapper.java:1.1->1.2(DEAD) 
	libraries/javalib/gnu/xml/transform/DocumentFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/DummyNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/ElementNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/ForEachNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/IfNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/LiteralNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/NodeNumberNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/NumberNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/OtherwiseNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/ParameterNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/ProcessingInstructionNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/SAXSerializer.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/SortKey.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/StreamSerializer.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/Stylesheet.java:1.1->1.2 
	libraries/javalib/gnu/xml/transform/Template.java:1.1->1.2 
	libraries/javalib/gnu/xml/transform/TemplateNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/TemplatesImpl.java:1.1->1.2 
	libraries/javalib/gnu/xml/transform/TextNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/TransformerFactoryImpl.java:1.1->1.2 
	libraries/javalib/gnu/xml/transform/TransformerImpl.java:1.1->1.2 
	libraries/javalib/gnu/xml/transform/ValueOfNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/WhenNode.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/WithParam.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/XSLComparator.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/XSLURIResolver.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/AndExpr.java:1.1->1.2 
	libraries/javalib/gnu/xml/xpath/ArithmeticExpr.java:1.1->1.2 
	libraries/javalib/gnu/xml/xpath/BooleanFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/CeilingFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/ConcatFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/Constant.java:1.1->1.2 
	libraries/javalib/gnu/xml/xpath/ContainsFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/CountFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/DocumentOrderComparator.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/EqualityExpr.java:1.1->1.2 
	libraries/javalib/gnu/xml/xpath/Expr.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/ExpressionTest.java:1.1->1.2 
	libraries/javalib/gnu/xml/xpath/FalseFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/FloorFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/FunctionCall.java:1.3->1.4 
	libraries/javalib/gnu/xml/xpath/IdFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/Index.java:1.2->1.3(DEAD) 
	libraries/javalib/gnu/xml/xpath/LangFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/LastFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/LocalNameFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/NameFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/NameTest.java:1.3->1.4 
	libraries/javalib/gnu/xml/xpath/NamespaceUriFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/NegativeExpr.java:1.1->1.2 
	libraries/javalib/gnu/xml/xpath/NodeTypeTest.java:1.2->1.3 
	libraries/javalib/gnu/xml/xpath/NormalizeSpaceFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/NotFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/NumberFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/OrExpr.java:1.1->1.2 
	libraries/javalib/gnu/xml/xpath/ParenthesizedExpr.java:1.1->1.2 
	libraries/javalib/gnu/xml/xpath/Path.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/PositionFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/RelationalExpr.java:1.1->1.2 
	libraries/javalib/gnu/xml/xpath/Root.java:1.2->1.3 
	libraries/javalib/gnu/xml/xpath/RoundFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/Selector.java:1.2->1.3 
	libraries/javalib/gnu/xml/xpath/StartsWithFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/Step.java:1.2->1.3 
	libraries/javalib/gnu/xml/xpath/StringFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/StringLengthFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/SubstringAfterFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/SubstringBeforeFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/SubstringFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/SumFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/Test.java:1.2->1.3 
	libraries/javalib/gnu/xml/xpath/TranslateFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/TrueFunction.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/xpath/UnionExpr.java:1.2->1.3 
	libraries/javalib/gnu/xml/xpath/VariableReference.java:1.1->1.2 
	libraries/javalib/gnu/xml/xpath/XPathParser.java:1.3->1.4 
	libraries/javalib/gnu/xml/xpath/XPathParser.y:1.2->1.3 
	libraries/javalib/gnu/xml/xpath/XPathTest.java:1.1->1.2 
	libraries/javalib/javax/xml/namespace/QName.java:1.2->1.3 

Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.262 kaffe/libraries/javalib/Makefile.am:1.263
--- kaffe/libraries/javalib/Makefile.am:1.262	Thu Nov 11 00:32:38 2004
+++ kaffe/libraries/javalib/Makefile.am	Thu Nov 11 03:52:44 2004
@@ -1423,6 +1423,7 @@
 	gnu/regexp/RETokenWordBoundary.java \
 	gnu/regexp/UncheckedRE.java
 gnu_xml_aelfred2_SRCS = \
+	gnu/xml/aelfred2/ContentHandler2.java \
 	gnu/xml/aelfred2/JAXPFactory.java \
 	gnu/xml/aelfred2/SAXDriver.java \
 	gnu/xml/aelfred2/XmlParser.java \
@@ -1444,6 +1445,7 @@
 	gnu/xml/dom/DomFragment.java \
 	gnu/xml/dom/DomImpl.java \
 	gnu/xml/dom/DomIterator.java \
+	gnu/xml/dom/DomNSResolverContext.java \
 	gnu/xml/dom/DomNamedNodeMap.java \
 	gnu/xml/dom/DomNode.java \
 	gnu/xml/dom/DomNotation.java \
@@ -1522,17 +1524,44 @@
 	gnu/xml/pipeline/XIncludeFilter.java \
 	gnu/xml/pipeline/XsltFilter.java
 gnu_xml_transform_SRCS = \
-	gnu/xml/transform/DOMResultWrapper.java \
-	gnu/xml/transform/DOMSerializer.java \
+	gnu/xml/transform/AbstractNumberNode.java \
+	gnu/xml/transform/ApplyTemplatesNode.java \
+	gnu/xml/transform/AttributeNode.java \
+	gnu/xml/transform/Bindings.java \
+	gnu/xml/transform/CallTemplateNode.java \
+	gnu/xml/transform/ChooseNode.java \
+	gnu/xml/transform/CommentNode.java \
+	gnu/xml/transform/CopyNode.java \
+	gnu/xml/transform/CopyOfNode.java \
 	gnu/xml/transform/DOMSourceLocator.java \
-	gnu/xml/transform/DOMSourceWrapper.java \
+	gnu/xml/transform/DocumentFunction.java \
+	gnu/xml/transform/DummyNode.java \
+	gnu/xml/transform/ElementNode.java \
 	gnu/xml/transform/ErrorListenerErrorHandler.java \
+	gnu/xml/transform/ForEachNode.java \
+	gnu/xml/transform/IfNode.java \
+	gnu/xml/transform/LiteralNode.java \
+	gnu/xml/transform/NodeNumberNode.java \
+	gnu/xml/transform/NumberNode.java \
+	gnu/xml/transform/OtherwiseNode.java \
+	gnu/xml/transform/ParameterNode.java \
+	gnu/xml/transform/ProcessingInstructionNode.java \
+	gnu/xml/transform/SAXSerializer.java \
+	gnu/xml/transform/SortKey.java \
+	gnu/xml/transform/StreamSerializer.java \
 	gnu/xml/transform/Stylesheet.java \
 	gnu/xml/transform/Template.java \
+	gnu/xml/transform/TemplateNode.java \
 	gnu/xml/transform/TemplatesImpl.java \
+	gnu/xml/transform/TextNode.java \
 	gnu/xml/transform/TransformerFactoryImpl.java \
 	gnu/xml/transform/TransformerImpl.java \
-	gnu/xml/transform/URIResolverEntityResolver.java
+	gnu/xml/transform/URIResolverEntityResolver.java \
+	gnu/xml/transform/ValueOfNode.java \
+	gnu/xml/transform/WhenNode.java \
+	gnu/xml/transform/WithParam.java \
+	gnu/xml/transform/XSLComparator.java \
+	gnu/xml/transform/XSLURIResolver.java
 gnu_xml_util_SRCS = \
 	gnu/xml/util/DoParse.java \
 	gnu/xml/util/DomParser.java \
@@ -1544,22 +1573,50 @@
 gnu_xml_xpath_SRCS = \
 	gnu/xml/xpath/AndExpr.java \
 	gnu/xml/xpath/ArithmeticExpr.java \
+	gnu/xml/xpath/BooleanFunction.java \
+	gnu/xml/xpath/CeilingFunction.java \
+	gnu/xml/xpath/ConcatFunction.java \
 	gnu/xml/xpath/Constant.java \
+	gnu/xml/xpath/ContainsFunction.java \
+	gnu/xml/xpath/CountFunction.java \
+	gnu/xml/xpath/DocumentOrderComparator.java \
 	gnu/xml/xpath/EqualityExpr.java \
 	gnu/xml/xpath/Expr.java \
 	gnu/xml/xpath/ExpressionTest.java \
+	gnu/xml/xpath/FalseFunction.java \
+	gnu/xml/xpath/FloorFunction.java \
 	gnu/xml/xpath/FunctionCall.java \
-	gnu/xml/xpath/Index.java \
+	gnu/xml/xpath/IdFunction.java \
+	gnu/xml/xpath/LangFunction.java \
+	gnu/xml/xpath/LastFunction.java \
+	gnu/xml/xpath/LocalNameFunction.java \
+	gnu/xml/xpath/NameFunction.java \
 	gnu/xml/xpath/NameTest.java \
+	gnu/xml/xpath/NamespaceUriFunction.java \
 	gnu/xml/xpath/NegativeExpr.java \
 	gnu/xml/xpath/NodeTypeTest.java \
+	gnu/xml/xpath/NormalizeSpaceFunction.java \
+	gnu/xml/xpath/NotFunction.java \
+	gnu/xml/xpath/NumberFunction.java \
 	gnu/xml/xpath/OrExpr.java \
 	gnu/xml/xpath/ParenthesizedExpr.java \
+	gnu/xml/xpath/Path.java \
+	gnu/xml/xpath/PositionFunction.java \
 	gnu/xml/xpath/RelationalExpr.java \
 	gnu/xml/xpath/Root.java \
+	gnu/xml/xpath/RoundFunction.java \
 	gnu/xml/xpath/Selector.java \
+	gnu/xml/xpath/StartsWithFunction.java \
 	gnu/xml/xpath/Step.java \
+	gnu/xml/xpath/StringFunction.java \
+	gnu/xml/xpath/StringLengthFunction.java \
+	gnu/xml/xpath/SubstringAfterFunction.java \
+	gnu/xml/xpath/SubstringBeforeFunction.java \
+	gnu/xml/xpath/SubstringFunction.java \
+	gnu/xml/xpath/SumFunction.java \
 	gnu/xml/xpath/Test.java \
+	gnu/xml/xpath/TranslateFunction.java \
+	gnu/xml/xpath/TrueFunction.java \
 	gnu/xml/xpath/UnionExpr.java \
 	gnu/xml/xpath/VariableReference.java \
 	gnu/xml/xpath/XPathFactoryImpl.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.342 kaffe/libraries/javalib/Makefile.in:1.343
--- kaffe/libraries/javalib/Makefile.in:1.342	Thu Nov 11 00:32:39 2004
+++ kaffe/libraries/javalib/Makefile.in	Thu Nov 11 03:52:45 2004
@@ -1866,6 +1866,7 @@
 	gnu/regexp/UncheckedRE.java
 
 gnu_xml_aelfred2_SRCS = \
+	gnu/xml/aelfred2/ContentHandler2.java \
 	gnu/xml/aelfred2/JAXPFactory.java \
 	gnu/xml/aelfred2/SAXDriver.java \
 	gnu/xml/aelfred2/XmlParser.java \
@@ -1888,6 +1889,7 @@
 	gnu/xml/dom/DomFragment.java \
 	gnu/xml/dom/DomImpl.java \
 	gnu/xml/dom/DomIterator.java \
+	gnu/xml/dom/DomNSResolverContext.java \
 	gnu/xml/dom/DomNamedNodeMap.java \
 	gnu/xml/dom/DomNode.java \
 	gnu/xml/dom/DomNotation.java \
@@ -1973,17 +1975,44 @@
 	gnu/xml/pipeline/XsltFilter.java
 
 gnu_xml_transform_SRCS = \
-	gnu/xml/transform/DOMResultWrapper.java \
-	gnu/xml/transform/DOMSerializer.java \
+	gnu/xml/transform/AbstractNumberNode.java \
+	gnu/xml/transform/ApplyTemplatesNode.java \
+	gnu/xml/transform/AttributeNode.java \
+	gnu/xml/transform/Bindings.java \
+	gnu/xml/transform/CallTemplateNode.java \
+	gnu/xml/transform/ChooseNode.java \
+	gnu/xml/transform/CommentNode.java \
+	gnu/xml/transform/CopyNode.java \
+	gnu/xml/transform/CopyOfNode.java \
 	gnu/xml/transform/DOMSourceLocator.java \
-	gnu/xml/transform/DOMSourceWrapper.java \
+	gnu/xml/transform/DocumentFunction.java \
+	gnu/xml/transform/DummyNode.java \
+	gnu/xml/transform/ElementNode.java \
 	gnu/xml/transform/ErrorListenerErrorHandler.java \
+	gnu/xml/transform/ForEachNode.java \
+	gnu/xml/transform/IfNode.java \
+	gnu/xml/transform/LiteralNode.java \
+	gnu/xml/transform/NodeNumberNode.java \
+	gnu/xml/transform/NumberNode.java \
+	gnu/xml/transform/OtherwiseNode.java \
+	gnu/xml/transform/ParameterNode.java \
+	gnu/xml/transform/ProcessingInstructionNode.java \
+	gnu/xml/transform/SAXSerializer.java \
+	gnu/xml/transform/SortKey.java \
+	gnu/xml/transform/StreamSerializer.java \
 	gnu/xml/transform/Stylesheet.java \
 	gnu/xml/transform/Template.java \
+	gnu/xml/transform/TemplateNode.java \
 	gnu/xml/transform/TemplatesImpl.java \
+	gnu/xml/transform/TextNode.java \
 	gnu/xml/transform/TransformerFactoryImpl.java \
 	gnu/xml/transform/TransformerImpl.java \
-	gnu/xml/transform/URIResolverEntityResolver.java
+	gnu/xml/transform/URIResolverEntityResolver.java \
+	gnu/xml/transform/ValueOfNode.java \
+	gnu/xml/transform/WhenNode.java \
+	gnu/xml/transform/WithParam.java \
+	gnu/xml/transform/XSLComparator.java \
+	gnu/xml/transform/XSLURIResolver.java
 
 gnu_xml_util_SRCS = \
 	gnu/xml/util/DoParse.java \
@@ -1997,22 +2026,50 @@
 gnu_xml_xpath_SRCS = \
 	gnu/xml/xpath/AndExpr.java \
 	gnu/xml/xpath/ArithmeticExpr.java \
+	gnu/xml/xpath/BooleanFunction.java \
+	gnu/xml/xpath/CeilingFunction.java \
+	gnu/xml/xpath/ConcatFunction.java \
 	gnu/xml/xpath/Constant.java \
+	gnu/xml/xpath/ContainsFunction.java \
+	gnu/xml/xpath/CountFunction.java \
+	gnu/xml/xpath/DocumentOrderComparator.java \
 	gnu/xml/xpath/EqualityExpr.java \
 	gnu/xml/xpath/Expr.java \
 	gnu/xml/xpath/ExpressionTest.java \
+	gnu/xml/xpath/FalseFunction.java \
+	gnu/xml/xpath/FloorFunction.java \
 	gnu/xml/xpath/FunctionCall.java \
-	gnu/xml/xpath/Index.java \
+	gnu/xml/xpath/IdFunction.java \
+	gnu/xml/xpath/LangFunction.java \
+	gnu/xml/xpath/LastFunction.java \
+	gnu/xml/xpath/LocalNameFunction.java \
+	gnu/xml/xpath/NameFunction.java \
 	gnu/xml/xpath/NameTest.java \
+	gnu/xml/xpath/NamespaceUriFunction.java \
 	gnu/xml/xpath/NegativeExpr.java \
 	gnu/xml/xpath/NodeTypeTest.java \
+	gnu/xml/xpath/NormalizeSpaceFunction.java \
+	gnu/xml/xpath/NotFunction.java \
+	gnu/xml/xpath/NumberFunction.java \
 	gnu/xml/xpath/OrExpr.java \
 	gnu/xml/xpath/ParenthesizedExpr.java \
+	gnu/xml/xpath/Path.java \
+	gnu/xml/xpath/PositionFunction.java \
 	gnu/xml/xpath/RelationalExpr.java \
 	gnu/xml/xpath/Root.java \
+	gnu/xml/xpath/RoundFunction.java \
 	gnu/xml/xpath/Selector.java \
+	gnu/xml/xpath/StartsWithFunction.java \
 	gnu/xml/xpath/Step.java \
+	gnu/xml/xpath/StringFunction.java \
+	gnu/xml/xpath/StringLengthFunction.java \
+	gnu/xml/xpath/SubstringAfterFunction.java \
+	gnu/xml/xpath/SubstringBeforeFunction.java \
+	gnu/xml/xpath/SubstringFunction.java \
+	gnu/xml/xpath/SumFunction.java \
 	gnu/xml/xpath/Test.java \
+	gnu/xml/xpath/TranslateFunction.java \
+	gnu/xml/xpath/TrueFunction.java \
 	gnu/xml/xpath/UnionExpr.java \
 	gnu/xml/xpath/VariableReference.java \
 	gnu/xml/xpath/XPathFactoryImpl.java \
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.50 kaffe/libraries/javalib/all.files:1.51
--- kaffe/libraries/javalib/all.files:1.50	Thu Nov 11 00:32:40 2004
+++ kaffe/libraries/javalib/all.files	Thu Nov 11 03:52:45 2004
@@ -991,6 +991,7 @@
 gnu/regexp/RETokenStart.java
 gnu/regexp/RETokenWordBoundary.java
 gnu/regexp/UncheckedRE.java
+gnu/xml/aelfred2/ContentHandler2.java
 gnu/xml/aelfred2/JAXPFactory.java
 gnu/xml/aelfred2/SAXDriver.java
 gnu/xml/aelfred2/XmlParser.java
@@ -1011,6 +1012,7 @@
 gnu/xml/dom/DomFragment.java
 gnu/xml/dom/DomImpl.java
 gnu/xml/dom/DomIterator.java
+gnu/xml/dom/DomNSResolverContext.java
 gnu/xml/dom/DomNamedNodeMap.java
 gnu/xml/dom/DomNode.java
 gnu/xml/dom/DomNotation.java
@@ -1082,17 +1084,44 @@
 gnu/xml/pipeline/WellFormednessFilter.java
 gnu/xml/pipeline/XIncludeFilter.java
 gnu/xml/pipeline/XsltFilter.java
-gnu/xml/transform/DOMResultWrapper.java
-gnu/xml/transform/DOMSerializer.java
+gnu/xml/transform/AbstractNumberNode.java
+gnu/xml/transform/ApplyTemplatesNode.java
+gnu/xml/transform/AttributeNode.java
+gnu/xml/transform/Bindings.java
+gnu/xml/transform/CallTemplateNode.java
+gnu/xml/transform/ChooseNode.java
+gnu/xml/transform/CommentNode.java
+gnu/xml/transform/CopyNode.java
+gnu/xml/transform/CopyOfNode.java
 gnu/xml/transform/DOMSourceLocator.java
-gnu/xml/transform/DOMSourceWrapper.java
+gnu/xml/transform/DocumentFunction.java
+gnu/xml/transform/DummyNode.java
+gnu/xml/transform/ElementNode.java
 gnu/xml/transform/ErrorListenerErrorHandler.java
+gnu/xml/transform/ForEachNode.java
+gnu/xml/transform/IfNode.java
+gnu/xml/transform/LiteralNode.java
+gnu/xml/transform/NodeNumberNode.java
+gnu/xml/transform/NumberNode.java
+gnu/xml/transform/OtherwiseNode.java
+gnu/xml/transform/ParameterNode.java
+gnu/xml/transform/ProcessingInstructionNode.java
+gnu/xml/transform/SAXSerializer.java
+gnu/xml/transform/SortKey.java
+gnu/xml/transform/StreamSerializer.java
 gnu/xml/transform/Stylesheet.java
 gnu/xml/transform/Template.java
+gnu/xml/transform/TemplateNode.java
 gnu/xml/transform/TemplatesImpl.java
+gnu/xml/transform/TextNode.java
 gnu/xml/transform/TransformerFactoryImpl.java
 gnu/xml/transform/TransformerImpl.java
 gnu/xml/transform/URIResolverEntityResolver.java
+gnu/xml/transform/ValueOfNode.java
+gnu/xml/transform/WhenNode.java
+gnu/xml/transform/WithParam.java
+gnu/xml/transform/XSLComparator.java
+gnu/xml/transform/XSLURIResolver.java
 gnu/xml/util/DoParse.java
 gnu/xml/util/DomParser.java
 gnu/xml/util/Resolver.java
@@ -1102,22 +1131,50 @@
 gnu/xml/util/XMLWriter.java
 gnu/xml/xpath/AndExpr.java
 gnu/xml/xpath/ArithmeticExpr.java
+gnu/xml/xpath/BooleanFunction.java
+gnu/xml/xpath/CeilingFunction.java
+gnu/xml/xpath/ConcatFunction.java
 gnu/xml/xpath/Constant.java
+gnu/xml/xpath/ContainsFunction.java
+gnu/xml/xpath/CountFunction.java
+gnu/xml/xpath/DocumentOrderComparator.java
 gnu/xml/xpath/EqualityExpr.java
 gnu/xml/xpath/Expr.java
 gnu/xml/xpath/ExpressionTest.java
+gnu/xml/xpath/FalseFunction.java
+gnu/xml/xpath/FloorFunction.java
 gnu/xml/xpath/FunctionCall.java
-gnu/xml/xpath/Index.java
+gnu/xml/xpath/IdFunction.java
+gnu/xml/xpath/LangFunction.java
+gnu/xml/xpath/LastFunction.java
+gnu/xml/xpath/LocalNameFunction.java
+gnu/xml/xpath/NameFunction.java
 gnu/xml/xpath/NameTest.java
+gnu/xml/xpath/NamespaceUriFunction.java
 gnu/xml/xpath/NegativeExpr.java
 gnu/xml/xpath/NodeTypeTest.java
+gnu/xml/xpath/NormalizeSpaceFunction.java
+gnu/xml/xpath/NotFunction.java
+gnu/xml/xpath/NumberFunction.java
 gnu/xml/xpath/OrExpr.java
 gnu/xml/xpath/ParenthesizedExpr.java
+gnu/xml/xpath/Path.java
+gnu/xml/xpath/PositionFunction.java
 gnu/xml/xpath/RelationalExpr.java
 gnu/xml/xpath/Root.java
+gnu/xml/xpath/RoundFunction.java
 gnu/xml/xpath/Selector.java
+gnu/xml/xpath/StartsWithFunction.java
 gnu/xml/xpath/Step.java
+gnu/xml/xpath/StringFunction.java
+gnu/xml/xpath/StringLengthFunction.java
+gnu/xml/xpath/SubstringAfterFunction.java
+gnu/xml/xpath/SubstringBeforeFunction.java
+gnu/xml/xpath/SubstringFunction.java
+gnu/xml/xpath/SumFunction.java
 gnu/xml/xpath/Test.java
+gnu/xml/xpath/TranslateFunction.java
+gnu/xml/xpath/TrueFunction.java
 gnu/xml/xpath/UnionExpr.java
 gnu/xml/xpath/VariableReference.java
 gnu/xml/xpath/XPathFactoryImpl.java
===================================================================
Checking out kaffe/libraries/javalib/gnu/xml/aelfred2/ContentHandler2.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/xml/aelfred2/ContentHandler2.java,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/xml/aelfred2/ContentHandler2.java	Thu Nov 11 03:57:02 2004
@@ -0,0 +1,64 @@
+/*
+ * ContentHandler2.java
+ * Copyright (C) 2004 The Free Software Foundation
+ * 
+ * This file is part of GNU JAXP, a library.
+ *
+ * GNU JAXP is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * GNU JAXP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; 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
+ * obliged 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 at 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
+   */
+  void xmlDecl(String version, String encoding, boolean standalone)
+    throws SAXException;
+  
+}
Index: kaffe/libraries/javalib/gnu/xml/aelfred2/SAXDriver.java
diff -u kaffe/libraries/javalib/gnu/xml/aelfred2/SAXDriver.java:1.12 kaffe/libraries/javalib/gnu/xml/aelfred2/SAXDriver.java:1.13
--- kaffe/libraries/javalib/gnu/xml/aelfred2/SAXDriver.java:1.12	Mon Oct 18 20:19:45 2004
+++ kaffe/libraries/javalib/gnu/xml/aelfred2/SAXDriver.java	Thu Nov 11 03:52:46 2004
@@ -580,6 +580,19 @@
 	attributesList.clear ();
     }
 
+    void xmlDecl(String version,
+                 String encoding,
+                 boolean standalone)
+      throws SAXException
+    {
+      if (contentHandler instanceof ContentHandler2)
+        {
+          ((ContentHandler2) contentHandler).xmlDecl(version,
+                                                     encoding,
+                                                     standalone);
+        }
+    }
+
     void skippedEntity (String name)
     throws SAXException
 	{ contentHandler.skippedEntity (name); }
Index: kaffe/libraries/javalib/gnu/xml/aelfred2/XmlParser.java
diff -u kaffe/libraries/javalib/gnu/xml/aelfred2/XmlParser.java:1.10 kaffe/libraries/javalib/gnu/xml/aelfred2/XmlParser.java:1.11
--- kaffe/libraries/javalib/gnu/xml/aelfred2/XmlParser.java:1.10	Fri Sep 17 21:02:01 2004
+++ kaffe/libraries/javalib/gnu/xml/aelfred2/XmlParser.java	Thu Nov 11 03:52:46 2004
@@ -632,6 +632,8 @@
 	skipWhitespace ();
 	require ("?>");
 
+        handler.xmlDecl(version, encodingName, "yes".equals(standalone));
+
 	return encodingName;
     }
 
Index: kaffe/libraries/javalib/gnu/xml/dom/Consumer.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/Consumer.java:1.5 kaffe/libraries/javalib/gnu/xml/dom/Consumer.java:1.6
--- kaffe/libraries/javalib/gnu/xml/dom/Consumer.java:1.5	Fri Sep 17 21:02:01 2004
+++ kaffe/libraries/javalib/gnu/xml/dom/Consumer.java	Thu Nov 11 03:52:47 2004
@@ -220,7 +220,7 @@
 	    Attributes2		attrs = (Attributes2) atts;
 	    int			length = atts.getLength ();
 
-	    map.compact ();
+	    //map.compact ();
 	    for (int i = 0; i < length; i++) {
 		if (attrs.isSpecified (i))
 		    continue;
@@ -293,14 +293,28 @@
 	    DomDocument		doc;
 
 	    super.startDocument ();
-	    ((DomDocument) getDocument ()).setCheckingCharacters (false);
+	    ((DomDocument) getDocument ()).setStrictErrorChecking(false);
 	}
 
+        /**
+         * Required by DOM Level 3 to report document parameters
+         */
+        public void xmlDecl(String version,
+                            String encoding,
+                            boolean standalone)
+          throws SAXException
+        {
+          super.xmlDecl(version, encoding, standalone);
+
+          DomDocument doc = (DomDocument) getDocument();
+          doc.setXmlEncoding(encoding);
+        }
+
 	public void endDocument ()
 	throws SAXException
 	{
 	    DomDocument		doc = (DomDocument) getDocument ();
-	    doc.setCheckingCharacters (true);
+	    doc.setStrictErrorChecking(true);
 	    doc.compact ();
 	    super.endDocument ();
 	}
Index: kaffe/libraries/javalib/gnu/xml/dom/DomAttr.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomAttr.java:1.5 kaffe/libraries/javalib/gnu/xml/dom/DomAttr.java:1.6
--- kaffe/libraries/javalib/gnu/xml/dom/DomAttr.java:1.5	Fri Sep 17 21:02:01 2004
+++ kaffe/libraries/javalib/gnu/xml/dom/DomAttr.java	Thu Nov 11 03:52:47 2004
@@ -38,7 +38,11 @@
 
 package gnu.xml.dom;
 
-import org.w3c.dom.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.TypeInfo;
 import org.w3c.dom.events.MutationEvent;
 
 
@@ -69,222 +73,226 @@
  *
  * @author David Brownell
  */
-public class DomAttr extends DomNsNode implements Attr
+public class DomAttr
+  extends DomNsNode
+  implements Attr
 {
-    private boolean	specified;
-
-    // NOTE:  it could be possible to rework this code a bit so that
-    // this extra field isn't needed; "parent" might do double duty,
-    // with appropriate safeguards.  Using less space is healthy!
-    private DomElement	element;
-
-
-    /**
-     * 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 (Document owner, String namespaceURI, String name)
-    {
-	super (owner, namespaceURI, name);
-	specified = true;
-
-	// 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)
-     */
-    final public String getName ()
-    {
-	return getNodeName ();
-    }
-
-    /**
-     * <b>DOM L1</b>
-     * Returns the constant ATTRIBUTE_NODE.
-     */
-    final public short getNodeType ()
-	{ return ATTRIBUTE_NODE; }
-
-
-    /**
-     * <b>DOM L1</b>
-     * Returns true if a parser reported this was in the source text.
-     */
-    final public boolean getSpecified ()
-    {
-	return specified;
-    }
-
-
-    /**
-     * Records whether this attribute was in the source text.
-     */
-    final public 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 ()
-    {
-	int	length = getLength ();
-	String	retval = null;
-
-	for (int i = 0; i < length; i++) {
-	    Node	n = item (i);
-
-	    if (n.getNodeType () == TEXT_NODE) {
-		if (retval == null)
-		    retval = n.getNodeValue ();
-		else
-		    retval += n.getNodeValue ();
-		continue;
-	    }
-	    
-	    // XXX entity ref child of attribute
-	    // contents exclude comments, PIs, elements
-	    throw new DomEx (DomEx.NOT_SUPPORTED_ERR);
-	}
-	if (retval == null)
-	    retval = "";
-	return retval;
-    }
-
-
-    /**
-     * <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).
-     */
-    final public 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>
-     */
-    final public 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)
-    {
-	int	len = getLength ();
-	String	oldValue;
-
-	if (isReadonly ())
-	    throw new DomEx (DomEx.NO_MODIFICATION_ALLOWED_ERR);
-
-	oldValue = getValue ();
-	for (int i = 0; i < len; i++)
-	    removeChild (getLastChild ());
-	appendChild (getOwnerDocument ().createTextNode (value));
-	specified = true;
-	
-	mutating (oldValue, value, MutationEvent.MODIFICATION);
-    }
-
-
-    /**
-     * <b>DOM L2</b>
-     * Returns the element with which this attribute is associated.
-     */
-    final public Element getOwnerElement ()
-    {
-	return element;
-    }
-
-
-    /**
-     * Records the element with which this attribute is associated.
-     */
-    final public void setOwnerElement (Element e)
-    {
-	if (element != null)
-	    throw new DomEx (DomEx.HIERARCHY_REQUEST_ERR);
-	if (!(e instanceof DomElement))
-	    throw new DomEx (DomEx.WRONG_DOCUMENT_ERR);
-	element = (DomElement) e;
-    }
-
-
-    /**
-     * Shallow clone of the attribute, breaking all ties with any
-     * elements.
-     */
-    public Object clone ()
-    {
-	DomAttr retval = (DomAttr) super.clone ();
-
-	retval.element = null;
-	retval.specified = false;
-	return retval;
-    }
-
-    private void mutating (String oldValue, String newValue, short why)
-    {
-	if (!reportMutations || element == null)
-	    return;
-
-	// EVENT:  DOMAttrModified, target = element,
-	//	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);
-	element.dispatchEvent (event);
-    }
-
-    // DOM Level 3 methods
-
-    public TypeInfo getSchemaTypeInfo ()
+  
+  private boolean	specified;
+  
+  /**
+   * 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(Document owner, String namespaceURI, String name)
+  {
+    super(ATTRIBUTE_NODE, owner, namespaceURI, name);
+    specified = true;
+    
+    // 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()
+  {
+    StringBuffer buf = new StringBuffer();
+    for (DomNode ctx = first; ctx != null; ctx = ctx.next)
       {
-        // TODO
-        return null;
+        switch (ctx.nodeType)
+          {
+          case Node.TEXT_NODE:
+            buf.append(ctx.getNodeValue());
+            break;
+          case Node.ENTITY_REFERENCE_NODE:
+            // TODO
+            break;
+          }
       }
-
-    public boolean isId ()
+    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 (isReadonly())
+      {
+        throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);

*** Patch too long, truncated ***




More information about the kaffe mailing list