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/07/11 13:24:00 UTC

(xalan-java) branch xalan-j_xslt3.0_mvn updated: committing implementation improvements to xslt3 attribute xpath-default-namespace

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 e2648e831 committing implementation improvements to xslt3 attribute xpath-default-namespace
e2648e831 is described below

commit e2648e831c6665536b53a35d907d2b83ecdbd0fe
Author: Mukul Gandhi <ga...@gmail.com>
AuthorDate: Fri Jul 11 18:53:27 2025 +0530

    committing implementation improvements to xslt3 attribute xpath-default-namespace
---
 README                                             |   8 +-
 .../org/apache/xalan/processor/XSLTSchema.java     |   9 +-
 .../apache/xalan/templates/ElemApplyTemplates.java |  30 +++++
 .../org/apache/xalan/templates/ElemCopyOf.java     |  30 ++++-
 .../org/apache/xalan/templates/ElemForEach.java    |  44 +++++--
 .../apache/xalan/templates/ElemForEachGroup.java   |  18 ++-
 .../org/apache/xalan/templates/ElemIterate.java    |  37 ++++++
 .../apache/xalan/transformer/TransformerImpl.java  | 136 ++++++++++++++++-----
 .../org/apache/xpath/compiler/XPathParser.java     |  34 +++++-
 .../w3c/xslt3/result/attr/_as-test-set_result.xml  |   2 +-
 .../w3c/xslt3/result/attr/_avt-test-set_result.xml |   2 +-
 .../xslt3/result/attr/_match-test-set_result.xml   |   2 +-
 .../xslt3/result/attr/_select-test-set_result.xml  |   2 +-
 .../_xpath-default-namespace-test-set_result.xml   |   6 +-
 .../result/decl/_attribute-set-test-set_result.xml |   2 +-
 .../result/decl/_character-map-test-set_result.xml |   2 +-
 .../result/decl/_function-test-set_result.xml      |   2 +-
 .../result/decl/_variable-test-set_result.xml      |   2 +-
 .../xslt3/result/expr/_axes-test-set_result.xml    |   2 +-
 .../result/expr/_castable-test-set_result.xml      |   2 +-
 .../result/expr/_expression-test-set_result.xml    |   2 +-
 .../w3c/xslt3/result/expr/_for-test-set_result.xml |   2 +-
 .../_higher-order-functions-test-set_result.xml    |   2 +-
 .../xslt3/result/expr/_math-test-set_result.xml    |   2 +-
 .../result/expr/_nodetest-test-set_result.xml      |   2 +-
 .../xslt3/result/expr/_path-test-set_result.xml    |   2 +-
 .../result/expr/_predicate-test-set_result.xml     |   2 +-
 .../result/fn/_deep-equal-test-set_result.xml      |   2 +-
 .../result/fn/_format-number-test-set_result.xml   |   2 +-
 .../w3c/xslt3/result/fn/_key-test-set_result.xml   |   2 +-
 .../xslt3/result/fn/_position-test-set_result.xml  |   2 +-
 .../w3c/xslt3/result/fn/_root-test-set_result.xml  |   2 +-
 .../insn/_analyze-string-test-set_result.xml       |   2 +-
 .../insn/_apply-templates-test-set_result.xml      |   2 +-
 .../result/insn/_attribute-test-set_result.xml     |   2 +-
 .../result/insn/_call-template-test-set_result.xml |   2 +-
 .../xslt3/result/insn/_choose-test-set_result.xml  |   2 +-
 .../xslt3/result/insn/_copy-test-set_result.xml    |   2 +-
 .../xslt3/result/insn/_element-test-set_result.xml |   2 +-
 .../insn/_for-each-group-test-set_result.xml       |   2 +-
 .../xslt3/result/insn/_iterate-test-set_result.xml |   2 +-
 .../result/insn/_sequence-test-set_result.xml      |   2 +-
 .../xslt3/result/insn/_sort-test-set_result.xml    |   2 +-
 .../w3c/xslt3/result/insn/_try-test-set_result.xml |   2 +-
 .../result/insn/_xsl-document-test-set_result.xml  |   2 +-
 .../xslt3/result/misc/_regex-test-set_result.xml   |   2 +-
 .../xslt3/result/type/_boolean-test-set_result.xml |   2 +-
 .../xslt3/result/type/_date-test-set_result.xml    |   2 +-
 .../xslt3/result/type/_node-test-set_result.xml    |   2 +-
 .../xslt3/result/type/_string-test-set_result.xml  |   2 +-
 .../result/w3c_xslt3_testsuite_xalan-j_result.xml  |   2 +-
 .../tests/xpath3/XPathDefaultNamespaceTests.java   |  70 +++++++++++
 .../xpath_default_namespace/gold/test10.out        |   5 +
 .../xpath_default_namespace/gold/test11.out        |   5 +
 .../xpath_default_namespace/gold/test12.out        |  12 ++
 .../xpath_default_namespace/gold/test6.out         |   5 +
 .../xpath_default_namespace/gold/test7.out         |   5 +
 .../xpath_default_namespace/gold/test8.out         |   5 +
 .../xpath_default_namespace/gold/test9.out         |   5 +
 .../resources/xpath_default_namespace/test1.xsl    |   8 +-
 .../{test4.xsl => test10.xsl}                      |  34 +++---
 .../{test4.xsl => test11.xsl}                      |  35 +++---
 .../{test4.xsl => test12.xsl}                      |  37 +++---
 .../resources/xpath_default_namespace/test2.xml    |   7 ++
 .../resources/xpath_default_namespace/test2.xsl    |   4 +-
 .../resources/xpath_default_namespace/test3.xml    |   7 ++
 .../resources/xpath_default_namespace/test3.xsl    |   4 +-
 .../resources/xpath_default_namespace/test4.xml    |  10 ++
 .../resources/xpath_default_namespace/test4.xsl    |   4 +-
 .../resources/xpath_default_namespace/test5.xsl    |   4 +-
 .../{test4.xsl => test6.xsl}                       |  32 +++--
 .../{test4.xsl => test7.xsl}                       |  31 +++--
 .../{test4.xsl => test8.xsl}                       |  31 +++--
 .../{test4.xsl => test9.xsl}                       |  30 ++---
 74 files changed, 587 insertions(+), 237 deletions(-)

diff --git a/README b/README
index 2f62ff3ba..c4d071820 100644
--- a/README
+++ b/README
@@ -17,7 +17,7 @@
 
 Copyright 1999-2025 The Apache Software Foundation
 
-Document last modified : 2025-07-10
+Document last modified : 2025-07-11
 
 Authors:
    Gary Gregory <gg...@apache.org>
@@ -59,16 +59,16 @@ The Maven build results like following shall be produced:
 [INFO]  T E S T S
 [INFO] -------------------------------------------------------
 [INFO] Running org.apache.xalan.tests.main.AllXalanXSLT3Tests
-[INFO] Tests run: 1119, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 95.736 s - in org.apache.xalan.tests.main.AllXalanXSLT3Tests
+[INFO] Tests run: 1126, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 90.834 s - in org.apache.xalan.tests.main.AllXalanXSLT3Tests
 [INFO]
 [INFO] Results:
 [INFO]
-[INFO] Tests run: 1119, Failures: 0, Errors: 0, Skipped: 0
+[INFO] Tests run: 1126, Failures: 0, Errors: 0, Skipped: 0
 [INFO]
 [INFO] ------------------------------------------------------------------------
 [INFO] BUILD SUCCESS
 [INFO] ------------------------------------------------------------------------
-[INFO] Total time:  03:21 min
+[INFO] Total time:  02:46 min
 
 
 If the user needs to run Xalan-J's XSLT 3.0 implementation via Java code, the value of JVM's system property 
diff --git a/src/main/java/org/apache/xalan/processor/XSLTSchema.java b/src/main/java/org/apache/xalan/processor/XSLTSchema.java
index 339bd37a0..acff6f3e0 100644
--- a/src/main/java/org/apache/xalan/processor/XSLTSchema.java
+++ b/src/main/java/org/apache/xalan/processor/XSLTSchema.java
@@ -571,7 +571,7 @@ public class XSLTSchema extends XSLTElementDef
                                  null /*alias */, null /* elements */,
                                  new XSLTAttributeDef[]{ selectAttrRequired,
                                 		                 typeAttrOpt,
-                                		                 validationAttrOpt },
+                                		                 validationAttrOpt, xpathDefaultNamespaceAttrOpt },
                                  new ProcessorTemplateElem(),
                                  ElemCopyOf.class /* class object */, 20, true);
     
@@ -624,7 +624,7 @@ public class XSLTSchema extends XSLTElementDef
                                          new XSLTElementDef[]{ xslSort,
                                                                xslWithParam } /* elements */, new XSLTAttributeDef[]{
                                                                  selectAttrDefNode,
-                                                                 modeAttr }, 
+                                                                 modeAttr, xpathDefaultNamespaceAttrOpt }, 
                                                                         new ProcessorTemplateElem(),
                                          ElemApplyTemplates.class /* class object */, 20, true);
     XSLTElementDef xslApplyImports =
@@ -637,7 +637,7 @@ public class XSLTSchema extends XSLTElementDef
                                   Constants.S_XSLNAMESPACEURL, "for-each",
                                   null /*alias */, templateElementsAndSort,  // (#PCDATA %instructions; %result-elements; | xsl:sort)*
                                   new XSLTAttributeDef[]{ selectAttrRequired,
-                                                          spaceAttr }, 
+                                		                  xpathDefaultNamespaceAttrOpt, spaceAttr }, 
                                                new ProcessorTemplateElem(),
                                   ElemForEach.class /* class object */, true, false, true, 20, true);
     
@@ -747,7 +747,8 @@ public class XSLTSchema extends XSLTElementDef
     
     XSLTElementDef xslIterate = new XSLTElementDef(this, Constants.S_XSLNAMESPACEURL, "iterate",
                                                    null /*alias */, templateElementsAndParams,
-                                                   new XSLTAttributeDef[]{ selectAttrRequired }, new ProcessorTemplateElem(),
+                                                   new XSLTAttributeDef[]{ selectAttrRequired,
+                                                		                   xpathDefaultNamespaceAttrOpt }, new ProcessorTemplateElem(),
                                                    ElemIterate.class /* class object */, true, false, true, 20, true);
     
     XSLTElementDef xslIterateOnCompletion = new XSLTElementDef(this, Constants.S_XSLNAMESPACEURL, "on-completion",
diff --git a/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java b/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java
index c85dc9017..e94179c8e 100644
--- a/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java
+++ b/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java
@@ -87,6 +87,12 @@ public class ElemApplyTemplates extends ElemCallTemplate
    * 
    */
   private boolean m_isDefaultTemplate = false;
+  
+  /**
+   * This class field, represents the value of "xpath-default-namespace" 
+   * attribute.
+   */
+  private String m_xpath_default_namespace = null;
 
   /**
    * Set the mode attribute for this element.
@@ -119,6 +125,25 @@ public class ElemApplyTemplates extends ElemCallTemplate
   {
 	  m_isDefaultTemplate = b;
   }
+  
+  /**
+   * Set the value of "xpath-default-namespace" attribute.
+   *
+   * @param v   Value of the "xpath-default-namespace" attribute
+   */
+  public void setXpathDefaultNamespace(String v)
+  {
+	  m_xpath_default_namespace = v; 
+  }
+
+  /**
+   * Get the value of "xpath-default-namespace" attribute.
+   *  
+   * @return		  The value of "xpath-default-namespace" attribute 
+   */
+  public String getXpathDefaultNamespace() {
+	  return m_xpath_default_namespace;
+  }
 
   /**
    * Get an int constant identifying the type of element.
@@ -219,6 +244,11 @@ public class ElemApplyTemplates extends ElemCallTemplate
 	  XObject varEvalResult = null;    
 	  ResultSequence resultSeq = null;
 	  QName xslTemplateInvokeMode = getMode();
+	  
+	  if ((m_selectExpression != null) && (m_xpath_default_namespace != null)) {    		
+		  m_xpath = new XPath(m_xpath.getPatternString(), srcLocator, xctxt.getNamespaceContext(), XPath.SELECT, null);
+    	  m_selectExpression = m_xpath.getExpression(); 
+      }
 
 	  if (m_selectExpression instanceof XPathSequenceConstructor) {
 		  resultSeq = (ResultSequence)(((XPathSequenceConstructor)m_selectExpression).execute(xctxt));
diff --git a/src/main/java/org/apache/xalan/templates/ElemCopyOf.java b/src/main/java/org/apache/xalan/templates/ElemCopyOf.java
index b29ca5697..7e2fc8025 100644
--- a/src/main/java/org/apache/xalan/templates/ElemCopyOf.java
+++ b/src/main/java/org/apache/xalan/templates/ElemCopyOf.java
@@ -82,7 +82,6 @@ public class ElemCopyOf extends ElemTemplateElement
 
   /**
    * The required select attribute contains an expression.
-   * @serial
    */
   public XPath m_selectExpression = null;
   
@@ -91,6 +90,12 @@ public class ElemCopyOf extends ElemTemplateElement
    */
   private boolean m_isDot = false;
   
+  /**
+   * This class field, represents the value of "xpath-default-namespace" 
+   * attribute.
+   */
+  private String m_xpath_default_namespace = null;
+  
   /**
    * This class field is used during, XPath.fixupVariables(..) action 
    * as performed within object of this class.  
@@ -133,6 +138,25 @@ public class ElemCopyOf extends ElemTemplateElement
     return m_selectExpression;
   }
   
+  /**
+   * Set the value of "xpath-default-namespace" attribute.
+   *
+   * @param v   Value of the "xpath-default-namespace" attribute
+   */
+  public void setXpathDefaultNamespace(String v)
+  {
+ 	 m_xpath_default_namespace = v; 
+  }
+
+  /**
+   * Get the value of "xpath-default-namespace" attribute.
+   *  
+   * @return		  The value of "xpath-default-namespace" attribute 
+   */
+  public String getXpathDefaultNamespace() {
+ 	 return m_xpath_default_namespace;
+  }
+  
   /**
    * This function is called after everything else has been
    * recomposed, and allows the template to set remaining
@@ -207,6 +231,10 @@ public class ElemCopyOf extends ElemTemplateElement
       
       XObject value = null;
       
+      if ((m_selectExpression != null) && (m_xpath_default_namespace != null)) {    		
+    	  m_selectExpression = new XPath(m_selectExpression.getPatternString(), srcLocator, xctxt.getNamespaceContext(), XPath.SELECT, null);
+      }
+      
       XObject xpath3ContextItem = xctxt.getXPath3ContextItem();
       if (m_isDot && (xpath3ContextItem != null)) {
           value = xpath3ContextItem;  
diff --git a/src/main/java/org/apache/xalan/templates/ElemForEach.java b/src/main/java/org/apache/xalan/templates/ElemForEach.java
index 980a52928..5818d24f6 100644
--- a/src/main/java/org/apache/xalan/templates/ElemForEach.java
+++ b/src/main/java/org/apache/xalan/templates/ElemForEach.java
@@ -94,12 +94,17 @@ public class ElemForEach extends ElemTemplateElement implements ExpressionOwner
    */
   protected Expression m_selectExpression = null;
   
+  /**
+   * Class field to store, XPath expression for subsequent 
+   * processing.
+   */
+  protected XPath m_xpath = null;
   
   /**
-   * Used to fix bug#16889
-   * Store XPath away for later processing.
+   * This class field, represents the value of "xpath-default-namespace" 
+   * attribute.
    */
-  protected XPath m_xpath = null;  
+  private String m_xpath_default_namespace = null;
 
   /**
    * Set the "select" attribute.
@@ -109,15 +114,8 @@ public class ElemForEach extends ElemTemplateElement implements ExpressionOwner
   public void setSelect(XPath xpath)
   {
     m_selectExpression = xpath.getExpression();
-    
-    // The following line is part of the codes added to fix bug#16889
-    // Store xpath which will be needed when firing Selected Event
     m_xpath = xpath;    
   }
-  
-  public XPath getXPath() {
-	 return m_xpath; 
-  }
 
   /**
    * Get the "select" attribute.
@@ -128,6 +126,25 @@ public class ElemForEach extends ElemTemplateElement implements ExpressionOwner
   {
     return m_selectExpression;
   }
+  
+  /**
+   * Set the value of "xpath-default-namespace" attribute.
+   *
+   * @param v   Value of the "xpath-default-namespace" attribute
+   */
+  public void setXpathDefaultNamespace(String v)
+  {
+	  m_xpath_default_namespace = v; 
+  }
+
+  /**
+   * Get the value of "xpath-default-namespace" attribute.
+   *  
+   * @return		  The value of "xpath-default-namespace" attribute 
+   */
+  public String getXpathDefaultNamespace() {
+	  return m_xpath_default_namespace;
+  }
 
   /**
    * This function is called after everything else has been
@@ -135,7 +152,7 @@ public class ElemForEach extends ElemTemplateElement implements ExpressionOwner
    * values that may be based on some other property that
    * depends on recomposition.
    *
-   * NEEDSDOC @param sroot
+   * @param sroot            StylesheetRoot object
    *
    * @throws TransformerException
    */
@@ -337,6 +354,11 @@ public class ElemForEach extends ElemTemplateElement implements ExpressionOwner
     
     DTMCursorIterator resultSeqDtmIterator = null;
     
+    if (m_xpath_default_namespace != null) {    		
+    	m_xpath = new XPath(m_xpath.getPatternString(), srcLocator, xctxt.getNamespaceContext(), XPath.SELECT, null);
+    	m_selectExpression = m_xpath.getExpression();
+  	}
+    
     if (m_selectExpression instanceof Function) {
         XObject evalResult = ((Function)m_selectExpression).execute(xctxt);
         
diff --git a/src/main/java/org/apache/xalan/templates/ElemForEachGroup.java b/src/main/java/org/apache/xalan/templates/ElemForEachGroup.java
index 858211c66..d8f4fd6bf 100644
--- a/src/main/java/org/apache/xalan/templates/ElemForEachGroup.java
+++ b/src/main/java/org/apache/xalan/templates/ElemForEachGroup.java
@@ -535,13 +535,21 @@ public class ElemForEachGroup extends ElemTemplateElement
         SourceLocator srcLocator = xctxt.getSAXLocator();
         
         if (m_xpath_default_namespace != null) {    		
-     	   m_selectExpression = new XPath(m_selectExpression.getPatternString(), srcLocator, xctxt.getNamespaceContext(), XPath.SELECT, null);
+        	m_selectExpression = new XPath(m_selectExpression.getPatternString(), srcLocator, xctxt.getNamespaceContext(), XPath.SELECT, null);
+
+        	if (m_GroupStartingWithExpression != null) {
+        		m_GroupStartingWithExpression = new XPath(m_GroupStartingWithExpression.getPatternString(), srcLocator, xctxt.getNamespaceContext(), XPath.SELECT, null); 
+        	}
+
+        	if (m_GroupEndingWithExpression != null) {
+        		m_GroupEndingWithExpression = new XPath(m_GroupEndingWithExpression.getPatternString(), srcLocator, xctxt.getNamespaceContext(), XPath.SELECT, null); 
+        	}
+
+        	if (m_GroupAdjacentExpression != null) {
+        		m_GroupAdjacentExpression = new XPath(m_GroupAdjacentExpression.getPatternString(), srcLocator, xctxt.getNamespaceContext(), XPath.SELECT, null); 
+        	}     	  
      	}
         
-        if ((m_xpath_default_namespace != null) && (m_GroupStartingWithExpression != null)) {    		
-        	m_GroupStartingWithExpression = new XPath(m_GroupStartingWithExpression.getPatternString(), srcLocator, xctxt.getNamespaceContext(), XPath.SELECT, null);
-      	}
-        
         int forEachGroupGroupingAttributesCount = getForEachGroupGroupingAttributesCount();
         
         if (forEachGroupGroupingAttributesCount == 0) {
diff --git a/src/main/java/org/apache/xalan/templates/ElemIterate.java b/src/main/java/org/apache/xalan/templates/ElemIterate.java
index c8c524c33..2485420b7 100644
--- a/src/main/java/org/apache/xalan/templates/ElemIterate.java
+++ b/src/main/java/org/apache/xalan/templates/ElemIterate.java
@@ -67,10 +67,23 @@ public class ElemIterate extends ElemTemplateElement implements ExpressionOwner
       * The "select" expression.
       */
      protected Expression m_selectExpression = null;
+     
+     /**
+      * Class field to store, XPath expression for subsequent 
+      * processing.
+      */
+     protected XPath m_xpath = null;
+     
+     /**
+      * This class field, represents the value of "xpath-default-namespace" 
+      * attribute.
+      */
+     private String m_xpath_default_namespace = null;
 
      public void setSelect(XPath xpath)
      {
          m_selectExpression = xpath.getExpression();
+         m_xpath = xpath;
      }
 
      /**
@@ -82,6 +95,25 @@ public class ElemIterate extends ElemTemplateElement implements ExpressionOwner
      {
          return m_selectExpression;
      }
+     
+     /**
+      * Set the value of "xpath-default-namespace" attribute.
+      *
+      * @param v   Value of the "xpath-default-namespace" attribute
+      */
+     public void setXpathDefaultNamespace(String v)
+     {
+    	 m_xpath_default_namespace = v; 
+     }
+
+     /**
+      * Get the value of "xpath-default-namespace" attribute.
+      *  
+      * @return		  The value of "xpath-default-namespace" attribute 
+      */
+     public String getXpathDefaultNamespace() {
+    	 return m_xpath_default_namespace;
+     }
 
      /**
       * @see ExpressionOwner#setExpression(Expression)
@@ -181,6 +213,11 @@ public class ElemIterate extends ElemTemplateElement implements ExpressionOwner
            xctxt.setPos(0);
            xctxt.setLast(0);
            
+           if (m_xpath_default_namespace != null) {    		
+        	   m_xpath = new XPath(m_xpath.getPatternString(), srcLocator, xctxt.getNamespaceContext(), XPath.SELECT, null);        	   
+        	   m_selectExpression = m_xpath.getExpression();
+           }
+           
            // Clear the, xsl:iterate->xsl:param list storage before this xsl:iterate 
            // instruction's evaluation.
            fXslIterateParamWithparamDataList.clear();
diff --git a/src/main/java/org/apache/xalan/transformer/TransformerImpl.java b/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
index ad3b2a4cb..ad03d552e 100644
--- a/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
+++ b/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
@@ -52,10 +52,13 @@ import org.apache.xalan.res.XSLMessages;
 import org.apache.xalan.res.XSLTErrorResources;
 import org.apache.xalan.templates.AVT;
 import org.apache.xalan.templates.Constants;
+import org.apache.xalan.templates.ElemApplyTemplates;
 import org.apache.xalan.templates.ElemAttributeSet;
 import org.apache.xalan.templates.ElemCharacterMap;
+import org.apache.xalan.templates.ElemCopyOf;
 import org.apache.xalan.templates.ElemForEach;
 import org.apache.xalan.templates.ElemForEachGroup;
+import org.apache.xalan.templates.ElemIterate;
 import org.apache.xalan.templates.ElemLiteralResult;
 import org.apache.xalan.templates.ElemNumber;
 import org.apache.xalan.templates.ElemOutputCharacter;
@@ -4339,10 +4342,10 @@ public class TransformerImpl extends Transformer
 	
 	/**
 	 * This method definition, does depth first traversal of an XSL 
-	 * compiled stylesheet tree, starting from StylesheetRoot object 
+	 * stylesheet compiled tree, starting from StylesheetRoot object 
 	 * and updates value of attribute xpath-default-namespace of each 
-	 * node from its parent node if the node doesn't have value of 
-	 * attribute 'xpath-default-namespace' specified. 
+	 * node from its parent node, if the node doesn't have attribute 
+	 * 'xpath-default-namespace' specified. 
 	 * 
 	 * @param elemTemplateElem						An XSL stylesheet supplied node from where
 	 *                                              the traversal starts.
@@ -4362,12 +4365,20 @@ public class TransformerImpl extends Transformer
 						  xpathDefaultNamespace = ((ElemTemplate)xslElem).getXpathDefaultNamespace();  
 					  }
 				  }
-				  else if (xslElem instanceof ElemValueOf) {
-					  if (((ElemValueOf)xslElem).getXpathDefaultNamespace() == null) {
-						  ((ElemValueOf)xslElem).setXpathDefaultNamespace(xpathDefaultNamespace);
+				  else if (xslElem instanceof ElemApplyTemplates) {
+					  if (((ElemApplyTemplates)xslElem).getXpathDefaultNamespace() == null) {
+						  ((ElemApplyTemplates)xslElem).setXpathDefaultNamespace(xpathDefaultNamespace);
 					  }
 					  else {
-						  xpathDefaultNamespace = ((ElemValueOf)xslElem).getXpathDefaultNamespace();  
+						  xpathDefaultNamespace = ((ElemApplyTemplates)xslElem).getXpathDefaultNamespace();  
+					  }
+				  }
+				  else if (xslElem instanceof ElemForEach) {
+					  if (((ElemForEach)xslElem).getXpathDefaultNamespace() == null) {
+						  ((ElemForEach)xslElem).setXpathDefaultNamespace(xpathDefaultNamespace);
+					  }
+					  else {
+						  xpathDefaultNamespace = ((ElemForEach)xslElem).getXpathDefaultNamespace();  
 					  }
 				  }
 				  else if (xslElem instanceof ElemForEachGroup) {
@@ -4378,50 +4389,109 @@ public class TransformerImpl extends Transformer
 						  xpathDefaultNamespace = ((ElemForEachGroup)xslElem).getXpathDefaultNamespace();  
 					  }
 				  }
-				  else if (xslElem instanceof ElemLiteralResult) {
-					  if (((ElemLiteralResult)xslElem).getXpathDefaultNamespace() == null) {
-						  ((ElemLiteralResult)xslElem).setXpathDefaultNamespace(xpathDefaultNamespace);
+				  else if (xslElem instanceof ElemIterate) {
+					  if (((ElemIterate)xslElem).getXpathDefaultNamespace() == null) {
+						  ((ElemIterate)xslElem).setXpathDefaultNamespace(xpathDefaultNamespace);
 					  }
 					  else {
-						  xpathDefaultNamespace = ((ElemLiteralResult)xslElem).getXpathDefaultNamespace();  
+						  xpathDefaultNamespace = ((ElemIterate)xslElem).getXpathDefaultNamespace();  
 					  }
 				  }
-				  
-				  ElemTemplateElement childElem = xslElem.getFirstChildElem();
-				  if (childElem instanceof ElemTemplate) {
-					  if (((ElemTemplate)childElem).getXpathDefaultNamespace() == null) {
-						  ((ElemTemplate)childElem).setXpathDefaultNamespace(xpathDefaultNamespace);
+				  else if (xslElem instanceof ElemValueOf) {
+					  if (((ElemValueOf)xslElem).getXpathDefaultNamespace() == null) {
+						  ((ElemValueOf)xslElem).setXpathDefaultNamespace(xpathDefaultNamespace);
 					  }
 					  else {
-						  xpathDefaultNamespace = ((ElemTemplate)childElem).getXpathDefaultNamespace();  
+						  xpathDefaultNamespace = ((ElemValueOf)xslElem).getXpathDefaultNamespace();  
 					  }
 				  }
-				  else if ((childElem instanceof ElemValueOf) && (((ElemValueOf)childElem).getXpathDefaultNamespace() == null)) {
-					  if (((ElemValueOf)childElem).getXpathDefaultNamespace() == null) {
-						  ((ElemValueOf)childElem).setXpathDefaultNamespace(xpathDefaultNamespace);
+				  else if (xslElem instanceof ElemCopyOf) {
+					  if (((ElemCopyOf)xslElem).getXpathDefaultNamespace() == null) {
+						  ((ElemCopyOf)xslElem).setXpathDefaultNamespace(xpathDefaultNamespace);
 					  }
 					  else {
-						  xpathDefaultNamespace = ((ElemValueOf)childElem).getXpathDefaultNamespace();  
+						  xpathDefaultNamespace = ((ElemCopyOf)xslElem).getXpathDefaultNamespace();  
 					  }
-				  }
-				  else if ((childElem instanceof ElemForEachGroup) && (((ElemForEachGroup)childElem).getXpathDefaultNamespace() == null)) {
-					  if (((ElemForEachGroup)childElem).getXpathDefaultNamespace() == null) {
-						  ((ElemForEachGroup)childElem).setXpathDefaultNamespace(xpathDefaultNamespace);
+				  }				  
+				  else if (xslElem instanceof ElemLiteralResult) {
+					  if (((ElemLiteralResult)xslElem).getXpathDefaultNamespace() == null) {
+						  ((ElemLiteralResult)xslElem).setXpathDefaultNamespace(xpathDefaultNamespace);
 					  }
 					  else {
-						  xpathDefaultNamespace = ((ElemForEachGroup)childElem).getXpathDefaultNamespace();  
+						  xpathDefaultNamespace = ((ElemLiteralResult)xslElem).getXpathDefaultNamespace();  
 					  }
 				  }
-				  else if ((childElem instanceof ElemLiteralResult) && (((ElemLiteralResult)childElem).getXpathDefaultNamespace() == null)) {
-					  if (((ElemLiteralResult)childElem).getXpathDefaultNamespace() == null) {
-						  ((ElemLiteralResult)childElem).setXpathDefaultNamespace(xpathDefaultNamespace);
+				  
+				  ElemTemplateElement elemTemplateChild = xslElem.getFirstChildElem();
+				  
+				  if (elemTemplateChild != null) {
+					  if (elemTemplateChild instanceof ElemTemplate) {
+						  if (((ElemTemplate)elemTemplateChild).getXpathDefaultNamespace() == null) {
+							  ((ElemTemplate)elemTemplateChild).setXpathDefaultNamespace(xpathDefaultNamespace);
+						  }
+						  else {
+							  xpathDefaultNamespace = ((ElemTemplate)elemTemplateChild).getXpathDefaultNamespace();  
+						  }
 					  }
-					  else {
-						  xpathDefaultNamespace = ((ElemLiteralResult)childElem).getXpathDefaultNamespace();  
+					  else if ((elemTemplateChild instanceof ElemApplyTemplates) && (((ElemApplyTemplates)elemTemplateChild).getXpathDefaultNamespace() == null)) {
+						  if (((ElemApplyTemplates)elemTemplateChild).getXpathDefaultNamespace() == null) {
+							  ((ElemApplyTemplates)elemTemplateChild).setXpathDefaultNamespace(xpathDefaultNamespace);
+						  }
+						  else {
+							  xpathDefaultNamespace = ((ElemApplyTemplates)elemTemplateChild).getXpathDefaultNamespace();  
+						  }
+					  }
+					  else if ((elemTemplateChild instanceof ElemForEach) && (((ElemForEach)elemTemplateChild).getXpathDefaultNamespace() == null)) {
+						  if (((ElemForEach)elemTemplateChild).getXpathDefaultNamespace() == null) {
+							  ((ElemForEach)elemTemplateChild).setXpathDefaultNamespace(xpathDefaultNamespace);
+						  }
+						  else {
+							  xpathDefaultNamespace = ((ElemForEach)elemTemplateChild).getXpathDefaultNamespace();  
+						  }
+					  }
+					  else if ((elemTemplateChild instanceof ElemForEachGroup) && (((ElemForEachGroup)elemTemplateChild).getXpathDefaultNamespace() == null)) {
+						  if (((ElemForEachGroup)elemTemplateChild).getXpathDefaultNamespace() == null) {
+							  ((ElemForEachGroup)elemTemplateChild).setXpathDefaultNamespace(xpathDefaultNamespace);
+						  }
+						  else {
+							  xpathDefaultNamespace = ((ElemForEachGroup)elemTemplateChild).getXpathDefaultNamespace();  
+						  }
+					  }
+					  else if ((elemTemplateChild instanceof ElemIterate) && (((ElemIterate)elemTemplateChild).getXpathDefaultNamespace() == null)) {
+						  if (((ElemIterate)elemTemplateChild).getXpathDefaultNamespace() == null) {
+							  ((ElemIterate)elemTemplateChild).setXpathDefaultNamespace(xpathDefaultNamespace);
+						  }
+						  else {
+							  xpathDefaultNamespace = ((ElemIterate)elemTemplateChild).getXpathDefaultNamespace();  
+						  }
+					  }
+					  else if ((elemTemplateChild instanceof ElemValueOf) && (((ElemValueOf)elemTemplateChild).getXpathDefaultNamespace() == null)) {
+						  if (((ElemValueOf)elemTemplateChild).getXpathDefaultNamespace() == null) {
+							  ((ElemValueOf)elemTemplateChild).setXpathDefaultNamespace(xpathDefaultNamespace);
+						  }
+						  else {
+							  xpathDefaultNamespace = ((ElemValueOf)elemTemplateChild).getXpathDefaultNamespace();  
+						  }
+					  }
+					  else if ((elemTemplateChild instanceof ElemCopyOf) && (((ElemCopyOf)elemTemplateChild).getXpathDefaultNamespace() == null)) {
+						  if (((ElemCopyOf)elemTemplateChild).getXpathDefaultNamespace() == null) {
+							  ((ElemCopyOf)elemTemplateChild).setXpathDefaultNamespace(xpathDefaultNamespace);
+						  }
+						  else {
+							  xpathDefaultNamespace = ((ElemCopyOf)elemTemplateChild).getXpathDefaultNamespace();  
+						  }
+					  }				  
+					  else if ((elemTemplateChild instanceof ElemLiteralResult) && (((ElemLiteralResult)elemTemplateChild).getXpathDefaultNamespace() == null)) {
+						  if (((ElemLiteralResult)elemTemplateChild).getXpathDefaultNamespace() == null) {
+							  ((ElemLiteralResult)elemTemplateChild).setXpathDefaultNamespace(xpathDefaultNamespace);
+						  }
+						  else {
+							  xpathDefaultNamespace = ((ElemLiteralResult)elemTemplateChild).getXpathDefaultNamespace();  
+						  }
 					  }
-				  }
 
-				  updateXPathDefaultNamespace(childElem, xpathDefaultNamespace);
+					  updateXPathDefaultNamespace(elemTemplateChild, xpathDefaultNamespace);
+			      }
 
 				  xslElem = xslElem.getNextSiblingElem();
 			  }		 
diff --git a/src/main/java/org/apache/xpath/compiler/XPathParser.java b/src/main/java/org/apache/xpath/compiler/XPathParser.java
index 0a9c0f73d..47f6d5f22 100644
--- a/src/main/java/org/apache/xpath/compiler/XPathParser.java
+++ b/src/main/java/org/apache/xpath/compiler/XPathParser.java
@@ -36,8 +36,12 @@ import javax.xml.transform.TransformerException;
 
 import org.apache.xalan.res.XSLMessages;
 import org.apache.xalan.templates.Constants;
+import org.apache.xalan.templates.ElemApplyTemplates;
+import org.apache.xalan.templates.ElemCopyOf;
+import org.apache.xalan.templates.ElemForEach;
 import org.apache.xalan.templates.ElemForEachGroup;
 import org.apache.xalan.templates.ElemFunction;
+import org.apache.xalan.templates.ElemIterate;
 import org.apache.xalan.templates.ElemLiteralResult;
 import org.apache.xalan.templates.ElemTemplate;
 import org.apache.xalan.templates.ElemTemplateElement;
@@ -292,7 +296,7 @@ public class XPathParser
   public XPathParser(ErrorListener errorListener, javax.xml.transform.SourceLocator sourceLocator)
   {
     m_errorListener = errorListener;
-    m_sourceLocator = sourceLocator;    
+    m_sourceLocator = sourceLocator;
   }
 
   /**
@@ -327,13 +331,13 @@ public class XPathParser
     m_namespaceContext = namespaceContext;
     m_functionTable = compiler.getFunctionTable();
     
+    m_expr_parent = (ExpressionNode)m_sourceLocator;
+    
     m_isSequenceTypeXPathExpr = isSequenceTypeXPathExpr;
     
     m_xpathArrayConsFuncArgs = new XPathArrayConsFuncArgs();
     
     m_xpathSequenceConsFuncArgs = new XPathSequenceConsFuncArgs();
-    
-    m_expr_parent = (ExpressionNode)m_sourceLocator;
 
     Lexer lexer = new Lexer(compiler, namespaceContext, this);
     
@@ -7174,18 +7178,42 @@ public class XPathParser
 				result = getXPathDefaultNamespaceValue(((ElemTemplate)xpathExprXslParentNode).getParentElem()); 
 			}
 		}
+		else if (xpathExprXslParentNode instanceof ElemApplyTemplates) {
+			result = ((ElemApplyTemplates)xpathExprXslParentNode).getXpathDefaultNamespace();
+			if (result == null) {
+				result = getXPathDefaultNamespaceValue(((ElemApplyTemplates)xpathExprXslParentNode).getParentElem()); 
+			}
+		}
+		else if (xpathExprXslParentNode instanceof ElemForEach) {
+			result = ((ElemForEach)xpathExprXslParentNode).getXpathDefaultNamespace();
+			if (result == null) {
+				result = getXPathDefaultNamespaceValue(((ElemForEach)xpathExprXslParentNode).getParentElem()); 
+			}
+		}
 		else if (xpathExprXslParentNode instanceof ElemForEachGroup) {
 			result = ((ElemForEachGroup)xpathExprXslParentNode).getXpathDefaultNamespace();
 			if (result == null) {
 				result = getXPathDefaultNamespaceValue(((ElemForEachGroup)xpathExprXslParentNode).getParentElem()); 
 			}
 		}
+		else if (xpathExprXslParentNode instanceof ElemIterate) {
+			result = ((ElemIterate)xpathExprXslParentNode).getXpathDefaultNamespace();
+			if (result == null) {
+				result = getXPathDefaultNamespaceValue(((ElemIterate)xpathExprXslParentNode).getParentElem()); 
+			}
+		}
 		else if (xpathExprXslParentNode instanceof ElemValueOf) {
 			result = ((ElemValueOf)xpathExprXslParentNode).getXpathDefaultNamespace();
 			if (result == null) {
 				result = getXPathDefaultNamespaceValue(((ElemValueOf)xpathExprXslParentNode).getParentElem()); 
 			}
 		}
+		else if (xpathExprXslParentNode instanceof ElemCopyOf) {
+			result = ((ElemCopyOf)xpathExprXslParentNode).getXpathDefaultNamespace();
+			if (result == null) {
+				result = getXPathDefaultNamespaceValue(((ElemCopyOf)xpathExprXslParentNode).getParentElem()); 
+			}
+		}		
 		else if (xpathExprXslParentNode instanceof ElemLiteralResult) {
 			result = ((ElemLiteralResult)xpathExprXslParentNode).getXpathDefaultNamespace();
 			if (result == null) {
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_as-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_as-test-set_result.xml
index 91f80388b..2011e6002 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_as-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_as-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:02Z" fail="53" name="as" pass="51" skipped="4" statusUnknown="1" totalRun="109">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:14Z" fail="53" name="as" pass="51" skipped="4" statusUnknown="1" totalRun="109">
    <testResult status="pass" testName="as-0101"/>
    <testResult status="pass" testName="as-0102"/>
    <testResult status="pass" testName="as-0103"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_avt-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_avt-test-set_result.xml
index 19e3794af..bef79cc6f 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_avt-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_avt-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:06Z" fail="14" name="avt" pass="21" skipped="0" statusUnknown="0" totalRun="35">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:18Z" fail="14" name="avt" pass="21" skipped="0" statusUnknown="0" totalRun="35">
    <testResult status="pass" testName="avt-0101"/>
    <testResult status="fail" testName="avt-0201"/>
    <testResult status="pass" testName="avt-0202"/>
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 7f00a03f7..037a36fb5 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-07-10T17:27:07Z" fail="61" name="match" pass="67" skipped="8" statusUnknown="1" totalRun="137">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:19Z" fail="61" name="match" pass="67" skipped="8" statusUnknown="1" totalRun="137">
    <testResult status="pass" testName="match-001"/>
    <testResult status="pass" testName="match-002"/>
    <testResult status="pass" testName="match-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_select-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_select-test-set_result.xml
index 1690c00f4..347542501 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_select-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_select-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:10Z" fail="6" name="select" pass="18" skipped="0" statusUnknown="1" totalRun="25">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:23Z" fail="6" name="select" pass="18" skipped="0" statusUnknown="1" totalRun="25">
    <testResult status="pass" testName="select-0101"/>
    <testResult status="pass" testName="select-0102"/>
    <testResult status="fail" testName="select-0201"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_xpath-default-namespace-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_xpath-default-namespace-test-set_result.xml
index b41bcb0e0..2d5bca278 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_xpath-default-namespace-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_xpath-default-namespace-test-set_result.xml
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:30:32Z" fail="19" name="xpath-default-namespace" pass="7" skipped="0" statusUnknown="0" totalRun="26">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:07:47Z" fail="19" name="xpath-default-namespace" pass="7" skipped="0" statusUnknown="0" totalRun="26">
    <testResult status="fail" testName="xpath-default-namespace-0101"/>
    <testResult status="fail" testName="xpath-default-namespace-0102"/>
    <testResult status="fail" testName="xpath-default-namespace-0103"/>
    <testResult status="pass" testName="xpath-default-namespace-0104"/>
    <testResult status="fail" testName="xpath-default-namespace-0105"/>
-   <testResult status="fail" testName="xpath-default-namespace-0106">
-      <outResult/>
-   </testResult>
+   <testResult status="fail" testName="xpath-default-namespace-0106"/>
    <testResult status="fail" testName="xpath-default-namespace-0107">
       <outResult/>
    </testResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_attribute-set-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_attribute-set-test-set_result.xml
index 8d0360010..18a2c9478 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_attribute-set-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_attribute-set-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:32Z" fail="8" name="attribute-set" pass="41" skipped="1" statusUnknown="0" totalRun="50">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:44Z" fail="8" name="attribute-set" pass="41" skipped="1" statusUnknown="0" totalRun="50">
    <testResult status="pass" testName="attribute-set-0101"/>
    <testResult status="fail" testName="attribute-set-0102">
       <outResult/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_character-map-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_character-map-test-set_result.xml
index d5706abb5..adc73ccab 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_character-map-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_character-map-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:31Z" fail="13" name="character-map" pass="15" skipped="0" statusUnknown="1" totalRun="29">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:43Z" fail="13" name="character-map" pass="15" skipped="0" statusUnknown="1" totalRun="29">
    <testResult status="pass" testName="character-map-001"/>
    <testResult status="pass" testName="character-map-002"/>
    <testResult status="pass" testName="character-map-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_function-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_function-test-set_result.xml
index 73d885f2e..5f6688bd1 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_function-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_function-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:30Z" fail="38" name="function" pass="27" skipped="4" statusUnknown="1" totalRun="70">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:42Z" fail="38" name="function" pass="27" skipped="4" statusUnknown="1" totalRun="70">
    <testResult status="fail" testName="function-0001">
       <outResult/>
    </testResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_variable-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_variable-test-set_result.xml
index a16af451b..7861d81cf 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_variable-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_variable-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:00Z" fail="3" name="variable" pass="16" skipped="0" statusUnknown="1" totalRun="20">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:11Z" fail="3" name="variable" pass="16" skipped="0" statusUnknown="1" totalRun="20">
    <testResult status="pass" testName="variable-0101"/>
    <testResult status="pass" testName="variable-0102"/>
    <testResult status="pass" testName="variable-0103"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_axes-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_axes-test-set_result.xml
index afbb80c0b..a9007a35c 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_axes-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_axes-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:33Z" fail="20" name="axes" pass="181" skipped="0" statusUnknown="0" totalRun="201">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:45Z" fail="20" name="axes" pass="181" skipped="0" statusUnknown="0" totalRun="201">
    <testResult status="pass" testName="axes-001"/>
    <testResult status="pass" testName="axes-002"/>
    <testResult status="pass" testName="axes-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_castable-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_castable-test-set_result.xml
index b604181c4..754734b87 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_castable-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_castable-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:38Z" fail="5" name="castable" pass="4" skipped="0" statusUnknown="0" totalRun="9">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:50Z" fail="5" name="castable" pass="4" skipped="0" statusUnknown="0" totalRun="9">
    <testResult status="pass" testName="castable-001"/>
    <testResult status="pass" testName="castable-002"/>
    <testResult status="pass" testName="castable-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_expression-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_expression-test-set_result.xml
index cf17d0d36..64438d340 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_expression-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_expression-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:38Z" fail="0" name="expression" pass="9" skipped="0" statusUnknown="1" totalRun="10">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:50Z" fail="0" name="expression" pass="9" skipped="0" statusUnknown="1" totalRun="10">
    <testResult status="pass" testName="expression-0101"/>
    <testResult status="pass" testName="expression-0301"/>
    <testResult status="pass" testName="expression-0302"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_for-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_for-test-set_result.xml
index f6e7716e5..85d4edae7 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_for-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_for-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:39Z" fail="2" name="for" pass="1" skipped="0" statusUnknown="1" totalRun="4">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:51Z" fail="2" name="for" pass="1" skipped="0" statusUnknown="1" totalRun="4">
    <testResult status="fail" testName="for-001"/>
    <testResult status="fail" testName="for-002"/>
    <testResult status="pass" testName="for-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_higher-order-functions-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_higher-order-functions-test-set_result.xml
index f0e4b96b1..da64a3ebb 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_higher-order-functions-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_higher-order-functions-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:47Z" fail="6" name="higher-order-functions" pass="18" skipped="0" statusUnknown="1" totalRun="25">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:58Z" fail="6" name="higher-order-functions" pass="18" skipped="0" statusUnknown="1" totalRun="25">
    <testResult status="pass" testName="higher-order-functions-001"/>
    <testResult status="pass" testName="higher-order-functions-002"/>
    <testResult status="pass" testName="higher-order-functions-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_math-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_math-test-set_result.xml
index 3a2c181c9..8a1b2884c 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_math-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_math-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:41Z" fail="39" name="math" pass="108" skipped="0" statusUnknown="1" totalRun="148">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:53Z" fail="39" name="math" pass="108" skipped="0" statusUnknown="1" totalRun="148">
    <testResult status="pass" testName="math-0101"/>
    <testResult status="fail" testName="math-0102">
       <outResult/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_nodetest-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_nodetest-test-set_result.xml
index cf3ec8ef1..d787d4194 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_nodetest-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_nodetest-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:45Z" fail="36" name="nodetest" pass="2" skipped="0" statusUnknown="0" totalRun="38">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:57Z" fail="36" name="nodetest" pass="2" skipped="0" statusUnknown="0" totalRun="38">
    <testResult status="pass" testName="nodetest-001"/>
    <testResult status="pass" testName="nodetest-002"/>
    <testResult status="fail" testName="nodetest-003">
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_path-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_path-test-set_result.xml
index 6c2c390d3..548731181 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_path-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_path-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:46Z" fail="3" name="path" pass="7" skipped="0" statusUnknown="0" totalRun="10">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:58Z" fail="3" name="path" pass="7" skipped="0" statusUnknown="0" totalRun="10">
    <testResult status="pass" testName="path-001"/>
    <testResult status="pass" testName="path-002"/>
    <testResult status="pass" testName="path-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_predicate-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_predicate-test-set_result.xml
index 2f23a0473..803047baf 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_predicate-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_predicate-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:48Z" fail="7" name="predicate" pass="50" skipped="0" statusUnknown="0" totalRun="57">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:59Z" fail="7" name="predicate" pass="50" skipped="0" statusUnknown="0" totalRun="57">
    <testResult status="fail" testName="predicate-001"/>
    <testResult status="fail" testName="predicate-002"/>
    <testResult status="fail" testName="predicate-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_deep-equal-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_deep-equal-test-set_result.xml
index 634b0df51..bc46c3459 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_deep-equal-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_deep-equal-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:30:22Z" fail="0" name="deep-equal" pass="2" skipped="0" statusUnknown="0" totalRun="2">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:07:36Z" fail="0" name="deep-equal" pass="2" skipped="0" statusUnknown="0" totalRun="2">
    <testResult status="pass" testName="deep-equal-001"/>
    <testResult status="pass" testName="deep-equal-002"/>
 </testrun>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_format-number-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_format-number-test-set_result.xml
index 7f9a1b951..c80a32337 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_format-number-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_format-number-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:30:30Z" fail="33" name="format-number" pass="37" skipped="4" statusUnknown="0" totalRun="74">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:07:44Z" fail="33" name="format-number" pass="37" skipped="4" statusUnknown="0" totalRun="74">
    <testResult status="fail" testName="format-number-001"/>
    <testResult status="fail" testName="format-number-002"/>
    <testResult status="fail" testName="format-number-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_key-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_key-test-set_result.xml
index 43992ab04..a0e6579ee 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_key-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_key-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:30:28Z" fail="3" name="key" pass="21" skipped="0" statusUnknown="1" totalRun="25">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:07:42Z" fail="3" name="key" pass="21" skipped="0" statusUnknown="1" totalRun="25">
    <testResult status="pass" testName="key-001"/>
    <testResult status="fail" testName="key-002"/>
    <testResult status="pass" testName="key-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_position-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_position-test-set_result.xml
index 50e2ded85..717c5e8f4 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_position-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_position-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:30:22Z" fail="11" name="position" pass="126" skipped="0" statusUnknown="1" totalRun="138">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:07:36Z" fail="11" name="position" pass="126" skipped="0" statusUnknown="1" totalRun="138">
    <testResult status="pass" testName="position-0101"/>
    <testResult status="fail" testName="position-0102"/>
    <testResult status="fail" testName="position-0103">
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_root-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_root-test-set_result.xml
index 3e773559f..e414ad29e 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_root-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_root-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:30:28Z" fail="4" name="root" pass="6" skipped="0" statusUnknown="0" totalRun="10">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:07:42Z" fail="4" name="root" pass="6" skipped="0" statusUnknown="0" totalRun="10">
    <testResult status="fail" testName="root-0101"/>
    <testResult status="fail" testName="root-0102"/>
    <testResult status="pass" testName="root-0103"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_analyze-string-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_analyze-string-test-set_result.xml
index a8f12a9ce..0e602b598 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_analyze-string-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_analyze-string-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:30:26Z" fail="17" name="analyze-string" pass="36" skipped="5" statusUnknown="0" totalRun="58">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:07:40Z" fail="17" name="analyze-string" pass="36" skipped="5" statusUnknown="0" totalRun="58">
    <testResult status="pass" testName="analyze-string-001"/>
    <testResult status="pass" testName="analyze-string-002"/>
    <testResult status="pass" testName="analyze-string-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_apply-templates-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_apply-templates-test-set_result.xml
index c05066400..f441da008 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_apply-templates-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_apply-templates-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:11Z" fail="29" name="apply-templates" pass="19" skipped="2" statusUnknown="0" totalRun="50">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:23Z" fail="29" name="apply-templates" pass="19" skipped="2" statusUnknown="0" totalRun="50">
    <testResult status="fail" testName="apply-templates-001">
       <outResult>&lt;?xml version="1.0" encoding="UTF-8"?&gt;&#13;
 &#13;
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_attribute-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_attribute-test-set_result.xml
index 5a212a1b9..ced1e3640 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_attribute-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_attribute-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:16Z" fail="21" name="attribute" pass="8" skipped="0" statusUnknown="1" totalRun="30">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:28Z" fail="21" name="attribute" pass="8" skipped="0" statusUnknown="1" totalRun="30">
    <testResult status="fail" testName="attribute-0001"/>
    <testResult status="fail" testName="attribute-0002">
       <outResult/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_call-template-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_call-template-test-set_result.xml
index d48f469d7..86cf9bcb1 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_call-template-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_call-template-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:16Z" fail="14" name="call-template" pass="27" skipped="1" statusUnknown="0" totalRun="42">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:29Z" fail="14" name="call-template" pass="27" skipped="1" statusUnknown="0" totalRun="42">
    <testResult status="fail" testName="call-template-0001">
       <outResult>&lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;out/&gt;</outResult>
    </testResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_choose-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_choose-test-set_result.xml
index eca7b0a0f..ce5d69575 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_choose-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_choose-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:17Z" fail="6" name="choose" pass="17" skipped="0" statusUnknown="1" totalRun="24">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:30Z" fail="6" name="choose" pass="17" skipped="0" statusUnknown="1" totalRun="24">
    <testResult status="pass" testName="choose-0101"/>
    <testResult status="pass" testName="choose-0102"/>
    <testResult status="fail" testName="choose-0103"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_copy-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_copy-test-set_result.xml
index b533fd27e..cc2ab3694 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_copy-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_copy-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:20Z" fail="43" name="copy" pass="16" skipped="0" statusUnknown="1" totalRun="60">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:33Z" fail="43" name="copy" pass="16" skipped="0" statusUnknown="1" totalRun="60">
    <testResult status="fail" testName="copy-0101"/>
    <testResult status="pass" testName="copy-0102"/>
    <testResult status="fail" testName="copy-0103"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_element-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_element-test-set_result.xml
index 2a08eff66..51ef4b777 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_element-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_element-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:26Z" fail="18" name="element" pass="11" skipped="0" statusUnknown="0" totalRun="29">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:39Z" fail="18" name="element" pass="11" skipped="0" statusUnknown="0" totalRun="29">
    <testResult status="fail" testName="element-0001">
       <outResult/>
    </testResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_for-each-group-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_for-each-group-test-set_result.xml
index c7835bc6a..4e7fdcda6 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_for-each-group-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_for-each-group-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:12Z" fail="26" name="for-each-group" pass="47" skipped="4" statusUnknown="1" totalRun="78">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:24Z" fail="26" name="for-each-group" pass="47" skipped="4" statusUnknown="1" totalRun="78">
    <testResult status="pass" testName="for-each-group-001"/>
    <testResult status="skipped" xsltVersion="2.0 only"/>
    <testResult status="pass" testName="for-each-group-002"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_iterate-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_iterate-test-set_result.xml
index 39d94a535..30c840ed1 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_iterate-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_iterate-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:23Z" fail="29" name="iterate" pass="15" skipped="0" statusUnknown="0" totalRun="44">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:35Z" fail="29" name="iterate" pass="15" skipped="0" statusUnknown="0" totalRun="44">
    <testResult status="pass" testName="iterate-001"/>
    <testResult status="pass" testName="iterate-002"/>
    <testResult status="pass" testName="iterate-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_sequence-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_sequence-test-set_result.xml
index c71f88b87..eeb266e4a 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_sequence-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_sequence-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:24Z" fail="18" name="sequence" pass="8" skipped="0" statusUnknown="1" totalRun="27">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:36Z" fail="18" name="sequence" pass="8" skipped="0" statusUnknown="1" totalRun="27">
    <testResult status="fail" testName="sequence-0101"/>
    <testResult status="fail" testName="sequence-0102"/>
    <testResult status="pass" testName="sequence-0103"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_sort-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_sort-test-set_result.xml
index 96f9f7cbc..2d6534058 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_sort-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_sort-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:27Z" fail="45" name="sort" pass="35" skipped="0" statusUnknown="0" totalRun="80">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:39Z" fail="45" name="sort" pass="35" skipped="0" statusUnknown="0" totalRun="80">
    <testResult status="pass" testName="sort-001"/>
    <testResult status="pass" testName="sort-002"/>
    <testResult status="fail" testName="sort-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_try-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_try-test-set_result.xml
index e7135cf19..ecf25350a 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_try-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_try-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:15Z" fail="26" name="try" pass="11" skipped="5" statusUnknown="0" totalRun="42">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:02:27Z" fail="26" name="try" pass="11" skipped="5" statusUnknown="0" totalRun="42">
    <testResult status="pass" testName="try-001"/>
    <testResult status="fail" testName="try-002">
       <outResult/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_xsl-document-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_xsl-document-test-set_result.xml
index a0d4b2897..dfd1bed0f 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_xsl-document-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_xsl-document-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:30:32Z" fail="13" name="xsl-document" pass="12" skipped="0" statusUnknown="0" totalRun="25">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:07:47Z" fail="13" name="xsl-document" pass="12" skipped="0" statusUnknown="0" totalRun="25">
    <testResult status="pass" testName="xsl-document-0101"/>
    <testResult status="fail" testName="xsl-document-0102">
       <outResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/misc/_regex-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/misc/_regex-test-set_result.xml
index 7c758e9b0..5dded238b 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/misc/_regex-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/misc/_regex-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:30:31Z" fail="12" name="regex" pass="33" skipped="0" statusUnknown="0" totalRun="45">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:07:45Z" fail="12" name="regex" pass="33" skipped="0" statusUnknown="0" totalRun="45">
    <testResult status="pass" testName="regex-001"/>
    <testResult status="fail" testName="regex-002"/>
    <testResult status="pass" testName="regex-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_boolean-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_boolean-test-set_result.xml
index 4c71f1fca..fab9b26aa 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_boolean-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_boolean-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:49Z" fail="24" name="boolean" pass="88" skipped="0" statusUnknown="0" totalRun="112">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:03:01Z" fail="24" name="boolean" pass="88" skipped="0" statusUnknown="0" totalRun="112">
    <testResult status="pass" testName="boolean-001"/>
    <testResult status="pass" testName="boolean-002"/>
    <testResult status="pass" testName="boolean-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_date-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_date-test-set_result.xml
index 711ceb273..1b9edec8f 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_date-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_date-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:56Z" fail="47" name="date" pass="37" skipped="0" statusUnknown="1" totalRun="85">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:03:06Z" fail="47" name="date" pass="37" skipped="0" statusUnknown="1" totalRun="85">
    <testResult status="pass" testName="date-001"/>
    <testResult status="pass" testName="date-002"/>
    <testResult status="pass" testName="date-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_node-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_node-test-set_result.xml
index 1192da276..f8489c6a6 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_node-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_node-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:52Z" fail="17" name="node" pass="15" skipped="0" statusUnknown="0" totalRun="32">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:03:03Z" fail="17" name="node" pass="15" skipped="0" statusUnknown="0" totalRun="32">
    <testResult status="pass" testName="node-0101"/>
    <testResult status="pass" testName="node-0201"/>
    <testResult status="fail" testName="node-0301">
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_string-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_string-test-set_result.xml
index 07fb55cec..e295f8b7e 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_string-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_string-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-10T17:27:53Z" fail="8" name="string" pass="128" skipped="0" statusUnknown="0" totalRun="136">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-07-11T13:03:04Z" fail="8" name="string" pass="128" skipped="0" statusUnknown="0" totalRun="136">
    <testResult status="pass" testName="string-001"/>
    <testResult status="pass" testName="string-002"/>
    <testResult status="pass" testName="string-003"/>
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 22e72d020..a3e2c5907 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,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<testResult dateTime="2025-07-10T17:30:48Z" desc="W3C XSLT 3.0 test suite results" fail="797" pass="1398" skipped="38" success="63.79%" totalRun="2251" xslt_processor="Xalan-J XSLT 3.0 development code">
+<testResult dateTime="2025-07-11T13:07:59Z" desc="W3C XSLT 3.0 test suite results" fail="797" pass="1398" skipped="38" success="63.79%" totalRun="2251" xslt_processor="Xalan-J XSLT 3.0 development code">
   <attr>
     <as fail="53" pass="51" skipped="4" success="50.46%" totalRun="109"/>
     <avt fail="14" pass="21" skipped="0" success="60.0%" totalRun="35"/>
diff --git a/src/test/java/org/apache/xalan/tests/xpath3/XPathDefaultNamespaceTests.java b/src/test/java/org/apache/xalan/tests/xpath3/XPathDefaultNamespaceTests.java
index 7a597b2c6..a11faf249 100644
--- a/src/test/java/org/apache/xalan/tests/xpath3/XPathDefaultNamespaceTests.java
+++ b/src/test/java/org/apache/xalan/tests/xpath3/XPathDefaultNamespaceTests.java
@@ -97,5 +97,75 @@ public class XPathDefaultNamespaceTests extends XslTransformTestsUtil {
         
         runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
     }
+    
+    @Test
+    public void xpathDefaultNamespaceTest6() {
+        String xmlFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test2.xml"; 
+        String xslFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test6.xsl";
+        
+        String goldFilePath = XSL_TRANSFORM_GOLD_DIRPATH + "test6.out";                
+        
+        runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
+    }
+    
+    @Test
+    public void xpathDefaultNamespaceTest7() {
+        String xmlFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test2.xml"; 
+        String xslFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test7.xsl";
+        
+        String goldFilePath = XSL_TRANSFORM_GOLD_DIRPATH + "test7.out";                
+        
+        runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
+    }
+    
+    @Test
+    public void xpathDefaultNamespaceTest8() {
+        String xmlFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test2.xml"; 
+        String xslFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test8.xsl";
+        
+        String goldFilePath = XSL_TRANSFORM_GOLD_DIRPATH + "test8.out";                
+        
+        runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
+    }
+    
+    @Test
+    public void xpathDefaultNamespaceTest9() {
+        String xmlFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test2.xml"; 
+        String xslFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test9.xsl";
+        
+        String goldFilePath = XSL_TRANSFORM_GOLD_DIRPATH + "test9.out";                
+        
+        runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
+    }
+    
+    @Test
+    public void xpathDefaultNamespaceTest10() {
+        String xmlFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test3.xml"; 
+        String xslFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test10.xsl";
+        
+        String goldFilePath = XSL_TRANSFORM_GOLD_DIRPATH + "test10.out";                
+        
+        runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
+    }
+    
+    @Test
+    public void xpathDefaultNamespaceTest11() {
+        String xmlFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test3.xml"; 
+        String xslFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test11.xsl";
+        
+        String goldFilePath = XSL_TRANSFORM_GOLD_DIRPATH + "test11.out";                
+        
+        runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
+    }
+    
+    @Test
+    public void xpathDefaultNamespaceTest12() {
+        String xmlFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test4.xml"; 
+        String xslFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test12.xsl";
+        
+        String goldFilePath = XSL_TRANSFORM_GOLD_DIRPATH + "test12.out";                
+        
+        runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
+    }
 
 }
diff --git a/src/test/resources/xpath_default_namespace/gold/test10.out b/src/test/resources/xpath_default_namespace/gold/test10.out
new file mode 100644
index 000000000..1b9d79e73
--- /dev/null
+++ b/src/test/resources/xpath_default_namespace/gold/test10.out
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><result>
+  <a m1="p">1</a>
+  <b m1="q">2</b>
+  <c m1="r">3</c>
+</result>
diff --git a/src/test/resources/xpath_default_namespace/gold/test11.out b/src/test/resources/xpath_default_namespace/gold/test11.out
new file mode 100644
index 000000000..c50e5e1e8
--- /dev/null
+++ b/src/test/resources/xpath_default_namespace/gold/test11.out
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><result>
+  <a m1="p"/>
+  <b m1="q"/>
+  <c m1="r"/>
+</result>
diff --git a/src/test/resources/xpath_default_namespace/gold/test12.out b/src/test/resources/xpath_default_namespace/gold/test12.out
new file mode 100644
index 000000000..327d36d7d
--- /dev/null
+++ b/src/test/resources/xpath_default_namespace/gold/test12.out
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><result>
+  <group group_key="m1">
+    <a m1="p">1</a>
+    <b m1="q">2</b>
+    <c m1="r">3</c>
+  </group>
+  <group group_key="m2">
+    <d m2="x">4</d>
+    <e m2="y">5</e>
+    <f m2="z">6</f>
+  </group>
+</result>
diff --git a/src/test/resources/xpath_default_namespace/gold/test6.out b/src/test/resources/xpath_default_namespace/gold/test6.out
new file mode 100644
index 000000000..f025481bd
--- /dev/null
+++ b/src/test/resources/xpath_default_namespace/gold/test6.out
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><result>
+  <number>1</number>
+  <number>2</number>
+  <number>3</number>
+</result>
diff --git a/src/test/resources/xpath_default_namespace/gold/test7.out b/src/test/resources/xpath_default_namespace/gold/test7.out
new file mode 100644
index 000000000..f025481bd
--- /dev/null
+++ b/src/test/resources/xpath_default_namespace/gold/test7.out
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><result>
+  <number>1</number>
+  <number>2</number>
+  <number>3</number>
+</result>
diff --git a/src/test/resources/xpath_default_namespace/gold/test8.out b/src/test/resources/xpath_default_namespace/gold/test8.out
new file mode 100644
index 000000000..f025481bd
--- /dev/null
+++ b/src/test/resources/xpath_default_namespace/gold/test8.out
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><result>
+  <number>1</number>
+  <number>2</number>
+  <number>3</number>
+</result>
diff --git a/src/test/resources/xpath_default_namespace/gold/test9.out b/src/test/resources/xpath_default_namespace/gold/test9.out
new file mode 100644
index 000000000..1879cd14c
--- /dev/null
+++ b/src/test/resources/xpath_default_namespace/gold/test9.out
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><result>
+  <a xmlns="http://ns0">1</a>
+  <b xmlns="http://ns0">2</b>
+  <c xmlns="http://ns0">3</c>
+</result>
diff --git a/src/test/resources/xpath_default_namespace/test1.xsl b/src/test/resources/xpath_default_namespace/test1.xsl
index 3f28121b0..a85e95ff7 100644
--- a/src/test/resources/xpath_default_namespace/test1.xsl
+++ b/src/test/resources/xpath_default_namespace/test1.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-               xpath-default-namespace="http://ns0" 
-			   version="3.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xpath-default-namespace="http://ns0" 
+			    version="3.0">
 			   
    <!-- Author: mukulg@apache.org -->			   
 			   
@@ -44,4 +44,4 @@
       * limitations under the License.
    -->
 
-</xsl:transform>
+</xsl:stylesheet>
diff --git a/src/test/resources/xpath_default_namespace/test4.xsl b/src/test/resources/xpath_default_namespace/test10.xsl
similarity index 62%
copy from src/test/resources/xpath_default_namespace/test4.xsl
copy to src/test/resources/xpath_default_namespace/test10.xsl
index 5dcde3a11..e2a650471 100644
--- a/src/test/resources/xpath_default_namespace/test4.xsl
+++ b/src/test/resources/xpath_default_namespace/test10.xsl
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
-			   version="3.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                              
+			    version="3.0">
+			    
+   <!-- Author: mukulg@apache.org -->			    
 			   
-   <!-- Author: mukulg@apache.org -->			   
-			   
-   <!-- use with test1.xml -->
+   <!-- use with test3.xml -->
    
-   <!-- An XSL stylesheet test case, to test XSL attribute 
-        'xpath-default-namespace'. -->			   
+   <!-- An XSL stylesheet test case, to test XSLT attribute 
+        'xpath-default-namespace' when using xsl:apply-templates 
+        instruction. -->			   
    
    <xsl:output method="xml" indent="yes"/>
 
    <xsl:template match="/">
       <result>
-	     <a>
-		   <xsl:value-of select="doc/a" xpath-default-namespace="http://ns0"/>
-		 </a>
-		 <b>
-		   <xsl:value-of select="doc/b"/>
-		 </b>
-		 <c>
-		   <xsl:value-of select="doc/c"/>
-		 </c>
+		<xsl:apply-templates select="doc/a | doc/b | doc/c" xpath-default-namespace="http://ns0"/>
 	  </result>
    </xsl:template>
    
+   <xsl:template match="*">
+	  <xsl:element name="{local-name()}">
+	    <xsl:copy-of select="@*"/>
+		<xsl:apply-templates/>
+	  </xsl:element>
+   </xsl:template>
+   
    <!--
       * Licensed to the Apache Software Foundation (ASF) under one
       * or more contributor license agreements. See the NOTICE file
@@ -43,4 +43,4 @@
       * limitations under the License.
    -->
 
-</xsl:transform>
+</xsl:stylesheet>
diff --git a/src/test/resources/xpath_default_namespace/test4.xsl b/src/test/resources/xpath_default_namespace/test11.xsl
similarity index 62%
copy from src/test/resources/xpath_default_namespace/test4.xsl
copy to src/test/resources/xpath_default_namespace/test11.xsl
index 5dcde3a11..d11fc7357 100644
--- a/src/test/resources/xpath_default_namespace/test4.xsl
+++ b/src/test/resources/xpath_default_namespace/test11.xsl
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
-			   version="3.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xpath-default-namespace="http://ns0"                              
+			    version="3.0">
+			    
+   <!-- Author: mukulg@apache.org -->			    
 			   
-   <!-- Author: mukulg@apache.org -->			   
-			   
-   <!-- use with test1.xml -->
+   <!-- use with test3.xml -->
    
-   <!-- An XSL stylesheet test case, to test XSL attribute 
-        'xpath-default-namespace'. -->			   
+   <!-- An XSL stylesheet test case, to test XSLT attribute 
+        'xpath-default-namespace' when using xsl:apply-templates 
+        instruction. -->				   
    
    <xsl:output method="xml" indent="yes"/>
 
    <xsl:template match="/">
       <result>
-	     <a>
-		   <xsl:value-of select="doc/a" xpath-default-namespace="http://ns0"/>
-		 </a>
-		 <b>
-		   <xsl:value-of select="doc/b"/>
-		 </b>
-		 <c>
-		   <xsl:value-of select="doc/c"/>
-		 </c>
+		<xsl:apply-templates select="doc/a | doc/b | doc/c"/>
 	  </result>
    </xsl:template>
    
+   <xsl:template match="*">
+	  <xsl:element name="{local-name()}">
+	    <xsl:copy-of select="@*"/>
+		<xsl:apply-templates/>
+	  </xsl:element>
+   </xsl:template>
+   
    <!--
       * Licensed to the Apache Software Foundation (ASF) under one
       * or more contributor license agreements. See the NOTICE file
@@ -43,4 +44,4 @@
       * limitations under the License.
    -->
 
-</xsl:transform>
+</xsl:stylesheet>
diff --git a/src/test/resources/xpath_default_namespace/test4.xsl b/src/test/resources/xpath_default_namespace/test12.xsl
similarity index 57%
copy from src/test/resources/xpath_default_namespace/test4.xsl
copy to src/test/resources/xpath_default_namespace/test12.xsl
index 5dcde3a11..ac58d3a8d 100644
--- a/src/test/resources/xpath_default_namespace/test4.xsl
+++ b/src/test/resources/xpath_default_namespace/test12.xsl
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
-			   version="3.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xpath-default-namespace="http://ns0"                              
+			    version="3.0">
+			    
+   <!-- Author: mukulg@apache.org -->			    
 			   
-   <!-- Author: mukulg@apache.org -->			   
-			   
-   <!-- use with test1.xml -->
+   <!-- use with test4.xml -->
    
-   <!-- An XSL stylesheet test case, to test XSL attribute 
-        'xpath-default-namespace'. -->			   
+   <!-- An XSL stylesheet test case, to test XSLT attribute 
+        'xpath-default-namespace' when using xsl:for-each-group 
+        instruction. -->			   
    
    <xsl:output method="xml" indent="yes"/>
 
    <xsl:template match="/">
       <result>
-	     <a>
-		   <xsl:value-of select="doc/a" xpath-default-namespace="http://ns0"/>
-		 </a>
-		 <b>
-		   <xsl:value-of select="doc/b"/>
-		 </b>
-		 <c>
-		   <xsl:value-of select="doc/c"/>
-		 </c>
+		<xsl:for-each-group select="doc/*" group-by="name(@*)">
+		   <group group_key="{current-grouping-key()}">
+		      <xsl:for-each select="current-group()">
+			    <xsl:element name="{local-name()}">
+				   <xsl:copy-of select="@*"/>
+				   <xsl:value-of select="."/>
+				</xsl:element>
+			  </xsl:for-each>
+		   </group>
+		</xsl:for-each-group>
 	  </result>
    </xsl:template>
    
@@ -43,4 +46,4 @@
       * limitations under the License.
    -->
 
-</xsl:transform>
+</xsl:stylesheet>
diff --git a/src/test/resources/xpath_default_namespace/test2.xml b/src/test/resources/xpath_default_namespace/test2.xml
new file mode 100644
index 000000000..76aa3d544
--- /dev/null
+++ b/src/test/resources/xpath_default_namespace/test2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doc xmlns="http://ns0">
+  <a>1</a>
+  <b>2</b>
+  <c>3</c>
+</doc>
+  
\ No newline at end of file
diff --git a/src/test/resources/xpath_default_namespace/test2.xsl b/src/test/resources/xpath_default_namespace/test2.xsl
index 0409dfad6..d407a9b18 100644
--- a/src/test/resources/xpath_default_namespace/test2.xsl
+++ b/src/test/resources/xpath_default_namespace/test2.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
 			   version="3.0">
 			   
    <!-- Author: mukulg@apache.org -->			   
@@ -43,4 +43,4 @@
       * limitations under the License.
    -->
 
-</xsl:transform>
+</xsl:stylesheet>
diff --git a/src/test/resources/xpath_default_namespace/test3.xml b/src/test/resources/xpath_default_namespace/test3.xml
new file mode 100644
index 000000000..a2312be6e
--- /dev/null
+++ b/src/test/resources/xpath_default_namespace/test3.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doc xmlns="http://ns0">
+  <a m1="p">1</a>
+  <b m1="q">2</b>
+  <c m1="r">3</c>
+</doc>
+  
\ No newline at end of file
diff --git a/src/test/resources/xpath_default_namespace/test3.xsl b/src/test/resources/xpath_default_namespace/test3.xsl
index 3f8ee6efd..115cd5b3e 100644
--- a/src/test/resources/xpath_default_namespace/test3.xsl
+++ b/src/test/resources/xpath_default_namespace/test3.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
 			   version="3.0">
 			   
    <!-- Author: mukulg@apache.org -->			   
@@ -43,4 +43,4 @@
       * limitations under the License.
    -->
 
-</xsl:transform>
+</xsl:stylesheet>
diff --git a/src/test/resources/xpath_default_namespace/test4.xml b/src/test/resources/xpath_default_namespace/test4.xml
new file mode 100644
index 000000000..e298121d4
--- /dev/null
+++ b/src/test/resources/xpath_default_namespace/test4.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doc xmlns="http://ns0">
+  <a m1="p">1</a>
+  <b m1="q">2</b>
+  <d m2="x">4</d>
+  <c m1="r">3</c>  
+  <e m2="y">5</e>
+  <f m2="z">6</f>
+</doc>
+  
\ No newline at end of file
diff --git a/src/test/resources/xpath_default_namespace/test4.xsl b/src/test/resources/xpath_default_namespace/test4.xsl
index 5dcde3a11..7ce88bc45 100644
--- a/src/test/resources/xpath_default_namespace/test4.xsl
+++ b/src/test/resources/xpath_default_namespace/test4.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
 			   version="3.0">
 			   
    <!-- Author: mukulg@apache.org -->			   
@@ -43,4 +43,4 @@
       * limitations under the License.
    -->
 
-</xsl:transform>
+</xsl:stylesheet>
diff --git a/src/test/resources/xpath_default_namespace/test5.xsl b/src/test/resources/xpath_default_namespace/test5.xsl
index 37b233e52..972a4df67 100644
--- a/src/test/resources/xpath_default_namespace/test5.xsl
+++ b/src/test/resources/xpath_default_namespace/test5.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                xmlns:ns0="http://ns0"
                exclude-result-prefixes="ns0"			   
 			   version="3.0">
@@ -46,4 +46,4 @@
       * limitations under the License.
    -->
 
-</xsl:transform>
+</xsl:stylesheet>
diff --git a/src/test/resources/xpath_default_namespace/test4.xsl b/src/test/resources/xpath_default_namespace/test6.xsl
similarity index 67%
copy from src/test/resources/xpath_default_namespace/test4.xsl
copy to src/test/resources/xpath_default_namespace/test6.xsl
index 5dcde3a11..83c7cda06 100644
--- a/src/test/resources/xpath_default_namespace/test4.xsl
+++ b/src/test/resources/xpath_default_namespace/test6.xsl
@@ -1,27 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
-			   version="3.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xpath-default-namespace="http://ns0" 
+			    version="3.0">
+			    
+   <!-- Author: mukulg@apache.org -->			    
 			   
-   <!-- Author: mukulg@apache.org -->			   
-			   
-   <!-- use with test1.xml -->
+   <!-- use with test2.xml -->
    
-   <!-- An XSL stylesheet test case, to test XSL attribute 
-        'xpath-default-namespace'. -->			   
+   <!-- An XSL stylesheet test case, to test XSLT attribute 
+        'xpath-default-namespace' when using xsl:for-each 
+        instruction. -->			   
    
    <xsl:output method="xml" indent="yes"/>
 
    <xsl:template match="/">
       <result>
-	     <a>
-		   <xsl:value-of select="doc/a" xpath-default-namespace="http://ns0"/>
-		 </a>
-		 <b>
-		   <xsl:value-of select="doc/b"/>
-		 </b>
-		 <c>
-		   <xsl:value-of select="doc/c"/>
-		 </c>
+	     <xsl:for-each select="doc/*">
+		   <number>
+		     <xsl:value-of select="."/>
+		   </number>
+		 </xsl:for-each>
 	  </result>
    </xsl:template>
    
@@ -43,4 +41,4 @@
       * limitations under the License.
    -->
 
-</xsl:transform>
+</xsl:stylesheet>
diff --git a/src/test/resources/xpath_default_namespace/test4.xsl b/src/test/resources/xpath_default_namespace/test7.xsl
similarity index 67%
copy from src/test/resources/xpath_default_namespace/test4.xsl
copy to src/test/resources/xpath_default_namespace/test7.xsl
index 5dcde3a11..34a48235b 100644
--- a/src/test/resources/xpath_default_namespace/test4.xsl
+++ b/src/test/resources/xpath_default_namespace/test7.xsl
@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
-			   version="3.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
+			    version="3.0">
+			    
+   <!-- Author: mukulg@apache.org -->			    
 			   
-   <!-- Author: mukulg@apache.org -->			   
-			   
-   <!-- use with test1.xml -->
+   <!-- use with test2.xml -->
    
-   <!-- An XSL stylesheet test case, to test XSL attribute 
-        'xpath-default-namespace'. -->			   
+   <!-- An XSL stylesheet test case, to test XSLT attribute 
+        'xpath-default-namespace' when using xsl:for-each 
+        instruction. -->			   
    
    <xsl:output method="xml" indent="yes"/>
 
    <xsl:template match="/">
       <result>
-	     <a>
-		   <xsl:value-of select="doc/a" xpath-default-namespace="http://ns0"/>
-		 </a>
-		 <b>
-		   <xsl:value-of select="doc/b"/>
-		 </b>
-		 <c>
-		   <xsl:value-of select="doc/c"/>
-		 </c>
+	     <xsl:for-each select="doc/*" xpath-default-namespace="http://ns0">
+		   <number>
+		     <xsl:value-of select="."/>
+		   </number>
+		 </xsl:for-each>
 	  </result>
    </xsl:template>
    
@@ -43,4 +40,4 @@
       * limitations under the License.
    -->
 
-</xsl:transform>
+</xsl:stylesheet>
diff --git a/src/test/resources/xpath_default_namespace/test4.xsl b/src/test/resources/xpath_default_namespace/test8.xsl
similarity index 67%
copy from src/test/resources/xpath_default_namespace/test4.xsl
copy to src/test/resources/xpath_default_namespace/test8.xsl
index 5dcde3a11..2743850f1 100644
--- a/src/test/resources/xpath_default_namespace/test4.xsl
+++ b/src/test/resources/xpath_default_namespace/test8.xsl
@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
-			   version="3.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
+			    version="3.0">
+			    
+   <!-- Author: mukulg@apache.org -->			    
 			   
-   <!-- Author: mukulg@apache.org -->			   
-			   
-   <!-- use with test1.xml -->
+   <!-- use with test2.xml -->
    
-   <!-- An XSL stylesheet test case, to test XSL attribute 
-        'xpath-default-namespace'. -->			   
+   <!-- An XSL stylesheet test case, to test XSLT attribute 
+        'xpath-default-namespace' when using xsl:iterate 
+        instruction. -->			   
    
    <xsl:output method="xml" indent="yes"/>
 
    <xsl:template match="/">
       <result>
-	     <a>
-		   <xsl:value-of select="doc/a" xpath-default-namespace="http://ns0"/>
-		 </a>
-		 <b>
-		   <xsl:value-of select="doc/b"/>
-		 </b>
-		 <c>
-		   <xsl:value-of select="doc/c"/>
-		 </c>
+	     <xsl:iterate select="doc/*" xpath-default-namespace="http://ns0">
+		   <number>
+		     <xsl:value-of select="."/>
+		   </number>
+		 </xsl:iterate>
 	  </result>
    </xsl:template>
    
@@ -43,4 +40,4 @@
       * limitations under the License.
    -->
 
-</xsl:transform>
+</xsl:stylesheet>
diff --git a/src/test/resources/xpath_default_namespace/test4.xsl b/src/test/resources/xpath_default_namespace/test9.xsl
similarity index 67%
copy from src/test/resources/xpath_default_namespace/test4.xsl
copy to src/test/resources/xpath_default_namespace/test9.xsl
index 5dcde3a11..0990f62fb 100644
--- a/src/test/resources/xpath_default_namespace/test4.xsl
+++ b/src/test/resources/xpath_default_namespace/test9.xsl
@@ -1,27 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
-			   version="3.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xpath-default-namespace="http://ns0"                
+			    version="3.0">
+			    
+   <!-- Author: mukulg@apache.org -->			    
 			   
-   <!-- Author: mukulg@apache.org -->			   
-			   
-   <!-- use with test1.xml -->
+   <!-- use with test2.xml -->
    
-   <!-- An XSL stylesheet test case, to test XSL attribute 
-        'xpath-default-namespace'. -->			   
+   <!-- An XSL stylesheet test case, to test XSLT attribute 
+        'xpath-default-namespace' when using xsl:copy-of 
+        instruction. -->			   
    
    <xsl:output method="xml" indent="yes"/>
 
    <xsl:template match="/">
       <result>
-	     <a>
-		   <xsl:value-of select="doc/a" xpath-default-namespace="http://ns0"/>
-		 </a>
-		 <b>
-		   <xsl:value-of select="doc/b"/>
-		 </b>
-		 <c>
-		   <xsl:value-of select="doc/c"/>
-		 </c>
+	     <xsl:for-each select="doc/*">
+		   <xsl:copy-of select="self::a | self::b | self::c"/>
+		 </xsl:for-each>
 	  </result>
    </xsl:template>
    
@@ -43,4 +39,4 @@
       * limitations under the License.
    -->
 
-</xsl:transform>
+</xsl:stylesheet>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org