jkesselm 2003/02/13 10:20:50
Modified: java/src/org/apache/xalan/transformer Tag: xslt20
KeyIterator.java
java/src/org/apache/xml/dtm Tag: xslt20 DTM.java
DTMConfigurationException.java DTMException.java
XType.java XTypeConverter.java
java/src/org/apache/xml/dtm/dom2dtm2 Tag: xslt20
DOM2DTM2.java DOM2DTM2Base.java
DOM2DTM2Traversers.java
java/src/org/apache/xml/dtm/ref Tag: xslt20
DTMDefaultBase.java DTMDefaultBaseIterators.java
DTMDefaultBaseTraversers.java DTMDocumentImpl.java
DTMNodeProxy.java
java/src/org/apache/xml/dtm/ref/sax2dtm Tag: xslt20
SAX2DTM.java
java/src/org/apache/xml/dtm/ref/xni2dtm Tag: xslt20
DTM_XSequence.java XNI2DTM.java XPath2Type.java
java/src/org/apache/xpath Tag: xslt20 XPathContext.java
java/src/org/apache/xpath/axes Tag: xslt20
AttributeIterator.java AxesWalker.java
ChildIterator.java ChildTestIterator.java
DescendantIterator.java
FilterExprIteratorSimple.java FilterExprWalker.java
LocPathIterator.java MatchPatternIterator.java
ReverseAxesWalker.java WalkerFactory.java
WalkingIteratorSorted.java
java/src/org/apache/xpath/functions Tag: xslt20
FuncAverage.java FuncBoolean.java FuncData.java
FuncMax.java FuncMin.java
java/src/org/apache/xpath/objects Tag: xslt20
XDTMSequence.java XObjectFactory.java
java/src/org/apache/xpath/parser Tag: xslt20 PathExpr.java
Pattern.java SimpleNode.java StepExpr.java
java/src/org/apache/xpath/patterns Tag: xslt20
ContextMatchStepPattern.java StepPattern.java
Added: java/src/org/apache/xml/xdm Tag: xslt20 Axis.java
SAX2DTMDesign.html XDMConfigurationException.java
XDMCursor.java XDMDesign.html XDMException.java
XDMManager.java XDMNodeVisitor.java
XDMSequence.java XDMSequenceEmpty.java
XDMTreeWalker.java XDMWSFilter.java
java/src/org/apache/xml/xdm/ref Tag: xslt20
XDMCursorDTM.java XDMManagerDTM.java
XDMSelfCursorDTM.java XDMTraverserCursorDTM.java
XDMTreeWalkerDTM.java
XDMTypedTraverserCursorDTM.java
Log:
NEW API UNDER DEVELOPMENT: eXtensible Data Model (XDM).
See org.apache.xml.xdm.* for details. In addition to the new
interfaces, that directory contains HTML documentation for both
DTM's internals (an updated version of Gary's SAX2DTM
summary) and the ideas behind XDM. The former should be
posted on our website some time soon; the latter may want to wait
until we're sure XDM will fly.
Since we're hoping that XDM will replace DTM's current public
interface (if it works out), some code reorganization has been done
to move some of the DTM support interfaces, such as Axes
and Sequences, up to the XDM layer.
The initial XDM implementation is wrapped around DTM Traversers,
and hence is not yet fully optimized. (The API is also still only
"cast in jello" and may change.)
Our intent is that the traversal logic would be merged into the XDM
implementation, and that the whole concept of Node Handles would
go away; all nodes would be accesssed via XDMCursors, which
are flyweight objects that combine the concepts of Iterator and
Current Node. We _think_ performance should be at least
comparable when accessing a DTM model, and superior when
accessing other source models such as a DOM. XDM should also
be more maintainable, once it stabilizes.
Revision Changes Path
No revision
No revision
1.12.6.2 +1 -1
xml-xalan/java/src/org/apache/xalan/transformer/KeyIterator.java
Index: KeyIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/KeyIterator.java,v
retrieving revision 1.12.6.1
retrieving revision 1.12.6.2
diff -u -r1.12.6.1 -r1.12.6.2
--- KeyIterator.java 30 Jan 2003 00:39:19 -0000 1.12.6.1
+++ KeyIterator.java 13 Feb 2003 18:20:36 -0000 1.12.6.2
@@ -62,9 +62,9 @@
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.templates.KeyDeclaration;
-import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.utils.QName;
+import org.apache.xml.xdm.Axis;
import org.apache.xpath.XPath;
import org.apache.xpath.XPathContext;
import org.apache.xpath.axes.OneStepIteratorForward;
No revision
No revision
1.7.4.1.2.4 +22 -21 xml-xalan/java/src/org/apache/xml/dtm/DTM.java
Index: DTM.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/DTM.java,v
retrieving revision 1.7.4.1.2.3
retrieving revision 1.7.4.1.2.4
diff -u -r1.7.4.1.2.3 -r1.7.4.1.2.4
--- DTM.java 30 Jan 2003 00:39:59 -0000 1.7.4.1.2.3
+++ DTM.java 13 Feb 2003 18:20:38 -0000 1.7.4.1.2.4
@@ -58,6 +58,7 @@
import org.apache.xml.utils.XMLString;
import org.apache.xml.utils.NodeVector;
+import org.apache.xml.xdm.*;
import org.apache.xpath.objects.*;
import javax.xml.transform.SourceLocator;
@@ -130,74 +131,74 @@
/**
* The node is an <code>Element</code>.
*/
- public static final short ELEMENT_NODE = 1;
+ public static final short ELEMENT_NODE = XDMCursor.ELEMENT_NODE;
/**
* The node is an <code>Attr</code>.
*/
- public static final short ATTRIBUTE_NODE = 2;
+ public static final short ATTRIBUTE_NODE = XDMCursor.ATTRIBUTE_NODE;
/**
* The node is a <code>Text</code> node.
*/
- public static final short TEXT_NODE = 3;
+ public static final short TEXT_NODE = XDMCursor.TEXT_NODE;
/**
* The node is a <code>CDATASection</code>.
*/
- public static final short CDATA_SECTION_NODE = 4;
+ public static final short CDATA_SECTION_NODE =
XDMCursor.CDATA_SECTION_NODE;
/**
* The node is an <code>EntityReference</code>.
*/
- public static final short ENTITY_REFERENCE_NODE = 5;
+ public static final short ENTITY_REFERENCE_NODE =
XDMCursor.ENTITY_REFERENCE_NODE;
/**
* The node is an <code>Entity</code>.
*/
- public static final short ENTITY_NODE = 6;
+ public static final short ENTITY_NODE = XDMCursor.ENTITY_NODE;
/**
* The node is a <code>ProcessingInstruction</code>.
*/
- public static final short PROCESSING_INSTRUCTION_NODE = 7;
+ public static final short PROCESSING_INSTRUCTION_NODE =
XDMCursor.PROCESSING_INSTRUCTION_NODE;
/**
* The node is a <code>Comment</code>.
*/
- public static final short COMMENT_NODE = 8;
+ public static final short COMMENT_NODE = XDMCursor.COMMENT_NODE;
/**
* The node is a <code>Document</code>.
*/
- public static final short DOCUMENT_NODE = 9;
+ public static final short DOCUMENT_NODE = XDMCursor.DOCUMENT_NODE;
/**
* The node is a <code>DocumentType</code>.
*/
- public static final short DOCUMENT_TYPE_NODE = 10;
+ public static final short DOCUMENT_TYPE_NODE =
XDMCursor.DOCUMENT_TYPE_NODE;
/**
* The node is a <code>DocumentFragment</code>.
*/
- public static final short DOCUMENT_FRAGMENT_NODE = 11;
+ public static final short DOCUMENT_FRAGMENT_NODE =
XDMCursor.DOCUMENT_FRAGMENT_NODE;
/**
* The node is a <code>Notation</code>.
*/
- public static final short NOTATION_NODE = 12;
+ public static final short NOTATION_NODE = XDMCursor.NOTATION_NODE;
- /**
- * The node is a <code>namespace node</code>. Note that this is not
- * currently a node type defined by the DOM API.
+ /** * The node is a <code>namespace node</code>. Note that this is not
+ * currently a node type defined by the DOM API.
+ *
+ * %REVIEW% I'm retrieving it from DTM; arguably, it should be
+ * defined here and DTM should ask XDM for it.
*/
- public static final short NAMESPACE_NODE = 13;
+ public static final short NAMESPACE_NODE = XDMCursor.NAMESPACE_NODE;
- /**
- * The number of valid nodetypes. REMEMBER TO UPDATE THIS if you add more
- * node types.
+ /** * The number of valid nodetypes.
*/
- public static final short NTYPES = 14;
+ public static final short NTYPES = XDMCursor.NTYPES;
// ========= DTM Implementation Control Functions. ==============
@@ -1099,7 +1100,7 @@
* @return XSequence object containing one or more values and their type
* information. If no typed value is available, returns an empty sequence.
* */
- public DTMSequence getTypedValue(int nodeHandle);
+ public XDMSequence getTypedValue(int nodeHandle);
/** Query which DTMManager this DTM is currently being handled by.
*
1.2.18.2 +6 -3
xml-xalan/java/src/org/apache/xml/dtm/DTMConfigurationException.java
Index: DTMConfigurationException.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/DTMConfigurationException.java,v
retrieving revision 1.2.18.1
retrieving revision 1.2.18.2
diff -u -r1.2.18.1 -r1.2.18.2
--- DTMConfigurationException.java 30 Jan 2003 00:39:59 -0000 1.2.18.1
+++ DTMConfigurationException.java 13 Feb 2003 18:20:38 -0000 1.2.18.2
@@ -56,12 +56,15 @@
*/
package org.apache.xml.dtm;
+import org.apache.xml.xdm.XDMConfigurationException;
import javax.xml.transform.SourceLocator;
-/**
+/** Subclass of XDMConfigurationException. No new information
+ * beyond object type.
+ *
* Indicates a serious configuration error.
*/
-public class DTMConfigurationException extends DTMException {
+public class DTMConfigurationException extends XDMConfigurationException {
/**
* Create a new <code>DTMConfigurationException</code> with no
@@ -133,4 +136,4 @@
Throwable e) {
super(message, locator, e);
}
-}
\ No newline at end of file
+}
1.3.16.2 +10 -280 xml-xalan/java/src/org/apache/xml/dtm/DTMException.java
Index: DTMException.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/DTMException.java,v
retrieving revision 1.3.16.1
retrieving revision 1.3.16.2
diff -u -r1.3.16.1 -r1.3.16.2
--- DTMException.java 30 Jan 2003 00:39:59 -0000 1.3.16.1
+++ DTMException.java 13 Feb 2003 18:20:38 -0000 1.3.16.2
@@ -56,7 +56,7 @@
*/
package org.apache.xml.dtm;
-
+import org.apache.xml.xdm.XDMException;
import java.lang.reflect.Method;
import java.lang.IllegalAccessException;
import java.lang.reflect.InvocationTargetException;
@@ -71,110 +71,18 @@
/**
* This class specifies an exceptional condition that occured
* in the DTM module.
+ *
+ * Subclass of XDMException. No new information
+ * beyond object type.
*/
-public class DTMException extends RuntimeException {
-
- /** Field locator specifies where the error occured.
- * @serial */
- SourceLocator locator;
-
- /**
- * Method getLocator retrieves an instance of a SourceLocator
- * object that specifies where an error occured.
- *
- * @return A SourceLocator object, or null if none was specified.
- */
- public SourceLocator getLocator() {
- return locator;
- }
-
- /**
- * Method setLocator sets an instance of a SourceLocator
- * object that specifies where an error occured.
- *
- * @param location A SourceLocator object, or null to clear the location.
- */
- public void setLocator(SourceLocator location) {
- locator = location;
- }
-
- /** Field containedException specifies a wrapped exception. May be null.
- * @serial */
- Throwable containedException;
-
- /**
- * This method retrieves an exception that this exception wraps.
- *
- * @return An Throwable object, or null.
- * @see #getCause
- */
- public Throwable getException() {
- return containedException;
- }
-
- /**
- * Returns the cause of this throwable or <code>null</code> if the
- * cause is nonexistent or unknown. (The cause is the throwable that
- * caused this throwable to get thrown.)
- */
- public Throwable getCause() {
-
- return ((containedException == this)
- ? null
- : containedException);
- }
-
- /**
- * Initializes the <i>cause</i> of this throwable to the specified value.
- * (The cause is the throwable that caused this throwable to get thrown.)
- *
- * <p>This method can be called at most once. It is generally called
from
- * within the constructor, or immediately after creating the
- * throwable. If this throwable was created
- * with [EMAIL PROTECTED] #DTMException(Throwable)} or
- * [EMAIL PROTECTED] #DTMException(String,Throwable)}, this method
cannot be called
- * even once.
- *
- * @param cause the cause (which is saved for later retrieval by the
- * [EMAIL PROTECTED] #getCause()} method). (A <tt>null</tt>
value is
- * permitted, and indicates that the cause is nonexistent or
- * unknown.)
- * @return a reference to this <code>Throwable</code> instance.
- * @throws IllegalArgumentException if <code>cause</code> is this
- * throwable. (A throwable cannot
- * be its own cause.)
- * @throws IllegalStateException if this throwable was
- * created with [EMAIL PROTECTED] #DTMException(Throwable)} or
- * [EMAIL PROTECTED] #DTMException(String,Throwable)}, or this
method has already
- * been called on this throwable.
- */
- public synchronized Throwable initCause(Throwable cause) {
-
- if ((this.containedException == null) && (cause != null)) {
- throw new
IllegalStateException(XSLMessages.createMessage(XSLTErrorResources.ER_CANNOT_OVERWRITE_CAUSE,
null)); //"Can't overwrite cause");
- }
-
- if (cause == this) {
- throw new IllegalArgumentException(
-
XSLMessages.createMessage(XSLTErrorResources.ER_SELF_CAUSATION_NOT_PERMITTED,
null)); //"Self-causation not permitted");
- }
-
- this.containedException = cause;
-
- return this;
- }
-
+public class DTMException extends XDMException {
/**
* Create a new DTMException.
*
* @param message The error or warning message.
*/
public DTMException(String message) {
-
super(message);
-
- this.containedException = null;
- this.locator = null;
}
/**
@@ -183,11 +91,7 @@
* @param e The exception to be wrapped.
*/
public DTMException(Throwable e) {
-
- super(e.getMessage());
-
- this.containedException = e;
- this.locator = null;
+ super(e);
}
/**
@@ -201,13 +105,7 @@
* @param e Any exception
*/
public DTMException(String message, Throwable e) {
-
- super(((message == null) || (message.length() == 0))
- ? e.getMessage()
- : message);
-
- this.containedException = e;
- this.locator = null;
+ super(message,e);
}
/**
@@ -221,11 +119,7 @@
* @param locator The locator object for the error or warning.
*/
public DTMException(String message, SourceLocator locator) {
-
- super(message);
-
- this.containedException = null;
- this.locator = locator;
+ super(message,locator);
}
/**
@@ -238,170 +132,6 @@
*/
public DTMException(String message, SourceLocator locator,
Throwable e) {
-
- super(message);
-
- this.containedException = e;
- this.locator = locator;
- }
-
- /**
- * Get the error message with location information
- * appended.
- */
- public String getMessageAndLocation() {
-
- StringBuffer sbuffer = new StringBuffer();
- String message = super.getMessage();
-
- if (null != message) {
- sbuffer.append(message);
- }
-
- if (null != locator) {
- String systemID = locator.getSystemId();
- int line = locator.getLineNumber();
- int column = locator.getColumnNumber();
-
- if (null != systemID) {
- sbuffer.append("; SystemID: ");
- sbuffer.append(systemID);
- }
-
- if (0 != line) {
- sbuffer.append("; Line#: ");
- sbuffer.append(line);
- }
-
- if (0 != column) {
- sbuffer.append("; Column#: ");
- sbuffer.append(column);
- }
- }
-
- return sbuffer.toString();
- }
-
- /**
- * Get the location information as a string.
- *
- * @return A string with location info, or null
- * if there is no location information.
- */
- public String getLocationAsString() {
-
- if (null != locator) {
- StringBuffer sbuffer = new StringBuffer();
- String systemID = locator.getSystemId();
- int line = locator.getLineNumber();
- int column = locator.getColumnNumber();
-
- if (null != systemID) {
- sbuffer.append("; SystemID: ");
- sbuffer.append(systemID);
- }
-
- if (0 != line) {
- sbuffer.append("; Line#: ");
- sbuffer.append(line);
- }
-
- if (0 != column) {
- sbuffer.append("; Column#: ");
- sbuffer.append(column);
- }
-
- return sbuffer.toString();
- } else {
- return null;
- }
- }
-
- /**
- * Print the the trace of methods from where the error
- * originated. This will trace all nested exception
- * objects, as well as this object.
- */
- public void printStackTrace() {
- printStackTrace(new java.io.PrintWriter(System.err, true));
- }
-
- /**
- * Print the the trace of methods from where the error
- * originated. This will trace all nested exception
- * objects, as well as this object.
- * @param s The stream where the dump will be sent to.
- */
- public void printStackTrace(java.io.PrintStream s) {
- printStackTrace(new java.io.PrintWriter(s));
- }
-
- /**
- * Print the the trace of methods from where the error
- * originated. This will trace all nested exception
- * objects, as well as this object.
- * @param s The writer where the dump will be sent to.
- */
- public void printStackTrace(java.io.PrintWriter s) {
-
- if (s == null) {
- s = new java.io.PrintWriter(System.err, true);
- }
-
- try {
- String locInfo = getLocationAsString();
-
- if (null != locInfo) {
- s.println(locInfo);
- }
-
- super.printStackTrace(s);
- } catch (Throwable e) {}
-
- Throwable exception = getException();
-
- for (int i = 0; (i < 10) && (null != exception); i++) {
- s.println("---------");
-
- try {
- if (exception instanceof DTMException) {
- String locInfo =
- ((DTMException) exception)
- .getLocationAsString();
-
- if (null != locInfo) {
- s.println(locInfo);
- }
- }
-
- exception.printStackTrace(s);
- } catch (Throwable e) {
- s.println("Could not print stack trace...");
- }
-
- try {
- Method meth =
- ((Object) exception).getClass().getMethod("getException",
- null);
-
- if (null != meth) {
- Throwable prev = exception;
-
- exception = (Throwable) meth.invoke(exception, null);
-
- if (prev == exception) {
- break;
- }
- } else {
- exception = null;
- }
- } catch (InvocationTargetException ite) {
- exception = null;
- } catch (IllegalAccessException iae) {
- exception = null;
- } catch (NoSuchMethodException nsme) {
- exception = null;
- }
- }
+ super(message,locator,e);
}
-}
\ No newline at end of file
+}
1.1.2.1.2.3 +1 -1 xml-xalan/java/src/org/apache/xml/dtm/Attic/XType.java
Index: XType.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/Attic/XType.java,v
retrieving revision 1.1.2.1.2.2
retrieving revision 1.1.2.1.2.3
diff -u -r1.1.2.1.2.2 -r1.1.2.1.2.3
--- XType.java 30 Jan 2003 00:39:59 -0000 1.1.2.1.2.2
+++ XType.java 13 Feb 2003 18:20:38 -0000 1.1.2.1.2.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.1.2.1.2.2 +1 -1
xml-xalan/java/src/org/apache/xml/dtm/Attic/XTypeConverter.java
Index: XTypeConverter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/Attic/XTypeConverter.java,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- XTypeConverter.java 30 Jan 2003 00:39:59 -0000 1.1.2.1.2.1
+++ XTypeConverter.java 13 Feb 2003 18:20:38 -0000 1.1.2.1.2.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
No revision
No revision
1.1.2.3 +1 -0
xml-xalan/java/src/org/apache/xml/dtm/dom2dtm2/Attic/DOM2DTM2.java
Index: DOM2DTM2.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/dom2dtm2/Attic/DOM2DTM2.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DOM2DTM2.java 30 Jan 2003 00:39:53 -0000 1.1.2.2
+++ DOM2DTM2.java 13 Feb 2003 18:20:39 -0000 1.1.2.3
@@ -63,6 +63,7 @@
import javax.xml.transform.Source;
import org.apache.xml.utils.XMLStringFactory;
+import org.apache.xml.xdm.*;
import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.res.XSLMessages;
1.1.2.7 +3 -3
xml-xalan/java/src/org/apache/xml/dtm/dom2dtm2/Attic/DOM2DTM2Base.java
Index: DOM2DTM2Base.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/dom2dtm2/Attic/DOM2DTM2Base.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- DOM2DTM2Base.java 30 Jan 2003 00:39:53 -0000 1.1.2.6
+++ DOM2DTM2Base.java 13 Feb 2003 18:20:39 -0000 1.1.2.7
@@ -73,7 +73,6 @@
import org.apache.xml.dtm.DTMAxisTraverser;
import org.apache.xml.dtm.DTMException;
import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTMSequence;
import org.apache.xml.dtm.DTMWSFilter;
import org.apache.xml.dtm.ref.DTMManagerDefault;
import org.apache.xml.dtm.ref.ExpandedNameTable;
@@ -86,6 +85,7 @@
import org.apache.xml.utils.XMLString;
import org.apache.xml.utils.XMLStringFactory;
import org.apache.xml.utils.NodeVector;
+import org.apache.xml.xdm.XDMSequence;
import org.apache.xpath.objects.XSequence;
import org.w3c.dom.*;
import org.xml.sax.ContentHandler;
@@ -3029,7 +3029,7 @@
* @return XSequence object containing one or more values and their type
* information. If no typed value is available, returns an empty sequence.
* */
- public DTMSequence getTypedValue(int nodeHandle)
- {return DTMSequence.EMPTY;}
+ public XDMSequence getTypedValue(int nodeHandle)
+ {return XDMSequence.EMPTY;}
}
1.1.2.4 +1 -0
xml-xalan/java/src/org/apache/xml/dtm/dom2dtm2/Attic/DOM2DTM2Traversers.java
Index: DOM2DTM2Traversers.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/dom2dtm2/Attic/DOM2DTM2Traversers.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- DOM2DTM2Traversers.java 30 Jan 2003 00:39:53 -0000 1.1.2.3
+++ DOM2DTM2Traversers.java 13 Feb 2003 18:20:39 -0000 1.1.2.4
@@ -65,6 +65,7 @@
import javax.xml.transform.Source;
import org.apache.xml.utils.XMLStringFactory;
+import org.apache.xml.xdm.*;
import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.res.XSLMessages;
No revision
No revision
1.29.2.1.2.3 +3 -3
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBase.java
Index: DTMDefaultBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBase.java,v
retrieving revision 1.29.2.1.2.2
retrieving revision 1.29.2.1.2.3
diff -u -r1.29.2.1.2.2 -r1.29.2.1.2.3
--- DTMDefaultBase.java 30 Jan 2003 00:39:54 -0000 1.29.2.1.2.2
+++ DTMDefaultBase.java 13 Feb 2003 18:20:39 -0000 1.29.2.1.2.3
@@ -71,12 +71,12 @@
import org.apache.xml.dtm.DTMAxisTraverser;
import org.apache.xml.dtm.DTMException;
import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTMSequence;
import org.apache.xml.dtm.DTMWSFilter;
import org.apache.xml.utils.BoolStack;
import org.apache.xml.utils.SuballocatedIntVector;
import org.apache.xml.utils.XMLString;
import org.apache.xml.utils.XMLStringFactory;
+import org.apache.xml.xdm.XDMSequence;
import org.apache.xpath.objects.XSequence;
/**
* The <code>DTMDefaultBase</code> class serves as a helper base for DTMs.
@@ -2238,7 +2238,7 @@
* @return XSequence object containing one or more values and their type
* information. If no typed value is available, returns an empty sequence.
* */
- public DTMSequence getTypedValue(int nodeHandle)
- {return DTMSequence.EMPTY;}
+ public XDMSequence getTypedValue(int nodeHandle)
+ {return XDMSequence.EMPTY;}
}
1.15.2.1.2.3 +8 -1
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java
Index: DTMDefaultBaseIterators.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java,v
retrieving revision 1.15.2.1.2.2
retrieving revision 1.15.2.1.2.3
diff -u -r1.15.2.1.2.2 -r1.15.2.1.2.3
--- DTMDefaultBaseIterators.java 11 Feb 2003 10:39:21 -0000
1.15.2.1.2.2
+++ DTMDefaultBaseIterators.java 13 Feb 2003 18:20:40 -0000
1.15.2.1.2.3
@@ -56,7 +56,14 @@
*/
package org.apache.xml.dtm.ref;
-import org.apache.xml.dtm.*;
+//import org.apache.xml.dtm.*;
+import org.apache.xml.xdm.Axis;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.DTMException;
+import org.apache.xml.dtm.DTMAxisIterator;
+import org.apache.xml.dtm.DTMAxisTraverser;
+import org.apache.xml.dtm.DTMWSFilter;
import javax.xml.transform.Source;
1.11.2.1.2.4 +1 -0
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java
Index: DTMDefaultBaseTraversers.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java,v
retrieving revision 1.11.2.1.2.3
retrieving revision 1.11.2.1.2.4
diff -u -r1.11.2.1.2.3 -r1.11.2.1.2.4
--- DTMDefaultBaseTraversers.java 30 Jan 2003 00:39:54 -0000
1.11.2.1.2.3
+++ DTMDefaultBaseTraversers.java 13 Feb 2003 18:20:40 -0000
1.11.2.1.2.4
@@ -61,6 +61,7 @@
import javax.xml.transform.Source;
import org.apache.xml.utils.XMLStringFactory;
+import org.apache.xml.xdm.*;
import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.res.XSLMessages;
1.7.10.1.2.4 +3 -3
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDocumentImpl.java
Index: DTMDocumentImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDocumentImpl.java,v
retrieving revision 1.7.10.1.2.3
retrieving revision 1.7.10.1.2.4
diff -u -r1.7.10.1.2.3 -r1.7.10.1.2.4
--- DTMDocumentImpl.java 30 Jan 2003 00:39:55 -0000 1.7.10.1.2.3
+++ DTMDocumentImpl.java 13 Feb 2003 18:20:40 -0000 1.7.10.1.2.4
@@ -62,12 +62,12 @@
import org.apache.xml.dtm.DTMAxisIterator;
import org.apache.xml.dtm.DTMAxisTraverser;
import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTMSequence;
import org.apache.xml.dtm.DTMWSFilter;
import org.apache.xml.utils.FastStringBuffer;
import org.apache.xml.utils.XMLString;
import org.apache.xml.utils.XMLStringFactory;
import org.apache.xml.utils.NodeVector;
+import org.apache.xml.xdm.XDMSequence;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
@@ -2532,8 +2532,8 @@
* @return XSequence object containing one or more values and their type
* information. If no typed value is available, returns an empty sequence.
* */
- public DTMSequence getTypedValue(int nodeHandle)
- {return DTMSequence.EMPTY;}
+ public XDMSequence getTypedValue(int nodeHandle)
+ {return XDMSequence.EMPTY;}
/**
* @see org.apache.xml.dtm.DTM#getManager()
1.13.12.3 +2 -1
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMNodeProxy.java
Index: DTMNodeProxy.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMNodeProxy.java,v
retrieving revision 1.13.12.2
retrieving revision 1.13.12.3
diff -u -r1.13.12.2 -r1.13.12.3
--- DTMNodeProxy.java 30 Jan 2003 00:39:54 -0000 1.13.12.2
+++ DTMNodeProxy.java 13 Feb 2003 18:20:40 -0000 1.13.12.3
@@ -58,7 +58,8 @@
import org.w3c.dom.*;
import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.Axis;
+import org.apache.xml.xdm.*;
+import org.apache.xml.xdm.Axis;
/**
* <meta name="usage" content="internal"/>
No revision
No revision
1.29.2.1.2.5 +1 -0
xml-xalan/java/src/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java
Index: SAX2DTM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java,v
retrieving revision 1.29.2.1.2.4
retrieving revision 1.29.2.1.2.5
diff -u -r1.29.2.1.2.4 -r1.29.2.1.2.5
--- SAX2DTM.java 30 Jan 2003 00:40:03 -0000 1.29.2.1.2.4
+++ SAX2DTM.java 13 Feb 2003 18:20:41 -0000 1.29.2.1.2.5
@@ -66,6 +66,7 @@
import org.apache.xml.dtm.*;
import org.apache.xml.dtm.ref.*;
+import org.apache.xml.xdm.Axis;
import org.apache.xml.utils.StringVector;
import org.apache.xml.utils.IntVector;
import org.apache.xml.utils.FastStringBuffer;
No revision
No revision
1.2.4.1.2.2 +2 -2
xml-xalan/java/src/org/apache/xml/dtm/ref/xni2dtm/Attic/DTM_XSequence.java
Index: DTM_XSequence.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/xni2dtm/Attic/DTM_XSequence.java,v
retrieving revision 1.2.4.1.2.1
retrieving revision 1.2.4.1.2.2
diff -u -r1.2.4.1.2.1 -r1.2.4.1.2.2
--- DTM_XSequence.java 30 Jan 2003 00:39:58 -0000 1.2.4.1.2.1
+++ DTM_XSequence.java 13 Feb 2003 18:20:41 -0000 1.2.4.1.2.2
@@ -56,7 +56,7 @@
*/
package org.apache.xml.dtm.ref.xni2dtm;
-import org.apache.xml.dtm.DTMSequence;
+import org.apache.xml.xdm.XDMSequence;
/** This class provides an API representation for the XPath 2 Data Model's
"Sequences"
* -- which are the basic representation for typed values. Only built-in
types,
@@ -67,7 +67,7 @@
* the effort, since XNI2DTM will use a stored instance.)
* */
public class DTM_XSequence
-implements DTMSequence
+implements XDMSequence
{
Object[] values;
1.2.4.1.2.9 +4 -4
xml-xalan/java/src/org/apache/xml/dtm/ref/xni2dtm/Attic/XNI2DTM.java
Index: XNI2DTM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/xni2dtm/Attic/XNI2DTM.java,v
retrieving revision 1.2.4.1.2.8
retrieving revision 1.2.4.1.2.9
diff -u -r1.2.4.1.2.8 -r1.2.4.1.2.9
--- XNI2DTM.java 30 Jan 2003 00:39:58 -0000 1.2.4.1.2.8
+++ XNI2DTM.java 13 Feb 2003 18:20:41 -0000 1.2.4.1.2.9
@@ -79,10 +79,10 @@
import org.apache.xerces.xni.psvi.ItemPSVI;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTMSequence;
import org.apache.xml.dtm.DTMWSFilter;
import org.apache.xml.utils.SparseVector;
import org.apache.xml.utils.WrappedRuntimeException;
+import org.apache.xml.xdm.XDMSequence;
import org.apache.xpath.objects.XSequence;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -345,7 +345,7 @@
* processing instruction nodes... but we haven't yet defined Error.
* %REVIEW%
* */
- public DTMSequence getTypedValue(int nodeHandle)
+ public XDMSequence getTypedValue(int nodeHandle)
{
// Determine whether instance of built-in type, or list thereof
// If so, map to corresponding Java type
@@ -355,14 +355,14 @@
int identity=makeNodeIdentity(nodeHandle);
if(identity==DTM.NULL)
- return DTMSequence.EMPTY;
+ return XDMSequence.EMPTY;
int nodetype=_type(identity);
if(nodetype==DTM.DOCUMENT_NODE
|| nodetype==DTM.NAMESPACE_NODE
|| nodetype==DTM.COMMENT_NODE
|| nodetype==DTM.PROCESSING_INSTRUCTION_NODE)
- return DTMSequence.EMPTY;
+ return XDMSequence.EMPTY;
XPath2Type
actualType=(XPath2Type)m_schemaTypeOverride.elementAt(identity);
if(actualType==null)
1.1.2.1.2.7 +3 -3
xml-xalan/java/src/org/apache/xml/dtm/ref/xni2dtm/Attic/XPath2Type.java
Index: XPath2Type.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/xni2dtm/Attic/XPath2Type.java,v
retrieving revision 1.1.2.1.2.6
retrieving revision 1.1.2.1.2.7
diff -u -r1.1.2.1.2.6 -r1.1.2.1.2.7
--- XPath2Type.java 30 Jan 2003 00:39:58 -0000 1.1.2.1.2.6
+++ XPath2Type.java 13 Feb 2003 18:20:41 -0000 1.1.2.1.2.7
@@ -65,7 +65,7 @@
import org.apache.xerces.impl.xs.psvi.XSTypeDefinition;
import org.apache.xerces.xni.NamespaceContext;
import org.apache.xerces.xni.psvi.ItemPSVI;
-import org.apache.xml.dtm.DTMSequence;
+import org.apache.xml.xdm.XDMSequence;
/** The full XNI ItemPSVI is far too heavy-weight for
* our needs. But their XSTypeDecl isn't quite heavy enough; it gives
@@ -215,7 +215,7 @@
* to the Built-In Type we have inherited from -- or null if no such
* mapping exists (eg, if actualType was complex)
* */
- public DTMSequence typedValue(String textvalue,
org.xml.sax.helpers.NamespaceSupport nsctxt)
+ public XDMSequence typedValue(String textvalue,
org.xml.sax.helpers.NamespaceSupport nsctxt)
{
Object value;
DTM_XSequence seq=null;
@@ -295,7 +295,7 @@
}
// Should the failure be empty, or error?
- return seq==null ? DTMSequence.EMPTY : seq;
+ return seq==null ? XDMSequence.EMPTY : seq;
}
/** @return individual element type, if this is a list-of; else null.
No revision
No revision
1.1.2.1 +225 -0 xml-xalan/java/src/org/apache/xml/xdm/Attic/Axis.java
1.1.2.1 +406 -0
xml-xalan/java/src/org/apache/xml/xdm/Attic/SAX2DTMDesign.html
1.1.2.1 +139 -0
xml-xalan/java/src/org/apache/xml/xdm/Attic/XDMConfigurationException.java
1.1.2.1 +1279 -0
xml-xalan/java/src/org/apache/xml/xdm/Attic/XDMCursor.java
1.1.2.1 +129 -0
xml-xalan/java/src/org/apache/xml/xdm/Attic/XDMDesign.html
1.1.2.1 +408 -0
xml-xalan/java/src/org/apache/xml/xdm/Attic/XDMException.java
1.1.2.1 +469 -0
xml-xalan/java/src/org/apache/xml/xdm/Attic/XDMManager.java
1.1.2.1 +206 -0
xml-xalan/java/src/org/apache/xml/xdm/Attic/XDMNodeVisitor.java
1.1.2.1 +135 -0
xml-xalan/java/src/org/apache/xml/xdm/Attic/XDMSequence.java
1.1.2.1 +137 -0
xml-xalan/java/src/org/apache/xml/xdm/Attic/XDMSequenceEmpty.java
1.1.2.1 +137 -0
xml-xalan/java/src/org/apache/xml/xdm/Attic/XDMTreeWalker.java
1.1.2.1 +93 -0
xml-xalan/java/src/org/apache/xml/xdm/Attic/XDMWSFilter.java
No revision
No revision
1.1.2.1 +754 -0
xml-xalan/java/src/org/apache/xml/xdm/ref/Attic/XDMCursorDTM.java
1.1.2.1 +190 -0
xml-xalan/java/src/org/apache/xml/xdm/ref/Attic/XDMManagerDTM.java
1.1.2.1 +255 -0
xml-xalan/java/src/org/apache/xml/xdm/ref/Attic/XDMSelfCursorDTM.java
1.1.2.1 +438 -0
xml-xalan/java/src/org/apache/xml/xdm/ref/Attic/XDMTraverserCursorDTM.java
1.1.2.1 +242 -0
xml-xalan/java/src/org/apache/xml/xdm/ref/Attic/XDMTreeWalkerDTM.java
1.1.2.1 +116 -0
xml-xalan/java/src/org/apache/xml/xdm/ref/Attic/XDMTypedTraverserCursorDTM.java
No revision
No revision
1.40.2.1.2.2 +1 -1 xml-xalan/java/src/org/apache/xpath/XPathContext.java
Index: XPathContext.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPathContext.java,v
retrieving revision 1.40.2.1.2.1
retrieving revision 1.40.2.1.2.2
diff -u -r1.40.2.1.2.1 -r1.40.2.1.2.2
--- XPathContext.java 20 Aug 2002 14:45:28 -0000 1.40.2.1.2.1
+++ XPathContext.java 13 Feb 2003 18:20:45 -0000 1.40.2.1.2.2
@@ -72,6 +72,7 @@
import org.apache.xml.utils.QName;
import org.apache.xml.utils.NodeVector;
import org.apache.xml.utils.WrappedRuntimeException;
+import org.apache.xml.xdm.Axis;
import org.apache.xalan.res.XSLMessages;
import org.apache.xpath.res.XPATHErrorResources;
import org.apache.xpath.axes.ContextNodeList;
@@ -105,7 +106,6 @@
import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMWSFilter;
-import org.apache.xml.dtm.Axis;
// Utility imports.
import org.apache.xml.utils.SAXSourceLocator;
No revision
No revision
1.10.4.1.2.2 +2 -2
xml-xalan/java/src/org/apache/xpath/axes/AttributeIterator.java
Index: AttributeIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/AttributeIterator.java,v
retrieving revision 1.10.4.1.2.1
retrieving revision 1.10.4.1.2.2
diff -u -r1.10.4.1.2.1 -r1.10.4.1.2.2
--- AttributeIterator.java 30 Jan 2003 14:18:03 -0000 1.10.4.1.2.1
+++ AttributeIterator.java 13 Feb 2003 18:20:46 -0000 1.10.4.1.2.2
@@ -57,8 +57,8 @@
package org.apache.xpath.axes;
import javax.xml.transform.TransformerException;
-import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTM;
+import org.apache.xml.xdm.Axis;
import org.apache.xpath.parser.StepExpr;
/**
@@ -103,7 +103,7 @@
*/
public int getAxis()
{
- return org.apache.xml.dtm.Axis.ATTRIBUTE;
+ return org.apache.xml.xdm.Axis.ATTRIBUTE;
}
1.24.2.1.2.3 +1 -1
xml-xalan/java/src/org/apache/xpath/axes/AxesWalker.java
Index: AxesWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/AxesWalker.java,v
retrieving revision 1.24.2.1.2.2
retrieving revision 1.24.2.1.2.3
diff -u -r1.24.2.1.2.2 -r1.24.2.1.2.3
--- AxesWalker.java 30 Jan 2003 14:18:04 -0000 1.24.2.1.2.2
+++ AxesWalker.java 13 Feb 2003 18:20:46 -0000 1.24.2.1.2.3
@@ -639,7 +639,7 @@
{
String namespace = getNamespace();
String localname = getLocalName();
- return org.apache.xml.dtm.Axis.names[m_axis]+"::"+
+ return org.apache.xml.xdm.Axis.names[m_axis]+"::"+
((null != namespace) ? (namespace+":") : "")+
((null != localname) ? localname : "node()")+
" "+super.toString();
1.10.4.1.2.2 +2 -2
xml-xalan/java/src/org/apache/xpath/axes/ChildIterator.java
Index: ChildIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/ChildIterator.java,v
retrieving revision 1.10.4.1.2.1
retrieving revision 1.10.4.1.2.2
diff -u -r1.10.4.1.2.1 -r1.10.4.1.2.2
--- ChildIterator.java 30 Jan 2003 14:18:05 -0000 1.10.4.1.2.1
+++ ChildIterator.java 13 Feb 2003 18:20:46 -0000 1.10.4.1.2.2
@@ -57,8 +57,8 @@
package org.apache.xpath.axes;
import javax.xml.transform.TransformerException;
-import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTM;
+import org.apache.xml.xdm.Axis;
import org.apache.xpath.XPathContext;
import org.apache.xpath.parser.StepExpr;
@@ -160,7 +160,7 @@
*/
public int getAxis()
{
- return org.apache.xml.dtm.Axis.CHILD;
+ return org.apache.xml.xdm.Axis.CHILD;
}
1.14.4.1.2.3 +2 -2
xml-xalan/java/src/org/apache/xpath/axes/ChildTestIterator.java
Index: ChildTestIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/ChildTestIterator.java,v
retrieving revision 1.14.4.1.2.2
retrieving revision 1.14.4.1.2.3
diff -u -r1.14.4.1.2.2 -r1.14.4.1.2.3
--- ChildTestIterator.java 30 Jan 2003 14:18:04 -0000 1.14.4.1.2.2
+++ ChildTestIterator.java 13 Feb 2003 18:20:47 -0000 1.14.4.1.2.3
@@ -57,10 +57,10 @@
package org.apache.xpath.axes;
import javax.xml.transform.TransformerException;
-import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMAxisTraverser;
import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.xdm.Axis;
import org.apache.xpath.parser.StepExpr;
/**
@@ -203,7 +203,7 @@
*/
public int getAxis()
{
- return org.apache.xml.dtm.Axis.CHILD;
+ return org.apache.xml.xdm.Axis.CHILD;
}
/**
1.15.4.1.2.2 +1 -1
xml-xalan/java/src/org/apache/xpath/axes/DescendantIterator.java
Index: DescendantIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/DescendantIterator.java,v
retrieving revision 1.15.4.1.2.1
retrieving revision 1.15.4.1.2.2
diff -u -r1.15.4.1.2.1 -r1.15.4.1.2.2
--- DescendantIterator.java 30 Jan 2003 14:18:04 -0000 1.15.4.1.2.1
+++ DescendantIterator.java 13 Feb 2003 18:20:47 -0000 1.15.4.1.2.2
@@ -57,11 +57,11 @@
package org.apache.xpath.axes;
import javax.xml.transform.TransformerException;
-import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMAxisTraverser;
import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.xdm.Axis;
import org.apache.xpath.Expression;
import org.apache.xpath.VariableStack;
import org.apache.xpath.XPathContext;
1.2.4.1.2.4 +1 -1
xml-xalan/java/src/org/apache/xpath/axes/FilterExprIteratorSimple.java
Index: FilterExprIteratorSimple.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/FilterExprIteratorSimple.java,v
retrieving revision 1.2.4.1.2.3
retrieving revision 1.2.4.1.2.4
diff -u -r1.2.4.1.2.3 -r1.2.4.1.2.4
--- FilterExprIteratorSimple.java 30 Jan 2003 14:18:05 -0000
1.2.4.1.2.3
+++ FilterExprIteratorSimple.java 13 Feb 2003 18:20:47 -0000
1.2.4.1.2.4
@@ -58,10 +58,10 @@
import javax.xml.transform.TransformerException;
-import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.utils.PrefixResolver;
+import org.apache.xml.xdm.Axis;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
import org.apache.xpath.VariableComposeState;
1.20.4.1.2.2 +1 -1
xml-xalan/java/src/org/apache/xpath/axes/FilterExprWalker.java
Index: FilterExprWalker.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/FilterExprWalker.java,v
retrieving revision 1.20.4.1.2.1
retrieving revision 1.20.4.1.2.2
diff -u -r1.20.4.1.2.1 -r1.20.4.1.2.2
--- FilterExprWalker.java 30 Jan 2003 14:18:04 -0000 1.20.4.1.2.1
+++ FilterExprWalker.java 13 Feb 2003 18:20:47 -0000 1.20.4.1.2.2
@@ -56,9 +56,9 @@
*/
package org.apache.xpath.axes;
-import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.xdm.Axis;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
import org.apache.xpath.VariableComposeState;
1.35.2.1.2.4 +1 -1
xml-xalan/java/src/org/apache/xpath/axes/LocPathIterator.java
Index: LocPathIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/LocPathIterator.java,v
retrieving revision 1.35.2.1.2.3
retrieving revision 1.35.2.1.2.4
diff -u -r1.35.2.1.2.3 -r1.35.2.1.2.4
--- LocPathIterator.java 30 Jan 2003 14:18:04 -0000 1.35.2.1.2.3
+++ LocPathIterator.java 13 Feb 2003 18:20:47 -0000 1.35.2.1.2.4
@@ -1055,7 +1055,7 @@
String localname = getLocalName();
if(getAxis() >= 0)
{
- return org.apache.xml.dtm.Axis.names[getAxis()]+"::"+
+ return org.apache.xml.xdm.Axis.names[getAxis()]+"::"+
((null != namespace) ? (namespace+":") : "")+
((null != localname) ? localname : "node()")+
" "+super.toString();
1.4.4.1.2.3 +1 -2
xml-xalan/java/src/org/apache/xpath/axes/MatchPatternIterator.java
Index: MatchPatternIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/MatchPatternIterator.java,v
retrieving revision 1.4.4.1.2.2
retrieving revision 1.4.4.1.2.3
diff -u -r1.4.4.1.2.2 -r1.4.4.1.2.3
--- MatchPatternIterator.java 30 Jan 2003 14:18:03 -0000 1.4.4.1.2.2
+++ MatchPatternIterator.java 13 Feb 2003 18:20:47 -0000 1.4.4.1.2.3
@@ -62,7 +62,7 @@
import org.apache.xpath.objects.XObject;
import org.apache.xpath.XPathContext;
import org.apache.xml.utils.PrefixResolver;
-import org.apache.xpath.axes.SubContextList;
+import org.apache.xml.xdm.Axis;
import org.apache.xpath.patterns.StepPattern;
import org.apache.xpath.VariableStack;
import org.apache.xpath.patterns.NodeTest;
@@ -70,7 +70,6 @@
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTMAxisTraverser;
/**
1.10.4.1.2.3 +1 -2
xml-xalan/java/src/org/apache/xpath/axes/ReverseAxesWalker.java
Index: ReverseAxesWalker.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/ReverseAxesWalker.java,v
retrieving revision 1.10.4.1.2.2
retrieving revision 1.10.4.1.2.3
diff -u -r1.10.4.1.2.2 -r1.10.4.1.2.3
--- ReverseAxesWalker.java 30 Jan 2003 14:18:05 -0000 1.10.4.1.2.2
+++ ReverseAxesWalker.java 13 Feb 2003 18:20:47 -0000 1.10.4.1.2.3
@@ -58,7 +58,6 @@
import java.util.Vector;
-import org.apache.xpath.axes.LocPathIterator;
import org.apache.xpath.XPath;
import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XObject;
@@ -68,7 +67,7 @@
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.Axis;
+import org.apache.xml.xdm.Axis;
/**
* Walker for a reverse axes.
1.23.2.1.2.2 +2 -2
xml-xalan/java/src/org/apache/xpath/axes/WalkerFactory.java
Index: WalkerFactory.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/WalkerFactory.java,v
retrieving revision 1.23.2.1.2.1
retrieving revision 1.23.2.1.2.2
diff -u -r1.23.2.1.2.1 -r1.23.2.1.2.2
--- WalkerFactory.java 30 Jan 2003 14:18:04 -0000 1.23.2.1.2.1
+++ WalkerFactory.java 13 Feb 2003 18:20:47 -0000 1.23.2.1.2.2
@@ -58,9 +58,9 @@
import javax.xml.transform.TransformerException;
import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.xdm.Axis;
import org.apache.xpath.Expression;
import org.apache.xpath.functions.FuncLast;
import org.apache.xpath.functions.FuncPosition;
@@ -517,7 +517,7 @@
{
stepExpr = (StepExpr) pathExpr.jjtGetChild(1);
PatternAxis axisExpr = stepExpr.getAxisExpr();
- axisExpr.setAxis(org.apache.xml.dtm.Axis.DESCENDANTSFROMROOT);
+ axisExpr.setAxis(org.apache.xml.xdm.Axis.DESCENDANTSFROMROOT);
}
else
stepExpr = (StepExpr) pathExpr.jjtGetChild(0);
1.7.4.1.2.2 +1 -1
xml-xalan/java/src/org/apache/xpath/axes/WalkingIteratorSorted.java
Index: WalkingIteratorSorted.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/WalkingIteratorSorted.java,v
retrieving revision 1.7.4.1.2.1
retrieving revision 1.7.4.1.2.2
diff -u -r1.7.4.1.2.1 -r1.7.4.1.2.2
--- WalkingIteratorSorted.java 30 Jan 2003 14:18:04 -0000
1.7.4.1.2.1
+++ WalkingIteratorSorted.java 13 Feb 2003 18:20:47 -0000
1.7.4.1.2.2
@@ -56,8 +56,8 @@
*/
package org.apache.xpath.axes;
-import org.apache.xml.dtm.Axis;
import org.apache.xml.utils.PrefixResolver;
+import org.apache.xml.xdm.Axis;
import org.apache.xpath.VariableComposeState;
/**
No revision
No revision
1.1.2.3 +1 -1
xml-xalan/java/src/org/apache/xpath/functions/Attic/FuncAverage.java
Index: FuncAverage.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/Attic/FuncAverage.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FuncAverage.java 30 Jan 2003 14:18:09 -0000 1.1.2.2
+++ FuncAverage.java 13 Feb 2003 18:20:48 -0000 1.1.2.3
@@ -62,7 +62,7 @@
//import org.w3c.dom.traversal.NodeIterator;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMSequence;
+import org.apache.xml.xdm.XDMSequence;
import java.util.Vector;
1.5.6.4 +2 -2
xml-xalan/java/src/org/apache/xpath/functions/FuncBoolean.java
Index: FuncBoolean.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncBoolean.java,v
retrieving revision 1.5.6.3
retrieving revision 1.5.6.4
diff -u -r1.5.6.3 -r1.5.6.4
--- FuncBoolean.java 30 Jan 2003 14:18:10 -0000 1.5.6.3
+++ FuncBoolean.java 13 Feb 2003 18:20:48 -0000 1.5.6.4
@@ -68,7 +68,7 @@
import org.apache.xpath.objects.XSequence;
import org.apache.xpath.objects.XSequenceImpl;
import org.apache.xpath.objects.XNodeSequenceSingleton;
-import org.apache.xml.dtm.DTMSequence;
+import org.apache.xml.xdm.XDMSequence;
/**
* <meta name="usage" content="advanced"/>
@@ -94,7 +94,7 @@
if (item instanceof XNodeSequenceSingleton)
{
XNodeSequenceSingleton xnss = (XNodeSequenceSingleton)item;
- //DTMSequence ds = xnss.getDTM().getTypedValue(xnss.getNodeHandle());
+ //XDMSequence ds = xnss.getDTM().getTypedValue(xnss.getNodeHandle());
XObject obj =
XObjectFactory.create(xnss.getDTM().getNodeValue(xnss.getNodeHandle()));
return obj.bool() ? XBoolean.S_TRUE : XBoolean.S_FALSE;
}
1.1.2.1.2.2 +2 -2
xml-xalan/java/src/org/apache/xpath/functions/Attic/FuncData.java
Index: FuncData.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/Attic/FuncData.java,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- FuncData.java 30 Jan 2003 14:18:10 -0000 1.1.2.1.2.1
+++ FuncData.java 13 Feb 2003 18:20:48 -0000 1.1.2.1.2.2
@@ -60,7 +60,7 @@
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xml.dtm.DTMSequence;
+import org.apache.xml.xdm.XDMSequence;
import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XJavaObject;
@@ -109,7 +109,7 @@
org.apache.xml.dtm.DTM sourceDTM=xctxt.getDTM(sourceHandle);
- DTMSequence seq=sourceDTM.getTypedValue(sourceHandle);
+ XDMSequence seq=sourceDTM.getTypedValue(sourceHandle);
// %TODO% Other kinds of objects?
return new org.apache.xpath.objects.XDTMSequence(seq);
1.1.2.3 +1 -1
xml-xalan/java/src/org/apache/xpath/functions/Attic/FuncMax.java
Index: FuncMax.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/Attic/FuncMax.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FuncMax.java 30 Jan 2003 14:18:10 -0000 1.1.2.2
+++ FuncMax.java 13 Feb 2003 18:20:48 -0000 1.1.2.3
@@ -62,8 +62,8 @@
//import org.w3c.dom.traversal.NodeIterator;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMSequence;
import org.apache.xml.dtm.XType;
+import org.apache.xml.xdm.XDMSequence;
import java.util.Vector;
1.1.2.3 +1 -1
xml-xalan/java/src/org/apache/xpath/functions/Attic/FuncMin.java
Index: FuncMin.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/Attic/FuncMin.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FuncMin.java 30 Jan 2003 14:18:10 -0000 1.1.2.2
+++ FuncMin.java 13 Feb 2003 18:20:48 -0000 1.1.2.3
@@ -62,8 +62,8 @@
//import org.w3c.dom.traversal.NodeIterator;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMSequence;
import org.apache.xml.dtm.XType;
+import org.apache.xml.xdm.XDMSequence;
import java.util.Vector;
No revision
No revision
1.1.2.1.2.4 +5 -5
xml-xalan/java/src/org/apache/xpath/objects/Attic/XDTMSequence.java
Index: XDTMSequence.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/Attic/XDTMSequence.java,v
retrieving revision 1.1.2.1.2.3
retrieving revision 1.1.2.1.2.4
diff -u -r1.1.2.1.2.3 -r1.1.2.1.2.4
--- XDTMSequence.java 30 Jan 2003 14:18:19 -0000 1.1.2.1.2.3
+++ XDTMSequence.java 13 Feb 2003 18:20:48 -0000 1.1.2.1.2.4
@@ -58,12 +58,12 @@
import javax.xml.transform.TransformerException;
-import org.apache.xml.dtm.DTMSequence;
import org.apache.xml.dtm.XType;
import org.apache.xml.utils.DateTimeObj;
import org.apache.xml.utils.Duration;
import org.apache.xml.utils.WrappedRuntimeException;
import org.apache.xml.utils.XMLString;
+import org.apache.xml.xdm.XDMSequence;
/** This class provides an API representation for the XPath 2 Data Model's
"Sequences"
* -- which are the basic representation for typed values. Only built-in
types,
@@ -71,20 +71,20 @@
* DM; complex schema-types must be accessed through the document tree.
*
* This implementation exists as a wrapper/proxy for the primitive
- * DTMSequence object. DTM is not aware of XPath, and DTMSequence
+ * XDMSequence object. DTM is not aware of XPath, and XDMSequence
* returns its values as primitive Java objects; we need to re-express
* that in XPath objects.
* */
public class XDTMSequence extends XObject implements XSequence
{
- DTMSequence m_dtmseq;
+ XDMSequence m_dtmseq;
protected int m_pos = -1;
protected int m_homogtype = -1; // cache getTypes()
/** Create a sequence, initially empty.
* */
- public XDTMSequence(DTMSequence seq)
+ public XDTMSequence(XDMSequence seq)
{
m_dtmseq=seq;
}
@@ -191,7 +191,7 @@
m_homogtype=XType.EMPTYSEQ;
else
{
- // AT THIS TIME, DTMSequences are always homogenous
+ // AT THIS TIME, XDMSequences are always homogenous
// collections of primitives,
// so I can just check the current element. If that
// changes, we'll have to loop and check for conflicts.
1.2.14.1.2.3 +1 -0
xml-xalan/java/src/org/apache/xpath/objects/XObjectFactory.java
Index: XObjectFactory.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XObjectFactory.java,v
retrieving revision 1.2.14.1.2.2
retrieving revision 1.2.14.1.2.3
diff -u -r1.2.14.1.2.2 -r1.2.14.1.2.3
--- XObjectFactory.java 30 Jan 2003 14:18:19 -0000 1.2.14.1.2.2
+++ XObjectFactory.java 13 Feb 2003 18:20:48 -0000 1.2.14.1.2.3
@@ -59,6 +59,7 @@
import org.apache.xml.dtm.*;
import org.apache.xml.utils.DateTimeObj;
import org.apache.xml.utils.Duration;
+import org.apache.xml.xdm.*;
import org.apache.xpath.XPathContext;
import org.apache.xpath.NodeSetDTM;
import org.apache.xpath.axes.OneStepIterator;
No revision
No revision
1.1.2.1.2.2 +1 -1
xml-xalan/java/src/org/apache/xpath/parser/Attic/PathExpr.java
Index: PathExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/parser/Attic/PathExpr.java,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- PathExpr.java 30 Jan 2003 14:18:06 -0000 1.1.2.1.2.1
+++ PathExpr.java 13 Feb 2003 18:20:49 -0000 1.1.2.1.2.2
@@ -112,7 +112,7 @@
if(isSlashSlash)
{
node = new StepExpr(m_parser);
- PatternAxis patAxis = new
PatternAxis(org.apache.xml.dtm.Axis.DESCENDANTORSELF, m_parser);
+ PatternAxis patAxis = new
PatternAxis(org.apache.xml.xdm.Axis.DESCENDANTORSELF, m_parser);
patAxis.m_value = "descendant-or-self::"; //
for diagnostics
NodeTest nt = new
NodeTest(org.apache.xml.dtm.DTMFilter.SHOW_ALL, m_parser);
Predicates preds = new Predicates(m_parser);
1.1.2.1.2.2 +1 -1
xml-xalan/java/src/org/apache/xpath/parser/Attic/Pattern.java
Index: Pattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/parser/Attic/Pattern.java,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- Pattern.java 30 Jan 2003 14:18:06 -0000 1.1.2.1.2.1
+++ Pattern.java 13 Feb 2003 18:20:49 -0000 1.1.2.1.2.2
@@ -104,7 +104,7 @@
{
m_exprs.removeElementAt(prevNodePos);
whichAxis =
((SlashOrSlashSlash)prevNode).getisSlashSlash() ?
- org.apache.xml.dtm.Axis.ANCESTOR :
org.apache.xml.dtm.Axis.PARENT;
+ org.apache.xml.xdm.Axis.ANCESTOR :
org.apache.xml.xdm.Axis.PARENT;
if(n instanceof StepPattern)
{
1.1.2.1.2.17 +20 -20
xml-xalan/java/src/org/apache/xpath/parser/Attic/SimpleNode.java
Index: SimpleNode.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/parser/Attic/SimpleNode.java,v
retrieving revision 1.1.2.1.2.16
retrieving revision 1.1.2.1.2.17
diff -u -r1.1.2.1.2.16 -r1.1.2.1.2.17
--- SimpleNode.java 30 Jan 2003 14:18:07 -0000 1.1.2.1.2.16
+++ SimpleNode.java 13 Feb 2003 18:20:49 -0000 1.1.2.1.2.17
@@ -549,7 +549,7 @@
{
newNode = new StepExpr(p);
PatternAxis patAxis =
- new PatternAxis(org.apache.xml.dtm.Axis.ROOT, p);
+ new PatternAxis(org.apache.xml.xdm.Axis.ROOT, p);
patAxis.m_value = "root::"; // for diagnostics
NodeTest nt =
new NodeTest(
@@ -566,7 +566,7 @@
StepPattern spat = new StepPattern();
spat.setWhatToShow(
DTMFilter.SHOW_DOCUMENT | DTMFilter.SHOW_DOCUMENT_FRAGMENT);
- spat.setAxis(org.apache.xml.dtm.Axis.PARENT);
+ spat.setAxis(org.apache.xml.xdm.Axis.PARENT);
//
spat.setT(org.apache.xpath.patterns.StepPattern.PSEUDONAME_ROOT);
newNode = spat;
}
@@ -579,7 +579,7 @@
newNode = new StepExpr(p);
PatternAxis patAxis =
new PatternAxis(
- org.apache.xml.dtm.Axis.DESCENDANTSORSELFFROMROOT,
+ org.apache.xml.xdm.Axis.DESCENDANTSORSELFFROMROOT,
p);
patAxis.m_value = "descendants-from-root::"; // for diagnostics
NodeTest nt =
@@ -597,7 +597,7 @@
StepPattern spat = new StepPattern();
spat.setWhatToShow(
DTMFilter.SHOW_DOCUMENT | DTMFilter.SHOW_DOCUMENT_FRAGMENT);
- spat.setAxis(org.apache.xml.dtm.Axis.ANCESTOR);
+ spat.setAxis(org.apache.xml.xdm.Axis.ANCESTOR);
newNode = spat;
}
}
@@ -660,50 +660,50 @@
// === AXES, ETC. ===
case XPathTreeConstants.JJTAXISDESCENDANT :
- newNode = new PatternAxis(org.apache.xml.dtm.Axis.DESCENDANT, p);
+ newNode = new PatternAxis(org.apache.xml.xdm.Axis.DESCENDANT, p);
break;
case XPathTreeConstants.JJTAXISSELF :
- newNode = new PatternAxis(org.apache.xml.dtm.Axis.SELF, p);
+ newNode = new PatternAxis(org.apache.xml.xdm.Axis.SELF, p);
break;
case XPathTreeConstants.JJTAXISDESCENDANTORSELF :
- newNode = new PatternAxis(org.apache.xml.dtm.Axis.DESCENDANTORSELF,
p);
+ newNode = new PatternAxis(org.apache.xml.xdm.Axis.DESCENDANTORSELF,
p);
break;
case XPathTreeConstants.JJTAXISFOLLOWINGSIBLING :
- newNode = new PatternAxis(org.apache.xml.dtm.Axis.FOLLOWINGSIBLING,
p);
+ newNode = new PatternAxis(org.apache.xml.xdm.Axis.FOLLOWINGSIBLING,
p);
break;
case XPathTreeConstants.JJTAXISFOLLOWING :
- newNode = new PatternAxis(org.apache.xml.dtm.Axis.FOLLOWING, p);
+ newNode = new PatternAxis(org.apache.xml.xdm.Axis.FOLLOWING, p);
break;
case XPathTreeConstants.JJTAXISNAMESPACE :
- newNode = new PatternAxis(org.apache.xml.dtm.Axis.NAMESPACE, p);
+ newNode = new PatternAxis(org.apache.xml.xdm.Axis.NAMESPACE, p);
break;
case XPathTreeConstants.JJTAXISPARENT :
- newNode = new PatternAxis(org.apache.xml.dtm.Axis.PARENT, p);
+ newNode = new PatternAxis(org.apache.xml.xdm.Axis.PARENT, p);
break;
case XPathTreeConstants.JJTAXISANCESTOR :
- newNode = new PatternAxis(org.apache.xml.dtm.Axis.ANCESTOR, p);
+ newNode = new PatternAxis(org.apache.xml.xdm.Axis.ANCESTOR, p);
break;
case XPathTreeConstants.JJTAXISPRECEDINGSIBLING :
- newNode = new PatternAxis(org.apache.xml.dtm.Axis.PRECEDINGSIBLING,
p);
+ newNode = new PatternAxis(org.apache.xml.xdm.Axis.PRECEDINGSIBLING,
p);
break;
case XPathTreeConstants.JJTAXISPRECEDING :
- newNode = new PatternAxis(org.apache.xml.dtm.Axis.PRECEDING, p);
+ newNode = new PatternAxis(org.apache.xml.xdm.Axis.PRECEDING, p);
break;
case XPathTreeConstants.JJTAXISANCESTORORSELF :
- newNode = new PatternAxis(org.apache.xml.dtm.Axis.ANCESTORORSELF, p);
+ newNode = new PatternAxis(org.apache.xml.xdm.Axis.ANCESTORORSELF, p);
break;
case XPathTreeConstants.JJTAXISCHILD :
- newNode = new PatternAxis(org.apache.xml.dtm.Axis.CHILD, p);
+ newNode = new PatternAxis(org.apache.xml.xdm.Axis.CHILD, p);
break;
case XPathTreeConstants.JJTAXISATTRIBUTE :
case XPathTreeConstants.JJTAT :
- newNode = new PatternAxis(org.apache.xml.dtm.Axis.ATTRIBUTE, p);
+ newNode = new PatternAxis(org.apache.xml.xdm.Axis.ATTRIBUTE, p);
break;
case XPathTreeConstants.JJTABBREVIATEDFORWARDSTEP :
{
PatternAxis patAxis =
- new PatternAxis(org.apache.xml.dtm.Axis.CHILD, p);
+ new PatternAxis(org.apache.xml.xdm.Axis.CHILD, p);
patAxis.m_value = "child::"; // for diagnostics
newNode = patAxis;
}
@@ -711,7 +711,7 @@
case XPathTreeConstants.JJTDOT :
{
PatternAxis patAxis =
- new PatternAxis(org.apache.xml.dtm.Axis.SELF, p);
+ new PatternAxis(org.apache.xml.xdm.Axis.SELF, p);
patAxis.m_value = "self::"; // for diagnostics
newNode = patAxis;
NodeTest nt = new NodeTest(org.apache.xml.dtm.DTMFilter.SHOW_ALL,
p);
@@ -721,7 +721,7 @@
case XPathTreeConstants.JJTDOTDOT :
{
PatternAxis patAxis =
- new PatternAxis(org.apache.xml.dtm.Axis.PARENT, p);
+ new PatternAxis(org.apache.xml.xdm.Axis.PARENT, p);
patAxis.m_value = "parent::"; // for diagnostics
newNode = patAxis;
NodeTest nt = new NodeTest(org.apache.xml.dtm.DTMFilter.SHOW_ALL,
p);
1.1.2.1.2.2 +4 -4
xml-xalan/java/src/org/apache/xpath/parser/Attic/StepExpr.java
Index: StepExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/parser/Attic/StepExpr.java,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- StepExpr.java 30 Jan 2003 14:18:07 -0000 1.1.2.1.2.1
+++ StepExpr.java 13 Feb 2003 18:20:49 -0000 1.1.2.1.2.2
@@ -56,8 +56,8 @@
*/
package org.apache.xpath.parser;
-import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTMFilter;
+import org.apache.xml.xdm.Axis;
import org.apache.xpath.axes.LocPathIterator;
/**
@@ -157,10 +157,10 @@
NodeTest ntest = getNodeTest();
if (null != ntest)
{
- if (org.apache.xml.dtm.Axis.ATTRIBUTE == axis)
+ if (org.apache.xml.xdm.Axis.ATTRIBUTE == axis)
ntest.setWhatToShow(org.apache.xml.dtm.DTMFilter.SHOW_ATTRIBUTE);
else
- if (org.apache.xml.dtm.Axis.NAMESPACE == axis)
+ if (org.apache.xml.xdm.Axis.NAMESPACE == axis)
{
ntest.setWhatToShow(org.apache.xml.dtm.DTMFilter.SHOW_NAMESPACE);
org.apache.xml.utils.PrefixResolver resolver =
@@ -190,7 +190,7 @@
if (firstChild instanceof PatternAxis)
return ((PatternAxis) firstChild).getAxis();
else
- return org.apache.xml.dtm.Axis.ALLFROMNODE;
+ return org.apache.xml.xdm.Axis.ALLFROMNODE;
}
/**
No revision
No revision
1.3.12.1.2.2 +1 -1
xml-xalan/java/src/org/apache/xpath/patterns/ContextMatchStepPattern.java
Index: ContextMatchStepPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/ContextMatchStepPattern.java,v
retrieving revision 1.3.12.1.2.1
retrieving revision 1.3.12.1.2.2
diff -u -r1.3.12.1.2.1 -r1.3.12.1.2.2
--- ContextMatchStepPattern.java 30 Jan 2003 14:18:18 -0000
1.3.12.1.2.1
+++ ContextMatchStepPattern.java 13 Feb 2003 18:20:49 -0000
1.3.12.1.2.2
@@ -62,7 +62,7 @@
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.dtm.DTMAxisTraverser;
-import org.apache.xml.dtm.Axis;
+import org.apache.xml.xdm.Axis;
import org.apache.xpath.axes.WalkerFactory; // evil import.
/**
1.24.4.1.2.2 +2 -2
xml-xalan/java/src/org/apache/xpath/patterns/StepPattern.java
Index: StepPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/StepPattern.java,v
retrieving revision 1.24.4.1.2.1
retrieving revision 1.24.4.1.2.2
diff -u -r1.24.4.1.2.1 -r1.24.4.1.2.2
--- StepPattern.java 30 Jan 2003 14:18:18 -0000 1.24.4.1.2.1
+++ StepPattern.java 13 Feb 2003 18:20:49 -0000 1.24.4.1.2.2
@@ -64,10 +64,10 @@
import java.util.Vector;
import javax.xml.transform.TransformerException;
-import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMAxisTraverser;
import org.apache.xml.dtm.DTMFilter;
+import org.apache.xml.xdm.Axis;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionNode;
import org.apache.xpath.ExpressionOwner;
@@ -88,7 +88,7 @@
{
/** The axis for this test. */
- protected int m_axis = org.apache.xml.dtm.Axis.SELF;
+ protected int m_axis = org.apache.xml.xdm.Axis.SELF;
// /**
// * Construct a StepPattern that tests for namespaces and node names.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
