mcnamara 2005/01/17 06:51:51
Modified: java/src/org/w3c/dom/xpath XPathResult.java
XPathNSResolver.java XPathNamespace.java
XPathExpression.java XPathException.java
XPathEvaluator.java COPYRIGHT.html
Log:
Update org.w3c.dom.xpath package to the latest DOM L3 Working Group Note
level. See XALANJ-1985.
Ideally this package should be moved into the xml-apis.jar in xml-commons,
but until that move happens
(likely when JAXP 1.3 is done), we should keep these APIs up to date.
Revision Changes Path
1.3 +55 -53 xml-xalan/java/src/org/w3c/dom/xpath/XPathResult.java
Index: XPathResult.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/w3c/dom/xpath/XPathResult.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPathResult.java 28 Oct 2002 21:48:05 -0000 1.2
+++ XPathResult.java 17 Jan 2005 14:51:51 -0000 1.3
@@ -1,18 +1,17 @@
/*
- * Copyright (c) 2002 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
*/
package org.w3c.dom.xpath;
-
import org.w3c.dom.Node;
import org.w3c.dom.DOMException;
@@ -22,7 +21,7 @@
* node. Since evaluation of an XPath expression can result in various
* result types, this object makes it possible to discover and manipulate
* the type and value of the result.
- * <p>See also the <a
href='http://www.w3.org/2002/08/WD-DOM-Level-3-XPath-20020820'>Document Object
Model (DOM) Level 3 XPath Specification</a>.
+ * <p>See also the <a
href='http://www.w3.org/TR/2004/NOTE-DOM-Level-3-XPath-20040226'>Document
Object Model (DOM) Level 3 XPath Specification</a>.
*/
public interface XPathResult {
// XPathResultType
@@ -38,72 +37,75 @@
*/
public static final short ANY_TYPE = 0;
/**
- * The result is a number as defined by . Document modification does not
- * invalidate the number, but may mean that reevaluation would not yield
- * the same number.
+ * The result is a <a
href='http://www.w3.org/TR/1999/REC-xpath-19991116#numbers'>number</a> as
defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath
1.0</a>].
+ * Document modification does not invalidate the number, but may mean
+ * that reevaluation would not yield the same number.
*/
public static final short NUMBER_TYPE = 1;
/**
- * The result is a string as defined by . Document modification does not
- * invalidate the string, but may mean that the string no longer
- * corresponds to the current document.
+ * The result is a <a
href='http://www.w3.org/TR/1999/REC-xpath-19991116#strings'>string</a> as
defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath
1.0</a>].
+ * Document modification does not invalidate the string, but may mean
+ * that the string no longer corresponds to the current document.
*/
public static final short STRING_TYPE = 2;
/**
- * The result is a boolean as defined by . Document modification does
not
- * invalidate the boolean, but may mean that reevaluation would not
- * yield the same boolean.
+ * The result is a <a
href='http://www.w3.org/TR/1999/REC-xpath-19991116#booleans'>boolean</a> as
defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath
1.0</a>].
+ * Document modification does not invalidate the boolean, but may mean
+ * that reevaluation would not yield the same boolean.
*/
public static final short BOOLEAN_TYPE = 3;
/**
- * The result is a node set as defined by that will be accessed
- * iteratively, which may not produce nodes in a particular order.
- * Document modification invalidates the iteration.
+ * The result is a <a
href='http://www.w3.org/TR/1999/REC-xpath-19991116#node-sets'>node set</a> as
defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath
1.0</a>] that
+ * will be accessed iteratively, which may not produce nodes in a
+ * particular order. Document modification invalidates the iteration.
* <br>This is the default type returned if the result is a node set and
* <code>ANY_TYPE</code> is requested.
*/
public static final short UNORDERED_NODE_ITERATOR_TYPE = 4;
/**
- * The result is a node set as defined by that will be accessed
- * iteratively, which will produce document-ordered nodes. Document
- * modification invalidates the iteration.
+ * The result is a node set as defined by [<a
href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath 1.0</a>] that
+ * will be accessed iteratively, which will produce document-ordered
+ * nodes. Document modification invalidates the iteration.
*/
public static final short ORDERED_NODE_ITERATOR_TYPE = 5;
/**
- * The result is a node set as defined by that will be accessed as a
- * snapshot list of nodes that may not be in a particular order.
- * Document modification does not invalidate the snapshot but may mean
- * that reevaluation would not yield the same snapshot and nodes in the
- * snapshot may have been altered, moved, or removed from the document.
+ * The result is a <a
href='http://www.w3.org/TR/1999/REC-xpath-19991116#node-sets'>node set</a> as
defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath
1.0</a>] that
+ * will be accessed as a snapshot list of nodes that may not be in a
+ * particular order. Document modification does not invalidate the
+ * snapshot but may mean that reevaluation would not yield the same
+ * snapshot and nodes in the snapshot may have been altered, moved, or
+ * removed from the document.
*/
public static final short UNORDERED_NODE_SNAPSHOT_TYPE = 6;
/**
- * The result is a node set as defined by that will be accessed as a
- * snapshot list of nodes that will be in original document order.
- * Document modification does not invalidate the snapshot but may mean
- * that reevaluation would not yield the same snapshot and nodes in the
- * snapshot may have been altered, moved, or removed from the document.
+ * The result is a <a
href='http://www.w3.org/TR/1999/REC-xpath-19991116#node-sets'>node set</a> as
defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath
1.0</a>] that
+ * will be accessed as a snapshot list of nodes that will be in original
+ * document order. Document modification does not invalidate the
+ * snapshot but may mean that reevaluation would not yield the same
+ * snapshot and nodes in the snapshot may have been altered, moved, or
+ * removed from the document.
*/
public static final short ORDERED_NODE_SNAPSHOT_TYPE = 7;
/**
- * The result is a node set as defined by and will be accessed as a
- * single node, which may be <code>null</code>if the node set is empty.
- * Document modification does not invalidate the node, but may mean that
- * the result node no longer corresponds to the current document. This
- * is a convenience that permits optimization since the implementation
- * can stop once any node in the in the resulting set has been found.
- * <br>If there are more than one node in the actual result, the single
+ * The result is a <a
href='http://www.w3.org/TR/1999/REC-xpath-19991116#node-sets'>node set</a> as
defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath
1.0</a>] and
+ * will be accessed as a single node, which may be <code>null</code>if
+ * the node set is empty. Document modification does not invalidate the
+ * node, but may mean that the result node no longer corresponds to the
+ * current document. This is a convenience that permits optimization
+ * since the implementation can stop once any node in the resulting set
+ * has been found.
+ * <br>If there is more than one node in the actual result, the single
* node returned might not be the first in document order.
*/
public static final short ANY_UNORDERED_NODE_TYPE = 8;
/**
- * The result is a node set as defined by and will be accessed as a
- * single node, which may be <code>null</code> if the node set is empty.
- * Document modification does not invalidate the node, but may mean that
- * the result node no longer corresponds to the current document. This
- * is a convenience that permits optimization since the implementation
- * can stop once the first node in document order of the resulting set
- * has been found.
+ * The result is a <a
href='http://www.w3.org/TR/1999/REC-xpath-19991116#node-sets'>node set</a> as
defined by [<a href='http://www.w3.org/TR/1999/REC-xpath-19991116'>XPath
1.0</a>] and
+ * will be accessed as a single node, which may be <code>null</code> if
+ * the node set is empty. Document modification does not invalidate the
+ * node, but may mean that the result node no longer corresponds to the
+ * current document. This is a convenience that permits optimization
+ * since the implementation can stop once the first node in document
+ * order of the resulting set has been found.
* <br>If there are more than one node in the actual result, the single
* node returned will be the first in document order.
*/
@@ -118,9 +120,9 @@
/**
* The value of this number result. If the native double type of the DOM
* binding does not directly support the exact IEEE 754 result of the
- * XPath expression, then it is up to the definition of the binding
- * binding to specify how the XPath number is converted to the native
- * binding number.
+ * XPath expression, then it is up to the definition of the binding to
+ * specify how the XPath number is converted to the native binding
+ * number.
* @exception XPathException
* TYPE_ERR: raised if <code>resultType</code> is not
* <code>NUMBER_TYPE</code>.
1.3 +10 -11 xml-xalan/java/src/org/w3c/dom/xpath/XPathNSResolver.java
Index: XPathNSResolver.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/w3c/dom/xpath/XPathNSResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPathNSResolver.java 28 Oct 2002 21:48:05 -0000 1.2
+++ XPathNSResolver.java 17 Jan 2005 14:51:51 -0000 1.3
@@ -1,25 +1,24 @@
/*
- * Copyright (c) 2002 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
*/
package org.w3c.dom.xpath;
-
/**
* The <code>XPathNSResolver</code> interface permit <code>prefix</code>
* strings in the expression to be properly bound to
* <code>namespaceURI</code> strings. <code>XPathEvaluator</code> can
* construct an implementation of <code>XPathNSResolver</code> from a node,
* or the interface may be implemented by any application.
- * <p>See also the <a
href='http://www.w3.org/2002/08/WD-DOM-Level-3-XPath-20020820'>Document Object
Model (DOM) Level 3 XPath Specification</a>.
+ * <p>See also the <a
href='http://www.w3.org/TR/2004/NOTE-DOM-Level-3-XPath-20040226'>Document
Object Model (DOM) Level 3 XPath Specification</a>.
*/
public interface XPathNSResolver {
/**
1.3 +19 -17 xml-xalan/java/src/org/w3c/dom/xpath/XPathNamespace.java
Index: XPathNamespace.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/w3c/dom/xpath/XPathNamespace.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPathNamespace.java 28 Oct 2002 21:48:05 -0000 1.2
+++ XPathNamespace.java 17 Jan 2005 14:51:51 -0000 1.3
@@ -1,18 +1,17 @@
/*
- * Copyright (c) 2002 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
*/
package org.w3c.dom.xpath;
-
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -26,26 +25,29 @@
* mutate the node result in a DOMException with the code
* <code>NO_MODIFICATION_ALLOWED_ERR</code>.
* <p>The core specification describes attributes of the <code>Node</code>
- * interface that are different for different node node types but does not
+ * interface that are different for different node types but does not
* describe <code>XPATH_NAMESPACE_NODE</code>, so here is a description of
* those attributes for this node type. All attributes of <code>Node</code>
* not described in this section have a <code>null</code> or
* <code>false</code> value.
* <p><code>ownerDocument</code> matches the <code>ownerDocument</code> of
the
* <code>ownerElement</code> even if the element is later adopted.
+ * <p><code>nodeName</code> is always the string "<code>#namespace</code>".
* <p><code>prefix</code> is the prefix of the namespace represented by the
* node.
- * <p><code>nodeName</code> is the same as <code>prefix</code>.
+ * <p><code>localName</code> is the same as <code>prefix</code>.
* <p><code>nodeType</code> is equal to <code>XPATH_NAMESPACE_NODE</code>.
* <p><code>namespaceURI</code> is the namespace URI of the namespace
* represented by the node.
+ * <p><code>nodeValue</code> is the same as <code>namespaceURI</code>.
* <p><code>adoptNode</code>, <code>cloneNode</code>, and
* <code>importNode</code> fail on this node type by raising a
- * <code>DOMException</code> with the code <code>NOT_SUPPORTED_ERR</code>.In
- * future versions of the XPath specification, the definition of a namespace
- * node may be changed incomatibly, in which case incompatible changes to
- * field values may be required to implement versions beyond XPath 1.0.
- * <p>See also the <a
href='http://www.w3.org/2002/08/WD-DOM-Level-3-XPath-20020820'>Document Object
Model (DOM) Level 3 XPath Specification</a>.
+ * <code>DOMException</code> with the code <code>NOT_SUPPORTED_ERR</code>.
+ * <p ><b>Note:</b> In future versions of the XPath specification, the
+ * definition of a namespace node may be changed incomatibly, in which case
+ * incompatible changes to field values may be required to implement
+ * versions beyond XPath 1.0.
+ * <p>See also the <a
href='http://www.w3.org/TR/2004/NOTE-DOM-Level-3-XPath-20040226'>Document
Object Model (DOM) Level 3 XPath Specification</a>.
*/
public interface XPathNamespace extends Node {
// XPathNodeType
1.3 +10 -11 xml-xalan/java/src/org/w3c/dom/xpath/XPathExpression.java
Index: XPathExpression.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/w3c/dom/xpath/XPathExpression.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPathExpression.java 28 Oct 2002 21:48:05 -0000 1.2
+++ XPathExpression.java 17 Jan 2005 14:51:51 -0000 1.3
@@ -1,25 +1,24 @@
/*
- * Copyright (c) 2002 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
*/
package org.w3c.dom.xpath;
-
import org.w3c.dom.Node;
import org.w3c.dom.DOMException;
/**
* The <code>XPathExpression</code> interface represents a parsed and
resolved
* XPath expression.
- * <p>See also the <a
href='http://www.w3.org/2002/08/WD-DOM-Level-3-XPath-20020820'>Document Object
Model (DOM) Level 3 XPath Specification</a>.
+ * <p>See also the <a
href='http://www.w3.org/TR/2004/NOTE-DOM-Level-3-XPath-20040226'>Document
Object Model (DOM) Level 3 XPath Specification</a>.
*/
public interface XPathExpression {
/**
1.4 +10 -10 xml-xalan/java/src/org/w3c/dom/xpath/XPathException.java
Index: XPathException.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/w3c/dom/xpath/XPathException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XPathException.java 12 Nov 2004 21:34:16 -0000 1.3
+++ XPathException.java 17 Jan 2005 14:51:51 -0000 1.4
@@ -1,13 +1,13 @@
/*
- * Copyright (c) 2002 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
*/
package org.w3c.dom.xpath;
@@ -15,7 +15,7 @@
/**
* A new exception has been created for exceptions specific to these XPath
* interfaces.
- * <p>See also the <a
href='http://www.w3.org/2002/08/WD-DOM-Level-3-XPath-20020820'>Document Object
Model (DOM) Level 3 XPath Specification</a>.
+ * <p>See also the <a
href='http://www.w3.org/TR/2004/NOTE-DOM-Level-3-XPath-20040226'>Document
Object Model (DOM) Level 3 XPath Specification</a>.
*/
public class XPathException extends RuntimeException {
public XPathException(short code, String message) {
1.3 +23 -22 xml-xalan/java/src/org/w3c/dom/xpath/XPathEvaluator.java
Index: XPathEvaluator.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/w3c/dom/xpath/XPathEvaluator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPathEvaluator.java 28 Oct 2002 21:48:05 -0000 1.2
+++ XPathEvaluator.java 17 Jan 2005 14:51:51 -0000 1.3
@@ -1,18 +1,17 @@
/*
- * Copyright (c) 2002 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program 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 W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ * Copyright (c) 2004 World Wide Web Consortium,
+ *
+ * (Massachusetts Institute of Technology, European Research Consortium for
+ * Informatics and Mathematics, Keio University). All Rights Reserved. This
+ * work is distributed under the W3C(r) Software License [1] 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.
+ *
+ * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
*/
package org.w3c.dom.xpath;
-
import org.w3c.dom.Node;
import org.w3c.dom.DOMException;
@@ -32,7 +31,7 @@
* from other sources that could provide specific support for specialized
* extension functions or variables as would be defined by other
* specifications.
- * <p>See also the <a
href='http://www.w3.org/2002/08/WD-DOM-Level-3-XPath-20020820'>Document Object
Model (DOM) Level 3 XPath Specification</a>.
+ * <p>See also the <a
href='http://www.w3.org/TR/2004/NOTE-DOM-Level-3-XPath-20040226'>Document
Object Model (DOM) Level 3 XPath Specification</a>.
*/
public interface XPathEvaluator {
/**
@@ -42,15 +41,16 @@
* efficient internal form and preresolve all namespace prefixes which
* occur within the expression.
* @param expression The XPath expression string to be parsed.
- * @param resolver The <code>resolver</code> permits translation of
- * prefixes within the XPath expression into appropriate namespace URIs
- * . If this is specified as <code>null</code>, any namespace prefix
- * within the expression will result in <code>DOMException</code>
- * being thrown with the code <code>NAMESPACE_ERR</code>.
+ * @param resolver The <code>resolver</code> permits translation of all
+ * prefixes, including the <code>xml</code> namespace prefix, within
+ * the XPath expression into appropriate namespace URIs. If this is
+ * specified as <code>null</code>, any namespace prefix within the
+ * expression will result in <code>DOMException</code> being thrown
+ * with the code <code>NAMESPACE_ERR</code>.
* @return The compiled form of the XPath expression.
* @exception XPathException
* INVALID_EXPRESSION_ERR: Raised if the expression is not legal
- * according to the rules of the <code>XPathEvaluator</code>i
+ * according to the rules of the <code>XPathEvaluator</code>.
* @exception DOMException
* NAMESPACE_ERR: Raised if the expression contains namespace prefixes
* which cannot be resolved by the specified
@@ -91,11 +91,12 @@
* <code>CDATASection</code>, then the context is interpreted as the
* whole logical text node as seen by XPath, unless the node is empty
* in which case it may not serve as the XPath context.
- * @param resolver The <code>resolver</code> permits translation of
- * prefixes within the XPath expression into appropriate namespace URIs
- * . If this is specified as <code>null</code>, any namespace prefix
- * within the expression will result in <code>DOMException</code>
- * being thrown with the code <code>NAMESPACE_ERR</code>.
+ * @param resolver The <code>resolver</code> permits translation of all
+ * prefixes, including the <code>xml</code> namespace prefix, within
+ * the XPath expression into appropriate namespace URIs. If this is
+ * specified as <code>null</code>, any namespace prefix within the
+ * expression will result in <code>DOMException</code> being thrown
+ * with the code <code>NAMESPACE_ERR</code>.
* @param type If a specific <code>type</code> is specified, then the
* result will be returned as the corresponding type.For XPath 1.0
* results, this must be one of the codes of the
1.2 +50 -66 xml-xalan/java/src/org/w3c/dom/xpath/COPYRIGHT.html
Index: COPYRIGHT.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/w3c/dom/xpath/COPYRIGHT.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- COPYRIGHT.html 4 Apr 2002 13:15:56 -0000 1.1
+++ COPYRIGHT.html 17 Jan 2005 14:51:51 -0000 1.2
@@ -12,13 +12,14 @@
</head>
<body>
<h1>
- W3C IPR SOFTWARE NOTICE
+ W3C SOFTWARE NOTICE AND LICENSE
</h1>
<h3>
- Copyright © 2002 <a href="http://www.w3.org/";>World Wide Web
+ Copyright © 2004 <a href="http://www.w3.org/";>World Wide Web
Consortium</a>, (<a href="http://www.lcs.mit.edu/";>Massachusetts
- Institute of Technology</a>, <a href="http://www.inria.fr/";>Institut
- National de Recherche en Informatique et en Automatique</a>, <a
+ Institute of Technology</a>, <a
+ href="http://www.ercim.org/";>European Research Consortium for
+ Informatics and Mathematics</a>, <a
href="http://www.keio.ac.jp/";>Keio University</a>). All Rights
Reserved.
</h3>
@@ -35,72 +36,55 @@
<p>
<b>Note:</b> The original version of the W3C Software Copyright Notice
and License could be found at <a
-
href='http://www.w3.org/Consortium/Legal/copyright-software-19980720'>http://www.w3.org/Consortium/Legal/copyright-software-19980720</a>
- </p>
- <h3>
- Copyright © 1994-2002 <a href="http://www.w3.org/";>World Wide Web
- Consortium</a>, (<a href="http://www.lcs.mit.edu/";>Massachusetts
- Institute of Technology</a>, <a href="http://www.inria.fr/";>Institut
- National de Recherche en Informatique et en Automatique</a>, <a
- href="http://www.keio.ac.jp/";>Keio University</a>). All Rights
- Reserved. http://www.w3.org/Consortium/Legal/
- </h3>
- <p>
- This W3C work (including software, documents, or other related items)
is
- being provided by the copyright holders under the following license. By
- obtaining, using and/or copying this work, you (the licensee) agree
that
- you have read, understood, and will comply with the following terms and
- conditions:
+
href='http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231'>http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231</a>
</p>
<p>
- Permission to use, copy, and modify this software and its
documentation,
- with or without modification, for any purpose and without fee or
- royalty is hereby granted, provided that you include the following on
ALL
- copies of the software and documentation or portions thereof, including
- modifications, that you make:
+ This work (and included software, documentation such as READMEs,
+ or other related items) is being provided by the copyright holders
+ under the following license. By obtaining, using and/or copying
+ this work, you (the licensee) agree that you have read,
+ understood, and will comply with the following terms and
+ conditions.
+ </p>
+
+ <p>
+ Permission to copy, modify, and distribute this software and its
+ documentation, with or without modification, for any purpose
+ and without fee or royalty is hereby granted, provided that you
+ include the following on ALL copies of the software and
+ documentation or portions thereof, including modifications:
</p>
<ol>
- <li>
- The full text of this NOTICE in a location viewable to users of the
- redistributed or derivative work.
- </li>
- <li>
- Any pre-existing intellectual property disclaimers, notices, or terms
- and conditions. If none exist, a short notice of the following form
- (hypertext is preferred, text is permitted) should be used within the
- body of any redistributed or derivative code: "Copyright ©
- [$date-of-software] <a href="http://www.w3.org/";>World Wide Web
- Consortium</a>, (<a href="http://www.lcs.mit.edu/";>Massachusetts
- Institute of Technology</a>, <a href="http://www.inria.fr/";>Institut
- National de Recherche en Informatique et en Automatique</a>, <a
- href="http://www.keio.ac.jp/";>Keio University</a>). All Rights
- Reserved. http://www.w3.org/Consortium/Legal/";
- </li>
- <li>
- Notice of any changes or modifications to the W3C files, including the
- date changes were made. (We recommend you provide URIs to the location
- from which the code is derived.)
- </li>
+ <li>The full text of this NOTICE in a location viewable to users
+ of the redistributed or derivative work.</li>
+
+ <li>Any pre-existing intellectual property disclaimers, notices,
+ or terms and conditions. If none exist, the <a
+
href="http://www.w3.org/Consortium/Legal/2002/copyright-software-short-notice-20021231.html";>W3C
+ Software Short Notice</a> should be included (hypertext is
+ preferred, text is permitted) within the body of any redistributed
+ or derivative code.</li>
+
+ <li>Notice of any changes or modifications to the files, including
+ the date changes were made. (We recommend you provide URIs to the
+ location from which the code is derived.)</li>
</ol>
- <p>
- THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
- HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
- INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
- DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
- TRADEMARKS OR OTHER RIGHTS.
- </p>
- <p>
- COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
OR
- CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
- DOCUMENTATION.
- </p>
- <p>
- The name and trademarks of copyright holders may NOT be used in
- advertising or publicity pertaining to the software without specific,
- written prior permission. Title to copyright in this software and any
- associated documentation will at all times remain with copyright
- holders.
- </p>
+
+ <p>THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND
+ COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY
+ OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+ SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
+ COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
+
+ <p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
+ SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
+ SOFTWARE OR DOCUMENTATION.</p>
+
+ <p>The name and trademarks of copyright holders may NOT be used in
+ advertising or publicity pertaining to the software without
+ specific, written prior permission. Title to copyright in this
+ software and any associated documentation will at all times remain
+ with copyright holders.</p>
</body>
</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
