obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

12 files changed, 969 insertions, 0 deletions

diff --git a/libjava/classpath/javax/xml/xpath/XPath.java b/libjava/classpath/javax/xml/xpath/XPath.java
new file mode 100644
index 000000000..eb652b1ae
--- /dev/null
+++ b/libjava/classpath/javax/xml/xpath/XPath.java
@@ -0,0 +1,115 @@
+/* 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/classpath/javax/xml/xpath/XPathConstants.java b/libjava/classpath/javax/xml/xpath/XPathConstants.java
new file mode 100644
index 000000000..9c39db9f3
--- /dev/null
+++ b/libjava/classpath/javax/xml/xpath/XPathConstants.java
@@ -0,0 +1,91 @@
+/* XPathConstants.java --
+   Copyright (C) 2004, 2005, 2006  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 Burdess</a)
+ * @since 1.5
+ */
+public class XPathConstants
+{
+  private XPathConstants()
+  {
+    // to prevent instantiation
+  }
+
+  /**
+   * The XPath 1.0 number data type.
+   */
+  public static final QName NUMBER =
+    new QName("http://java.sun.com/jaxp/xpath/dom#number", "");
+
+  /**
+   * The XPath 1.0 string data type.
+   */
+  public static final QName STRING =
+    new QName("http://java.sun.com/jaxp/xpath/dom#string", "");
+
+  /**
+   * The XPath 1.0 boolean data type.
+   */
+  public static final QName BOOLEAN =
+    new QName("http://java.sun.com/jaxp/xpath/dom#boolean", "");
+
+  /**
+   * The XPath 1.0 node-set data type.
+   */
+  public static final QName NODESET =
+    new QName("http://java.sun.com/jaxp/xpath/dom#node-set", "");
+
+  /**
+   * The XPath 1.0 node data type.
+   */
+  public static final QName NODE =
+    new QName("http://java.sun.com/jaxp/xpath/dom#node", "");
+
+  /**
+   * The URL for the JAXP DOM object model.
+   */
+  public static final String DOM_OBJECT_MODEL =
+    "http://java.sun.com/jaxp/xpath/dom";
+
+}
diff --git a/libjava/classpath/javax/xml/xpath/XPathException.java b/libjava/classpath/javax/xml/xpath/XPathException.java
new file mode 100644
index 000000000..7d45fa747
--- /dev/null
+++ b/libjava/classpath/javax/xml/xpath/XPathException.java
@@ -0,0 +1,88 @@
+/* XPathException.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 java.io.PrintStream;
+import java.io.PrintWriter;
+
+/**
+ * A generic XPath exception.
+ *
+ * @author (a href='mailto:dog@gnu.org'>Chris Burdess</a)
+ * @since 1.3
+ */
+public class XPathException
+  extends Exception
+{
+  private static final long serialVersionUID = -1837080260374986980L;
+
+  // Name is fixed by serialization spec.
+  Throwable cause;
+
+  public XPathException(String message)
+  {
+    super(message);
+  }
+
+  public XPathException(Throwable cause)
+  {
+    super(cause);
+    this.cause = cause;
+  }
+
+  public Throwable getCause()
+  {
+    return cause;
+  }
+
+  public void printStackTrace()
+  {
+    super.printStackTrace();
+  }
+
+  public void printStackTrace(PrintStream out)
+  {
+    super.printStackTrace(out);
+  }
+
+  public void printStackTrace(PrintWriter out)
+  {
+    super.printStackTrace(out);
+  }
+
+}
diff --git a/libjava/classpath/javax/xml/xpath/XPathExpression.java b/libjava/classpath/javax/xml/xpath/XPathExpression.java
new file mode 100644
index 000000000..89c6494c2
--- /dev/null
+++ b/libjava/classpath/javax/xml/xpath/XPathExpression.java
@@ -0,0 +1,86 @@
+/* XPathExpression.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;
+import org.xml.sax.InputSource;
+
+/**
+ * An XPath expression.
+ *
+ * @author (a href='mailto:dog@gnu.org'>Chris Burdess</a)
+ * @since 1.3
+ */
+public interface XPathExpression
+{
+
+  /**
+   * Evaluates this expression against the specified context.
+   * @param item the evaluation context
+   * @param returnType the desired return type
+   */
+  Object evaluate(Object item,
+                  QName returnType)
+    throws XPathExpressionException;
+
+  /**
+   * Evaluates this expression against the specified context, returning the
+   * result as a string.
+   * @param item the evaluation context
+   */
+  String evaluate(Object item)
+    throws XPathExpressionException;
+
+  /**
+   * Evaluates this expression against the specified context.
+   * @param source the source to load the context from
+   * @param returnType the desired return type
+   */
+  Object evaluate(InputSource source,
+                  QName returnType)
+    throws XPathExpressionException;
+
+  /**
+   * Evaluates this expression against the specified context, returning the
+   * result as a string.
+   * @param source the source to load the context from
+   */
+  String evaluate(InputSource source)
+    throws XPathExpressionException;
+
+}
diff --git a/libjava/classpath/javax/xml/xpath/XPathExpressionException.java b/libjava/classpath/javax/xml/xpath/XPathExpressionException.java
new file mode 100644
index 000000000..543570485
--- /dev/null
+++ b/libjava/classpath/javax/xml/xpath/XPathExpressionException.java
@@ -0,0 +1,61 @@
+/* XPathExpressionException.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;
+
+/**
+ * An exception in an XPath expression.
+ *
+ * @author (a href='mailto:dog@gnu.org'>Chris Burdess</a)
+ * @since 1.3
+ */
+public class XPathExpressionException
+  extends XPathException
+{
+  private static final long serialVersionUID = -1837080260374986980L;
+
+  public XPathExpressionException(String message)
+  {
+    super(message);
+  }
+
+  public XPathExpressionException(Throwable cause)
+  {
+    super(cause);
+  }
+
+}
diff --git a/libjava/classpath/javax/xml/xpath/XPathFactory.java b/libjava/classpath/javax/xml/xpath/XPathFactory.java
new file mode 100644
index 000000000..62c17154a
--- /dev/null
+++ b/libjava/classpath/javax/xml/xpath/XPathFactory.java
@@ -0,0 +1,227 @@
+/* XPathFactory.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 java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.util.Properties;
+
+/**
+ * Factory for creating XPath environments.
+ *
+ * @author (a href='mailto:dog@gnu.org'>Chris Burdess</a)
+ * @since 1.3
+ */
+public abstract class XPathFactory
+{
+
+  /**
+   * The default property name according to the JAXP specification.
+   */
+  public static final String DEFAULT_PROPERTY_NAME =
+                "javax.xml.xpath.XPathFactory";
+
+  /**
+   * The default object model URI.
+   */
+  public static final String DEFAULT_OBJECT_MODEL_URI =
+    XPathConstants.DOM_OBJECT_MODEL;
+
+  protected XPathFactory()
+  {
+  }
+
+  /**
+   * Returns a new factory for the default (DOM) object model.
+   */
+  public static final XPathFactory newInstance()
+  {
+    try
+      {
+        return newInstance(DEFAULT_OBJECT_MODEL_URI);
+      }
+    catch (XPathFactoryConfigurationException e)
+      {
+        throw new RuntimeException(e.getMessage());
+      }
+  }
+
+  /**
+   * Returns a new factory for the given object model URI.
+   * The implementation class to load is the first found in the following
+   * locations that advertises support for the given model URI:
+   * <ol>
+   * <li>the <code>javax.xml.xpath.XPathFactory</code> system property</li>
+   * <li>the above named property value in the
+   * <code><i>$JAVA_HOME</i>/lib/jaxp.properties</code> file</li>
+   * <li>the class name specified in the
+   * <code>META-INF/services/javax.xml.xpath.XPathFactory</code> system
+   * resource</li>
+   * <li>the default factory class</li>
+   * </ol>
+   * @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/classpath/javax/xml/xpath/XPathFactoryConfigurationException.java b/libjava/classpath/javax/xml/xpath/XPathFactoryConfigurationException.java
new file mode 100644
index 000000000..929cbe64b
--- /dev/null
+++ b/libjava/classpath/javax/xml/xpath/XPathFactoryConfigurationException.java
@@ -0,0 +1,61 @@
+/* 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 Burdess</a)
+ * @since 1.3
+ */
+public class XPathFactoryConfigurationException
+  extends XPathException
+{
+  private static final long serialVersionUID = -1837080260374986980L;
+
+  public XPathFactoryConfigurationException(String message)
+  {
+    super(message);
+  }
+
+  public XPathFactoryConfigurationException(Throwable cause)
+  {
+    super(cause);
+  }
+
+}
diff --git a/libjava/classpath/javax/xml/xpath/XPathFunction.java b/libjava/classpath/javax/xml/xpath/XPathFunction.java
new file mode 100644
index 000000000..4406e318c
--- /dev/null
+++ b/libjava/classpath/javax/xml/xpath/XPathFunction.java
@@ -0,0 +1,59 @@
+/* XPathFunction.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 java.util.List;
+
+/**
+ * An XPath extension function.
+ *
+ * @author (a href='mailto:dog@gnu.org'>Chris Burdess</a)
+ * @since 1.3
+ */
+public interface XPathFunction
+{
+
+  /**
+   * Evaluate the function with the specified arguments.
+   * @param args the list of arguments
+   */
+  @SuppressWarnings("unchecked")
+  Object evaluate(List args)
+    throws XPathFunctionException;
+
+}
diff --git a/libjava/classpath/javax/xml/xpath/XPathFunctionException.java b/libjava/classpath/javax/xml/xpath/XPathFunctionException.java
new file mode 100644
index 000000000..c1d3b98cd
--- /dev/null
+++ b/libjava/classpath/javax/xml/xpath/XPathFunctionException.java
@@ -0,0 +1,61 @@
+/* XPathFunctionException.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;
+
+/**
+ * An exception in an XPath function.
+ *
+ * @author (a href='mailto:dog@gnu.org'>Chris Burdess</a)
+ * @since 1.3
+ */
+public class XPathFunctionException
+  extends XPathExpressionException
+{
+  private static final long serialVersionUID = -1837080260374986980L;
+
+  public XPathFunctionException(String message)
+  {
+    super(message);
+  }
+
+  public XPathFunctionException(Throwable cause)
+  {
+    super(cause);
+  }
+
+}
diff --git a/libjava/classpath/javax/xml/xpath/XPathFunctionResolver.java b/libjava/classpath/javax/xml/xpath/XPathFunctionResolver.java
new file mode 100644
index 000000000..e896690e6
--- /dev/null
+++ b/libjava/classpath/javax/xml/xpath/XPathFunctionResolver.java
@@ -0,0 +1,59 @@
+/* XPathFunctionResolver.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;
+
+/**
+ * Interface providing the means to access XPath extension functions.
+ *
+ * @author (a href='mailto:dog@gnu.org'>Chris Burdess</a)
+ * @since 1.3
+ */
+public interface XPathFunctionResolver
+{
+
+  /**
+   * Returns the function with the specified name and arity.
+   * @param functionName the function name
+   * @param arity the number of arguments
+   */
+  XPathFunction resolveFunction(QName functionName,
+                                int arity);
+
+}
diff --git a/libjava/classpath/javax/xml/xpath/XPathVariableResolver.java b/libjava/classpath/javax/xml/xpath/XPathVariableResolver.java
new file mode 100644
index 000000000..2da4a6e63
--- /dev/null
+++ b/libjava/classpath/javax/xml/xpath/XPathVariableResolver.java
@@ -0,0 +1,52 @@
+/* XPathVariableResolver.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.QName;
+
+/**
+ * Interface providing the means to access the values of XPath variable
+ * references.
+ * @since 1.3
+ */
+public interface XPathVariableResolver
+{
+
+  Object resolveVariable(QName variableName);
+
+}
diff --git a/libjava/classpath/javax/xml/xpath/package.html b/libjava/classpath/javax/xml/xpath/package.html
new file mode 100644
index 000000000..458cff843
--- /dev/null
+++ b/libjava/classpath/javax/xml/xpath/package.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+
+<div>
+This package provides access to an XPath evaluation environment and expressions.
+</div>
+
+</body>
+</html>