From b0fa81eea9a270f23d6ad67ca7a6d25c18d20da1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 16 Jul 2005 01:27:14 +0000 Subject: Major merge with Classpath. Removed many duplicate files. * HACKING: Updated.x * classpath: Imported new directory. * standard.omit: New file. * Makefile.in, aclocal.m4, configure: Rebuilt. * sources.am: New file. * configure.ac: Run Classpath configure script. Moved code around to support. Disable xlib AWT peers (temporarily). * Makefile.am (SUBDIRS): Added 'classpath' (JAVAC): Removed. (AM_CPPFLAGS): Added more -I options. (BOOTCLASSPATH): Simplified. Completely redid how sources are built. Include sources.am. * include/Makefile.am (tool_include__HEADERS): Removed jni.h. * include/jni.h: Removed (in Classpath). * scripts/classes.pl: Updated to look at built classes. * scripts/makemake.tcl: New file. * testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Added -I options. (gcj_jni_invocation_compile_c_to_binary): Likewise. From-SVN: r102082 --- libjava/javax/xml/xpath/XPath.java | 115 ----------- libjava/javax/xml/xpath/XPathConstants.java | 87 -------- libjava/javax/xml/xpath/XPathException.java | 86 -------- libjava/javax/xml/xpath/XPathExpression.java | 86 -------- .../javax/xml/xpath/XPathExpressionException.java | 60 ------ libjava/javax/xml/xpath/XPathFactory.java | 227 --------------------- .../xpath/XPathFactoryConfigurationException.java | 60 ------ libjava/javax/xml/xpath/XPathFunction.java | 58 ------ .../javax/xml/xpath/XPathFunctionException.java | 60 ------ libjava/javax/xml/xpath/XPathFunctionResolver.java | 59 ------ libjava/javax/xml/xpath/XPathVariableResolver.java | 52 ----- 11 files changed, 950 deletions(-) delete mode 100644 libjava/javax/xml/xpath/XPath.java delete mode 100644 libjava/javax/xml/xpath/XPathConstants.java delete mode 100644 libjava/javax/xml/xpath/XPathException.java delete mode 100644 libjava/javax/xml/xpath/XPathExpression.java delete mode 100644 libjava/javax/xml/xpath/XPathExpressionException.java delete mode 100644 libjava/javax/xml/xpath/XPathFactory.java delete mode 100644 libjava/javax/xml/xpath/XPathFactoryConfigurationException.java delete mode 100644 libjava/javax/xml/xpath/XPathFunction.java delete mode 100644 libjava/javax/xml/xpath/XPathFunctionException.java delete mode 100644 libjava/javax/xml/xpath/XPathFunctionResolver.java delete mode 100644 libjava/javax/xml/xpath/XPathVariableResolver.java (limited to 'libjava/javax/xml/xpath') diff --git a/libjava/javax/xml/xpath/XPath.java b/libjava/javax/xml/xpath/XPath.java deleted file mode 100644 index 1bcfa63..0000000 --- a/libjava/javax/xml/xpath/XPath.java +++ /dev/null @@ -1,115 +0,0 @@ -/* XPath.java -- - Copyright (C) 2004 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath 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, or (at your option) -any later version. - -GNU Classpath 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 GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 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 -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - -package javax.xml.xpath; - -import javax.xml.namespace.NamespaceContext; -import javax.xml.namespace.QName; -import org.xml.sax.InputSource; - -/** - * Interface to the XPath evaluation environment. - * @since 1.3 - */ -public interface XPath -{ - - /** - * Resets the environment. - */ - void reset(); - - void setXPathVariableResolver(XPathVariableResolver resolver); - - XPathVariableResolver getXPathVariableResolver(); - - void setXPathFunctionResolver(XPathFunctionResolver resolver); - - XPathFunctionResolver getXPathFunctionResolver(); - - void setNamespaceContext(NamespaceContext nsContext); - - NamespaceContext getNamespaceContext(); - - /** - * Compiles an XPath expression for future evaluation. - * @param expression the expression - */ - XPathExpression compile(String expression) - throws XPathExpressionException; - - /** - * Evaluates an expression. - * @param expression the expression - * @param item the expression context - * @param returnType the desired return type - */ - Object evaluate(String expression, - Object item, - QName returnType) - throws XPathExpressionException; - - /** - * Evaluates an expression and returns the result as a string. - * @param expression the expression - * @param item the expression context - */ - String evaluate(String expression, - Object item) - throws XPathExpressionException; - - /** - * Evaluates an expression. - * @param expression the expression - * @param source the source to load the expression context from - * @param returnType the desired return type - */ - Object evaluate(String expression, - InputSource source, - QName returnType) - throws XPathExpressionException; - - /** - * Evaluates an expression and returns the result as a string. - * @param expression the expression - * @param source the source to load the expression context from - */ - String evaluate(String expression, - InputSource source) - throws XPathExpressionException; - -} diff --git a/libjava/javax/xml/xpath/XPathConstants.java b/libjava/javax/xml/xpath/XPathConstants.java deleted file mode 100644 index 3b2d5d2..0000000 --- a/libjava/javax/xml/xpath/XPathConstants.java +++ /dev/null @@ -1,87 +0,0 @@ -/* XPathConstants.java -- - Copyright (C) 2004, 2005 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath 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, or (at your option) -any later version. - -GNU Classpath 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 GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 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 -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - -package javax.xml.xpath; - -import javax.xml.namespace.QName; - -/** - * XPath constants. - * - * @author (a href='mailto:dog@gnu.org'>Chris BurdessChris BurdessChris BurdessChris BurdessChris Burdess - *
  • the javax.xml.xpath.XPathFactory system property
    • - *
  • the above named property value in the - * $JAVA_HOME/lib/jaxp.properties file
    • - *
  • the class name specified in the - * META-INF/services/javax.xml.xpath.XPathFactory system - * resource
    • - *
  • the default factory class
    • - * - * @param uri the object model URI - */ - public static final XPathFactory newInstance(String uri) - throws XPathFactoryConfigurationException - { - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - if (loader == null) - { - loader = XPathFactory.class.getClassLoader(); - } - String className = null; - int count = 0; - do - { - className = getFactoryClassName(loader, count++); - if (className != null) - { - try - { - Class t = (loader != null) ? loader.loadClass(className) : - Class.forName(className); - XPathFactory ret = (XPathFactory) t.newInstance(); - if (ret.isObjectModelSupported(uri)) - { - return ret; - } - className = null; - } - catch (ClassNotFoundException e) - { - className = null; - } - catch (Exception e) - { - throw new XPathFactoryConfigurationException(e); - } - } - } - while (className == null && count < 4); - String msg = "no factories with support for " + uri; - throw new XPathFactoryConfigurationException(msg); - } - - private static String getFactoryClassName(ClassLoader loader, int attempt) - { - final String propertyName = DEFAULT_PROPERTY_NAME; - switch (attempt) - { - case 0: - return System.getProperty(propertyName); - case 1: - try - { - File file = new File(System.getProperty("java.home")); - file = new File(file, "lib"); - file = new File(file, "jaxp.properties"); - InputStream in = new FileInputStream(file); - Properties props = new Properties(); - props.load(in); - in.close(); - return props.getProperty(propertyName); - } - catch (IOException e) - { - return null; - } - case 2: - try - { - String serviceKey = "/META-INF/services/" + propertyName; - InputStream in = (loader != null) ? - loader.getResourceAsStream(serviceKey) : - XPathFactory.class.getResourceAsStream(serviceKey); - if (in != null) - { - BufferedReader r = - new BufferedReader(new InputStreamReader(in)); - String ret = r.readLine(); - r.close(); - return ret; - } - } - catch (IOException e) - { - } - return null; - case 3: - return "gnu.xml.xpath.XPathFactoryImpl"; - default: - return null; - } - } - - /** - * Indicates whether the specified object model URI is supported by - * this factory. - */ - public abstract boolean isObjectModelSupported(String objectModel); - - /** - * Sets the state of the named feature. - */ - public abstract void setFeature(String name, boolean value) - throws XPathFactoryConfigurationException; - - /** - * Returns the state of the named feature. - */ - public abstract boolean getFeature(String name) - throws XPathFactoryConfigurationException; - - /** - * Sets the XPath variable resolver calback. - */ - public abstract void setXPathVariableResolver(XPathVariableResolver resolver); - - /** - * Sets the XPath extension function resolver calback. - */ - public abstract void setXPathFunctionResolver(XPathFunctionResolver resolver); - - /** - * Returns a new XPath evaluation environment. - */ - public abstract XPath newXPath(); - -} diff --git a/libjava/javax/xml/xpath/XPathFactoryConfigurationException.java b/libjava/javax/xml/xpath/XPathFactoryConfigurationException.java deleted file mode 100644 index a896463..0000000 --- a/libjava/javax/xml/xpath/XPathFactoryConfigurationException.java +++ /dev/null @@ -1,60 +0,0 @@ -/* XPathFactoryConfigurationException.java -- - Copyright (C) 2004, 2005 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath 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, or (at your option) -any later version. - -GNU Classpath 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 GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 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 -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - -package javax.xml.xpath; - -/** - * A configuration exception in an XPath factory environment. - * - * @author (a href='mailto:dog@gnu.org'>Chris BurdessChris BurdessChris BurdessChris Burdess