[kaffe] CVS kaffe (robilad): Resynced with GNU JAXP: cleanups for merge with GNU Classpath, and xslt fixes
Kaffe CVS
cvs-commits at kaffe.org
Sun Oct 31 05:41:23 PST 2004
PatchSet 5388
Date: 2004/10/31 13:36:22
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU JAXP: cleanups for merge with GNU Classpath, and xslt fixes
2004-10-30 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/gnu/xml/xpath/VariableReference.java,
libraries/javalib/gnu/xml/xpath/XPathFactoryImpl.java,
libraries/javalib/gnu/xml/xpath/XPathImpl.java:
New files taken from GNU JAXP.
* m4/libxslt.m4: Updated to match the version in GNU JAXP.
* configure.ac:
Updated the minimum libxml2 and libxslt requirements.
* configure,
libraries/javalib/Makefile.am,
libraries/javalib/Makefile.in,
libraries/javalib/all.files:
Regerated.
* libraries/clib/libxmlj/xmlj_transform.c,
libraries/clib/libxmlj/xmlj_util.c,
libraries/clib/libxmlj/xmlj_util.h,
libraries/javalib/gnu/xml/libxmlj/RawData.java,
libraries/javalib/gnu/xml/libxmlj/RawData32.java,
libraries/javalib/gnu/xml/libxmlj/RawData64.java,
libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformer.java,
libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java,
libraries/javalib/gnu/xml/libxmlj/transform/TransformTest.java,
libraries/javalib/gnu/xml/libxmlj/util/XMLJ.java,
libraries/javalib/gnu/xml/util/SAXNullTransformerFactory.java,
libraries/javalib/gnu/xml/xpath/Expr.java,
libraries/javalib/gnu/xml/xpath/FunctionCall.java,
libraries/javalib/gnu/xml/xpath/XPathParser.java,
libraries/javalib/gnu/xml/xpath/XPathParser.y,
libraries/javalib/javax/xml/XMLConstants.java,
libraries/javalib/javax/xml/datatype/DatatypeConfigurationException.java,
libraries/javalib/javax/xml/datatype/DatatypeConstants.java,
libraries/javalib/javax/xml/datatype/DatatypeFactory.java,
libraries/javalib/javax/xml/datatype/Duration.java,
libraries/javalib/javax/xml/datatype/XMLGregorianCalendar.java,
libraries/javalib/javax/xml/namespace/NamespaceContext.java,
libraries/javalib/javax/xml/namespace/QName.java,
libraries/javalib/javax/xml/parsers/ClassStuff.java,
libraries/javalib/javax/xml/parsers/DocumentBuilder.java,
libraries/javalib/javax/xml/parsers/DocumentBuilderFactory.java,
libraries/javalib/javax/xml/parsers/FactoryConfigurationError.java,
libraries/javalib/javax/xml/parsers/ParserConfigurationException.java,
libraries/javalib/javax/xml/parsers/SAXParser.java,
libraries/javalib/javax/xml/parsers/SAXParserFactory.java,
libraries/javalib/javax/xml/transform/ClassStuff.java,
libraries/javalib/javax/xml/transform/ErrorListener.java,
libraries/javalib/javax/xml/transform/OutputKeys.java,
libraries/javalib/javax/xml/transform/Result.java,
libraries/javalib/javax/xml/transform/Source.java,
libraries/javalib/javax/xml/transform/SourceLocator.java,
libraries/javalib/javax/xml/transform/Templates.java,
libraries/javalib/javax/xml/transform/Transformer.java,
libraries/javalib/javax/xml/transform/TransformerConfigurationException.java,
libraries/javalib/javax/xml/transform/TransformerException.java,
libraries/javalib/javax/xml/transform/TransformerFactory.java,
libraries/javalib/javax/xml/transform/TransformerFactoryConfigurationError.java,
libraries/javalib/javax/xml/transform/URIResolver.java,
libraries/javalib/javax/xml/transform/dom/DOMLocator.java,
libraries/javalib/javax/xml/transform/dom/DOMResult.java,
libraries/javalib/javax/xml/transform/dom/DOMSource.java,
libraries/javalib/javax/xml/transform/sax/SAXResult.java,
libraries/javalib/javax/xml/transform/sax/SAXSource.java,
libraries/javalib/javax/xml/transform/sax/SAXTransformerFactory.java,
libraries/javalib/javax/xml/transform/sax/TemplatesHandler.java,
libraries/javalib/javax/xml/transform/sax/TransformerHandler.java,
libraries/javalib/javax/xml/transform/stream/StreamResult.java,
libraries/javalib/javax/xml/transform/stream/StreamSource.java,
libraries/javalib/javax/xml/validation/Schema.java,
libraries/javalib/javax/xml/validation/SchemaFactory.java,
libraries/javalib/javax/xml/validation/TypeInfoProvider.java,
libraries/javalib/javax/xml/validation/Validator.java,
libraries/javalib/javax/xml/validation/ValidatorHandler.java,
libraries/javalib/javax/xml/xpath/XPathConstants.java,
libraries/javalib/javax/xml/xpath/XPathException.java,
libraries/javalib/javax/xml/xpath/XPathExpression.java,
libraries/javalib/javax/xml/xpath/XPathExpressionException.java,
libraries/javalib/javax/xml/xpath/XPathFactory.java,
libraries/javalib/javax/xml/xpath/XPathFactoryConfigurationException.java,
libraries/javalib/javax/xml/xpath/XPathFunction.java,
libraries/javalib/javax/xml/xpath/XPathFunctionException.java,
libraries/javalib/javax/xml/xpath/XPathFunctionResolver.java:
Resynced with GNU JAXP.
2004-10-27 Chris Burdess <dog at gnu.org>
* parsers, transform, dom, sax, stream: API rewritten from
scratch to satisfy copyright assignment.
2004-10-28 Chris Burdess <dog at gnu.org>
* xpath: Implemented XPathFactory.newInstance(); added missing
imports in GNU implementation.
2004-10-27 Chris Burdess <dog at gnu.org>
* xpath: Added JAXP XPath implementation. Variable references and
function calls now use JAXP resolver callback interfaces.
2004-10-06 Chris Burdess <dog at gnu.org>
* RawData.java, RawData32.java, RawData64.java: Added copyright.
2004-10-25 Chris Burdess <dog at gnu.org>
* xmlj_transform.c: Experimental code to load external entities
(xsl:import, xsl:include, and document()) from Java URL.
* configure.ac: Minimum version of libxslt is 1.1.11.
2004-10-08 Chris Burdess <dog at gnu.org>
* xmlj_util.c: String caching only by setting macro.
Members:
ChangeLog:1.2939->1.2940
configure:1.389->1.390
configure.ac:1.84->1.85
libraries/clib/libxmlj/xmlj_transform.c:1.5->1.6
libraries/clib/libxmlj/xmlj_util.c:1.5->1.6
libraries/clib/libxmlj/xmlj_util.h:1.4->1.5
libraries/javalib/Makefile.am:1.257->1.258
libraries/javalib/Makefile.in:1.337->1.338
libraries/javalib/all.files:1.45->1.46
libraries/javalib/gnu/xml/libxmlj/RawData.java:1.1->1.2
libraries/javalib/gnu/xml/libxmlj/RawData32.java:1.1->1.2
libraries/javalib/gnu/xml/libxmlj/RawData64.java:1.1->1.2
libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformer.java:1.4->1.5
libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java:1.3->1.4
libraries/javalib/gnu/xml/libxmlj/transform/TransformTest.java:1.4->1.5
libraries/javalib/gnu/xml/libxmlj/util/XMLJ.java:1.4->1.5
libraries/javalib/gnu/xml/util/SAXNullTransformerFactory.java:1.5->1.6
libraries/javalib/gnu/xml/xpath/Expr.java:1.2->1.3
libraries/javalib/gnu/xml/xpath/FunctionCall.java:1.2->1.3
libraries/javalib/gnu/xml/xpath/VariableReference.java:INITIAL->1.1
libraries/javalib/gnu/xml/xpath/XPathFactoryImpl.java:INITIAL->1.1
libraries/javalib/gnu/xml/xpath/XPathImpl.java:INITIAL->1.1
libraries/javalib/gnu/xml/xpath/XPathParser.java:1.2->1.3
libraries/javalib/gnu/xml/xpath/XPathParser.y:1.1->1.2
libraries/javalib/javax/xml/XMLConstants.java:1.1->1.2
libraries/javalib/javax/xml/datatype/DatatypeConfigurationException.java:1.1->1.2
libraries/javalib/javax/xml/datatype/DatatypeConstants.java:1.1->1.2
libraries/javalib/javax/xml/datatype/DatatypeFactory.java:1.1->1.2
libraries/javalib/javax/xml/datatype/Duration.java:1.1->1.2
libraries/javalib/javax/xml/datatype/XMLGregorianCalendar.java:1.1->1.2
libraries/javalib/javax/xml/namespace/NamespaceContext.java:1.1->1.2
libraries/javalib/javax/xml/namespace/QName.java:1.1->1.2
libraries/javalib/javax/xml/parsers/ClassStuff.java:1.6->1.7(DEAD)
libraries/javalib/javax/xml/parsers/DocumentBuilder.java:1.7->1.8
libraries/javalib/javax/xml/parsers/DocumentBuilderFactory.java:1.7->1.8
libraries/javalib/javax/xml/parsers/FactoryConfigurationError.java:1.5->1.6
libraries/javalib/javax/xml/parsers/ParserConfigurationException.java:1.5->1.6
libraries/javalib/javax/xml/parsers/SAXParser.java:1.7->1.8
libraries/javalib/javax/xml/parsers/SAXParserFactory.java:1.6->1.7
libraries/javalib/javax/xml/transform/ClassStuff.java:1.5->1.6(DEAD)
libraries/javalib/javax/xml/transform/ErrorListener.java:1.5->1.6
libraries/javalib/javax/xml/transform/OutputKeys.java:1.5->1.6
libraries/javalib/javax/xml/transform/Result.java:1.5->1.6
libraries/javalib/javax/xml/transform/Source.java:1.5->1.6
libraries/javalib/javax/xml/transform/SourceLocator.java:1.5->1.6
libraries/javalib/javax/xml/transform/Templates.java:1.5->1.6
libraries/javalib/javax/xml/transform/Transformer.java:1.5->1.6
libraries/javalib/javax/xml/transform/TransformerConfigurationException.java:1.5->1.6
libraries/javalib/javax/xml/transform/TransformerException.java:1.7->1.8
libraries/javalib/javax/xml/transform/TransformerFactory.java:1.7->1.8
libraries/javalib/javax/xml/transform/TransformerFactoryConfigurationError.java:1.5->1.6
libraries/javalib/javax/xml/transform/URIResolver.java:1.4->1.5
libraries/javalib/javax/xml/transform/dom/DOMLocator.java:1.6->1.7
libraries/javalib/javax/xml/transform/dom/DOMResult.java:1.6->1.7
libraries/javalib/javax/xml/transform/dom/DOMSource.java:1.6->1.7
libraries/javalib/javax/xml/transform/sax/SAXResult.java:1.6->1.7
libraries/javalib/javax/xml/transform/sax/SAXSource.java:1.8->1.9
libraries/javalib/javax/xml/transform/sax/SAXTransformerFactory.java:1.5->1.6
libraries/javalib/javax/xml/transform/sax/TemplatesHandler.java:1.6->1.7
libraries/javalib/javax/xml/transform/sax/TransformerHandler.java:1.6->1.7
libraries/javalib/javax/xml/transform/stream/StreamResult.java:1.6->1.7
libraries/javalib/javax/xml/transform/stream/StreamSource.java:1.6->1.7
libraries/javalib/javax/xml/validation/Schema.java:1.1->1.2
libraries/javalib/javax/xml/validation/SchemaFactory.java:1.1->1.2
libraries/javalib/javax/xml/validation/TypeInfoProvider.java:1.1->1.2
libraries/javalib/javax/xml/validation/Validator.java:1.1->1.2
libraries/javalib/javax/xml/validation/ValidatorHandler.java:1.1->1.2
libraries/javalib/javax/xml/xpath/XPathConstants.java:1.1->1.2
libraries/javalib/javax/xml/xpath/XPathException.java:1.1->1.2
libraries/javalib/javax/xml/xpath/XPathExpression.java:1.1->1.2
libraries/javalib/javax/xml/xpath/XPathExpressionException.java:1.1->1.2
libraries/javalib/javax/xml/xpath/XPathFactory.java:1.1->1.2
libraries/javalib/javax/xml/xpath/XPathFactoryConfigurationException.java:1.1->1.2
libraries/javalib/javax/xml/xpath/XPathFunction.java:1.1->1.2
libraries/javalib/javax/xml/xpath/XPathFunctionException.java:1.1->1.2
libraries/javalib/javax/xml/xpath/XPathFunctionResolver.java:1.1->1.2
m4/libxslt.m4:1.1->1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2939 kaffe/ChangeLog:1.2940
--- kaffe/ChangeLog:1.2939 Sat Oct 30 12:14:08 2004
+++ kaffe/ChangeLog Sun Oct 31 13:36:22 2004
@@ -1,5 +1,121 @@
2004-10-30 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/gnu/xml/xpath/VariableReference.java,
+ libraries/javalib/gnu/xml/xpath/XPathFactoryImpl.java,
+ libraries/javalib/gnu/xml/xpath/XPathImpl.java:
+ New files taken from GNU JAXP.
+
+ * m4/libxslt.m4: Updated to match the version in GNU JAXP.
+
+ * configure.ac:
+ Updated the minimum libxml2 and libxslt requirements.
+
+ * configure,
+ libraries/javalib/Makefile.am,
+ libraries/javalib/Makefile.in,
+ libraries/javalib/all.files:
+ Regerated.
+
+ * libraries/clib/libxmlj/xmlj_transform.c,
+ libraries/clib/libxmlj/xmlj_util.c,
+ libraries/clib/libxmlj/xmlj_util.h,
+ libraries/javalib/gnu/xml/libxmlj/RawData.java,
+ libraries/javalib/gnu/xml/libxmlj/RawData32.java,
+ libraries/javalib/gnu/xml/libxmlj/RawData64.java,
+ libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformer.java,
+ libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java,
+ libraries/javalib/gnu/xml/libxmlj/transform/TransformTest.java,
+ libraries/javalib/gnu/xml/libxmlj/util/XMLJ.java,
+ libraries/javalib/gnu/xml/util/SAXNullTransformerFactory.java,
+ libraries/javalib/gnu/xml/xpath/Expr.java,
+ libraries/javalib/gnu/xml/xpath/FunctionCall.java,
+ libraries/javalib/gnu/xml/xpath/XPathParser.java,
+ libraries/javalib/gnu/xml/xpath/XPathParser.y,
+ libraries/javalib/javax/xml/XMLConstants.java,
+ libraries/javalib/javax/xml/datatype/DatatypeConfigurationException.java,
+ libraries/javalib/javax/xml/datatype/DatatypeConstants.java,
+ libraries/javalib/javax/xml/datatype/DatatypeFactory.java,
+ libraries/javalib/javax/xml/datatype/Duration.java,
+ libraries/javalib/javax/xml/datatype/XMLGregorianCalendar.java,
+ libraries/javalib/javax/xml/namespace/NamespaceContext.java,
+ libraries/javalib/javax/xml/namespace/QName.java,
+ libraries/javalib/javax/xml/parsers/ClassStuff.java,
+ libraries/javalib/javax/xml/parsers/DocumentBuilder.java,
+ libraries/javalib/javax/xml/parsers/DocumentBuilderFactory.java,
+ libraries/javalib/javax/xml/parsers/FactoryConfigurationError.java,
+ libraries/javalib/javax/xml/parsers/ParserConfigurationException.java,
+ libraries/javalib/javax/xml/parsers/SAXParser.java,
+ libraries/javalib/javax/xml/parsers/SAXParserFactory.java,
+ libraries/javalib/javax/xml/transform/ClassStuff.java,
+ libraries/javalib/javax/xml/transform/ErrorListener.java,
+ libraries/javalib/javax/xml/transform/OutputKeys.java,
+ libraries/javalib/javax/xml/transform/Result.java,
+ libraries/javalib/javax/xml/transform/Source.java,
+ libraries/javalib/javax/xml/transform/SourceLocator.java,
+ libraries/javalib/javax/xml/transform/Templates.java,
+ libraries/javalib/javax/xml/transform/Transformer.java,
+ libraries/javalib/javax/xml/transform/TransformerConfigurationException.java,
+ libraries/javalib/javax/xml/transform/TransformerException.java,
+ libraries/javalib/javax/xml/transform/TransformerFactory.java,
+ libraries/javalib/javax/xml/transform/TransformerFactoryConfigurationError.java,
+ libraries/javalib/javax/xml/transform/URIResolver.java,
+ libraries/javalib/javax/xml/transform/dom/DOMLocator.java,
+ libraries/javalib/javax/xml/transform/dom/DOMResult.java,
+ libraries/javalib/javax/xml/transform/dom/DOMSource.java,
+ libraries/javalib/javax/xml/transform/sax/SAXResult.java,
+ libraries/javalib/javax/xml/transform/sax/SAXSource.java,
+ libraries/javalib/javax/xml/transform/sax/SAXTransformerFactory.java,
+ libraries/javalib/javax/xml/transform/sax/TemplatesHandler.java,
+ libraries/javalib/javax/xml/transform/sax/TransformerHandler.java,
+ libraries/javalib/javax/xml/transform/stream/StreamResult.java,
+ libraries/javalib/javax/xml/transform/stream/StreamSource.java,
+ libraries/javalib/javax/xml/validation/Schema.java,
+ libraries/javalib/javax/xml/validation/SchemaFactory.java,
+ libraries/javalib/javax/xml/validation/TypeInfoProvider.java,
+ libraries/javalib/javax/xml/validation/Validator.java,
+ libraries/javalib/javax/xml/validation/ValidatorHandler.java,
+ libraries/javalib/javax/xml/xpath/XPathConstants.java,
+ libraries/javalib/javax/xml/xpath/XPathException.java,
+ libraries/javalib/javax/xml/xpath/XPathExpression.java,
+ libraries/javalib/javax/xml/xpath/XPathExpressionException.java,
+ libraries/javalib/javax/xml/xpath/XPathFactory.java,
+ libraries/javalib/javax/xml/xpath/XPathFactoryConfigurationException.java,
+ libraries/javalib/javax/xml/xpath/XPathFunction.java,
+ libraries/javalib/javax/xml/xpath/XPathFunctionException.java,
+ libraries/javalib/javax/xml/xpath/XPathFunctionResolver.java:
+ Resynced with GNU JAXP.
+
+ 2004-10-27 Chris Burdess <dog at gnu.org>
+
+ * parsers, transform, dom, sax, stream: API rewritten from
+ scratch to satisfy copyright assignment.
+
+ 2004-10-28 Chris Burdess <dog at gnu.org>
+
+ * xpath: Implemented XPathFactory.newInstance(); added missing
+ imports in GNU implementation.
+
+ 2004-10-27 Chris Burdess <dog at gnu.org>
+
+ * xpath: Added JAXP XPath implementation. Variable references and
+ function calls now use JAXP resolver callback interfaces.
+
+ 2004-10-06 Chris Burdess <dog at gnu.org>
+
+ * RawData.java, RawData32.java, RawData64.java: Added copyright.
+
+ 2004-10-25 Chris Burdess <dog at gnu.org>
+
+ * xmlj_transform.c: Experimental code to load external entities
+ (xsl:import, xsl:include, and document()) from Java URL.
+ * configure.ac: Minimum version of libxslt is 1.1.11.
+
+ 2004-10-08 Chris Burdess <dog at gnu.org>
+
+ * xmlj_util.c: String caching only by setting macro.
+
+2004-10-30 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/gnu/inet/comsat/ComsatClient.java,
libraries/javalib/gnu/inet/comsat/ComsatInfo.java,
libraries/javalib/gnu/inet/finger/FingerConnection.java,
Index: kaffe/configure
diff -u kaffe/configure:1.389 kaffe/configure:1.390
--- kaffe/configure:1.389 Sat Oct 9 22:17:51 2004
+++ kaffe/configure Sun Oct 31 13:36:25 2004
@@ -55258,7 +55258,7 @@
echo "${ECHO_T}no" >&6
fi
- min_xml_version=2.5.1
+ min_xml_version=2.6.8
echo "$as_me:$LINENO: checking for libxml - version >= $min_xml_version" >&5
echo $ECHO_N "checking for libxml - version >= $min_xml_version... $ECHO_C" >&6
no_xml=""
@@ -55564,7 +55564,7 @@
echo "${ECHO_T}no" >&6
fi
- min_xslt_version=1.0.24
+ min_xslt_version=1.1.11
echo "$as_me:$LINENO: checking for libxslt - version >= $min_xslt_version" >&5
echo $ECHO_N "checking for libxslt - version >= $min_xslt_version... $ECHO_C" >&6
no_xslt=""
@@ -55574,11 +55574,11 @@
XSLT_CFLAGS=`$XSLT_CONFIG $xslt_config_args --cflags`
XSLT_LIBS=`$XSLT_CONFIG $xslt_config_args --libs`
xslt_config_major_version=`$XSLT_CONFIG $xslt_config_args --version | \
- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
xslt_config_minor_version=`$XSLT_CONFIG $xslt_config_args --version | \
- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
xslt_config_micro_version=`$XSLT_CONFIG $xslt_config_args --version | \
- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
if test "x$enable_xslttest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
@@ -55701,7 +55701,8 @@
if test "x$no_xslt" = x ; then
echo "$as_me:$LINENO: result: yes (version $xslt_config_major_version.$xslt_config_minor_version.$xslt_config_micro_version)" >&5
echo "${ECHO_T}yes (version $xslt_config_major_version.$xslt_config_minor_version.$xslt_config_micro_version)" >&6
- CFLAGS="${XSLT_CFLAGS} ${CFLAGS}" CPPFLAGS="${XSLT_CFLAGS} ${CPPFLAGS}" LIBS="${XSLT_LIBS} ${LIBS}"
+ CFLAGS="${XSLT_CFLAGS} ${CFLAGS}" CPPFLAGS="${XSLT_CFLAGS} ${CPPFLAGS}"
+LIBS="${XSLT_LIBS} ${LIBS}"
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.84 kaffe/configure.ac:1.85
--- kaffe/configure.ac:1.84 Sat Oct 9 22:17:57 2004
+++ kaffe/configure.ac Sun Oct 31 13:36:28 2004
@@ -1876,9 +1876,10 @@
if test x"$enable_libxmlj" = x"yes" ; then
if test x"$with_threads" = x"unix-pthreads" ; then
- AM_PATH_XML2([2.5.1],[CFLAGS="${CFLAGS}"] [CPPFLAGS="${CPPFLAGS}"] [LIBS="${XML_LIBS} ${LIBS}"] ,
+ AM_PATH_XML2([2.6.8],[CFLAGS="${CFLAGS}"] [CPPFLAGS="${CPPFLAGS}"] [LIBS="${XML_LIBS} ${LIBS}"] ,
AC_MSG_ERROR([unable to locate libxml.]))
- AM_PATH_XSLT([1.0.24],[CFLAGS="${XSLT_CFLAGS} ${CFLAGS}"] [CPPFLAGS="${XSLT_CFLAGS} ${CPPFLAGS}"] [LIBS="${XSLT_LIBS} ${LIBS}"] ,
+ AM_PATH_XSLT([1.1.11],[CFLAGS="${XSLT_CFLAGS} ${CFLAGS}"] [CPPFLAGS="${XSLT_CFLAGS} ${CPPFLAGS}"]
+[LIBS="${XSLT_LIBS} ${LIBS}"] ,
AC_MSG_ERROR([unable to locate libxslt.]))
LIBXMLJ_LIB="\$(top_builddir)/libraries/clib/libxmlj/libxmlj.la"
else
Index: kaffe/libraries/clib/libxmlj/xmlj_transform.c
diff -u kaffe/libraries/clib/libxmlj/xmlj_transform.c:1.5 kaffe/libraries/clib/libxmlj/xmlj_transform.c:1.6
--- kaffe/libraries/clib/libxmlj/xmlj_transform.c:1.5 Mon Aug 16 02:43:43 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_transform.c Sun Oct 31 13:36:31 2004
@@ -100,6 +100,13 @@
xmljTransformToSAX (JNIEnv *env, jobject transformer, xmlDocPtr source,
jobject callback);
+xmlDocPtr
+xmljDocLoader (const xmlChar *uri, xmlDictPtr dict, int options,
+ void *ctxt, xsltLoadType type);
+
+/* HACK: store stylesheet URL as context for resolving URIs in xmljDocLoader */
+static jstring stylesheetURL = NULL;
+
/*
* --------------------------------------------------------------------------
*
@@ -232,7 +239,9 @@
xmlXPathFreeObject (obj);
if (obj2 != NULL)
- xmlXPathFreeObject (obj2);
+ {
+ xmlXPathFreeObject (obj2);
+ }
valuePush (ctxt, ret);
return;
}
@@ -587,6 +596,66 @@
}
}
+xmlDocPtr
+xmljDocLoader (const xmlChar *uri, xmlDictPtr dict, int options,
+ void *ctxt, xsltLoadType type)
+{
+ JNIEnv *env;
+ jclass xmljClass;
+ jclass inputStreamClass;
+ jmethodID getInputStream;
+ jmethodID getDetectBuffer;
+ jstring systemId;
+ jobject inputStream;
+ jbyteArray detectBuffer;
+
+ fprintf(stderr,"xmljDocLoader:2\n");
+ fflush(stdout);
+ env = xmljGetJNIEnv ();
+ if (!env)
+ {
+ return NULL;
+ }
+ xmljClass = (*env)->FindClass (env, "gnu/xml/libxmlj/util/XMLJ");
+ if (!xmljClass)
+ {
+ return NULL;
+ }
+ getInputStream =
+ (*env)->GetMethodID (env, xmljClass, "getInputStream",
+ "(Ljava/lang/String;Ljava/lang/String;)Lgnu/xml/libxmlj/util/NamedInputStream;");
+ if (!getInputStream)
+ {
+ return NULL;
+ }
+ systemId = xmljNewString (env, uri);
+ inputStream = (*env)->CallStaticObjectMethod (env, xmljClass, getInputStream,
+ stylesheetURL, systemId);
+ if (!inputStream)
+ {
+ return NULL;
+ }
+ inputStreamClass = (*env)->GetObjectClass (env, inputStream);
+ if (!inputStreamClass)
+ {
+ return NULL;
+ }
+ getDetectBuffer = (*env)->GetMethodID (env, inputStreamClass,
+ "getDetectBuffer", "()[B");
+ if (!getDetectBuffer)
+ {
+ return NULL;
+ }
+ detectBuffer = (*env)->CallObjectMethod (env, inputStream, getDetectBuffer);
+ if (!detectBuffer)
+ {
+ return NULL;
+ }
+ return xmljParseDocument (env, NULL, inputStream, detectBuffer,
+ NULL, systemId, stylesheetURL,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2);
+}
+
/* GnomeTransformer.newStylesheet */
JNIEXPORT jobject JNICALL
Java_gnu_xml_libxmlj_transform_GnomeTransformer_newStylesheet (JNIEnv *env,
@@ -595,6 +664,8 @@
xsltStylesheetPtr stylesheet;
jobject ret;
+ stylesheetURL = NULL;
+ xsltSetLoaderFunc (xmljDocLoader);
stylesheet = xsltNewStylesheet ();
xmljSetOutputProperties (env, self, stylesheet);
ret = xmljAsField (env, stylesheet);
@@ -625,12 +696,15 @@
{
return NULL;
}
+ stylesheetURL = systemId;
+ xsltSetLoaderFunc (xmljDocLoader);
stylesheet = xsltParseStylesheetDoc (doc);
if (stylesheet == NULL)
{
xmljThrowException (env,
"javax/xml/transform/TransformerConfigurationException",
"Error parsing XSLT stylesheet");
+ return NULL;
}
xmljSetOutputProperties (env, self, stylesheet);
ret = xmljAsField (env, stylesheet);
@@ -657,6 +731,8 @@
{
return NULL;
}
+ stylesheetURL = xmljNewString (env, doc->URL);
+ xsltSetLoaderFunc (xmljDocLoader);
stylesheet = xsltParseStylesheetDoc (doc);
if (stylesheet == NULL)
{
Index: kaffe/libraries/clib/libxmlj/xmlj_util.c
diff -u kaffe/libraries/clib/libxmlj/xmlj_util.c:1.5 kaffe/libraries/clib/libxmlj/xmlj_util.c:1.6
--- kaffe/libraries/clib/libxmlj/xmlj_util.c:1.5 Sun Oct 10 18:43:13 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_util.c Sun Oct 31 13:36:31 2004
@@ -204,7 +204,8 @@
return ret;
}
-void * xmljAsPointer (JNIEnv *env, jobject ptr)
+void *
+xmljAsPointer (JNIEnv *env, jobject ptr)
{
jclass cls;
jfieldID field;
@@ -220,7 +221,8 @@
#endif
}
-jobject xmljAsField (JNIEnv *env, void * ptr)
+jobject
+xmljAsField (JNIEnv *env, void * ptr)
{
jclass cls;
jmethodID method;
@@ -234,5 +236,55 @@
method = (*env)->GetMethodID (env, cls, "<init>", "(I)V");
return (*env)->NewObject (env, cls, method, (jint) ptr);
#endif
+}
+
+JNIEnv *
+xmljGetJNIEnv ()
+{
+ JavaVM **jvms;
+ jsize *jvm_count;
+ JavaVM *jvm;
+ JNIEnv **envs;
+ JNIEnv *env;
+
+ jvms = (JavaVM **) malloc (sizeof (JavaVM *));
+ if (!jvms)
+ {
+ return NULL;
+ }
+ jvm_count = (jsize *) malloc (sizeof (jsize));
+ if (!jvm_count)
+ {
+ free (jvms);
+ return NULL;
+ }
+ if (JNI_GetCreatedJavaVMs (jvms, 1, jvm_count))
+ {
+ free (jvms);
+ free (jvm_count);
+ return NULL;
+ }
+ jvm = *jvms;
+ envs = (JNIEnv **) malloc (sizeof (JNIEnv *));
+ if (!envs)
+ {
+ free (jvms);
+ free (jvm_count);
+ return NULL;
+ }
+ (*jvm)->AttachCurrentThread (jvm, (void **) envs, NULL);
+ (*jvm)->GetEnv (jvm, (void **) envs, JNI_VERSION_1_2);
+ if (envs)
+ {
+ env = *envs;
+ free (envs);
+ }
+ else
+ {
+ env = NULL;
+ }
+ free (jvms);
+ free (jvm_count);
+ return env;
}
Index: kaffe/libraries/clib/libxmlj/xmlj_util.h
diff -u kaffe/libraries/clib/libxmlj/xmlj_util.h:1.4 kaffe/libraries/clib/libxmlj/xmlj_util.h:1.5
--- kaffe/libraries/clib/libxmlj/xmlj_util.h:1.4 Mon Aug 16 02:43:43 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_util.h Sun Oct 31 13:36:31 2004
@@ -54,4 +54,6 @@
jobject xmljAsField (JNIEnv *env, void * ptr);
+JNIEnv * xmljGetJNIEnv (void);
+
#endif /* !defined XMLJ_UTIL_H */
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.257 kaffe/libraries/javalib/Makefile.am:1.258
--- kaffe/libraries/javalib/Makefile.am:1.257 Sat Oct 30 10:34:58 2004
+++ kaffe/libraries/javalib/Makefile.am Sun Oct 31 13:36:31 2004
@@ -1503,6 +1503,9 @@
gnu/xml/xpath/Step.java \
gnu/xml/xpath/Test.java \
gnu/xml/xpath/UnionExpr.java \
+ gnu/xml/xpath/VariableReference.java \
+ gnu/xml/xpath/XPathFactoryImpl.java \
+ gnu/xml/xpath/XPathImpl.java \
gnu/xml/xpath/XPathParser.java \
gnu/xml/xpath/XPathTokenizer.java
java_applet_SRCS = \
@@ -3525,7 +3528,6 @@
javax/xml/namespace/NamespaceContext.java \
javax/xml/namespace/QName.java
javax_xml_parsers_SRCS = \
- javax/xml/parsers/ClassStuff.java \
javax/xml/parsers/DocumentBuilder.java \
javax/xml/parsers/DocumentBuilderFactory.java \
javax/xml/parsers/FactoryConfigurationError.java \
@@ -3533,7 +3535,6 @@
javax/xml/parsers/SAXParser.java \
javax/xml/parsers/SAXParserFactory.java
javax_xml_transform_SRCS = \
- javax/xml/transform/ClassStuff.java \
javax/xml/transform/ErrorListener.java \
javax/xml/transform/OutputKeys.java \
javax/xml/transform/Result.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.337 kaffe/libraries/javalib/Makefile.in:1.338
--- kaffe/libraries/javalib/Makefile.in:1.337 Sat Oct 30 10:34:58 2004
+++ kaffe/libraries/javalib/Makefile.in Sun Oct 31 13:36:32 2004
@@ -1952,6 +1952,9 @@
gnu/xml/xpath/Step.java \
gnu/xml/xpath/Test.java \
gnu/xml/xpath/UnionExpr.java \
+ gnu/xml/xpath/VariableReference.java \
+ gnu/xml/xpath/XPathFactoryImpl.java \
+ gnu/xml/xpath/XPathImpl.java \
gnu/xml/xpath/XPathParser.java \
gnu/xml/xpath/XPathTokenizer.java
@@ -4075,7 +4078,6 @@
javax/xml/namespace/QName.java
javax_xml_parsers_SRCS = \
- javax/xml/parsers/ClassStuff.java \
javax/xml/parsers/DocumentBuilder.java \
javax/xml/parsers/DocumentBuilderFactory.java \
javax/xml/parsers/FactoryConfigurationError.java \
@@ -4084,7 +4086,6 @@
javax/xml/parsers/SAXParserFactory.java
javax_xml_transform_SRCS = \
- javax/xml/transform/ClassStuff.java \
javax/xml/transform/ErrorListener.java \
javax/xml/transform/OutputKeys.java \
javax/xml/transform/Result.java \
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.45 kaffe/libraries/javalib/all.files:1.46
--- kaffe/libraries/javalib/all.files:1.45 Sat Oct 30 10:34:59 2004
+++ kaffe/libraries/javalib/all.files Sun Oct 31 13:36:33 2004
@@ -1069,6 +1069,9 @@
gnu/xml/xpath/Step.java
gnu/xml/xpath/Test.java
gnu/xml/xpath/UnionExpr.java
+gnu/xml/xpath/VariableReference.java
+gnu/xml/xpath/XPathFactoryImpl.java
+gnu/xml/xpath/XPathImpl.java
gnu/xml/xpath/XPathParser.java
gnu/xml/xpath/XPathTokenizer.java
java/applet/Applet.java
@@ -2990,14 +2993,12 @@
javax/xml/datatype/XMLGregorianCalendar.java
javax/xml/namespace/NamespaceContext.java
javax/xml/namespace/QName.java
-javax/xml/parsers/ClassStuff.java
javax/xml/parsers/DocumentBuilder.java
javax/xml/parsers/DocumentBuilderFactory.java
javax/xml/parsers/FactoryConfigurationError.java
javax/xml/parsers/ParserConfigurationException.java
javax/xml/parsers/SAXParser.java
javax/xml/parsers/SAXParserFactory.java
-javax/xml/transform/ClassStuff.java
javax/xml/transform/ErrorListener.java
javax/xml/transform/OutputKeys.java
javax/xml/transform/Result.java
Index: kaffe/libraries/javalib/gnu/xml/libxmlj/RawData.java
diff -u kaffe/libraries/javalib/gnu/xml/libxmlj/RawData.java:1.1 kaffe/libraries/javalib/gnu/xml/libxmlj/RawData.java:1.2
--- kaffe/libraries/javalib/gnu/xml/libxmlj/RawData.java:1.1 Mon Jul 26 02:41:05 2004
+++ kaffe/libraries/javalib/gnu/xml/libxmlj/RawData.java Sun Oct 31 13:36:33 2004
@@ -1,5 +1,47 @@
+/*
+ * RawData.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 library; 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.libxmlj;
+/**
+ * A native pointer container.
+ *
+ * @author <a href='mailto:dog at gnu.org'>Chris Burdess</a>
+ */
abstract class RawData
{
}
Index: kaffe/libraries/javalib/gnu/xml/libxmlj/RawData32.java
diff -u kaffe/libraries/javalib/gnu/xml/libxmlj/RawData32.java:1.1 kaffe/libraries/javalib/gnu/xml/libxmlj/RawData32.java:1.2
--- kaffe/libraries/javalib/gnu/xml/libxmlj/RawData32.java:1.1 Mon Jul 26 02:41:05 2004
+++ kaffe/libraries/javalib/gnu/xml/libxmlj/RawData32.java Sun Oct 31 13:36:33 2004
@@ -1,13 +1,55 @@
+/*
+ * RawData32.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 library; 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.libxmlj;
+/**
+ * 32-bit native pointer.
+ *
+ * @author <a href='mailto:dog at gnu.org'>Chris Burdess</a>
+ */
final class RawData32 extends RawData
{
final int data;
- RawData32 (int data)
- {
- this.data = data;
- }
+ RawData32(int data)
+ {
+ this.data = data;
+ }
}
Index: kaffe/libraries/javalib/gnu/xml/libxmlj/RawData64.java
diff -u kaffe/libraries/javalib/gnu/xml/libxmlj/RawData64.java:1.1 kaffe/libraries/javalib/gnu/xml/libxmlj/RawData64.java:1.2
--- kaffe/libraries/javalib/gnu/xml/libxmlj/RawData64.java:1.1 Mon Jul 26 02:41:05 2004
+++ kaffe/libraries/javalib/gnu/xml/libxmlj/RawData64.java Sun Oct 31 13:36:33 2004
@@ -1,13 +1,55 @@
+/*
+ * RawData64.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 library; 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.libxmlj;
+/**
+ * 64-bit native pointer.
+ *
+ * @author <a href='mailto:dog at gnu.org'>Chris Burdess</a>
+ */
final class RawData64 extends RawData
{
final long data;
- RawData64 (long data)
- {
- this.data = data;
- }
-
+ RawData64(long data)
+ {
+ this.data = data;
+ }
+
}
Index: kaffe/libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformer.java
diff -u kaffe/libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformer.java:1.4 kaffe/libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformer.java:1.5
--- kaffe/libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformer.java:1.4 Sun Oct 24 19:23:40 2004
+++ kaffe/libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformer.java Sun Oct 31 13:36:34 2004
@@ -1,5 +1,5 @@
/*
- * $Id: GnomeTransformer.java,v 1.4 2004/10/24 19:23:40 robilad Exp $
+ * $Id: GnomeTransformer.java,v 1.5 2004/10/31 13:36:34 robilad Exp $
* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
*
* This file is part of GNU Classpathx/jaxp.
Index: kaffe/libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java
diff -u kaffe/libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java:1.3 kaffe/libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java:1.4
--- kaffe/libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java:1.3 Mon Aug 16 02:43:48 2004
+++ kaffe/libraries/javalib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java Sun Oct 31 13:36:34 2004
@@ -158,6 +158,12 @@
DOMResult.FEATURE.equals (name));
}
+ public void setFeature(String name, boolean value)
+ throws TransformerConfigurationException
+ {
+ throw new TransformerConfigurationException(name);
+ }
+
/**
* Returns a new instance of class {@link Transformer} for a
* null souce.
Index: kaffe/libraries/javalib/gnu/xml/libxmlj/transform/TransformTest.java
diff -u kaffe/libraries/javalib/gnu/xml/libxmlj/transform/TransformTest.java:1.4 kaffe/libraries/javalib/gnu/xml/libxmlj/transform/TransformTest.java:1.5
--- kaffe/libraries/javalib/gnu/xml/libxmlj/transform/TransformTest.java:1.4 Mon Jul 26 02:41:09 2004
+++ kaffe/libraries/javalib/gnu/xml/libxmlj/transform/TransformTest.java Sun Oct 31 13:36:34 2004
@@ -74,14 +74,22 @@
"gnu.xml.libxmlj.transform.GnomeTransformerFactory");
// Read arguments
- if (args.length != 3)
+ if (args.length < 1)
{
System.err.println ("Usage: java " + TransformTest.class.getName ()
+ " <stylesheet> <source> <result>");
}
Source xsltSource = new StreamSource (args[0]);
- Source source = new StreamSource (args[1]);
- Result target = new StreamResult (args[2]);
+ Source source = new StreamSource (System.in);
+ Result target = new StreamResult (System.out);
+ if (args.length > 1)
+ {
+ source = new StreamSource (args[1]);
+ if (args.length > 2)
+ {
+ target = new StreamResult (args[2]);
+ }
+ }
// Prepare stylesheet
TransformerFactory transformerFactory = TransformerFactory.newInstance ();
Index: kaffe/libraries/javalib/gnu/xml/libxmlj/util/XMLJ.java
diff -u kaffe/libraries/javalib/gnu/xml/libxmlj/util/XMLJ.java:1.4 kaffe/libraries/javalib/gnu/xml/libxmlj/util/XMLJ.java:1.5
--- kaffe/libraries/javalib/gnu/xml/libxmlj/util/XMLJ.java:1.4 Fri Sep 17 21:02:05 2004
+++ kaffe/libraries/javalib/gnu/xml/libxmlj/util/XMLJ.java Sun Oct 31 13:36:35 2004
@@ -172,6 +172,16 @@
}
/**
+ * Convenience method for xmljDocLoader
+ */
+ static NamedInputStream getInputStream (String base, String url)
+ throws IOException
+ {
+ URL u = (base == null) ? new URL (url) : new URL (new URL (base), url);
+ return getInputStream (u);
+ }
+
+ /**
* Returns an output stream for the specified transformer result.
*/
public static OutputStream getOutputStream (Result result)
Index: kaffe/libraries/javalib/gnu/xml/util/SAXNullTransformerFactory.java
diff -u kaffe/libraries/javalib/gnu/xml/util/SAXNullTransformerFactory.java:1.5 kaffe/libraries/javalib/gnu/xml/util/SAXNullTransformerFactory.java:1.6
--- kaffe/libraries/javalib/gnu/xml/util/SAXNullTransformerFactory.java:1.5 Fri Sep 17 21:02:06 2004
+++ kaffe/libraries/javalib/gnu/xml/util/SAXNullTransformerFactory.java Sun Oct 31 13:36:35 2004
@@ -96,456 +96,581 @@
*/
public class SAXNullTransformerFactory extends SAXTransformerFactory
{
- private ErrorListener errListener;
- private URIResolver uriResolver;
-
- /** Default constructor */
- public SAXNullTransformerFactory () { }
-
- //
- // only has stuff that makes sense with null transforms
- //
-
- /**
- * Returns true if the requested feature is supported.
- * All three kinds of input and output are accepted:
- * XML text, SAX events, and DOM nodes.
- */
- public boolean getFeature (String feature)
- {
- return SAXTransformerFactory.FEATURE.equals (feature)
- || SAXResult.FEATURE.equals (feature)
- || SAXSource.FEATURE.equals (feature)
- || DOMResult.FEATURE.equals (feature)
- || DOMSource.FEATURE.equals (feature)
- || StreamResult.FEATURE.equals (feature)
- || StreamSource.FEATURE.equals (feature)
- ;
- }
+
+ private ErrorListener errListener;
+ private URIResolver uriResolver;
*** Patch too long, truncated ***
More information about the kaffe
mailing list