[kaffe] CVS kaffe (dalibor): Resynced with GNU JAXP

Kaffe CVS cvs-commits at kaffe.org
Thu Jun 3 16:55:11 PDT 2004


PatchSet 4815 
Date: 2004/06/03 18:56:03
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU JAXP

2004-06-03  Dalibor Topic  <robilad at kaffe.org>

        * libraries/clib/libxmlj/Makefile.am:
        (libxmlj_la_SOURCES) Added xmlj_xpath.c.

        libraries/clib/libxmlj/Makefile.in,
        libraries/javalib/Makefile.am,
        libraries/javalib/Makefile.in:
        Regenerated.

        * libraries/javalib/profiles/allatonce/all.files,
        libraries/javalib/profiles/default/jaxp.files,
        libraries/javalib/profiles/default/xml.files:
        Updated.

        * libraries/clib/libxmlj/xmlj_dom.c,
        libraries/clib/libxmlj/xmlj_dom.h,
        libraries/clib/libxmlj/xmlj_error.c,
        libraries/clib/libxmlj/xmlj_error.h,
        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_transform.c,
        libraries/clib/libxmlj/xmlj_xpath.c,
        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/dom/MatchingNodeList.java,
        libraries/javalib/gnu/xml/libxmlj/transform/DefaultErrorListenerImpl.java,
        libraries/javalib/gnu/xml/libxmlj/transform/DefaultURIResolverImpl.java,
        libraries/javalib/gnu/xml/libxmlj/transform/GnomeTemplates.java,
        libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformer.java,
        libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java,
        libraries/javalib/gnu/xml/libxmlj/transform/IOToolkit.java,
        libraries/javalib/gnu/xml/libxmlj/transform/JavaContext.java,
        libraries/javalib/gnu/xml/libxmlj/transform/LibxmlDocument.java,
        libraries/javalib/gnu/xml/libxmlj/transform/LibxsltStylesheet.java,
        libraries/javalib/gnu/xml/libxmlj/transform/SourceLocatorImpl.java,
        libraries/javalib/gnu/xml/libxmlj/transform/SourceWrapper.java,
        libraries/javalib/gnu/xml/libxmlj/transform/TemplatesImpl.java,
        libraries/javalib/gnu/xml/libxmlj/transform/TransformTest.java,
        libraries/javalib/gnu/xml/libxmlj/transform/TemplatesImpl.java,
        libraries/javalib/gnu/xml/libxmlj/transform/TransformTest.java,
        libraries/javalib/gnu/xml/libxmlj/transform/TransformerFactoryImpl.java,
        libraries/javalib/gnu/xml/libxmlj/transform/TransformerImpl.java,
        libraries/javalib/gnu/xml/libxmlj/transform/package.html,
        libraries/javalib/gnu/xml/libxmlj/util/NamedInputStream.java,
        libraries/javalib/gnu/xml/libxmlj/util/StandaloneLocator.java,
        libraries/javalib/gnu/xml/libxmlj/util/XMLJ.java,
        libraries/javalib/javax/xml/transform/TransformerFactory.java,
        libraries/javalib/org/w3c/dom/xpath/XPathEvaluator.java,
        libraries/javalib/org/w3c/dom/xpath/XPathException.java,
        libraries/javalib/org/w3c/dom/xpath/XPathExpression.java,
        libraries/javalib/org/w3c/dom/xpath/XPathNSResolver.java,
        libraries/javalib/org/w3c/dom/xpath/XPathNamespace.java,
        libraries/javalib/org/w3c/dom/xpath/XPathResult.java,
        libraries/javalib/org/xml/sax/helpers/NamespaceSupport.java,
        Resynced with GNU JAXP.

        2004-06-03  Chris Burdess <dog at gnu.org>

        * all: Use longs for native pointers.
        * dom: Added dom.xpath interfaces.

        2004-06-02  Chris Burdess <dog at gnu.org>

        * GnomeNode.java et al, xmlj_dom.c: Implementation of some DOM Level 3
            methods.

        2004-06-01  Chris Burdess <dog at gnu.org>

        * GnomeNode.java et al: Applied Dalibor's #3080 patch for missing
            imports.

        2004-05-27  Chris Burdess <dog at gnu.org>

        * GnomeXMLReader.java, GnomeDocumentBuilder.java, JavaContext.java:
            Correct handling of zero-length documents.

        2004-05-24  Chris Burdess <dog at gnu.org>

        * all: Refactoring for Gnome* naming scheme. All modules now use
            common parsing framework.

Members: 
	ChangeLog:1.2383->1.2384 
	libraries/clib/libxmlj/Makefile.am:1.2->1.3 
	libraries/clib/libxmlj/Makefile.in:1.5->1.6 
	libraries/clib/libxmlj/xmlj_dom.c:1.1->1.2 
	libraries/clib/libxmlj/xmlj_dom.h:1.1->1.2 
	libraries/clib/libxmlj/xmlj_error.c:1.2->1.3 
	libraries/clib/libxmlj/xmlj_error.h:1.2->1.3 
	libraries/clib/libxmlj/xmlj_io.c:1.2->1.3 
	libraries/clib/libxmlj/xmlj_io.h:1.2->1.3 
	libraries/clib/libxmlj/xmlj_node.c:1.1->1.2 
	libraries/clib/libxmlj/xmlj_sax.c:1.1->1.2 
	libraries/clib/libxmlj/xmlj_transform.c:1.1->1.2 
	libraries/clib/libxmlj/xmlj_xpath.c:INITIAL->1.1 
	libraries/javalib/Makefile.am:1.193->1.194 
	libraries/javalib/Makefile.in:1.258->1.259 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeAttr.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeCDATASection.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeCharacterData.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeComment.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocument.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentBuilderFactory.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentFragment.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeDocumentType.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeElement.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeEntity.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeEntityReference.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeNode.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeNodeList.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeNotation.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeText.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeXPathExpression.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeXPathNSResolver.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/libxmlj/dom/GnomeXPathResult.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/libxmlj/dom/MatchingNodeList.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/transform/DefaultErrorListenerImpl.java:1.2->1.3(DEAD) 
	libraries/javalib/gnu/xml/libxmlj/transform/DefaultURIResolverImpl.java:1.2->1.3(DEAD) 
	libraries/javalib/gnu/xml/libxmlj/transform/GnomeTemplates.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformer.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/libxmlj/transform/IOToolkit.java:1.2->1.3(DEAD) 
	libraries/javalib/gnu/xml/libxmlj/transform/JavaContext.java:1.2->1.3 
	libraries/javalib/gnu/xml/libxmlj/transform/LibxmlDocument.java:1.2->1.3(DEAD) 
	libraries/javalib/gnu/xml/libxmlj/transform/LibxsltStylesheet.java:1.2->1.3 
	libraries/javalib/gnu/xml/libxmlj/transform/SourceLocatorImpl.java:1.2->1.3(DEAD) 
	libraries/javalib/gnu/xml/libxmlj/transform/SourceWrapper.java:1.2->1.3(DEAD) 
	libraries/javalib/gnu/xml/libxmlj/transform/TemplatesImpl.java:1.2->1.3(DEAD) 
	libraries/javalib/gnu/xml/libxmlj/transform/TransformTest.java:1.2->1.3 
	libraries/javalib/gnu/xml/libxmlj/transform/TransformerFactoryImpl.java:1.2->1.3(DEAD) 
	libraries/javalib/gnu/xml/libxmlj/transform/TransformerImpl.java:1.2->1.3(DEAD) 
	libraries/javalib/gnu/xml/libxmlj/transform/package.html:1.2->1.3 
	libraries/javalib/gnu/xml/libxmlj/util/NamedInputStream.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/libxmlj/util/StandaloneLocator.java:1.1->1.2 
	libraries/javalib/gnu/xml/libxmlj/util/XMLJ.java:INITIAL->1.1 
	libraries/javalib/javax/xml/transform/TransformerFactory.java:1.4->1.5 
	libraries/javalib/org/w3c/dom/xpath/XPathEvaluator.java:INITIAL->1.1 
	libraries/javalib/org/w3c/dom/xpath/XPathException.java:INITIAL->1.1 
	libraries/javalib/org/w3c/dom/xpath/XPathExpression.java:INITIAL->1.1 
	libraries/javalib/org/w3c/dom/xpath/XPathNSResolver.java:INITIAL->1.1 
	libraries/javalib/org/w3c/dom/xpath/XPathNamespace.java:INITIAL->1.1 
	libraries/javalib/org/w3c/dom/xpath/XPathResult.java:INITIAL->1.1 
	libraries/javalib/org/xml/sax/helpers/NamespaceSupport.java:1.2->1.3 
	libraries/javalib/profiles/allatonce/all.files:1.49->1.50 
	libraries/javalib/profiles/default/jaxp.files:1.4->1.5 
	libraries/javalib/profiles/default/xml.files:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2383 kaffe/ChangeLog:1.2384
--- kaffe/ChangeLog:1.2383	Thu Jun  3 18:50:04 2004
+++ kaffe/ChangeLog	Thu Jun  3 18:56:03 2004
@@ -15,6 +15,107 @@
 
 2004-06-03  Dalibor Topic  <robilad at kaffe.org>
 
+        * libraries/clib/libxmlj/Makefile.am:
+	(libxmlj_la_SOURCES) Added xmlj_xpath.c.
+
+        libraries/clib/libxmlj/Makefile.in,
+        libraries/javalib/Makefile.am,
+        libraries/javalib/Makefile.in:
+	Regenerated.
+
+        * libraries/javalib/profiles/allatonce/all.files,
+        libraries/javalib/profiles/default/jaxp.files,
+        libraries/javalib/profiles/default/xml.files:
+	Updated.
+
+        * libraries/clib/libxmlj/xmlj_dom.c,
+        libraries/clib/libxmlj/xmlj_dom.h,
+        libraries/clib/libxmlj/xmlj_error.c,
+        libraries/clib/libxmlj/xmlj_error.h,
+        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_transform.c,
+        libraries/clib/libxmlj/xmlj_xpath.c,
+        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/dom/MatchingNodeList.java,
+        libraries/javalib/gnu/xml/libxmlj/transform/DefaultErrorListenerImpl.java,
+        libraries/javalib/gnu/xml/libxmlj/transform/DefaultURIResolverImpl.java,
+        libraries/javalib/gnu/xml/libxmlj/transform/GnomeTemplates.java,
+        libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformer.java,
+        libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java,
+        libraries/javalib/gnu/xml/libxmlj/transform/IOToolkit.java,
+        libraries/javalib/gnu/xml/libxmlj/transform/JavaContext.java,
+        libraries/javalib/gnu/xml/libxmlj/transform/LibxmlDocument.java,
+        libraries/javalib/gnu/xml/libxmlj/transform/LibxsltStylesheet.java,
+        libraries/javalib/gnu/xml/libxmlj/transform/SourceLocatorImpl.java,
+        libraries/javalib/gnu/xml/libxmlj/transform/SourceWrapper.java,
+        libraries/javalib/gnu/xml/libxmlj/transform/TemplatesImpl.java,
+        libraries/javalib/gnu/xml/libxmlj/transform/TransformTest.java,
+        libraries/javalib/gnu/xml/libxmlj/transform/TransformerFactoryImpl.java,
+        libraries/javalib/gnu/xml/libxmlj/transform/TransformerImpl.java,
+        libraries/javalib/gnu/xml/libxmlj/transform/package.html,
+        libraries/javalib/gnu/xml/libxmlj/util/NamedInputStream.java,
+        libraries/javalib/gnu/xml/libxmlj/util/StandaloneLocator.java,
+        libraries/javalib/gnu/xml/libxmlj/util/XMLJ.java,
+        libraries/javalib/javax/xml/transform/TransformerFactory.java,
+        libraries/javalib/org/w3c/dom/xpath/XPathEvaluator.java,
+        libraries/javalib/org/w3c/dom/xpath/XPathException.java,
+        libraries/javalib/org/w3c/dom/xpath/XPathExpression.java,
+        libraries/javalib/org/w3c/dom/xpath/XPathNSResolver.java,
+        libraries/javalib/org/w3c/dom/xpath/XPathNamespace.java,
+        libraries/javalib/org/w3c/dom/xpath/XPathResult.java,
+        libraries/javalib/org/xml/sax/helpers/NamespaceSupport.java,
+	Resynced with GNU JAXP.
+
+	2004-06-03  Chris Burdess <dog at gnu.org>
+
+        * all: Use longs for native pointers.
+        * dom: Added dom.xpath interfaces.
+
+	2004-06-02  Chris Burdess <dog at gnu.org>
+
+        * GnomeNode.java et al, xmlj_dom.c: Implementation of some DOM Level 3
+            methods.
+
+	2004-06-01  Chris Burdess <dog at gnu.org>
+
+        * GnomeNode.java et al: Applied Dalibor's #3080 patch for missing
+            imports.
+
+	2004-05-27  Chris Burdess <dog at gnu.org>
+
+        * GnomeXMLReader.java, GnomeDocumentBuilder.java, JavaContext.java:
+            Correct handling of zero-length documents.
+
+	2004-05-24  Chris Burdess <dog at gnu.org>
+
+        * all: Refactoring for Gnome* naming scheme. All modules now use
+            common parsing framework.
+
+2004-06-03  Dalibor Topic  <robilad at kaffe.org>
+
         * m4/acx_pthread.m4:
 	New file, taken from ac-archive.sf.net.
 
Index: kaffe/libraries/clib/libxmlj/Makefile.am
diff -u kaffe/libraries/clib/libxmlj/Makefile.am:1.2 kaffe/libraries/clib/libxmlj/Makefile.am:1.3
--- kaffe/libraries/clib/libxmlj/Makefile.am:1.2	Wed May 19 17:27:45 2004
+++ kaffe/libraries/clib/libxmlj/Makefile.am	Thu Jun  3 18:56:06 2004
@@ -37,7 +37,8 @@
 	xmlj_sax.h \
 	xmlj_transform.c \
 	xmlj_util.c \
-	xmlj_util.h
+	xmlj_util.h \
+	xmlj_xpath.c
 
 libxmlj_la_LDFLAGS = \
         $(KLIBFLAGS) \
Index: kaffe/libraries/clib/libxmlj/Makefile.in
diff -u kaffe/libraries/clib/libxmlj/Makefile.in:1.5 kaffe/libraries/clib/libxmlj/Makefile.in:1.6
--- kaffe/libraries/clib/libxmlj/Makefile.in:1.5	Thu Jun  3 16:22:07 2004
+++ kaffe/libraries/clib/libxmlj/Makefile.in	Thu Jun  3 18:56:07 2004
@@ -89,7 +89,8 @@
 am_libxmlj_la_OBJECTS = libxmlj_la-xmlj_dom.lo \
 	libxmlj_la-xmlj_error.lo libxmlj_la-xmlj_io.lo \
 	libxmlj_la-xmlj_node.lo libxmlj_la-xmlj_sax.lo \
-	libxmlj_la-xmlj_transform.lo libxmlj_la-xmlj_util.lo
+	libxmlj_la-xmlj_transform.lo libxmlj_la-xmlj_util.lo \
+	libxmlj_la-xmlj_xpath.lo
 libxmlj_la_OBJECTS = $(am_libxmlj_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config -I$(top_builddir)/include/kaffe
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
@@ -100,7 +101,8 @@
 @AMDEP_TRUE@	./$(DEPDIR)/libxmlj_la-xmlj_node.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/libxmlj_la-xmlj_sax.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/libxmlj_la-xmlj_transform.Plo \
- at AMDEP_TRUE@	./$(DEPDIR)/libxmlj_la-xmlj_util.Plo
+ at AMDEP_TRUE@	./$(DEPDIR)/libxmlj_la-xmlj_util.Plo \
+ at AMDEP_TRUE@	./$(DEPDIR)/libxmlj_la-xmlj_xpath.Plo
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
@@ -371,7 +373,8 @@
 	xmlj_sax.h \
 	xmlj_transform.c \
 	xmlj_util.c \
-	xmlj_util.h
+	xmlj_util.h \
+	xmlj_xpath.c
 
 libxmlj_la_LDFLAGS = \
         $(KLIBFLAGS) \
@@ -460,6 +463,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlj_la-xmlj_sax.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlj_la-xmlj_transform.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlj_la-xmlj_util.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlj_la-xmlj_xpath.Plo at am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -652,6 +656,30 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libxmlj_la-xmlj_util.Plo' tmpdepfile='$(DEPDIR)/libxmlj_la-xmlj_util.TPlo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxmlj_la_CFLAGS) $(CFLAGS) -c -o libxmlj_la-xmlj_util.lo `test -f 'xmlj_util.c' || echo '$(srcdir)/'`xmlj_util.c
+
+libxmlj_la-xmlj_xpath.o: xmlj_xpath.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxmlj_la_CFLAGS) $(CFLAGS) -MT libxmlj_la-xmlj_xpath.o -MD -MP -MF "$(DEPDIR)/libxmlj_la-xmlj_xpath.Tpo" -c -o libxmlj_la-xmlj_xpath.o `test -f 'xmlj_xpath.c' || echo '$(srcdir)/'`xmlj_xpath.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlj_la-xmlj_xpath.Tpo" "$(DEPDIR)/libxmlj_la-xmlj_xpath.Po"; else rm -f "$(DEPDIR)/libxmlj_la-xmlj_xpath.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmlj_xpath.c' object='libxmlj_la-xmlj_xpath.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libxmlj_la-xmlj_xpath.Po' tmpdepfile='$(DEPDIR)/libxmlj_la-xmlj_xpath.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxmlj_la_CFLAGS) $(CFLAGS) -c -o libxmlj_la-xmlj_xpath.o `test -f 'xmlj_xpath.c' || echo '$(srcdir)/'`xmlj_xpath.c
+
+libxmlj_la-xmlj_xpath.obj: xmlj_xpath.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxmlj_la_CFLAGS) $(CFLAGS) -MT libxmlj_la-xmlj_xpath.obj -MD -MP -MF "$(DEPDIR)/libxmlj_la-xmlj_xpath.Tpo" -c -o libxmlj_la-xmlj_xpath.obj `if test -f 'xmlj_xpath.c'; then $(CYGPATH_W) 'xmlj_xpath.c'; else $(CYGPATH_W) '$(srcdir)/xmlj_xpath.c'; fi`; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlj_la-xmlj_xpath.Tpo" "$(DEPDIR)/libxmlj_la-xmlj_xpath.Po"; else rm -f "$(DEPDIR)/libxmlj_la-xmlj_xpath.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmlj_xpath.c' object='libxmlj_la-xmlj_xpath.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libxmlj_la-xmlj_xpath.Po' tmpdepfile='$(DEPDIR)/libxmlj_la-xmlj_xpath.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxmlj_la_CFLAGS) $(CFLAGS) -c -o libxmlj_la-xmlj_xpath.obj `if test -f 'xmlj_xpath.c'; then $(CYGPATH_W) 'xmlj_xpath.c'; else $(CYGPATH_W) '$(srcdir)/xmlj_xpath.c'; fi`
+
+libxmlj_la-xmlj_xpath.lo: xmlj_xpath.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxmlj_la_CFLAGS) $(CFLAGS) -MT libxmlj_la-xmlj_xpath.lo -MD -MP -MF "$(DEPDIR)/libxmlj_la-xmlj_xpath.Tpo" -c -o libxmlj_la-xmlj_xpath.lo `test -f 'xmlj_xpath.c' || echo '$(srcdir)/'`xmlj_xpath.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlj_la-xmlj_xpath.Tpo" "$(DEPDIR)/libxmlj_la-xmlj_xpath.Plo"; else rm -f "$(DEPDIR)/libxmlj_la-xmlj_xpath.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmlj_xpath.c' object='libxmlj_la-xmlj_xpath.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libxmlj_la-xmlj_xpath.Plo' tmpdepfile='$(DEPDIR)/libxmlj_la-xmlj_xpath.TPlo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxmlj_la_CFLAGS) $(CFLAGS) -c -o libxmlj_la-xmlj_xpath.lo `test -f 'xmlj_xpath.c' || echo '$(srcdir)/'`xmlj_xpath.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
Index: kaffe/libraries/clib/libxmlj/xmlj_dom.c
diff -u kaffe/libraries/clib/libxmlj/xmlj_dom.c:1.1 kaffe/libraries/clib/libxmlj/xmlj_dom.c:1.2
--- kaffe/libraries/clib/libxmlj/xmlj_dom.c:1.1	Wed May 19 17:27:46 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_dom.c	Thu Jun  3 18:56:07 2004
@@ -82,11 +82,20 @@
   xmlNodeSetContent (node, s_value);
 }
 
+JNIEXPORT jboolean JNICALL
+Java_gnu_xml_libxmlj_dom_GnomeAttr_isId (JNIEnv * env, jobject self)
+{
+  xmlAttrPtr attr;
+
+  attr = (xmlAttrPtr) xmljGetNodeID (env, self);
+  return (attr->atype == XML_ATTRIBUTE_ID);
+}
+
 /* -- GnomeDocument -- */
 
 JNIEXPORT void JNICALL
 Java_gnu_xml_libxmlj_dom_GnomeDocument_free (JNIEnv * env,
-                                             jobject self, jint id)
+                                             jobject self, jlong id)
 {
   xmlDocPtr doc;
 
@@ -216,8 +225,22 @@
                                                    jobject importedNode,
                                                    jboolean deep)
 {
-  /* TODO */
-  return NULL;
+  xmlDocPtr doc;
+  xmlNodePtr node;
+  xmlNodePtr ret;
+
+  doc = (xmlDocPtr) xmljGetNodeID (env, self);
+  node = xmljGetNodeID (env, importedNode);
+  ret = xmlDocCopyNode (node, doc, deep);
+  if (ret == NULL)
+    {
+      xmljThrowDOMException (env, 9, NULL); /* NOT_SUPPORTED_ERR */
+      return NULL;
+    }
+  else
+    {
+      return xmljGetNodeInstance (env, ret);
+    }
 }
 
 JNIEXPORT jobject JNICALL
@@ -288,12 +311,129 @@
   return NULL;
 }
 
+JNIEXPORT jstring JNICALL
+Java_gnu_xml_libxmlj_dom_GnomeDocument_getInputEncoding (JNIEnv * env,
+                                                         jobject self)
+{
+  xmlDocPtr doc;
+
+  doc = (xmlDocPtr) xmljGetNodeID (env, self);
+  return (doc->encoding == NULL) ? NULL : xmljNewString (env, doc->encoding);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_gnu_xml_libxmlj_dom_GnomeDocument_getXmlStandalone (JNIEnv * env,
+                                                         jobject self)
+{
+  xmlDocPtr doc;
+
+  doc = (xmlDocPtr) xmljGetNodeID (env, self);
+  return doc->standalone;
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_xml_libxmlj_dom_GnomeDocument_setXmlStandalone (JNIEnv * env,
+                                                         jobject self,
+                                                         jboolean xmlStandalone)
+{
+  xmlDocPtr doc;
+
+  doc = (xmlDocPtr) xmljGetNodeID (env, self);
+  doc->standalone = xmlStandalone;
+}
+
+JNIEXPORT jstring JNICALL
+Java_gnu_xml_libxmlj_dom_GnomeDocument_getXmlVersion (JNIEnv * env,
+                                                      jobject self)
+{
+  xmlDocPtr doc;
+
+  doc = (xmlDocPtr) xmljGetNodeID (env, self);
+  return (doc->version == NULL) ? NULL : xmljNewString (env, doc->version);
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_xml_libxmlj_dom_GnomeDocument_setXmlVersion (JNIEnv * env,
+                                                      jobject self,
+                                                      jstring xmlVersion)
+{
+  xmlDocPtr doc;
+
+  doc = (xmlDocPtr) xmljGetNodeID (env, self);
+  if (xmlVersion == NULL)
+    {
+      doc->version = NULL;
+    }
+  else
+    {
+      doc->version = xmljGetStringChars (env, xmlVersion);
+    }
+}
+
+JNIEXPORT jstring JNICALL
+Java_gnu_xml_libxmlj_dom_GnomeDocument_getDocumentURI (JNIEnv * env,
+                                                       jobject self)
+{
+  xmlDocPtr doc;
+
+  doc = (xmlDocPtr) xmljGetNodeID (env, self);
+  return (doc->name == NULL) ? NULL :
+    xmljNewString (env, (const xmlChar *) doc->name);
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_xml_libxmlj_dom_GnomeDocument_setDocumentURI (JNIEnv * env,
+                                                       jobject self,
+                                                       jstring documentURI)
+{
+  xmlDocPtr doc;
+
+  doc = (xmlDocPtr) xmljGetNodeID (env, self);
+  if (documentURI == NULL)
+    {
+      doc->name = NULL;
+    }
+  else
+    {
+      doc->name = (char *) xmljGetStringChars (env, documentURI);
+    }
+}
+
+JNIEXPORT jobject JNICALL
+Java_gnu_xml_libxmlj_dom_GnomeDocument_renameNode (JNIEnv * env,
+                                                   jobject self,
+                                                   jobject n,
+                                                   jstring namespaceURI,
+                                                   jstring qualifiedName)
+{
+  xmlNodePtr node;
+  const xmlChar *href;
+  const xmlChar *prefix;
+
+  node = xmljGetNodeID (env, n);
+  xmlNodeSetName (node, xmljGetStringChars (env, qualifiedName));
+  href = xmljGetStringChars (env, namespaceURI);
+  prefix = xmlSplitQName3 (node->name, NULL);
+  if (node->ns == NULL)
+    {
+      node->ns = xmlNewNs (node, href, prefix);
+    }
+  else
+    {
+      node->ns->href = href;
+      node->ns->prefix = prefix;
+    }
+  return n;
+}
+
 /* -- GnomeDocumentBuilder -- */
 
 JNIEXPORT jobject JNICALL
 Java_gnu_xml_libxmlj_dom_GnomeDocumentBuilder_parseStream (JNIEnv * env,
                                                            jobject self,
                                                            jobject in,
+                                                           jbyteArray
+                                                           detectBuffer,
                                                            jstring publicId,
                                                            jstring systemId,
                                                            jboolean validate,
@@ -310,6 +450,7 @@
   doc = xmljParseDocument(env,
                           self,
                           in,
+                          detectBuffer,
                           publicId,
                           systemId,
                           validate,
@@ -321,8 +462,8 @@
                           errorHandler,
                           0,
                           0,
-                          0);
-  return createDocument (env, self, doc);
+                          1);
+  return xmljCreateDocument (env, self, doc);
 }
 
 JNIEXPORT jobject JNICALL
@@ -335,14 +476,73 @@
                                                               jobject doctype)
 {
   xmlDocPtr doc;
+  xmlNodePtr root;
+  xmlNsPtr ns;
+  const xmlChar *href;
+  const xmlChar *prefix;
   const xmlChar *version;
 
+  /* Create the document node */
   version = xmlCharStrdup ("1.0");
   doc = xmlNewDoc (version);
-  /* TODO namespaceURI
-   * TODO qualifiedName
-   * TODO doctype */
-  return createDocument (env, self, doc);
+
+  /* doctype */
+  if (doctype != NULL)
+    {
+      jclass cls;
+      jmethodID method;
+      const xmlChar *name;
+      const xmlChar *publicId;
+      const xmlChar *systemId;
+      const xmlChar *internalSubset;
+      xmlDtdPtr dtd;
+
+      cls = (*env)->GetObjectClass (env, doctype);
+      method = (*env)->GetMethodID (env, cls, "getName",
+                                    "()Ljava/lang/String;");
+      name =
+        xmljGetStringChars (env, (*env)->CallObjectMethod (env,
+                                                           doctype,
+                                                           method));
+      method = (*env)->GetMethodID (env, cls, "getPublicId",
+                                    "()Ljava/lang/String;");
+      publicId =
+        xmljGetStringChars (env, (*env)->CallObjectMethod (env,
+                                                           doctype,
+                                                           method));
+      method = (*env)->GetMethodID (env, cls, "getSystemId",
+                                    "()Ljava/lang/String;");
+      systemId =
+        xmljGetStringChars (env, (*env)->CallObjectMethod (env,
+                                                           doctype,
+                                                           method));
+      method = (*env)->GetMethodID (env, cls, "getInternalSubset",
+                                    "()Ljava/lang/String;");
+      internalSubset =
+        xmljGetStringChars (env, (*env)->CallObjectMethod (env,
+                                                           doctype,
+                                                           method));
+      /* TODO notations */
+      /* TODO entities */
+      if (internalSubset == NULL)
+        {
+          dtd = xmlNewDtd (doc, name, publicId, systemId);
+        }
+      else
+        {
+          dtd = xmlCreateIntSubset (doc, name, publicId, systemId);
+          /* TODO parse internal subset? */
+        }
+    }
+  
+  /* Create the root element */
+  root = xmlNewNode (NULL, xmljGetStringChars (env, qualifiedName));
+  href = xmljGetStringChars (env, namespaceURI);
+  prefix = xmlSplitQName3 (root->name, NULL);
+  ns = xmlNewNs (root, href, prefix);
+  xmlDocSetRootElement (doc, root);
+  
+  return xmljCreateDocument (env, self, doc);
 }
 
 /* -- GnomeDocumentType -- */
@@ -404,8 +604,11 @@
                                                            jobject self,
                                                            jobject oldAttr)
 {
-  /* TODO */
-  return NULL;
+  xmlNodePtr attr;
+
+  attr = xmljGetNodeID (env, oldAttr);
+  xmlUnlinkNode (attr);
+  return oldAttr;
 }
 
 JNIEXPORT jstring JNICALL
@@ -465,15 +668,6 @@
     }
 }
 
-JNIEXPORT void JNICALL
-Java_gnu_xml_libxmlj_dom_GnomeElement_removeAttributeNS (JNIEnv * env,
-                                                         jobject self,
-                                                         jstring uri,
-                                                         jstring localName)
-{
-  /* TODO */
-}
-
 JNIEXPORT jobject JNICALL
 Java_gnu_xml_libxmlj_dom_GnomeElement_getAttributeNodeNS (JNIEnv * env,
                                                           jobject self,
@@ -552,15 +746,19 @@
 JNIEXPORT jstring JNICALL
 Java_gnu_xml_libxmlj_dom_GnomeEntity_getPublicId (JNIEnv * env, jobject self)
 {
-  /* TODO */
-  return NULL;
+  xmlEntityPtr entity;
+
+  entity = (xmlEntityPtr) xmljGetNodeID (env, self);
+  return xmljNewString (env, entity->ExternalID);
 }
 
 JNIEXPORT jstring JNICALL
 Java_gnu_xml_libxmlj_dom_GnomeEntity_getSystemId (JNIEnv * env, jobject self)
 {
-  /* TODO */
-  return NULL;
+  xmlEntityPtr entity;
+
+  entity = (xmlEntityPtr) xmljGetNodeID (env, self);
+  return xmljNewString (env, entity->SystemID);
 }
 
 JNIEXPORT jstring JNICALL
@@ -580,7 +778,7 @@
 {
   xmlAttrPtr attr;
 
-  attr = getNamedItem (env, self, name);
+  attr = xmljGetNamedItem (env, self, name);
   return xmljGetNodeInstance (env, (xmlNodePtr) attr);
 }
 
@@ -611,7 +809,7 @@
 {
   xmlAttrPtr attr;
 
-  attr = getNamedItem (env, self, name);
+  attr = xmljGetNamedItem (env, self, name);
   if (attr == NULL)
     {
       xmljThrowDOMException (env, 8, NULL);	/* NOT_FOUND_ERR */
@@ -668,7 +866,7 @@
 {
   xmlAttrPtr attr;
 
-  attr = getNamedItemNS (env, self, uri, localName);
+  attr = xmljGetNamedItemNS (env, self, uri, localName);
   return xmljGetNodeInstance (env, (xmlNodePtr) attr);
 }
 
@@ -690,7 +888,7 @@
 {
   xmlAttrPtr attr;
 
-  attr = getNamedItemNS (env, self, uri, localName);
+  attr = xmljGetNamedItemNS (env, self, uri, localName);
   if (attr == NULL)
     {
       xmljThrowDOMException (env, 8, NULL);	/* NOT_FOUND_ERR */
@@ -821,8 +1019,8 @@
 
   /* Construct named node map object */
   cls = (*env)->FindClass (env, "gnu/xml/libxmlj/dom/GnomeNamedNodeMap");
-  method = (*env)->GetMethodID (env, cls, "<init>", "(I)V");
-  return (*env)->NewObject (env, cls, method, node);
+  method = (*env)->GetMethodID (env, cls, "<init>", "(J)V");
+  return (*env)->NewObject (env, cls, method, (jlong) node);
 }
 
 JNIEXPORT jobject JNICALL
@@ -1003,6 +1201,81 @@
   return (node->properties != NULL);
 }
 
+JNIEXPORT jstring JNICALL
+Java_gnu_xml_libxmlj_dom_GnomeNode_getBaseURI (JNIEnv * env, jobject self)
+{
+  xmlNodePtr node;
+  xmlChar *baseURI;
+  jstring ret;
+  
+  node = xmljGetNodeID (env, self);
+  baseURI = xmlNodeGetBase (node->doc, node);
+  ret = xmljNewString (env, (const xmlChar *) baseURI);
+  xmlFree (baseURI);
+  return ret;
+}
+
+JNIEXPORT jstring JNICALL
+Java_gnu_xml_libxmlj_dom_GnomeNode_lookupPrefix (JNIEnv * env, jobject self,
+                                                 jstring namespaceURI)
+{
+  xmlNodePtr node;
+  xmlNsPtr ns;
+  
+  node = xmljGetNodeID (env, self);
+  ns = xmlSearchNsByHref (node->doc, node, xmljGetStringChars (env,
+                                                               namespaceURI));
+  if (ns == NULL)
+    {
+      return NULL;
+    }
+  else
+    {
+      return xmljNewString (env, ns->prefix);
+    }
+}
+
+JNIEXPORT jboolean JNICALL
+Java_gnu_xml_libxmlj_dom_GnomeNode_isDefaultNamespace (JNIEnv * env,
+                                                       jobject self,
+                                                       jstring namespaceURI)
+{
+  xmlNodePtr node;
+  xmlNsPtr ns;
+  
+  node = xmljGetNodeID (env, self);
+  ns = xmlSearchNsByHref (node->doc, node, xmljGetStringChars (env,
+                                                               namespaceURI));
+  if (ns == NULL)
+    {
+      return 0;
+    }
+  else
+    {
+      return (ns->prefix == NULL || xmlStrlen (ns->prefix) == 0);
+    }
+}
+
+JNIEXPORT jstring JNICALL
+Java_gnu_xml_libxmlj_dom_GnomeNode_lookupNamespaceURI (JNIEnv * env,
+                                                       jobject self,
+                                                       jstring prefix)
+{
+  xmlNodePtr node;
+  xmlNsPtr ns;
+  
+  node = xmljGetNodeID (env, self);
+  ns = xmlSearchNs (node->doc, node, xmljGetStringChars (env, prefix));
+  if (ns == NULL)
+    {
+      return NULL;
+    }
+  else
+    {
+      return xmljNewString (env, ns->href);
+    }
+}
+
 /* -- GnomeNodeList -- */
 
 JNIEXPORT jobject JNICALL
@@ -1183,7 +1456,7 @@
  * Create GnomeDocument object from the given xmlDocPtr
  */
 jobject
-createDocument (JNIEnv * env, jobject self, xmlDocPtr doc)
+xmljCreateDocument (JNIEnv * env, jobject self, xmlDocPtr doc)
 {
   jclass cls;
   jfieldID field;
@@ -1203,111 +1476,8 @@
   return ret;
 }
 
-/*
- * Get parser context from GnomeDocumentBuilder field
- */
-xmlParserCtxtPtr
-getContext (JNIEnv * env, jobject self)
-{
-  xmlParserCtxtPtr ret;
-  jclass cls;
-  jfieldID field;
-
-  cls = (*env)->GetObjectClass (env, self);
-  field = (*env)->GetFieldID (env, cls, "context", "I");
-  ret = (xmlParserCtxtPtr) (*env)->GetIntField (env, self, field);
-  return ret;
-}
-
-/* -- Callback functions -- */
-
-xmlParserInputPtr
-xmljDOMResolveEntity (void *ctx,
-                      const xmlChar * publicId, const xmlChar * systemId)
-{
-  /* TODO */
-  return defaultResolveEntity (ctx, publicId, systemId);
-}
-
-void
-xmljDOMWarning (void *ctx, const char *msg, ...)
-{
-  va_list args;
-
-  va_start (args, msg);
-  dispatchLogCallback (msg, "warning");
-  va_end (args);
-}
-
-void
-xmljDOMError (void *ctx, const char *msg, ...)
-{
-  va_list args;
-
-  va_start (args, msg);
-  dispatchLogCallback (msg, "error");
-  va_end (args);
-}
-
-void
-xmljDOMFatalError (void *ctx, const char *msg, ...)
-{
-  va_list args;
-
-  va_start (args, msg);
-  dispatchLogCallback (msg, "fatalError");
-  va_end (args);
-}
-
-void
-dispatchLogCallback (const char *msg, const char *methodName)
-{
-  xmlParserCtxtPtr context;
-  const xmlChar *errorMsg;
-  const xmlChar *systemId;
-
-  jclass cls;
-  jmethodID method;
-
-  jstring j_msg;
-  jstring j_publicId;
-  jstring j_systemId;
-  jint lineNumber;
-  jint columnNumber;
-
-  context = getContext (dom_cb_env, dom_cb_obj);
-
-  /* Get the logging method to invoke */
-  cls = (*dom_cb_env)->GetObjectClass (dom_cb_env, dom_cb_obj);
-  method = (*dom_cb_env)->GetMethodID (dom_cb_env, cls,
-                                       methodName,
-                                       "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;II)V");
-  if (method == NULL)
-    return;
-
-  /* Prepare arguments */
-  if (context->lastError.message != NULL)
-    errorMsg = xmlCharStrdup (context->lastError.message);
-  else
-    errorMsg = (msg == NULL) ? NULL : xmlCharStrdup (msg);
-  systemId = (context->lastError.file == NULL) ? NULL :
-    xmlCharStrdup (context->lastError.file);
-
-  j_msg = (errorMsg == NULL) ? NULL : xmljNewString (dom_cb_env, errorMsg);
-  j_publicId = NULL;
-  j_systemId = (systemId == NULL) ? NULL :
-    xmljNewString (dom_cb_env, systemId);
-  lineNumber = (jint) context->lastError.line;
-  columnNumber = -1;
-
-  /* Invoke the method */
-  (*dom_cb_env)->CallVoidMethod (dom_cb_env, dom_cb_obj, method,
-                                 j_msg, j_publicId, j_systemId,
-                                 lineNumber, columnNumber);
-}
-
 xmlAttrPtr
-getNamedItem (JNIEnv * env, jobject self, jstring name)
+xmljGetNamedItem (JNIEnv * env, jobject self, jstring name)
 {
   xmlNodePtr node;
   xmlAttrPtr attr;
@@ -1328,7 +1498,7 @@
 }
 
 xmlAttrPtr
-getNamedItemNS (JNIEnv * env, jobject self, jstring uri, jstring localName)
+xmljGetNamedItemNS (JNIEnv * env, jobject self, jstring uri, jstring localName)
 {
   xmlNodePtr node;
   xmlAttrPtr attr;
Index: kaffe/libraries/clib/libxmlj/xmlj_dom.h
diff -u kaffe/libraries/clib/libxmlj/xmlj_dom.h:1.1 kaffe/libraries/clib/libxmlj/xmlj_dom.h:1.2
--- kaffe/libraries/clib/libxmlj/xmlj_dom.h:1.1	Wed May 19 17:27:46 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_dom.h	Thu Jun  3 18:56:07 2004
@@ -41,19 +41,10 @@
 
 #include <libxml/parser.h>
 
-/* Callback functions */
-xmlParserInputPtr xmljDOMResolveEntity (void *ctx, const xmlChar * publicId,
-					const xmlChar * systemId);
-void xmljDOMWarning (void *ctx, const char *msg, ...);
-void xmljDOMError (void *ctx, const char *msg, ...);
-void xmljDOMFatalError (void *ctx, const char *msg, ...);
-void dispatchLogCallback (const char *msg, const char *methodName);
-
 /* Utility */
-jobject createDocument (JNIEnv * env, jobject self, xmlDocPtr doc);
-xmlParserCtxtPtr getContext (JNIEnv * env, jobject self);
-xmlAttrPtr getNamedItem (JNIEnv * env, jobject self, jstring name);
-xmlAttrPtr getNamedItemNS (JNIEnv * env, jobject self, jstring uri,
+jobject xmljCreateDocument (JNIEnv * env, jobject self, xmlDocPtr doc);
+xmlAttrPtr xmljGetNamedItem (JNIEnv * env, jobject self, jstring name);
+xmlAttrPtr xmljGetNamedItemNS (JNIEnv * env, jobject self, jstring uri,
 			   jstring localName);
 
 #endif /* !defined XMLJ_DOM_H */
Index: kaffe/libraries/clib/libxmlj/xmlj_error.c
diff -u kaffe/libraries/clib/libxmlj/xmlj_error.c:1.2 kaffe/libraries/clib/libxmlj/xmlj_error.c:1.3

*** Patch too long, truncated ***




More information about the kaffe mailing list