You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by il...@apache.org on 2002/10/28 22:48:05 UTC
cvs commit: xml-xalan/java/src/org/apache/xpath/domapi XPathEvaluatorImpl.java XPathNSResolverImpl.java XPathResultImpl.java XPathExpressionImpl.java
ilene 2002/10/28 13:48:05
Modified: java/src/org/w3c/dom/xpath XPathNamespace.java
XPathException.java XPathNSResolver.java
XPathResult.java XPathExpression.java
XPathEvaluator.java
java/src/org/apache/xpath/domapi XPathEvaluatorImpl.java
XPathNSResolverImpl.java XPathResultImpl.java
XPathExpressionImpl.java
Removed: java/src/org/apache/xalan/dom3/xpath XPathEvaluator.java
COPYRIGHT.html XPathException.java
XPathNamespace.java XPathResult.java
XPathNSResolver.java XPathExpression.java
Log:
Removed the temporary org.apache.xalan.dom3.xpath package.
Updated the org.w3c.dom.xpath interfaces.
Changed dependencies to org.w3c.dom.xpath interfaces in the implementation
classes in org.apache.xalan.xpath.domapi.
Revision Changes Path
1.2 +6 -10 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathNamespace.java 4 Apr 2002 13:15:56 -0000 1.1
+++ XPathNamespace.java 28 Oct 2002 21:48:05 -0000 1.2
@@ -12,6 +12,7 @@
package org.w3c.dom.xpath;
+
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -40,16 +41,11 @@
* represented by the node.
* <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>.
- * importNode should also fail on XPathNamespace nodes.This was already
- * fixed in the public draft.The Namespace node should be added to DOM Level
- * 3 core and should be available via a read-only NamedNodeMap on element to
- * reduce the confusion of adding a special node type for XPath.No change.
- * There are no known problems with this add-on node type and uses beyond
- * XPath are not anticipated.<code>Node.namespaceValue</code> should be
- * identical to Node.namespaceURI and not <code>null</code>.No change.It is
- * not clear why it should be this way since the infoset does not dictate it.
- * <p>See also the <a href='http://www.w3.org/TR/2002/WD-DOM-Level-3-XPath-20020328'>Document Object Model (DOM) Level 3 XPath Specification</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>.
*/
public interface XPathNamespace extends Node {
// XPathNodeType
1.2 +3 -6 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathException.java 4 Apr 2002 13:15:56 -0000 1.1
+++ XPathException.java 28 Oct 2002 21:48:05 -0000 1.2
@@ -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/TR/2002/WD-DOM-Level-3-XPath-20020328'>Document Object Model (DOM) Level 3 XPath Specification</a>.
+ * <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>.
*/
public class XPathException extends RuntimeException {
public XPathException(short code, String message) {
@@ -27,11 +27,8 @@
/**
* If the expression has a syntax error or otherwise is not a legal
* expression according to the rules of the specific
- * <code>XPathEvaluator</code>. If the <code>XPathEvaluator</code> was
- * obtained by casting the document, the expression must be XPath 1.0
- * with no special extension functions.A separate exception should be
- * raised if there are problems resolving namespaces.Yes. These now
- * raise DOMException with the code NAMESPACE_ERR.
+ * <code>XPathEvaluator</code> or contains specialized extension
+ * functions or variables not supported by this implementation.
*/
public static final short INVALID_EXPRESSION_ERR = 1;
/**
1.2 +3 -12 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathNSResolver.java 4 Apr 2002 13:15:56 -0000 1.1
+++ XPathNSResolver.java 28 Oct 2002 21:48:05 -0000 1.2
@@ -12,29 +12,20 @@
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/TR/2002/WD-DOM-Level-3-XPath-20020328'>Document Object Model (DOM) Level 3 XPath Specification</a>.
+ * <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>.
*/
public interface XPathNSResolver {
/**
* Look up the namespace URI associated to the given namespace prefix. The
* XPath evaluator must never call this with a <code>null</code> or
- * empty argument, because the result of doing this is undefined.Null /
- * empty prefix passed to XPathNSResolver should return default
- * namespace.Do not permit <code>null</code>to be passed in invocation,
- * allowing the implementation, if shared, to do anything it wants with
- * a passed <code>null</code>.It would be confusing to specify more than
- * this since the resolution of namespaces for XPath expressions never
- * requires the default namespace.Null returns are problematic.No change.
- * They should be adequately addressed in core. Some implementations
- * have not properly supported them, but they will be fixed to be
- * compliant. Bindings are still free to choose alternative
- * representations of <code>null</code>where required.
+ * empty argument, because the result of doing this is undefined.
* @param prefix The prefix to look for.
* @return Returns the associated namespace URI or <code>null</code> if
* none is found.
1.2 +10 -17 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathResult.java 4 Apr 2002 13:15:56 -0000 1.1
+++ XPathResult.java 28 Oct 2002 21:48:05 -0000 1.2
@@ -12,28 +12,17 @@
package org.w3c.dom.xpath;
+
import org.w3c.dom.Node;
import org.w3c.dom.DOMException;
/**
* The <code>XPathResult</code> interface represents the result of the
- * evaluation of an XPath expression within the context of a particular
+ * evaluation of an XPath 1.0 expression within the context of a particular
* 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.Should there be a flag on the result to
- * say whether an iteration has become invalid?Yes.Added the boolean
- * attribute <code>invalidIteratorState</code>Should there be a reset method
- * on the result in case someone wants to iterate the result multiple times?
- * It may be more trouble than it is worth, because the user can request a
- * new query. See if there are use cases.It might be better to consolidate
- * the interfaces and just move the snapshot and iterator functions to the
- * result object.Yes.The result of the consolidation looks good and unless
- * there are great objections, this is how it will be.There is concern that
- * the result cannot represent multiple strings, which is a possible result
- * of XPath 2.0. on them?No change.This is not part of the XPath 1.0 data
- * model. We cannot plan well for the XPath 2.0 data model at this point.
- * Most likely a new API will be required for XPath 2.0
- * <p>See also the <a href='http://www.w3.org/TR/2002/WD-DOM-Level-3-XPath-20020328'>Document Object Model (DOM) Level 3 XPath Specification</a>.
+ * 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>.
*/
public interface XPathResult {
// XPathResultType
@@ -104,7 +93,7 @@
* 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
- * node returned may not be the first in document order.
+ * node returned might not be the first in document order.
*/
public static final short ANY_UNORDERED_NODE_TYPE = 8;
/**
@@ -127,7 +116,11 @@
public short getResultType();
/**
- * The value of this number result.
+ * 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.
* @exception XPathException
* TYPE_ERR: raised if <code>resultType</code> is not
* <code>NUMBER_TYPE</code>.
1.2 +19 -18 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathExpression.java 4 Apr 2002 13:15:56 -0000 1.1
+++ XPathExpression.java 28 Oct 2002 21:48:05 -0000 1.2
@@ -12,16 +12,14 @@
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.The evaluateExpression method should be moved to the
- * XPathExpression interface so you do not have to use / pass two interfaces
- * just to use it.Done.XPathExpression should have a public reference to the
- * XPathEvaluator that created it.No change.Lacks justification.
- * <p>See also the <a href='http://www.w3.org/TR/2002/WD-DOM-Level-3-XPath-20020328'>Document Object Model (DOM) Level 3 XPath Specification</a>.
+ * 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>.
*/
public interface XPathExpression {
/**
@@ -41,25 +39,28 @@
* result will be coerced to return the specified type relying on
* XPath conversions and fail if the desired coercion is not possible.
* This must be one of the type codes of <code>XPathResult</code>.
- * @param result The <code>result</code> specifies a specific
- * <code>XPathResult</code> which may be reused and returned by this
- * method. If this is specified as <code>null</code>or the
- * implementation cannot reuse the specified result, a new
- * <code>XPathResult</code> will be constructed and returned.
- * @return The result of the evaluation of the XPath expression.
+ * @param result The <code>result</code> specifies a specific result
+ * object which may be reused and returned by this method. If this is
+ * specified as <code>null</code>or the implementation does not reuse
+ * the specified result, a new result object will be constructed and
+ * returned.For XPath 1.0 results, this object will be of type
+ * <code>XPathResult</code>.
+ * @return The result of the evaluation of the XPath expression.For XPath
+ * 1.0 results, this object will be of type <code>XPathResult</code>.
* @exception XPathException
* TYPE_ERR: Raised if the result cannot be converted to return the
* specified type.
* @exception DOMException
* WRONG_DOCUMENT_ERR: The Node is from a document that is not supported
- * by the XPathExpression that created this
- * <code>XPathExpression</code>.
+ * by the XPathEvaluator that created this <code>XPathExpression</code>
+ * .
* <br>NOT_SUPPORTED_ERR: The Node is not a type permitted as an XPath
- * context node.
+ * context node or the request type is not permitted by this
+ * <code>XPathExpression</code>.
*/
- public XPathResult evaluate(Node contextNode,
- short type,
- XPathResult result)
- throws XPathException, DOMException;
+ public Object evaluate(Node contextNode,
+ short type,
+ Object result)
+ throws XPathException, DOMException;
}
1.2 +42 -119 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathEvaluator.java 4 Apr 2002 13:15:56 -0000 1.1
+++ XPathEvaluator.java 28 Oct 2002 21:48:05 -0000 1.2
@@ -12,53 +12,27 @@
package org.w3c.dom.xpath;
+
import org.w3c.dom.Node;
import org.w3c.dom.DOMException;
/**
* The evaluation of XPath expressions is provided by
- * <code>XPathEvaluator</code>, which will provide evaluation of XPath 1.0
- * expressions with no specialized extension functions or variables. It is
- * expected that the <code>XPathEvaluator</code> interface will be
- * implemented on the same object which implements the <code>Document</code>
- * interface in an implementation which supports the XPath DOM module.
- * <code>XPathEvaluator</code> implementations may be available from other
- * sources that may provide support for special extension functions or
- * variables which are not defined in this specification. The methods of
- * XPathExpression should be named with more-XPath- specific names because
- * the interface will often be implemented by the same object which
- * implements document.No change.The point of interfaces is to localize the
- * implementing namespace. This would make the method names unnecessarily
- * long and complex even though there are no conflicts in the interface
- * itself. The new core method getInterface is designed for discovering
- * interfaces of additional modules that may not be directly implemented on
- * the objects to which they are attached. This could be used to implement
- * XPath on a separate object. The user only refers to the separate
- * interfaces and not the proprietary aggregate implementation.Should entity
- * refs be supported so that queries can be made on them?No change.We will
- * not do this now. They are not part of the XPath data model. Note that
- * they may be present in the hierarchy of returned nodes, but may not
- * directly be requested or returned in the node set.What does createResult
- * create when one wants to reuse the XPath?It is not useful.Removed method.
- * Should ordering be a separate flag, or a type of result that can be
- * requested. As a type of result, it can be better optimized in
- * implementations.It makes sense as a type of result. Changed.Removed
- * method.Implementing XPathEvaluator on Document can be a problem due to
- * conflicts in the names of the methods.The working group finds no better
- * solution. GetInterface in Level 3 permits the object to be implemented
- * separately. We should be committed to this. We will leave this issue open
- * to see if we get more feedback on it.How does this interface adapt to
- * XPath 2.0 and other query languages.No change.This interface is not
- * intended to adapt to XPath 2.0 or other languages. The models of these
- * are likely to be incompatible enough to require new APIs.For alternate
- * implementations that can use this API, it can be obtained from different
- * sources.Support for custom variables and functions would be very useful.
- * No change.It is possible for an implementation to supply alternative
- * sources of an XPathEvaluator that can be customized with a custom
- * variable and function context. We do not specify how this is
- * accomplished. It is too complex to address in this version of the XPath
- * DOM.
- * <p>See also the <a href='http://www.w3.org/TR/2002/WD-DOM-Level-3-XPath-20020328'>Document Object Model (DOM) Level 3 XPath Specification</a>.
+ * <code>XPathEvaluator</code>. In a DOM implementation which supports the
+ * XPath 3.0 feature, as described above, the <code>XPathEvaluator</code>
+ * interface will be implemented on the same object which implements the
+ * <code>Document</code> interface permitting it to be obtained by the usual
+ * binding-specific method such as casting or by using the DOM Level 3
+ * getInterface method. In this case the implementation obtained from the
+ * Document supports the XPath DOM module and is compatible with the XPath
+ * 1.0 specification.
+ * <p>Evaluation of expressions with specialized extension functions or
+ * variables may not work in all implementations and is, therefore, not
+ * portable. <code>XPathEvaluator</code> implementations may be available
+ * 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>.
*/
public interface XPathEvaluator {
/**
@@ -66,9 +40,7 @@
* useful when an expression will be reused in an application since it
* makes it possible to compile the expression string into a more
* efficient internal form and preresolve all namespace prefixes which
- * occur within the expression.createExpression should not raise
- * exceptions about type coercion.This was already fixed in the public
- * draft.
+ * 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
@@ -91,19 +63,11 @@
/**
* Adapts any DOM node to resolve namespaces so that an XPath expression
* can be easily evaluated relative to the context of the node where it
- * appeared within the document. This adapter works by calling the
- * method <code>lookupNamespacePrefix</code> on <code>Node</code>.It
- * should be possible to create an XPathNSResolver that does not rely on
- * a node, but which implements a map of resolutions that can be added
- * to by the application.No change.The application can easily create
- * this, which was why the interface was designed as it is. The
- * specification will not require a specific factory at this time for
- * application populated maps.There should be type restrictions on which
- * types of nodes may be adapted by createNSResolver.No change.The
- * namespace methods on the Node interface of the Level 3 core may be
- * called without exception on all node types. In some cases no non-null
- * namespace resolution will ever be returned. That is what may also be
- * expected of this adapter.
+ * appeared within the document. This adapter works like the DOM Level 3
+ * method <code>lookupNamespaceURI</code> on nodes in resolving the
+ * namespaceURI from a given prefix using the current information
+ * available in the node's hierarchy at the time lookupNamespaceURI is
+ * called. also correctly resolving the implicit xml prefix.
* @param nodeResolver The node to be used as a context for namespace
* resolution.
* @return <code>XPathNSResolver</code> which resolves namespaces with
@@ -113,50 +77,7 @@
/**
* Evaluates an XPath expression string and returns a result of the
- * specified type if possible.An exception needs to be raised when an
- * XPath expression is evaluated on a node such as an EntityReference
- * which cannot serve as an XPath context node.Done: NOT_SUPPORTED_ERR.A
- * description is needed of what happens when the node passed to the
- * evaluation function is a Text or CDATASection in the DOM case where
- * the text may be fragmented between text nodes.Done.Eliminate the
- * evaluate method from XPathEvaluator, forcing everyone to create
- * expressions.No change.Any implementor can easily implement it by
- * creating an expression. Having it available as a separate routine is
- * a convenience and may be an optimization as well in some cases.Revert
- * to multiple evaluateAs methods instead of passing a type code.No
- * change.This is an alternative which eliminates a method argument
- * while adding methods, but the type code is used to designate the type
- * on returns anyway and using it as an argument to specify any coercion
- * seems natural to many.Error exceptions are needed when there is a
- * mismatch between the implementation of XPathEvaluator and the context
- * node being evaluated.Done: WRONG_DOCUMENT_ERRConcern that the XPath
- * API should only support natural results of XPath expression, without
- * convenience coercion or alternative representations. Any special
- * thing such as ordering should be added later to resultNo change.We
- * have significant use cases for returning alternative types and
- * representations by explicit request in advance.Eliminate the reusable
- * result argument.No change.No. We have use cases for it, and there is
- * already an implementation showing there is nothing wrong with it.
- * State that the XPathNSResolver argument may be a function in
- * Javascript.Yes.There is an exception when there is a problem parsing
- * the expression, but none when there is a problem evaluating the
- * expression.No change.If the expression parsing was OK, then the worst
- * that can happen is an empty result is returned.When requesting any
- * type, the implementation should be permitted to return any type of
- * node set, i.e. ordered or unordered, it finds convenient.No change.
- * The iterator it returns may contain ordered results, but identifying
- * it as such produces undesirable results, because it would create
- * complexity for the user -- requiring checking two types to see if the
- * result was a node set -- or incompatibility caused by assuming it was
- * always the one returned by a particular implementation the developer
- * was using.NAMESPACE_ERR description is not appropriate to the way it
- * is being used here.Make the description of NAMESPACE_ERR in the core
- * specification more general.Should the INVALID_EXPRESSION_ERR be
- * INVALID_SYNTAX_ERR?No change.We can improve the description of the
- * error, but the name is appropriate as-is. It covers not only syntax
- * errors but expression errors, such as when the implementation has no
- * custom functions or variables but the expression specifies custom
- * functions or variables.
+ * specified type if possible.
* @param expression The XPath expression string to be parsed and
* evaluated.
* @param contextNode The <code>context</code> is context node for the
@@ -176,16 +97,17 @@
* 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 coerced to return the specified type relying on
- * XPath type conversions and fail if the desired coercion is not
- * possible. This must be one of the type codes of
+ * result will be returned as the corresponding type.For XPath 1.0
+ * results, this must be one of the codes of the
+ * <code>XPathResult</code> interface.
+ * @param result The <code>result</code> specifies a specific result
+ * object which may be reused and returned by this method. If this is
+ * specified as <code>null</code>or the implementation does not reuse
+ * the specified result, a new result object will be constructed and
+ * returned.For XPath 1.0 results, this object will be of type
* <code>XPathResult</code>.
- * @param result The <code>result</code> specifies a specific
- * <code>XPathResult</code> which may be reused and returned by this
- * method. If this is specified as <code>null</code>or the
- * implementation cannot reuse the specified result, a new
- * <code>XPathResult</code> will be constructed and returned.
- * @return The result of the evaluation of the XPath expression.
+ * @return The result of the evaluation of the XPath expression.For XPath
+ * 1.0 results, this object will be of type <code>XPathResult</code>.
* @exception XPathException
* INVALID_EXPRESSION_ERR: Raised if the expression is not legal
* according to the rules of the <code>XPathEvaluator</code>i
@@ -196,15 +118,16 @@
* which cannot be resolved by the specified
* <code>XPathNSResolver</code>.
* <br>WRONG_DOCUMENT_ERR: The Node is from a document that is not
- * supported by this XPathEvaluator.
+ * supported by this <code>XPathEvaluator</code>.
* <br>NOT_SUPPORTED_ERR: The Node is not a type permitted as an XPath
- * context node.
+ * context node or the request type is not permitted by this
+ * <code>XPathEvaluator</code>.
*/
- public XPathResult evaluate(String expression,
- Node contextNode,
- XPathNSResolver resolver,
- short type,
- XPathResult result)
- throws XPathException, DOMException;
+ public Object evaluate(String expression,
+ Node contextNode,
+ XPathNSResolver resolver,
+ short type,
+ Object result)
+ throws XPathException, DOMException;
}
1.3 +1 -5 xml-xalan/java/src/org/apache/xpath/domapi/XPathEvaluatorImpl.java
Index: XPathEvaluatorImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/domapi/XPathEvaluatorImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPathEvaluatorImpl.java 23 Sep 2002 21:11:24 -0000 1.2
+++ XPathEvaluatorImpl.java 28 Oct 2002 21:48:05 -0000 1.3
@@ -66,11 +66,7 @@
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import org.apache.xalan.dom3.xpath.XPathEvaluator;
-import org.apache.xalan.dom3.xpath.XPathException;
-import org.apache.xalan.dom3.xpath.XPathExpression;
-import org.apache.xalan.dom3.xpath.XPathNSResolver;
-import org.apache.xalan.dom3.xpath.XPathResult;
+import org.w3c.dom.xpath.*;
/**
* <meta name="usage" content="experimental"/>
1.3 +1 -1 xml-xalan/java/src/org/apache/xpath/domapi/XPathNSResolverImpl.java
Index: XPathNSResolverImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/domapi/XPathNSResolverImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPathNSResolverImpl.java 23 Sep 2002 21:11:24 -0000 1.2
+++ XPathNSResolverImpl.java 28 Oct 2002 21:48:05 -0000 1.3
@@ -59,7 +59,7 @@
import org.apache.xml.utils.PrefixResolverDefault;
import org.w3c.dom.Node;
-import org.apache.xalan.dom3.xpath.XPathNSResolver;
+import org.w3c.dom.xpath.XPathNSResolver;
/**
* <meta name="usage" content="experimental"/>
1.3 +2 -2 xml-xalan/java/src/org/apache/xpath/domapi/XPathResultImpl.java
Index: XPathResultImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/domapi/XPathResultImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPathResultImpl.java 23 Sep 2002 21:11:24 -0000 1.2
+++ XPathResultImpl.java 28 Oct 2002 21:48:05 -0000 1.3
@@ -70,8 +70,8 @@
import org.w3c.dom.events.EventListener;
import org.w3c.dom.events.EventTarget;
import org.w3c.dom.traversal.NodeIterator;
-import org.apache.xalan.dom3.xpath.XPathException;
-import org.apache.xalan.dom3.xpath.XPathResult;
+import org.w3c.dom.xpath.XPathException;
+import org.w3c.dom.xpath.XPathResult;
/**
* <meta name="usage" content="experimental"/>
1.3 +1 -4 xml-xalan/java/src/org/apache/xpath/domapi/XPathExpressionImpl.java
Index: XPathExpressionImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/domapi/XPathExpressionImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPathExpressionImpl.java 23 Sep 2002 21:11:24 -0000 1.2
+++ XPathExpressionImpl.java 28 Oct 2002 21:48:05 -0000 1.3
@@ -69,10 +69,7 @@
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import org.apache.xalan.dom3.xpath.XPathException;
-import org.apache.xalan.dom3.xpath.XPathExpression;
-import org.apache.xalan.dom3.xpath.XPathNamespace;
-import org.apache.xalan.dom3.xpath.XPathResult;
+import org.w3c.dom.xpath.*;
/**
*
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org