You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mu...@apache.org on 2025/11/07 11:32:11 UTC
(xalan-java) branch xalan-j_xslt3.0_mvn updated: committing xalan-j xslt 3.0 xsl:mode instruction implementation improvements
This is an automated email from the ASF dual-hosted git repository.
mukulg pushed a commit to branch xalan-j_xslt3.0_mvn
in repository https://gitbox.apache.org/repos/asf/xalan-java.git
The following commit(s) were added to refs/heads/xalan-j_xslt3.0_mvn by this push:
new b484bc4de committing xalan-j xslt 3.0 xsl:mode instruction implementation improvements
b484bc4de is described below
commit b484bc4deec2118d510db4b229ab9864aaecd19a
Author: Mukul Gandhi <ga...@gmail.com>
AuthorDate: Fri Nov 7 17:01:49 2025 +0530
committing xalan-j xslt 3.0 xsl:mode instruction implementation improvements
---
.../java/org/apache/xalan/lib/ExsltDynamic.java | 60 ++---
.../java/org/apache/xalan/lib/ExsltStrings.java | 3 +
src/main/java/org/apache/xalan/lib/Extensions.java | 7 +
.../apache/xalan/processor/ProcessorInclude.java | 4 +-
.../processor/XSL3TransformerFactoryImpl.java | 2 +
.../apache/xalan/serialize/SerializerUtils.java | 12 +-
.../apache/xalan/templates/ElemApplyTemplates.java | 63 ++++-
.../org/apache/xalan/templates/ElemChoose.java | 2 +-
.../apache/xalan/templates/ElemForEachGroup.java | 2 +-
.../java/org/apache/xalan/templates/ElemIf.java | 2 +-
.../xalan/templates/ElemMatchingSubstring.java | 2 +-
.../org/apache/xalan/templates/ElemNamespace.java | 25 +-
.../xalan/templates/ElemNonMatchingSubstring.java | 2 +-
.../apache/xalan/templates/ElemResultDocument.java | 1 +
.../org/apache/xalan/templates/ElemVariable.java | 266 ++++++++++++++-------
.../org/apache/xalan/templates/StylesheetRoot.java | 4 -
.../xalan/transformer/TransformerIdentityImpl.java | 7 +-
.../apache/xalan/transformer/TransformerImpl.java | 8 +-
src/main/java/org/apache/xalan/xslt/Process.java | 12 +-
.../xslt/util/XslTransformEvaluationHelper.java | 44 ++--
src/main/java/org/apache/xml/dtm/DTMManager.java | 127 +++++++---
.../org/apache/xml/dtm/ref/DTMManagerDefault.java | 28 ++-
src/main/java/org/apache/xml/utils/DOM2Helper.java | 8 +-
src/main/java/org/apache/xml/utils/DOMHelper.java | 5 +-
.../xpath/axes/FilterExprIteratorSimple.java | 2 +-
.../xpath/composite/SequenceTypeSupport.java | 4 +
.../org/apache/xpath/functions/FuncDeepEqual.java | 3 +-
.../org/apache/xpath/functions/FuncParseXml.java | 8 +-
.../xpath/functions/FuncParseXmlFragment.java | 9 +-
.../org/apache/xpath/functions/FuncTransform.java | 9 +-
.../XSL3ConstructorOrExtensionFunction.java | 4 +-
.../apache/xpath/functions/json/FuncJsonToXml.java | 3 +
.../xpath/functions/string/FuncAnalyzeString.java | 6 +-
.../org/apache/xpath/jaxp/XPathExpressionImpl.java | 9 +-
src/main/java/org/apache/xpath/jaxp/XPathImpl.java | 9 +-
.../org/apache/xpath/objects/XdmAttributeItem.java | 3 +-
.../org/apache/xpath/objects/XdmNamespaceItem.java | 72 ++++++
.../xslt3/result/attr/_match-test-set_result.xml | 14 +-
.../xslt3/result/attr/_mode-test-set_result.xml | 8 +-
.../result/w3c_xslt3_testsuite_xalan-j_result.xml | 6 +-
40 files changed, 619 insertions(+), 246 deletions(-)
diff --git a/src/main/java/org/apache/xalan/lib/ExsltDynamic.java b/src/main/java/org/apache/xalan/lib/ExsltDynamic.java
index 31213d812..941f2ade7 100644
--- a/src/main/java/org/apache/xalan/lib/ExsltDynamic.java
+++ b/src/main/java/org/apache/xalan/lib/ExsltDynamic.java
@@ -27,6 +27,7 @@ import javax.xml.transform.TransformerException;
import org.apache.xalan.extensions.ExpressionContext;
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xml.utils.Constants;
import org.apache.xpath.NodeSet;
import org.apache.xpath.NodeSetDTM;
import org.apache.xpath.XPath;
@@ -393,37 +394,40 @@ public class ExsltDynamic extends ExsltBase
if (object instanceof XMLNodeCursorImpl)
{
- NodeList nodelist = null;
- nodelist = ((XMLNodeCursorImpl)object).nodelist();
-
- for (int k = 0; k < nodelist.getLength(); k++)
- {
- Node n = nodelist.item(k);
- if (!resultSet.contains(n))
- resultSet.addNode(n);
- }
+ NodeList nodelist = null;
+ nodelist = ((XMLNodeCursorImpl)object).nodelist();
+
+ for (int k = 0; k < nodelist.getLength(); k++)
+ {
+ Node n = nodelist.item(k);
+ if (!resultSet.contains(n))
+ resultSet.addNode(n);
+ }
}
else
{
- if (lDoc == null)
- {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
- lDoc = db.newDocument();
- }
-
- Element element = null;
- if (object instanceof XNumber)
- element = lDoc.createElementNS(EXSL_URI, "exsl:number");
- else if (object instanceof XBoolean)
- element = lDoc.createElementNS(EXSL_URI, "exsl:boolean");
- else
- element = lDoc.createElementNS(EXSL_URI, "exsl:string");
-
- Text textNode = lDoc.createTextNode(object.str());
- element.appendChild(textNode);
- resultSet.addNode(element);
+ if (lDoc == null)
+ {
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ DocumentBuilder db = dbf.newDocumentBuilder();
+
+ lDoc = db.newDocument();
+ }
+
+ Element element = null;
+ if (object instanceof XNumber)
+ element = lDoc.createElementNS(EXSL_URI, "exsl:number");
+ else if (object instanceof XBoolean)
+ element = lDoc.createElementNS(EXSL_URI, "exsl:boolean");
+ else
+ element = lDoc.createElementNS(EXSL_URI, "exsl:string");
+
+ Text textNode = lDoc.createTextNode(object.str());
+ element.appendChild(textNode);
+ resultSet.addNode(element);
}
}
catch (Exception e)
diff --git a/src/main/java/org/apache/xalan/lib/ExsltStrings.java b/src/main/java/org/apache/xalan/lib/ExsltStrings.java
index 2404baec3..c1efd6e49 100644
--- a/src/main/java/org/apache/xalan/lib/ExsltStrings.java
+++ b/src/main/java/org/apache/xalan/lib/ExsltStrings.java
@@ -25,6 +25,7 @@ import java.util.StringTokenizer;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.xml.utils.Constants;
import org.apache.xpath.NodeSet;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -339,6 +340,8 @@ public class ExsltStrings extends ExsltBase
static {
try
{
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
m_doc =DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
}
diff --git a/src/main/java/org/apache/xalan/lib/Extensions.java b/src/main/java/org/apache/xalan/lib/Extensions.java
index 7dd4a4b6f..f342b7a4a 100644
--- a/src/main/java/org/apache/xalan/lib/Extensions.java
+++ b/src/main/java/org/apache/xalan/lib/Extensions.java
@@ -29,6 +29,7 @@ import javax.xml.parsers.ParserConfigurationException;
import org.apache.xalan.extensions.ExpressionContext;
import org.apache.xalan.xslt.EnvironmentCheck;
+import org.apache.xml.utils.Constants;
import org.apache.xpath.NodeSet;
import org.apache.xpath.objects.XBoolean;
import org.apache.xpath.objects.XNumber;
@@ -111,6 +112,8 @@ public class Extensions
// Document myDoc = myProcessor.getContextNode().getOwnerDocument();
try
{
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder db = dbf.newDocumentBuilder();
Document myDoc = db.newDocument();
@@ -306,6 +309,8 @@ public class Extensions
Document factoryDocument;
try
{
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder db = dbf.newDocumentBuilder();
factoryDocument = db.newDocument();
@@ -403,6 +408,8 @@ public class Extensions
{
try
{
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
m_doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
}
diff --git a/src/main/java/org/apache/xalan/processor/ProcessorInclude.java b/src/main/java/org/apache/xalan/processor/ProcessorInclude.java
index ce88531e8..d5992eaec 100644
--- a/src/main/java/org/apache/xalan/processor/ProcessorInclude.java
+++ b/src/main/java/org/apache/xalan/processor/ProcessorInclude.java
@@ -416,11 +416,11 @@ public class ProcessorInclude extends XSLTElementProcessor
private void saveNsBindingsXSLIncludedStylesheet(StylesheetHandler handler) throws SAXException {
try {
String xslIncludedStylesheetAbsUri = SystemIDResolver.getAbsoluteURI(getHref(), handler.getBaseIdentifier());
+
System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
-
+ dbf.setNamespaceAware(true);
DocumentBuilder dBuilder = dbf.newDocumentBuilder();
Document xslDocument = dBuilder.parse(xslIncludedStylesheetAbsUri);
diff --git a/src/main/java/org/apache/xalan/processor/XSL3TransformerFactoryImpl.java b/src/main/java/org/apache/xalan/processor/XSL3TransformerFactoryImpl.java
index ff33b035c..25ea152ed 100644
--- a/src/main/java/org/apache/xalan/processor/XSL3TransformerFactoryImpl.java
+++ b/src/main/java/org/apache/xalan/processor/XSL3TransformerFactoryImpl.java
@@ -878,6 +878,7 @@ public class XSL3TransformerFactoryImpl extends SAXTransformerFactory
else if (source instanceof StreamSource) {
if (xslStylesheetSystemId != null) {
System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
Document document = null;
@@ -906,6 +907,7 @@ public class XSL3TransformerFactoryImpl extends SAXTransformerFactory
if (source instanceof SAXSource) {
System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
Document document = null;
diff --git a/src/main/java/org/apache/xalan/serialize/SerializerUtils.java b/src/main/java/org/apache/xalan/serialize/SerializerUtils.java
index 32d3269d8..d2a26b80c 100644
--- a/src/main/java/org/apache/xalan/serialize/SerializerUtils.java
+++ b/src/main/java/org/apache/xalan/serialize/SerializerUtils.java
@@ -30,6 +30,7 @@ import org.apache.xml.utils.XMLString;
import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XdmAttributeItem;
+import org.apache.xpath.objects.XdmNamespaceItem;
import org.xml.sax.SAXException;
/**
@@ -48,9 +49,18 @@ public class SerializerUtils
*
* This list stores xdm attribute items, that're not serialized
* but are emitted during an XSL transformation and may need to
- * be checked with an XPath sequence type.
+ * be checked with an xdm sequence type.
*/
public static List<XdmAttributeItem> m_xdmAttrList = new ArrayList<XdmAttributeItem>();
+
+ /**
+ * Class field, representing a list of xdm namespace node items.
+ *
+ * This list stores xdm namespace node items, that're not serialized
+ * but are emitted during an XSL transformation and may need to
+ * be checked with an xdm sequence type.
+ */
+ public static List<XdmNamespaceItem> m_xdmNamespaceList = new ArrayList<XdmNamespaceItem>();
/**
* Copy an DOM attribute to the created output element, executing
diff --git a/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java b/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java
index 20f6aae35..6f0d48f4c 100644
--- a/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java
+++ b/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java
@@ -416,8 +416,8 @@ public class ElemApplyTemplates extends ElemCallTemplate
}
}
else if ((varEvalResult instanceof XSAnyAtomicType) || (varEvalResult instanceof XString) ||
- (varEvalResult instanceof XBoolean) ||
- (varEvalResult instanceof XNumber)) {
+ (varEvalResult instanceof XBoolean) ||
+ (varEvalResult instanceof XNumber)) {
xslApplyTemplatesAtomicValue(transformer, xctxt, varEvalResult, xslTemplateInvokeMode);
return;
@@ -880,8 +880,7 @@ public class ElemApplyTemplates extends ElemCallTemplate
throw new TransformerException(errMesg, srcLocator);
}
- else if (!((Constants.ATTRVAL_TEXT_ONLY_COPY).equals(onNoMatchStr) || (Constants.ATTRVAL_DEEP_COPY).equals(onNoMatchStr) ||
- (Constants.ATTRVAL_DEEP_SKIP).equals(onNoMatchStr) || (Constants.ATTRVAL_SHALLOW_SKIP).equals(onNoMatchStr))) {
+ else {
throw new TransformerException("XTTE0505 : An XSL mode instruction's attribute \"on-no-match\" has disallowed "
+ "value '" + onNoMatchStr + "'.", elemMode);
}
@@ -941,8 +940,7 @@ public class ElemApplyTemplates extends ElemCallTemplate
throw new TransformerException(errMesg, srcLocator);
}
- else if (!((Constants.ATTRVAL_TEXT_ONLY_COPY).equals(onNoMatchStr) || (Constants.ATTRVAL_DEEP_COPY).equals(onNoMatchStr) ||
- (Constants.ATTRVAL_DEEP_SKIP).equals(onNoMatchStr) || (Constants.ATTRVAL_SHALLOW_SKIP).equals(onNoMatchStr))) {
+ else {
throw new TransformerException("XTTE0505 : An XSL mode instruction's attribute \"on-no-match\" has disallowed "
+ "value '" + onNoMatchStr + "'.", elemMode);
}
@@ -960,7 +958,58 @@ public class ElemApplyTemplates extends ElemCallTemplate
break;
}
- continue;
+ continue;
+ case DTM.NAMESPACE_NODE :
+ nodeTypeStr = Constants.ELEMNAME_NAMESPACE_STRING;
+ if (elemMode != null) {
+ String nodeNameStr = dtm.getNodeName(child);
+ if (onNoMatchStr != null) {
+ if ((Constants.ATTRVAL_TEXT_ONLY_COPY).equals(onNoMatchStr) || (Constants.ATTRVAL_DEEP_COPY).equals(onNoMatchStr)
+ || (Constants.ATTRVAL_SHALLOW_COPY).equals(onNoMatchStr)
+ || (Constants.ATTRVAL_DEEP_SKIP).equals(onNoMatchStr)
+ || (Constants.ATTRVAL_SHALLOW_SKIP).equals(onNoMatchStr)) {
+ // Not processing an XML namespace node, for now.
+ // Handling this, further down this method.
+ }
+ else if ((Constants.ATTRVAL_FAIL).equals(onNoMatchStr)) {
+ String errMesg = "XTDE0555 : An XSL template declaration could not be found to process an XML " + nodeTypeStr + " node";
+ if (nodeNameStr != null) {
+ errMesg = (errMesg + " '" + nodeNameStr + "'.");
+ }
+ else {
+ errMesg = (errMesg + ".");
+ }
+
+ throw new TransformerException(errMesg, srcLocator);
+ }
+ else {
+ throw new TransformerException("XTTE0505 : An XSL mode instruction's attribute \"on-no-match\" has disallowed "
+ + "value '" + onNoMatchStr + "'.", elemMode);
+ }
+ }
+
+ if (elemMode.isWarningOnNoMatch()) {
+ /**
+ * Emit an, XSL stylesheet processing warning, when xsl:mode
+ * instruction specifies an attribute 'warning-on-no-match' with
+ * boolean value true.
+ */
+ emitXslTransformNoRuleMatchWarning(nodeNameStr, nodeTypeStr, xctxt, srcLocator);
+ }
+
+ if ((Constants.ATTRVAL_SHALLOW_COPY).equals(onNoMatchStr) || (Constants.ATTRVAL_DEEP_COPY).equals(onNoMatchStr)) {
+ String xslNamespaceName = dtm.getNodeName(child);
+ String data = dtm.getNodeValue(child);
+ int idx = xslNamespaceName.indexOf(':');
+ if (idx > -1) {
+ xslNamespaceName = xslNamespaceName.substring(idx + 1);
+ }
+
+ transformer.getResultTreeHandler().namespaceAfterStartElement(xslNamespaceName, data);
+ }
+ }
+
+ continue;
case DTM.DOCUMENT_NODE :
template = sroot.getDefaultRootRule();
break;
diff --git a/src/main/java/org/apache/xalan/templates/ElemChoose.java b/src/main/java/org/apache/xalan/templates/ElemChoose.java
index 36b870fa0..3e01c0b76 100644
--- a/src/main/java/org/apache/xalan/templates/ElemChoose.java
+++ b/src/main/java/org/apache/xalan/templates/ElemChoose.java
@@ -207,7 +207,7 @@ public class ElemChoose extends ElemTemplateElement
else {
strVal = xpath3ContextItem.str();
}
- DTM docFragDtm = dtmMgr.createDTMForSimpleXMLDocument(strVal);
+ DTM docFragDtm = dtmMgr.constructShallowXmlDTMTree(strVal, null, null);
int contextNode = docFragDtm.getFirstChild(docFragDtm.getDocument());
xctxtNew.pushCurrentNode(contextNode);
diff --git a/src/main/java/org/apache/xalan/templates/ElemForEachGroup.java b/src/main/java/org/apache/xalan/templates/ElemForEachGroup.java
index 08b92c47b..6a6b02157 100644
--- a/src/main/java/org/apache/xalan/templates/ElemForEachGroup.java
+++ b/src/main/java/org/apache/xalan/templates/ElemForEachGroup.java
@@ -674,7 +674,7 @@ public class ElemForEachGroup extends ElemTemplateElement
// Construct an XML DOM wrapper over a sequence of input
// atomic values, for the purpose of grouping
- DTM dtm = dtmManager.getDTMFromResultSequence(resultSeq);
+ DTM dtm = dtmManager.constructXmlDTMTreeFromResultSequence(resultSeq);
int docNodeHandle = dtm.getDocument();
int topMostElemNodeHandle = dtm.getFirstChild(docNodeHandle);
diff --git a/src/main/java/org/apache/xalan/templates/ElemIf.java b/src/main/java/org/apache/xalan/templates/ElemIf.java
index 6ce59afd0..e4eb824b9 100644
--- a/src/main/java/org/apache/xalan/templates/ElemIf.java
+++ b/src/main/java/org/apache/xalan/templates/ElemIf.java
@@ -250,7 +250,7 @@ public class ElemIf extends ElemTemplateElement
else {
strVal = xpath3ContextItem.str();
}
- DTM docFragDtm = dtmMgr.createDTMForSimpleXMLDocument(strVal);
+ DTM docFragDtm = dtmMgr.constructShallowXmlDTMTree(strVal, null, null);
int contextNode = docFragDtm.getFirstChild(docFragDtm.getDocument());
xctxtNew.pushCurrentNode(contextNode);
diff --git a/src/main/java/org/apache/xalan/templates/ElemMatchingSubstring.java b/src/main/java/org/apache/xalan/templates/ElemMatchingSubstring.java
index a944e5710..1ef260aad 100644
--- a/src/main/java/org/apache/xalan/templates/ElemMatchingSubstring.java
+++ b/src/main/java/org/apache/xalan/templates/ElemMatchingSubstring.java
@@ -208,7 +208,7 @@ public class ElemMatchingSubstring extends ElemTemplateElement implements Expres
xctxtNew.setLast(xctxt.getLast());
DTMManager dtmMgr = xctxtNew.getDTMManager();
- DTM docFragDtm = dtmMgr.createDTMForSimpleXMLDocument(strValueTobeEvaluated);
+ DTM docFragDtm = dtmMgr.constructShallowXmlDTMTree(strValueTobeEvaluated, null, null);
int contextNode = docFragDtm.getFirstChild(docFragDtm.getDocument());
diff --git a/src/main/java/org/apache/xalan/templates/ElemNamespace.java b/src/main/java/org/apache/xalan/templates/ElemNamespace.java
index 5814b13b3..ba6529b99 100644
--- a/src/main/java/org/apache/xalan/templates/ElemNamespace.java
+++ b/src/main/java/org/apache/xalan/templates/ElemNamespace.java
@@ -23,6 +23,7 @@ import javax.xml.transform.SourceLocator;
import javax.xml.transform.TransformerException;
import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.serialize.SerializerUtils;
import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xalan.xslt.util.XslTransformEvaluationHelper;
import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
@@ -31,6 +32,7 @@ import org.apache.xml.utils.XML11Char;
import org.apache.xpath.XPath;
import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XObject;
+import org.apache.xpath.objects.XdmNamespaceItem;
import org.w3c.dom.DOMException;
/**
@@ -252,13 +254,15 @@ public class ElemNamespace extends ElemTemplateElement
}
AnyURIDV xsAnyUriDv = new AnyURIDV();
- try {
- Object xsAnyUriObj1 = xsAnyUriDv.getActualValue(data, null);
+ try {
+ // Validate string value with lexical space of XML
+ // Schema data type xs:anyURI.
+ xsAnyUriDv.getActualValue(data, null);
}
catch (InvalidDatatypeValueException ex) {
throw new TransformerException("XTDE0905 : An XSL namespace instruction, produced an URI value "
- + "that is not valid in the lexical space of "
- + "the datatype xs:anyURI.", srcLocator);
+ + "that is not valid with lexical space of "
+ + "XML Schema data type xs:anyURI.", srcLocator);
}
if (m_selectExpression != null) {
@@ -306,8 +310,17 @@ public class ElemNamespace extends ElemTemplateElement
}
try
- {
- transformer.getResultTreeHandler().namespaceAfterStartElement(xslNamespaceName, data);
+ {
+ ElemTemplateElement xslParentElem = getParentElem();
+ if (!((xslParentElem instanceof ElemVariable) || (xslParentElem instanceof ElemFunction))) {
+ // An xsl:namespace instruction, is not xsl:variable or xsl:function
+ // instruction's XSL child node.
+ transformer.getResultTreeHandler().namespaceAfterStartElement(xslNamespaceName, data);
+ }
+ else {
+ XdmNamespaceItem xdmNamespaceItem = new XdmNamespaceItem(xslNamespaceName, data);
+ (SerializerUtils.m_xdmNamespaceList).add(xdmNamespaceItem);
+ }
}
catch(org.xml.sax.SAXException se)
{
diff --git a/src/main/java/org/apache/xalan/templates/ElemNonMatchingSubstring.java b/src/main/java/org/apache/xalan/templates/ElemNonMatchingSubstring.java
index fbcac7491..bb12e3b2b 100644
--- a/src/main/java/org/apache/xalan/templates/ElemNonMatchingSubstring.java
+++ b/src/main/java/org/apache/xalan/templates/ElemNonMatchingSubstring.java
@@ -191,7 +191,7 @@ public class ElemNonMatchingSubstring extends ElemTemplateElement implements Exp
xctxtNew.setLast(xctxt.getLast());
DTMManager dtmMgr = xctxtNew.getDTMManager();
- DTM docFragDtm = dtmMgr.createDTMForSimpleXMLDocument(strValueTobeEvaluated);
+ DTM docFragDtm = dtmMgr.constructShallowXmlDTMTree(strValueTobeEvaluated, null, null);
int contextNode = docFragDtm.getFirstChild(docFragDtm.getDocument());
diff --git a/src/main/java/org/apache/xalan/templates/ElemResultDocument.java b/src/main/java/org/apache/xalan/templates/ElemResultDocument.java
index b04dd46ab..37b93b388 100644
--- a/src/main/java/org/apache/xalan/templates/ElemResultDocument.java
+++ b/src/main/java/org/apache/xalan/templates/ElemResultDocument.java
@@ -509,6 +509,7 @@ public class ElemResultDocument extends ElemTemplateElement
DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
+
StringReader strReader = new StringReader(resultStrValue);
Document document = docBuilder.parse(new InputSource(strReader));
diff --git a/src/main/java/org/apache/xalan/templates/ElemVariable.java b/src/main/java/org/apache/xalan/templates/ElemVariable.java
index 7606d946f..20dc77c53 100644
--- a/src/main/java/org/apache/xalan/templates/ElemVariable.java
+++ b/src/main/java/org/apache/xalan/templates/ElemVariable.java
@@ -45,6 +45,7 @@ import org.apache.xpath.composite.SequenceTypeData;
import org.apache.xpath.composite.SequenceTypeFunctionTest;
import org.apache.xpath.composite.SequenceTypeKindTest;
import org.apache.xpath.composite.SequenceTypeSupport;
+import org.apache.xpath.composite.SequenceTypeSupport.OccurrenceIndicator;
import org.apache.xpath.composite.XPathArrayConstructor;
import org.apache.xpath.composite.XPathNamedFunctionReference;
import org.apache.xpath.composite.XPathTextAndNodeExpr;
@@ -65,6 +66,8 @@ import org.apache.xpath.objects.XPathMap;
import org.apache.xpath.objects.XRTreeFrag;
import org.apache.xpath.objects.XRTreeFragSelectWrapper;
import org.apache.xpath.objects.XString;
+import org.apache.xpath.objects.XdmAttributeItem;
+import org.apache.xpath.objects.XdmNamespaceItem;
import org.apache.xpath.operations.ArrowOp;
import org.apache.xpath.operations.Operation;
import org.apache.xpath.operations.Range;
@@ -462,9 +465,10 @@ public class ElemVariable extends ElemTemplateElement
if (m_asAttr != null && !(XSL3FunctionService.XS_VALID_TRUE).equals(evalResultStrValue)) {
evalResult = SequenceTypeSupport.castXdmValueToAnotherType(evalResult, m_asAttr, null, xctxt);
if (evalResult == null) {
- String xpathPatternStr = m_selectPattern.getPatternString();
- throw new TransformerException("XTTE0570 : The supplied value " + xpathPatternStr + ", doesn't "
- + "match an expected XPath sequence type " + m_asAttr + ".", srcLocator);
+ String xpathPatternStr = m_selectPattern.getPatternString();
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation result, doesn't "
+ + "match an expected xdm sequence type "
+ + m_asAttr + ".", srcLocator);
}
}
else if (m_asAttr != null && (XSL3FunctionService.XS_VALID_TRUE).equals(evalResultStrValue)) {
@@ -477,9 +481,9 @@ public class ElemVariable extends ElemTemplateElement
evalResult = valToBeValidated;
}
else {
- String xpathPatternStr = m_selectPattern.getPatternString();
- throw new TransformerException("XTTE0570 : The supplied value " + xpathPatternStr + ", doesn't "
- + "match an expected XPath sequence type " + m_asAttr + ".", srcLocator);
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation result, doesn't "
+ + "match an expected xdm sequence type "
+ + m_asAttr + ".", srcLocator);
}
}
else if (m_asAttr == null && (XSL3FunctionService.XS_VALID_TRUE).equals(evalResultStrValue)) {
@@ -502,8 +506,9 @@ public class ElemVariable extends ElemTemplateElement
if (m_asAttr != null) {
evalResult = SequenceTypeSupport.castXdmValueToAnotherType(evalResult, m_asAttr, null, xctxt);
if (evalResult == null) {
- throw new javax.xml.transform.TransformerException("XTTE0570 : An XSL variable's value is not of an expected "
- + "XPath sequence type " + m_asAttr +".", srcLocator);
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation result, doesn't "
+ + "match an expected xdm sequence type "
+ + m_asAttr + ".", srcLocator);
}
}
@@ -552,7 +557,9 @@ public class ElemVariable extends ElemTemplateElement
if (m_asAttr != null) {
evalResult = SequenceTypeSupport.castXdmValueToAnotherType(evalResult, m_asAttr, null, xctxt);
if (evalResult == null) {
- throw new javax.xml.transform.TransformerException("XTTE0570 : An XSL variable's value is not of an expected XPath sequence type " + m_asAttr +".", srcLocator);
+ throw new javax.xml.transform.TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation result, "
+ + "doesn't match the specified xdm sequence type "
+ + m_asAttr +".", srcLocator);
}
}
@@ -816,17 +823,125 @@ public class ElemVariable extends ElemTemplateElement
if (m_parentNode instanceof Stylesheet) {
// Global variable
rootNodeHandleOfRtf = transformer.transformToGlobalRTF(this);
-
- int attrCount = SerializerUtils.m_xdmAttrList.size();
+
+ int attrCount = (SerializerUtils.m_xdmAttrList).size();
if (attrCount > 0) {
- ResultSequence rSeq = new ResultSequence();
- for (int idx = 0; idx < attrCount; idx++) {
- rSeq.add((SerializerUtils.m_xdmAttrList).get(idx));
- }
-
- (SerializerUtils.m_xdmAttrList).clear();
-
- var = rSeq;
+ ResultSequence rSeq = new ResultSequence();
+ for (int idx = 0; idx < attrCount; idx++) {
+ rSeq.add((SerializerUtils.m_xdmAttrList).get(idx));
+ }
+
+ (SerializerUtils.m_xdmAttrList).clear();
+
+ var = rSeq;
+
+ if (m_asAttr != null) {
+ XPath seqTypeXPath = new XPath(m_asAttr, srcLocator, xctxt.getNamespaceContext(), XPath.SELECT, null, true);
+
+ XObject seqTypeExpressionEvalResult = seqTypeXPath.execute(xctxt, xctxt.getContextNode(), xctxt.getNamespaceContext());
+
+ SequenceTypeData seqExpectedTypeData = (SequenceTypeData)seqTypeExpressionEvalResult;
+ SequenceTypeKindTest seqTypeKindTest = seqExpectedTypeData.getSequenceTypeKindTest();
+ int seqTypeKindVal = seqTypeKindTest.getKindVal();
+
+ if (seqTypeKindVal == SequenceTypeSupport.ATTRIBUTE_KIND) {
+ if (var instanceof ResultSequence) {
+ ResultSequence rSeq2 = (ResultSequence)var;
+ int rSeqLength = rSeq2.size();
+ int count = 0;
+ for (int idx = 0; idx < rSeqLength; idx++) {
+ XObject xObj = rSeq2.item(idx);
+ if (xObj instanceof XdmAttributeItem) {
+ count++;
+ }
+ }
+
+ if ((rSeqLength >= 1) && (count == rSeqLength)) {
+ boolean isXdmValueConformsType = false;
+ int seqTypeOccrIndicator = seqExpectedTypeData.getItemTypeOccurrenceIndicator();
+ if ((seqTypeOccrIndicator == OccurrenceIndicator.ZERO_OR_MANY)
+ || (seqTypeOccrIndicator == OccurrenceIndicator.ONE_OR_MANY)) {
+ isXdmValueConformsType = true;
+ }
+ else if ((seqTypeOccrIndicator == OccurrenceIndicator.ZERO_OR_ONE) && (rSeqLength <= 1)) {
+ isXdmValueConformsType = true;
+ }
+ else if ((seqTypeOccrIndicator == OccurrenceIndicator.ABSENT) && (rSeqLength == 1)) {
+ isXdmValueConformsType = true;
+ }
+
+ if (isXdmValueConformsType) {
+ return var;
+ }
+ else {
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation "
+ + "result doesn't match the specified "
+ + "xdm sequence type " + m_asAttr + ".", srcLocator);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ int nsCount = (SerializerUtils.m_xdmNamespaceList).size();
+ if (nsCount > 0) {
+ ResultSequence rSeq = new ResultSequence();
+ for (int idx = 0; idx < nsCount; idx++) {
+ rSeq.add((SerializerUtils.m_xdmNamespaceList).get(idx));
+ }
+
+ (SerializerUtils.m_xdmNamespaceList).clear();
+
+ var = rSeq;
+
+ if (m_asAttr != null) {
+ XPath seqTypeXPath = new XPath(m_asAttr, srcLocator, xctxt.getNamespaceContext(), XPath.SELECT, null, true);
+
+ XObject seqTypeExpressionEvalResult = seqTypeXPath.execute(xctxt, xctxt.getContextNode(), xctxt.getNamespaceContext());
+
+ SequenceTypeData seqExpectedTypeData = (SequenceTypeData)seqTypeExpressionEvalResult;
+ SequenceTypeKindTest seqTypeKindTest = seqExpectedTypeData.getSequenceTypeKindTest();
+ int seqTypeKindVal = seqTypeKindTest.getKindVal();
+
+ if (seqTypeKindVal == SequenceTypeSupport.NAMESPACE_NODE_KIND) {
+ if (var instanceof ResultSequence) {
+ ResultSequence rSeq2 = (ResultSequence)var;
+ int rSeqLength = rSeq2.size();
+ int count = 0;
+ for (int idx = 0; idx < rSeqLength; idx++) {
+ XObject xObj = rSeq2.item(idx);
+ if (xObj instanceof XdmNamespaceItem) {
+ count++;
+ }
+ }
+
+ if ((rSeqLength >= 1) && (count == rSeqLength)) {
+ boolean isXdmValueConformsType = false;
+ int seqTypeOccrIndicator = seqExpectedTypeData.getItemTypeOccurrenceIndicator();
+ if ((seqTypeOccrIndicator == OccurrenceIndicator.ZERO_OR_MANY)
+ || (seqTypeOccrIndicator == OccurrenceIndicator.ONE_OR_MANY)) {
+ isXdmValueConformsType = true;
+ }
+ else if ((seqTypeOccrIndicator == OccurrenceIndicator.ZERO_OR_ONE) && (rSeqLength <= 1)) {
+ isXdmValueConformsType = true;
+ }
+ else if ((seqTypeOccrIndicator == OccurrenceIndicator.ABSENT) && (rSeqLength == 1)) {
+ isXdmValueConformsType = true;
+ }
+
+ if (isXdmValueConformsType) {
+ return var;
+ }
+ else {
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation "
+ + "result doesn't match the specified "
+ + "xdm sequence type " + m_asAttr + ".", srcLocator);
+ }
+ }
+ }
+ }
+ }
}
}
else {
@@ -889,15 +1004,15 @@ public class ElemVariable extends ElemTemplateElement
XObject seqTypeExpressionEvalResult = seqTypeXPath.execute(xctxt, xctxt.getContextNode(), xctxt.getNamespaceContext());
SequenceTypeData seqExpectedTypeData = (SequenceTypeData)seqTypeExpressionEvalResult;
- SequenceTypeKindTest seqTypeKindTest = seqExpectedTypeData.getSequenceTypeKindTest();
+ SequenceTypeKindTest seqTypeKindTest = seqExpectedTypeData.getSequenceTypeKindTest();
+
+ int seqTypeOccrIndicator = seqExpectedTypeData.getItemTypeOccurrenceIndicator();
int seqTypeKindVal = 0;
if (seqTypeKindTest != null) {
seqTypeKindVal = seqTypeKindTest.getKindVal();
- if ((seqTypeKindVal == SequenceTypeSupport.DOCUMENT_KIND) && ((seqExpectedTypeData.getItemTypeOccurrenceIndicator() ==
- SequenceTypeSupport.OccurrenceIndicator.ZERO_OR_ONE) ||
- (seqExpectedTypeData.getItemTypeOccurrenceIndicator() ==
- SequenceTypeSupport.OccurrenceIndicator.ZERO_OR_MANY))) {
+ if ((seqTypeKindVal == SequenceTypeSupport.DOCUMENT_KIND) && ((seqTypeOccrIndicator == SequenceTypeSupport.OccurrenceIndicator.ZERO_OR_ONE) ||
+ (seqTypeOccrIndicator == SequenceTypeSupport.OccurrenceIndicator.ZERO_OR_MANY))) {
if (var.equals(XString.EMPTYSTRING)) {
return var;
}
@@ -910,7 +1025,9 @@ public class ElemVariable extends ElemTemplateElement
XslTransformData.m_xpathInlineFunction = null;
}
else {
- throw new TransformerException("XTTE0570 : The supplied xdm item doesn't match an XPath sequence type " + m_asAttr + ".", srcLocator);
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation "
+ + "result doesn't match the specified "
+ + "xdm sequence type " + m_asAttr + ".", srcLocator);
}
}
else if (XslTransformData.m_xpathArray != null) {
@@ -919,7 +1036,9 @@ public class ElemVariable extends ElemTemplateElement
XslTransformData.m_xpathArray = null;
}
else {
- throw new TransformerException("XTTE0570 : The supplied xdm item doesn't match an XPath sequence type " + m_asAttr + ".", srcLocator);
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation "
+ + "result doesn't match the specified "
+ + "xdm sequence type " + m_asAttr + ".", srcLocator);
}
}
else if (XslTransformData.m_xpathMap != null) {
@@ -928,7 +1047,9 @@ public class ElemVariable extends ElemTemplateElement
XslTransformData.m_xpathMap = null;
}
else {
- throw new TransformerException("XTTE0570 : The supplied xdm item doesn't match an XPath sequence type " + m_asAttr + ".", srcLocator);
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation "
+ + "result doesn't match the specified "
+ + "xdm sequence type " + m_asAttr + ".", srcLocator);
}
}
else if (XslTransformData.m_xslDocumentEvaluationResult != null) {
@@ -937,38 +1058,38 @@ public class ElemVariable extends ElemTemplateElement
XslTransformData.m_xslDocumentEvaluationResult = null;
}
else {
- throw new TransformerException("XTTE0570 : The supplied xdm item doesn't match an XPath sequence type " + m_asAttr + ".", srcLocator);
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation "
+ + "result doesn't match the specified "
+ + "xdm sequence type " + m_asAttr + ".", srcLocator);
}
}
else if ((XslTransformData.m_xpathNamedFunctionRefSequence).size() > 0) {
int funcItemSeqSize = (XslTransformData.m_xpathNamedFunctionRefSequence).size();
SequenceTypeFunctionTest sequenceTypeFunctionTest = seqExpectedTypeData.getSequenceTypeFunctionTest();
- int seqTypeItemOccurenceIndicator = seqExpectedTypeData.getItemTypeOccurrenceIndicator();
boolean isSeqCardinalityOk = false;
- if ((funcItemSeqSize == 0) && ((seqTypeItemOccurenceIndicator == SequenceTypeSupport.OccurrenceIndicator.ZERO_OR_MANY) ||
- (seqTypeItemOccurenceIndicator == SequenceTypeSupport.OccurrenceIndicator.ZERO_OR_ONE))) {
+ if ((funcItemSeqSize == 0) && ((seqTypeOccrIndicator == SequenceTypeSupport.OccurrenceIndicator.ZERO_OR_MANY) ||
+ (seqTypeOccrIndicator == SequenceTypeSupport.OccurrenceIndicator.ZERO_OR_ONE))) {
isSeqCardinalityOk = true;
}
- else if ((funcItemSeqSize == 1) && ((seqTypeItemOccurenceIndicator == SequenceTypeSupport.OccurrenceIndicator.ABSENT) ||
- (seqTypeItemOccurenceIndicator == SequenceTypeSupport.OccurrenceIndicator.ZERO_OR_MANY) ||
- (seqTypeItemOccurenceIndicator == SequenceTypeSupport.OccurrenceIndicator.ONE_OR_MANY) ||
- (seqTypeItemOccurenceIndicator == SequenceTypeSupport.OccurrenceIndicator.ZERO_OR_ONE))) {
+ else if ((funcItemSeqSize == 1) && ((seqTypeOccrIndicator == SequenceTypeSupport.OccurrenceIndicator.ABSENT) ||
+ (seqTypeOccrIndicator == SequenceTypeSupport.OccurrenceIndicator.ZERO_OR_MANY) ||
+ (seqTypeOccrIndicator == SequenceTypeSupport.OccurrenceIndicator.ONE_OR_MANY) ||
+ (seqTypeOccrIndicator == SequenceTypeSupport.OccurrenceIndicator.ZERO_OR_ONE))) {
// An XPath sequence type occurrence indicator with value absent, or any
// other occurrence indicator is ok for this case.
isSeqCardinalityOk = true;
}
- else if ((seqTypeItemOccurenceIndicator == SequenceTypeSupport.OccurrenceIndicator.ZERO_OR_MANY) ||
- (seqTypeItemOccurenceIndicator == SequenceTypeSupport.OccurrenceIndicator.ONE_OR_MANY)) {
+ else if ((seqTypeOccrIndicator == SequenceTypeSupport.OccurrenceIndicator.ZERO_OR_MANY) ||
+ (seqTypeOccrIndicator == SequenceTypeSupport.OccurrenceIndicator.ONE_OR_MANY)) {
// funcItemSeqSize > 1
isSeqCardinalityOk = true;
}
if (!isSeqCardinalityOk) {
- throw new TransformerException("XTTE0505 : An XSL variable " + m_qname.getLocalName() + "'s value doesn't conform to XPath sequence "
- + "type's occurence indicator, implying that an xdm value's "
- + "cardinality found as " + funcItemSeqSize + " is incorrect. "
- + "The sequence type has been specified as " + m_asAttr + ".", srcLocator);
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation "
+ + "result doesn't match the specified "
+ + "xdm sequence type " + m_asAttr + ".", srcLocator);
}
if (sequenceTypeFunctionTest != null) {
@@ -1031,9 +1152,9 @@ public class ElemVariable extends ElemTemplateElement
SequenceTypeData seqExpectedTypeData2 = (SequenceTypeData)seqTypeExpressionEvalResult2;
if (!seqExpectedTypeData1.equal(seqExpectedTypeData2)) {
- throw new TransformerException("XPTY0004 : An XSL variable " + m_qname.getLocalName() + "'s value doesn't conform to "
- + "XSL variable's type specification " + m_asAttr + ". The "
- + "function parameter specifications doesn't match.", srcLocator);
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation "
+ + "result doesn't match the specified "
+ + "xdm sequence type " + m_asAttr + ".", srcLocator);
}
}
}
@@ -1045,9 +1166,9 @@ public class ElemVariable extends ElemTemplateElement
}
}
else {
- throw new TransformerException("XPTY0004 : An XSL variable " + m_qname.getLocalName() + "'s value doesn't conform to "
- + "XSL variable's type specification " + m_asAttr + ". The "
- + "function arities doesn't match.", srcLocator);
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation "
+ + "result doesn't match the specified "
+ + "xdm sequence type " + m_asAttr + ".", srcLocator);
}
String elemFuncAs = elemFunction.getAs();
@@ -1062,10 +1183,10 @@ public class ElemVariable extends ElemTemplateElement
XObject seqTypeExpressionEvalResult2 = seqTypeXPath2.execute(xctxt, xctxt.getContextNode(), xctxt.getNamespaceContext());
SequenceTypeData seqExpectedTypeData2 = (SequenceTypeData)seqTypeExpressionEvalResult2;
- if (!seqExpectedTypeData1.equal(seqExpectedTypeData2)) {
- throw new TransformerException("XPTY0004 : An XSL variable " + m_qname.getLocalName() + "'s value doesn't conform to "
- + "XSL variable's type specification " + m_asAttr + ". The "
- + "function return types doesn't match.", srcLocator);
+ if (!seqExpectedTypeData1.equal(seqExpectedTypeData2)) {
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation "
+ + "result doesn't match the specified "
+ + "xdm sequence type " + m_asAttr + ".", srcLocator);
}
}
}
@@ -1086,7 +1207,9 @@ public class ElemVariable extends ElemTemplateElement
m_isXPathNamedFunctionRefSequenceVar = true;
}
else {
- throw new TransformerException("XTTE0570 : The supplied xdm item doesn't match an XPath sequence type " + m_asAttr + ".", srcLocator);
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation "
+ + "result doesn't match the specified "
+ + "xdm sequence type " + m_asAttr + ".", srcLocator);
}
}
else if (var instanceof XNodeSetForDOM) {
@@ -1168,7 +1291,9 @@ public class ElemVariable extends ElemTemplateElement
else {
var = SequenceTypeSupport.castXdmValueToAnotherType(var, m_asAttr, null, xctxt);
if (var == null) {
- throw new TransformerException("XTTE0570 : The supplied xdm item doesn't match an XPath sequence type " + m_asAttr + ".", srcLocator);
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation "
+ + "result doesn't match the specified "
+ + "xdm sequence type " + m_asAttr + ".", srcLocator);
}
}
}
@@ -1183,39 +1308,18 @@ public class ElemVariable extends ElemTemplateElement
}
}
else {
- throw new TransformerException("XTTE0570 : The supplied xdm item doesn't match an XPath sequence type " + m_asAttr + ".", srcLocator);
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation "
+ + "result doesn't match the specified "
+ + "xdm sequence type " + m_asAttr + ".", srcLocator);
}
- }
-
- /*boolean isXdmValueConformType = false;
-
- if (seqTypeKindVal == SequenceTypeSupport.ATTRIBUTE_KIND) {
- if (var instanceof ResultSequence) {
- ResultSequence rSeq = (ResultSequence)var;
- int rSeqLength = rSeq.size();
- for (int idx = 0; idx < rSeqLength; idx++) {
- XObject xObj = rSeq.item(idx);
- if (xObj instanceof XdmAttributeItem) {
- isXdmValueConformType = true;
- }
- else {
- isXdmValueConformType = false;
-
- break;
- }
- }
-
- if (!isXdmValueConformType) {
- throw new TransformerException("XTTE0570 : The supplied xdm item doesn't match an XPath sequence type " + m_asAttr + ".", srcLocator);
- }
- }
- }*/
-
+ }
else {
try {
var = SequenceTypeSupport.castXdmValueToAnotherType(var, m_asAttr, null, xctxt);
if (var == null) {
- throw new TransformerException("XTTE0570 : The supplied xdm item doesn't match an XPath sequence type " + m_asAttr + ".", srcLocator);
+ throw new TransformerException("XTTE0570 : An XSL variable " + m_qname.toString() + "'s evaluation "
+ + "result doesn't match the specified "
+ + "xdm sequence type " + m_asAttr + ".", srcLocator);
}
}
catch (TransformerException ex) {
diff --git a/src/main/java/org/apache/xalan/templates/StylesheetRoot.java b/src/main/java/org/apache/xalan/templates/StylesheetRoot.java
index 354864f16..2e81a7569 100644
--- a/src/main/java/org/apache/xalan/templates/StylesheetRoot.java
+++ b/src/main/java/org/apache/xalan/templates/StylesheetRoot.java
@@ -1147,10 +1147,6 @@ public class StylesheetRoot extends StylesheetComposed
XPath xpathMatch = new XPath("comment()", this, this, XPath.MATCH, m_errorListener);
result.setMatch(xpathMatch);
}
- else if (nodeType == DTM.NAMESPACE_NODE) {
- XPath xpathMatch = new XPath("namespace-node()", this, this, XPath.MATCH, m_errorListener);
- result.setMatch(xpathMatch);
- }
return result;
}
diff --git a/src/main/java/org/apache/xalan/transformer/TransformerIdentityImpl.java b/src/main/java/org/apache/xalan/transformer/TransformerIdentityImpl.java
index 5ae0f7010..209458502 100644
--- a/src/main/java/org/apache/xalan/transformer/TransformerIdentityImpl.java
+++ b/src/main/java/org/apache/xalan/transformer/TransformerIdentityImpl.java
@@ -52,6 +52,7 @@ import org.apache.xalan.templates.OutputProperties;
import org.apache.xml.serializer.Method;
import org.apache.xml.serializer.Serializer;
import org.apache.xml.serializer.SerializerFactory;
+import org.apache.xml.utils.Constants;
import org.apache.xml.utils.DOMBuilder;
import org.apache.xml.utils.XMLReaderManager;
import org.w3c.dom.Document;
@@ -215,8 +216,9 @@ public class TransformerIdentityImpl extends Transformer
{
try
{
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-
dbf.setNamespaceAware(true);
if (m_isSecureProcessing)
@@ -348,8 +350,11 @@ public class TransformerIdentityImpl extends Transformer
((SAXSource)source).getXMLReader()==null )||
(source instanceof DOMSource && ((DOMSource)source).getNode()==null)){
try {
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory builderF = DocumentBuilderFactory.newInstance();
DocumentBuilder builder = builderF.newDocumentBuilder();
+
String systemID = source.getSystemId();
source = new DOMSource(builder.newDocument());
diff --git a/src/main/java/org/apache/xalan/transformer/TransformerImpl.java b/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
index 1bff5a993..306f228c5 100644
--- a/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
+++ b/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
@@ -839,9 +839,11 @@ public class TransformerImpl extends Transformer
((SAXSource)source).getXMLReader()==null )||
(source instanceof DOMSource && ((DOMSource)source).getNode()==null)){
try {
- DocumentBuilderFactory builderF =
- DocumentBuilderFactory.newInstance();
- DocumentBuilder builder = builderF.newDocumentBuilder();
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ DocumentBuilder builder = dbf.newDocumentBuilder();
+
String systemID = source.getSystemId();
source = new DOMSource(builder.newDocument());
diff --git a/src/main/java/org/apache/xalan/xslt/Process.java b/src/main/java/org/apache/xalan/xslt/Process.java
index 8adf1129c..e46e7f800 100644
--- a/src/main/java/org/apache/xalan/xslt/Process.java
+++ b/src/main/java/org/apache/xalan/xslt/Process.java
@@ -727,6 +727,8 @@ public class Process
if (flavor.equals("d2d"))
{
// Parse in the xml data into a DOM
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
dfactory.setNamespaceAware(true);
@@ -874,8 +876,9 @@ public class Process
if (flavor.equals("d2d"))
{
// Parse in the xml data into a DOM
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
-
dfactory.setCoalescing(true);
dfactory.setNamespaceAware(true);
@@ -923,10 +926,11 @@ public class Process
identityTransformer.transform(new DOMSource(outNode), strResult);
}
else if (flavor.equals("s2s"))
- {
+ {
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
dfactory.setNamespaceAware(true);
-
DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
Document doc = docBuilder.newDocument();
@@ -1119,6 +1123,8 @@ public class Process
if (null != xslFileName)
{
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
dfactory.setNamespaceAware(true);
diff --git a/src/main/java/org/apache/xalan/xslt/util/XslTransformEvaluationHelper.java b/src/main/java/org/apache/xalan/xslt/util/XslTransformEvaluationHelper.java
index 17f41d0ae..b4c066e00 100644
--- a/src/main/java/org/apache/xalan/xslt/util/XslTransformEvaluationHelper.java
+++ b/src/main/java/org/apache/xalan/xslt/util/XslTransformEvaluationHelper.java
@@ -64,6 +64,7 @@ import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XPathArray;
import org.apache.xpath.objects.XString;
import org.apache.xpath.objects.XdmAttributeItem;
+import org.apache.xpath.objects.XdmNamespaceItem;
import org.apache.xpath.operations.Operation;
import org.apache.xpath.operations.Range;
import org.apache.xpath.operations.SimpleMapOperator;
@@ -300,39 +301,50 @@ public class XslTransformEvaluationHelper {
}
/**
- * Method definition to convert an XDM sequence to a node set.
+ * Method definition, to convert an xdm sequence to a node set.
*/
public static XMLNodeCursorImpl getXNodeSetFromResultSequence(ResultSequence resultSeq, DTMManager dtmMgr) {
- XMLNodeCursorImpl nodeSet = null;
+ XMLNodeCursorImpl result = null;
List<Integer> dtmNodeHandleList = new ArrayList<Integer>();
int rSeqLength = resultSeq.size();
for (int idx = 0; idx < rSeqLength; idx++) {
- XObject nodeSetItem = resultSeq.item(idx);
- if (nodeSetItem instanceof XMLNodeCursorImpl) {
- int nodeDtmHandle = (((XMLNodeCursorImpl)nodeSetItem).iter()).nextNode();
+ XObject xObj = resultSeq.item(idx);
+ if (xObj instanceof XMLNodeCursorImpl) {
+ int nodeDtmHandle = (((XMLNodeCursorImpl)xObj).iter()).nextNode();
dtmNodeHandleList.add(nodeDtmHandle);
}
- /*else if (nodeSetItem instanceof XdmAttributeItem) {
- XdmAttributeItem xdmAttributeItem = (XdmAttributeItem)nodeSetItem;
+ else if (xObj instanceof XdmAttributeItem) {
+ XdmAttributeItem xdmAttributeItem = (XdmAttributeItem)xObj;
+ DTM dtm = dtmMgr.constructShallowXmlDTMTree(null, xdmAttributeItem, null);
+ int docNodeHandle = dtm.getDocument();
+ int docElemHandle = dtm.getFirstChild(docNodeHandle);
+ String attrNamespace = xdmAttributeItem.getAttrNodeNs();
String localName = xdmAttributeItem.getAttrLocalName();
- String namespace = xdmAttributeItem.getAttrNodeNs();
- String attrValue = xdmAttributeItem.getAttrStrValue();
-
- // TO DO
- }*/
+ int attNodeHandle = dtm.getAttributeNode(docElemHandle, attrNamespace, localName);
+ dtmNodeHandleList.add(attNodeHandle);
+ }
+ else if (xObj instanceof XdmNamespaceItem) {
+ XdmNamespaceItem xdmNamespaceItem = (XdmNamespaceItem)xObj;
+ DTM dtm = dtmMgr.constructShallowXmlDTMTree(null, null, xdmNamespaceItem);
+ int docNodeHandle = dtm.getDocument();
+ int docElemHandle = dtm.getFirstChild(docNodeHandle);
+ String localName = xdmNamespaceItem.getNamespaceNodeName();
+ int nsNodeHandle = dtm.getAttributeNode(docElemHandle, "http://www.w3.org/2000/xmlns/", localName);
+ dtmNodeHandleList.add(nsNodeHandle);
+ }
else {
break;
}
}
if (dtmNodeHandleList.size() == resultSeq.size()) {
- nodeSet = new XMLNodeCursorImpl(dtmNodeHandleList, dtmMgr);
+ result = new XMLNodeCursorImpl(dtmNodeHandleList, dtmMgr);
}
- return nodeSet;
+ return result;
}
/**
@@ -789,9 +801,13 @@ public class XslTransformEvaluationHelper {
try {
xmlStr = XslTransformEvaluationHelper.serializeXmlDomElementNode(node);
+
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
dbFactory.setNamespaceAware(true);
DocumentBuilder docBuilder = dbFactory.newDocumentBuilder();
+
StringReader strReader = new StringReader(xmlStr);
InputSource inpSource = new InputSource(strReader);
Document document = docBuilder.parse(inpSource);
diff --git a/src/main/java/org/apache/xml/dtm/DTMManager.java b/src/main/java/org/apache/xml/dtm/DTMManager.java
index 4de4035e8..7f6e24115 100644
--- a/src/main/java/org/apache/xml/dtm/DTMManager.java
+++ b/src/main/java/org/apache/xml/dtm/DTMManager.java
@@ -27,10 +27,14 @@ import javax.xml.transform.dom.DOMSource;
import org.apache.xalan.xslt.util.XslTransformEvaluationHelper;
import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.res.XMLMessages;
+import org.apache.xml.utils.Constants;
import org.apache.xml.utils.PrefixResolver;
import org.apache.xml.utils.XMLStringFactory;
import org.apache.xpath.objects.ResultSequence;
import org.apache.xpath.objects.XObject;
+import org.apache.xpath.objects.XdmAttributeItem;
+import org.apache.xpath.objects.XdmNamespaceItem;
+import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
@@ -217,35 +221,80 @@ public abstract class DTMManager
*/
public abstract DTM createDocumentFragment();
- /*
- * This method constructs a DTM object representing an XML document.
- * The DTM object instance that is constructed by this method, contains
- * only 'one xml element having a text node child'.
+ /**
+ * Method definition, to construct DTM object instance representing
+ * an XML shallow document, containing one XML document element
+ * with a child text node or/and atrribute, namespace node.
*
- * @param strVal string value of the text node, that shall be available
- * within this constructed DTM object.
+ * @param textNodeStrValue The supplied, string value of an
+ * XML text node to be constructed.
+ *
+ * @param xdmAttributeItem An XdmAttributeItem object instance,
+ * derived from XObject, containing an
+ * XML attribute's name and value for an
+ * attribute node to be constructed.
+ *
+ * @param xdmNamespaceItem An XdmNamespaceItem object instance,
+ * derived from XObject, containing an
+ * XML namespace's name and value for
+ * namespace node to be constructed.
*
- * @return the DTM object, that is constructed by this method
+ * @return The constructed DTM object instance
*
*/
- public DTM createDTMForSimpleXMLDocument(String strVal) {
- try {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-
+ public DTM constructShallowXmlDTMTree(String textNodeStrValue, XdmAttributeItem xdmAttributeItem,
+ XdmNamespaceItem xdmNamespaceItem) {
+
+ try {
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
-
DocumentBuilder dBuilder = dbf.newDocumentBuilder();
+
Document document = dBuilder.newDocument();
- // we create a, temporary xml element name here. this xml
- // element name, is unlikely to be present within the xml
- // input document that is been transformed by an xslt
- // stylesheet.
+
+ /**
+ * We form, an XML element temporary name, here. This
+ * XML element name, is unlikely to be present within
+ * one or more XML document's that're transformed by
+ * an XSL stylesheet.
+ */
long currentTimeMills = System.currentTimeMillis();
String elemNameSuffix = (Long.valueOf(currentTimeMills)).toString();
- Element documentElem = document.createElement("t0_" + elemNameSuffix);
- Text textNode = document.createTextNode(strVal);
- documentElem.appendChild(textNode);
- document.appendChild(documentElem);
+ elemNameSuffix = elemNameSuffix.substring(0, 5); // Represents string value with length 5
+
+ Element elem1 = document.createElement("elem_" + elemNameSuffix);
+
+ if (xdmAttributeItem != null) {
+ // Add an XML attribute to element, if this method's caller
+ // provided the needed argument.
+ String localName = xdmAttributeItem.getAttrLocalName();
+ String namespace = xdmAttributeItem.getAttrNodeNs();
+ String attrValue = xdmAttributeItem.getAttrStrValue();
+ Attr attr = document.createAttributeNS(namespace, localName);
+ attr.setValue(attrValue);
+ elem1.setAttributeNode(attr);
+ }
+
+ if (xdmNamespaceItem != null) {
+ // Add an XML namespace node to element, if this method's caller
+ // provided the needed argument.
+ String nsNodeName = xdmNamespaceItem.getNamespaceNodeName();
+ String nsNodeValue = xdmNamespaceItem.getNsNodeValue();
+ Attr attr = document.createAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:" + nsNodeName);
+ attr.setValue(nsNodeValue);
+ elem1.setAttributeNode(attr);
+ }
+
+ if (textNodeStrValue != null) {
+ // Add an XML text node child to this element, if this
+ // method's caller provided the needed argument.
+ Text textNode = document.createTextNode(textNodeStrValue);
+ elem1.appendChild(textNode);
+ }
+
+ document.appendChild(elem1);
return getDTM(new DOMSource(document), true, null, false, false);
}
@@ -255,31 +304,33 @@ public abstract class DTMManager
}
/**
- * Given a supplied sequence of XDM atomic values, construct a DTM
- * wrapper object over the values available within the supplied
- * sequence.
+ * Method definition, to construct DTM object instance, representing
+ * an XML document using the supplied xdm sequence object instance.
*
- * @param resultSeq Sequence of XDM atomic values
- * @return DTM object instance
+ * @param rSeq The supplied xdm sequence object
+ * @return The constructed DTM object instance
*/
- public DTM getDTMFromResultSequence(ResultSequence resultSeq) {
- try {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ public DTM constructXmlDTMTreeFromResultSequence(ResultSequence rSeq) {
+
+ try {
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ DocumentBuilder dBuilder = dbf.newDocumentBuilder();
- dbf.setNamespaceAware(true);
-
- DocumentBuilder dBuilder = dbf.newDocumentBuilder();
Document document = dBuilder.newDocument();
- // Produce, random XML element name values
+ // We form, XML element temporary names, here
String str1 = String.valueOf(System.currentTimeMillis());
- String docElemName = "a_" + str1.substring(0, 5);
- String childElemName = "b_" + str1.substring(0, 5);
+ String docElemName = "a_" + str1.substring(0, 5); // Represents string value with length 5
+ String childElemName = "b_" + str1.substring(0, 5); // Represents string value with length 5
- Element docElem = document.createElement(docElemName);
- for (int idx = 0; idx < resultSeq.size(); idx++) {
- XObject seqItem = resultSeq.item(idx);
- String strVal = XslTransformEvaluationHelper.getStrVal(seqItem);
+ Element docElem = document.createElement(docElemName);
+ int rSeqLength = rSeq.size();
+ for (int idx = 0; idx < rSeqLength; idx++) {
+ XObject xObj = rSeq.item(idx);
+ String strVal = XslTransformEvaluationHelper.getStrVal(xObj);
Element elemNode = document.createElement(childElemName);
Text textNode = document.createTextNode(strVal);
elemNode.appendChild(textNode);
diff --git a/src/main/java/org/apache/xml/dtm/ref/DTMManagerDefault.java b/src/main/java/org/apache/xml/dtm/ref/DTMManagerDefault.java
index f80053b00..465ae8c46 100644
--- a/src/main/java/org/apache/xml/dtm/ref/DTMManagerDefault.java
+++ b/src/main/java/org/apache/xml/dtm/ref/DTMManagerDefault.java
@@ -27,6 +27,7 @@ import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
+import org.apache.xalan.templates.Constants;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMException;
import org.apache.xml.dtm.DTMFilter;
@@ -759,22 +760,23 @@ public class DTMManagerDefault extends DTMManager
synchronized public DTM createDocumentFragment()
{
- try
- {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ try
+ {
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
- dbf.setNamespaceAware(true);
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ DocumentBuilder db = dbf.newDocumentBuilder();
- DocumentBuilder db = dbf.newDocumentBuilder();
- Document doc = db.newDocument();
- Node df = doc.createDocumentFragment();
+ Document doc = db.newDocument();
+ Node df = doc.createDocumentFragment();
- return getDTM(new DOMSource(df), true, null, false, false);
- }
- catch (Exception e)
- {
- throw new DTMException(e);
- }
+ return getDTM(new DOMSource(df), true, null, false, false);
+ }
+ catch (Exception e)
+ {
+ throw new DTMException(e);
+ }
}
/**
diff --git a/src/main/java/org/apache/xml/utils/DOM2Helper.java b/src/main/java/org/apache/xml/utils/DOM2Helper.java
index a7200b793..3e691587c 100644
--- a/src/main/java/org/apache/xml/utils/DOM2Helper.java
+++ b/src/main/java/org/apache/xml/utils/DOM2Helper.java
@@ -27,6 +27,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
+import org.apache.xalan.templates.Constants;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -138,9 +139,10 @@ public class DOM2Helper extends DOMHelper
// I guess I should use JAXP factory here... when it's legal.
// org.apache.xerces.parsers.DOMParser parser
// = new org.apache.xerces.parsers.DOMParser();
- DocumentBuilderFactory builderFactory =
- DocumentBuilderFactory.newInstance();
-
+
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
+ DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setNamespaceAware(true);
builderFactory.setValidating(true);
diff --git a/src/main/java/org/apache/xml/utils/DOMHelper.java b/src/main/java/org/apache/xml/utils/DOMHelper.java
index a76492f73..99c35c32d 100644
--- a/src/main/java/org/apache/xml/utils/DOMHelper.java
+++ b/src/main/java/org/apache/xml/utils/DOMHelper.java
@@ -28,6 +28,7 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.xalan.templates.Constants;
import org.apache.xml.dtm.ref.DTMNodeProxy;
import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.res.XMLMessages;
@@ -81,8 +82,10 @@ public class DOMHelper
// Use an implementation of the JAVA API for XML Parsing 1.0 to
// create a DOM Document node to contain the result.
+
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
-
dfactory.setNamespaceAware(true);
dfactory.setValidating(true);
diff --git a/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java b/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java
index 01add4df0..c32d83a9d 100644
--- a/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java
+++ b/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java
@@ -146,7 +146,7 @@ public class FilterExprIteratorSimple extends LocPathIterator
Object obj1 = null;
if ((exprEvalResult instanceof ResultSequence) && XslTransformEvaluationHelper.isSequenceContainsAllXDMAtomicValues((ResultSequence)exprEvalResult)) {
DTMManager dtmMgr = xctxt.getDTMManager();
- DTM dtm = dtmMgr.getDTMFromResultSequence((ResultSequence)exprEvalResult);
+ DTM dtm = dtmMgr.constructXmlDTMTreeFromResultSequence((ResultSequence)exprEvalResult);
int docNodeHandle = dtm.getDocument();
int docElemHandle = dtm.getFirstChild(docNodeHandle);
int nextNode = dtm.getFirstChild(docElemHandle);
diff --git a/src/main/java/org/apache/xpath/composite/SequenceTypeSupport.java b/src/main/java/org/apache/xpath/composite/SequenceTypeSupport.java
index 6eeb9b245..b89c3daf6 100644
--- a/src/main/java/org/apache/xpath/composite/SequenceTypeSupport.java
+++ b/src/main/java/org/apache/xpath/composite/SequenceTypeSupport.java
@@ -36,6 +36,7 @@ import javax.xml.validation.Schema;
import javax.xml.validation.Validator;
import org.apache.xalan.serialize.SerializerUtils;
+import org.apache.xalan.templates.Constants;
import org.apache.xalan.templates.ElemSequence;
import org.apache.xalan.templates.StylesheetRoot;
import org.apache.xalan.templates.XMLNSDecl;
@@ -1529,9 +1530,12 @@ public class SequenceTypeSupport {
throws ParserConfigurationException, SAXException, IOException {
boolean isNodeValidWithSchemaType = false;
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
DocumentBuilder dBuilder = dbf.newDocumentBuilder();
+
Document document = dBuilder.parse(new ByteArrayInputStream(xmlDocumentStr.getBytes()));
String xsTargetNamespace = null;
diff --git a/src/main/java/org/apache/xpath/functions/FuncDeepEqual.java b/src/main/java/org/apache/xpath/functions/FuncDeepEqual.java
index 78bc703d2..c86eb2b70 100644
--- a/src/main/java/org/apache/xpath/functions/FuncDeepEqual.java
+++ b/src/main/java/org/apache/xpath/functions/FuncDeepEqual.java
@@ -300,8 +300,7 @@ public class FuncDeepEqual extends FunctionMultiArgs {
System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
-
+ dbf.setNamespaceAware(true);
DocumentBuilder dBuilder = dbf.newDocumentBuilder();
Document document1 = dBuilder.parse(new ByteArrayInputStream(xmlStr1.getBytes()));
diff --git a/src/main/java/org/apache/xpath/functions/FuncParseXml.java b/src/main/java/org/apache/xpath/functions/FuncParseXml.java
index 141d31f38..d3e7884a0 100644
--- a/src/main/java/org/apache/xpath/functions/FuncParseXml.java
+++ b/src/main/java/org/apache/xpath/functions/FuncParseXml.java
@@ -25,6 +25,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.SourceLocator;
import javax.xml.transform.dom.DOMSource;
+import org.apache.xalan.templates.Constants;
import org.apache.xalan.xslt.util.XslTransformEvaluationHelper;
import org.apache.xml.dtm.DTM;
import org.apache.xpath.XPathContext;
@@ -87,11 +88,10 @@ public class FuncParseXml extends FunctionOneArg {
public static XMLNodeCursorImpl getNodeSetFromStr(String strVal, XPathContext xctxt, ErrorHandler errorHandler) throws Exception {
XMLNodeCursorImpl nodeSet = null;
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-
- // Enable XML namespace processing, for XML parse of the string value
- dbf.setNamespaceAware(true);
-
+ dbf.setNamespaceAware(true);
DocumentBuilder dBuilder = dbf.newDocumentBuilder();
if (errorHandler != null) {
diff --git a/src/main/java/org/apache/xpath/functions/FuncParseXmlFragment.java b/src/main/java/org/apache/xpath/functions/FuncParseXmlFragment.java
index b695c11ee..7b11dd8b4 100644
--- a/src/main/java/org/apache/xpath/functions/FuncParseXmlFragment.java
+++ b/src/main/java/org/apache/xpath/functions/FuncParseXmlFragment.java
@@ -25,6 +25,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.SourceLocator;
import javax.xml.transform.dom.DOMSource;
+import org.apache.xalan.templates.Constants;
import org.apache.xalan.xslt.util.XslTransformEvaluationHelper;
import org.apache.xml.dtm.DTM;
import org.apache.xpath.XPathContext;
@@ -88,12 +89,10 @@ public class FuncParseXmlFragment extends FunctionOneArg {
XMLNodeCursorImpl nodeSet = null;
try {
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-
- // Enable the XML namespace processing, on an XML parse
- // of the string value.
- dbf.setNamespaceAware(true);
-
+ dbf.setNamespaceAware(true);
DocumentBuilder dBuilder = dbf.newDocumentBuilder();
// Wrap the originally provided string value (that is supposed to be an XML fragment
diff --git a/src/main/java/org/apache/xpath/functions/FuncTransform.java b/src/main/java/org/apache/xpath/functions/FuncTransform.java
index f10aab45b..762ca2cc3 100644
--- a/src/main/java/org/apache/xpath/functions/FuncTransform.java
+++ b/src/main/java/org/apache/xpath/functions/FuncTransform.java
@@ -212,9 +212,10 @@ public class FuncTransform extends FunctionDef1Arg
String xmlInpDocStr = XslTransformEvaluationHelper.serializeXmlDomElementNode(xmlInpDocNode);
String xslStylesheetUrlStr = xslSecondaryStylesheetAbsUrl.toString();
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory xmlDocumentBuilderFactory = DocumentBuilderFactory.newInstance();
xmlDocumentBuilderFactory.setNamespaceAware(true);
-
DocumentBuilder xmlDocumentBuilder = xmlDocumentBuilderFactory.newDocumentBuilder();
Document document = xmlDocumentBuilder.parse(new InputSource(new StringReader(xmlInpDocStr)));
@@ -333,10 +334,12 @@ public class FuncTransform extends FunctionDef1Arg
DTM dtm = xctxt.getDTM(xmlInpNodeHandle);
Node xmlInpDocNode = dtm.getNode(xmlInpNodeHandle);
- DocumentBuilderFactory xmlDocumentBuilderFactory = DocumentBuilderFactory.newInstance();
- xmlDocumentBuilderFactory.setNamespaceAware(true);
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+ DocumentBuilderFactory xmlDocumentBuilderFactory = DocumentBuilderFactory.newInstance();
+ xmlDocumentBuilderFactory.setNamespaceAware(true);
DocumentBuilder xmlDocumentBuilder = xmlDocumentBuilderFactory.newDocumentBuilder();
+
Document document = xmlDocumentBuilder.parse(new InputSource(new StringReader(xslStylesheetStrValue)));
TransformerFactory xslTransformerFactory = TransformerFactory.newInstance();
diff --git a/src/main/java/org/apache/xpath/functions/XSL3ConstructorOrExtensionFunction.java b/src/main/java/org/apache/xpath/functions/XSL3ConstructorOrExtensionFunction.java
index d0f34f616..103185b68 100644
--- a/src/main/java/org/apache/xpath/functions/XSL3ConstructorOrExtensionFunction.java
+++ b/src/main/java/org/apache/xpath/functions/XSL3ConstructorOrExtensionFunction.java
@@ -28,6 +28,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.TransformerException;
import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.templates.Constants;
import org.apache.xalan.xslt.util.XslTransformEvaluationHelper;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMManager;
@@ -264,9 +265,10 @@ public class XSL3ConstructorOrExtensionFunction extends Function
try {
String xmlStr1 = XslTransformEvaluationHelper.serializeXmlDomElementNode(node);
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
-
DocumentBuilder dBuilder = dbf.newDocumentBuilder();
Document document = dBuilder.parse(new ByteArrayInputStream(xmlStr1.getBytes()));
diff --git a/src/main/java/org/apache/xpath/functions/json/FuncJsonToXml.java b/src/main/java/org/apache/xpath/functions/json/FuncJsonToXml.java
index 34a6f5207..e77d82e3e 100644
--- a/src/main/java/org/apache/xpath/functions/json/FuncJsonToXml.java
+++ b/src/main/java/org/apache/xpath/functions/json/FuncJsonToXml.java
@@ -32,6 +32,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.SourceLocator;
+import org.apache.xalan.templates.Constants;
import org.apache.xalan.xslt.util.XslTransformEvaluationHelper;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMManager;
@@ -235,6 +236,8 @@ public class FuncJsonToXml extends JsonFunction
optionDuplicatesValStr + ".", srcLocator);
}
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
diff --git a/src/main/java/org/apache/xpath/functions/string/FuncAnalyzeString.java b/src/main/java/org/apache/xpath/functions/string/FuncAnalyzeString.java
index cab9fa76f..fbcbd7c7f 100644
--- a/src/main/java/org/apache/xpath/functions/string/FuncAnalyzeString.java
+++ b/src/main/java/org/apache/xpath/functions/string/FuncAnalyzeString.java
@@ -26,6 +26,7 @@ import javax.xml.transform.SourceLocator;
import javax.xml.transform.TransformerException;
import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.templates.Constants;
import org.apache.xml.dtm.DTMManager;
import org.apache.xpath.XPathContext;
import org.apache.xpath.compiler.FunctionTable;
@@ -354,13 +355,16 @@ public class FuncAnalyzeString extends FunctionMultiArgs {
private Document createEmptyXmlDom(SourceLocator srcLocator) throws TransformerException {
Document document = null;
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
DocumentBuilder dBuilder = null;
try {
dBuilder = dbf.newDocumentBuilder();
- } catch (ParserConfigurationException ex) {
+ }
+ catch (ParserConfigurationException ex) {
throw new javax.xml.transform.TransformerException("FOJS0001 : An error occured, within an XML parser "
+ "library.", srcLocator);
}
diff --git a/src/main/java/org/apache/xpath/jaxp/XPathExpressionImpl.java b/src/main/java/org/apache/xpath/jaxp/XPathExpressionImpl.java
index c35a6ca9d..8cfdd3919 100644
--- a/src/main/java/org/apache/xpath/jaxp/XPathExpressionImpl.java
+++ b/src/main/java/org/apache/xpath/jaxp/XPathExpressionImpl.java
@@ -28,6 +28,7 @@ import javax.xml.xpath.XPathFunctionResolver;
import javax.xml.xpath.XPathVariableResolver;
import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.templates.Constants;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.res.XPATHErrorResources;
import org.w3c.dom.DOMImplementation;
@@ -279,6 +280,8 @@ public class XPathExpressionImpl implements javax.xml.xpath.XPathExpression{
}
try {
if ( dbf == null ) {
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware( true );
dbf.setValidating( false );
@@ -366,9 +369,11 @@ public class XPathExpressionImpl implements javax.xml.xpath.XPathExpression{
private static Document getDummyDocument( ) {
try {
if ( dbf == null ) {
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware( true );
- dbf.setValidating( false );
+ dbf.setNamespaceAware(true);
+ dbf.setValidating(false);
}
db = dbf.newDocumentBuilder();
diff --git a/src/main/java/org/apache/xpath/jaxp/XPathImpl.java b/src/main/java/org/apache/xpath/jaxp/XPathImpl.java
index ea3feb8ef..afa0e392b 100644
--- a/src/main/java/org/apache/xpath/jaxp/XPathImpl.java
+++ b/src/main/java/org/apache/xpath/jaxp/XPathImpl.java
@@ -34,6 +34,7 @@ import javax.xml.xpath.XPathFunctionResolver;
import javax.xml.xpath.XPathVariableResolver;
import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.templates.Constants;
import org.apache.xml.dtm.DTM;
import org.apache.xpath.XPath;
import org.apache.xpath.XPathFactory;
@@ -169,9 +170,13 @@ public class XPathImpl implements javax.xml.xpath.XPath {
//
// so we really have to create a fresh DocumentBuilder every time we need one
// - KK
+
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware( true );
- dbf.setValidating( false );
+ dbf.setNamespaceAware(true);
+ dbf.setValidating(false);
+
return dbf.newDocumentBuilder();
} catch (ParserConfigurationException e) {
// this should never happen with a well-behaving JAXP implementation.
diff --git a/src/main/java/org/apache/xpath/objects/XdmAttributeItem.java b/src/main/java/org/apache/xpath/objects/XdmAttributeItem.java
index 1bfe07459..9d44af10b 100644
--- a/src/main/java/org/apache/xpath/objects/XdmAttributeItem.java
+++ b/src/main/java/org/apache/xpath/objects/XdmAttributeItem.java
@@ -18,7 +18,8 @@
package org.apache.xpath.objects;
/**
- * Class definition, to represent an xdm attribute item.
+ * Class definition, to represent an xdm attribute
+ * node item.
*
* @author Mukul Gandhi <mu...@apache.org>
*
diff --git a/src/main/java/org/apache/xpath/objects/XdmNamespaceItem.java b/src/main/java/org/apache/xpath/objects/XdmNamespaceItem.java
new file mode 100644
index 000000000..9da0cbeae
--- /dev/null
+++ b/src/main/java/org/apache/xpath/objects/XdmNamespaceItem.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.xpath.objects;
+
+/**
+ * Class definition, to represent an xdm namespace
+ * node item.
+ *
+ * @author Mukul Gandhi <mu...@apache.org>
+ *
+ * @xsl.usage advanced
+ */
+public class XdmNamespaceItem extends XObject {
+
+ private static final long serialVersionUID = -796575556890931503L;
+
+ /**
+ * Class field, representing an XML namespace node's
+ * ncname value.
+ */
+ private String m_NsName = null;
+
+ /**
+ * Class field, representing an XML namespace node's
+ * string value.
+ */
+ private String m_NsStrValue = null;
+
+ /**
+ * Class constructor.
+ *
+ * @param nsName An XML namespace node's name
+ * @param nsValue An XML namespace node's string
+ * value.
+ */
+ public XdmNamespaceItem(String nsName, String nsValue) {
+ m_NsName = nsName;
+ m_NsStrValue = nsValue;
+ }
+
+ public String getNamespaceNodeName() {
+ return m_NsName;
+ }
+
+ public void setNamespaceNodeName(String nsName) {
+ this.m_NsName = nsName;
+ }
+
+ public String getNsNodeValue() {
+ return m_NsStrValue;
+ }
+
+ public void setNsNodeValue(String nsValue) {
+ this.m_NsStrValue = nsValue;
+ }
+
+}
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_match-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_match-test-set_result.xml
index 758deee0f..599a83004 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_match-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_match-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-11-05T17:18:42Z" fail="57" name="match" pass="68" skipped="11" statusUnknown="1" totalRun="126">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-11-07T11:24:11Z" fail="51" name="match" pass="74" skipped="11" statusUnknown="1" totalRun="126">
<testResult status="pass" testName="match-001"/>
<testResult status="pass" testName="match-002"/>
<testResult status="pass" testName="match-003"/>
@@ -178,8 +178,8 @@
org.apache.xpath.XPathProcessorException: CONTINUE_AFTER_FATAL_ERROR</errTrace>
</outResult>
</testResult>
- <testResult status="fail" testName="match-102"/>
- <testResult status="fail" testName="match-103"/>
+ <testResult status="pass" testName="match-102"/>
+ <testResult status="pass" testName="match-103"/>
<testResult status="pass" testName="match-104"/>
<testResult status="fail" testName="match-105">
<outResult/>
@@ -197,10 +197,10 @@ org.apache.xpath.XPathProcessorException: CONTINUE_AFTER_FATAL_ERROR</errTrace>
org.apache.xpath.XPathProcessorException: CONTINUE_AFTER_FATAL_ERROR</errTrace>
</outResult>
</testResult>
- <testResult status="fail" testName="match-108"/>
- <testResult status="fail" testName="match-109"/>
- <testResult status="fail" testName="match-110"/>
- <testResult status="fail" testName="match-111"/>
+ <testResult status="pass" testName="match-108"/>
+ <testResult status="pass" testName="match-109"/>
+ <testResult status="pass" testName="match-110"/>
+ <testResult status="pass" testName="match-111"/>
<testResult status="fail" testName="match-112">
<outResult/>
</testResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_mode-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_mode-test-set_result.xml
index 5d10e7c65..36e0ac9b6 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_mode-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_mode-test-set_result.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-11-06T12:30:10Z" fail="73" name="mode" pass="45" skipped="25" statusUnknown="0" totalRun="118">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-11-07T11:25:18Z" fail="70" name="mode" pass="48" skipped="25" statusUnknown="0" totalRun="118">
<testResult status="pass" testName="mode-0001"/>
<testResult feature="streaming" status="skipped" testName="mode-0002"/>
<testResult status="pass" testName="mode-0003"/>
<testResult feature="streaming" status="skipped" testName="mode-0004"/>
<testResult status="pass" testName="mode-0005"/>
<testResult feature="streaming" status="skipped" testName="mode-0006"/>
- <testResult status="fail" testName="mode-0007"/>
+ <testResult status="pass" testName="mode-0007"/>
<testResult feature="streaming" status="skipped" testName="mode-0008"/>
- <testResult status="fail" testName="mode-0009"/>
+ <testResult status="pass" testName="mode-0009"/>
<testResult feature="streaming" status="skipped" testName="mode-0010"/>
<testResult status="fail" testName="mode-0011"/>
<testResult feature="streaming" status="skipped" testName="mode-0012"/>
- <testResult status="fail" testName="mode-0013"/>
+ <testResult status="pass" testName="mode-0013"/>
<testResult feature="streaming" status="skipped" testName="mode-0014"/>
<testResult status="fail" testName="mode-0015"/>
<testResult status="fail" testName="mode-0016"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/w3c_xslt3_testsuite_xalan-j_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/w3c_xslt3_testsuite_xalan-j_result.xml
index 9be9e31f8..71c495a18 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/w3c_xslt3_testsuite_xalan-j_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/w3c_xslt3_testsuite_xalan-j_result.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<testResult dateTime="2025-11-06T12:30:23Z" desc="W3C XSLT 3.0 test suite results" fail="652" pass="1855" skipped="160" success="73.55%" totalRun="2522" xslt_processor="Xalan-J XSLT 3.0 development code">
+<testResult dateTime="2025-11-07T11:25:36Z" desc="W3C XSLT 3.0 test suite results" fail="643" pass="1864" skipped="160" success="73.91%" totalRun="2522" xslt_processor="Xalan-J XSLT 3.0 development code">
<attr>
<as fail="24" pass="79" skipped="5" success="75.96%" totalRun="104"/>
<avt fail="14" pass="21" skipped="0" success="60.0%" totalRun="35"/>
<expand-text fail="8" pass="51" skipped="3" success="86.44%" totalRun="59"/>
- <match fail="57" pass="68" skipped="11" success="53.97%" totalRun="126"/>
- <mode fail="73" pass="45" skipped="25" success="38.14%" totalRun="118"/>
+ <match fail="51" pass="74" skipped="11" success="58.73%" totalRun="126"/>
+ <mode fail="70" pass="48" skipped="25" success="40.68%" totalRun="118"/>
<select fail="3" pass="25" skipped="0" success="86.21%" totalRun="29"/>
<xpath-default-namespace fail="11" pass="11" skipped="4" success="50.0%" totalRun="22"/>
</attr>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org