dmarston    01/03/26 11:18:06

  Modified:    test/tests/conf/lre lre02.xsl lre03.xsl lre07.xml lre07.xsl
                        lre10.xml lre10.xsl lre01.xsl
  Added:       test/tests/conf/lre lre21.xsl lre20.xml lre20.xsl lre21.xml
  Log:
  Overhaul some cases concerning placement of namespace declarations.
  Old LRE07, LRE10 become 6 cases in NAMESPACE group.
  
  Revision  Changes    Path
  1.2       +9 -12     xml-xalan/test/tests/conf/lre/lre02.xsl
  
  Index: lre02.xsl
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/lre/lre02.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- lre02.xsl 2000/12/17 18:43:40     1.1
  +++ lre02.xsl 2001/03/26 19:18:02     1.2
  @@ -1,28 +1,25 @@
   <?xml version="1.0"?>
   <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; 
version="1.0"
  -                             xmlns:ext="http://somebody.elses.extension";
  -                xmlns:java="http://xml.apache.org/xslt/java";
  -                             xmlns:ped="http://tester.com";
  -                             xmlns:bdd="http://buster.com";
  -                             xmlns:jad="http://administrator.com";
  -                             xmlns="www.lotus.com"
  -                exclude-result-prefixes="java jad #default"
  -                extension-element-prefixes="ext">
  +      xmlns:java="http://xml.apache.org/xslt/java";
  +     xmlns:ped="http://tester.com";
  +     xmlns:jad="http://administrator.com";
  +     xmlns="www.lotus.com"
  +      exclude-result-prefixes="java jad #default">
   
     <!-- FileName: lre02 -->
     <!-- Document: http://www.w3.org/TR/xslt -->
     <!-- DocVersion: 19991116 -->
     <!-- Section: 7.1.1 Literal Result Elements-->
     <!-- Creator: Paul Dick -->
  -  <!-- Purpose: The created element node will also have a copy of the 
namespace nodes 
  +  <!-- Purpose: Test exclusion of prefixes specified as xsl:stylesheet 
attribute. -->
  +  <!-- Elaboration: The created element node will also have a copy of the 
namespace nodes 
          that were present on the element node in the stylesheet tree with the 
exception 
          of any namespace node whose string-value is the XSLT namespace URI, a 
namespace 
          URI declared as an extension namespace, or a namespace URI designated 
as an 
  -       excluded namespace. Excluded namespaces specified with 
exclude-result-prefixes
  -       attribute of xsl:stylesheet . -->
  +       excluded namespace. -->
   
   <xsl:template match="doc">
  -  <out xsl:if= "my if" english="to leave"/>
  +  <out english="to leave"/>
   </xsl:template>
   
   </xsl:stylesheet>
  
  
  
  1.2       +8 -11     xml-xalan/test/tests/conf/lre/lre03.xsl
  
  Index: lre03.xsl
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/lre/lre03.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- lre03.xsl 2000/12/17 18:43:40     1.1
  +++ lre03.xsl 2001/03/26 19:18:02     1.2
  @@ -1,27 +1,24 @@
   <?xml version="1.0"?>
   <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; 
version="1.0"
  -                             xmlns:ext="http://somebody.elses.extension";
  -                xmlns:java="http://xml.apache.org/xslt/java";
  -                             xmlns:ped="http://tester.com";
  -                             xmlns:bdd="http://buster.com";
  -                             xmlns:jad="http://administrator.com";
  -                             xmlns="www.lotus.com"
  -                extension-element-prefixes="ext">
  +      xmlns:java="http://xml.apache.org/xslt/java";
  +     xmlns:bdd="http://buster.com";
  +     xmlns:jad="http://administrator.com";
  +     xmlns="www.lotus.com">
   
     <!-- FileName: lre03 -->
     <!-- Document: http://www.w3.org/TR/xslt -->
     <!-- DocVersion: 19991116 -->
     <!-- Section: 7.1.1 Literal Result Elements-->
     <!-- Creator: Paul Dick -->
  -  <!-- Purpose: The created element node will also have a copy of the 
namespace nodes 
  +  <!-- Purpose: Test exclude-result-prefixes as an attribute on an LRE. -->
  +  <!-- Elaboration: The created element node will also have a copy of the 
namespace nodes 
          that were present on the element node in the stylesheet tree with the 
exception 
          of any namespace node whose string-value is the XSLT namespace URI, a 
namespace 
          URI declared as an extension namespace, or a namespace URI designated 
as an 
  -       excluded namespace. Excluded namespaces specified with 
xsl:exclude-result-prefixes
  -       attribute of LRE. -->
  +       excluded namespace. -->
   
   <xsl:template match="doc">
  -  <out xsl:if= "my if" english="to leave" xsl:exclude-result-prefixes="java 
jad #default"/>
  +  <out english="to leave" xsl:exclude-result-prefixes="java jad #default"/>
   </xsl:template>
   
   </xsl:stylesheet>
  
  
  
  1.2       +2 -3      xml-xalan/test/tests/conf/lre/lre07.xml
  
  Index: lre07.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/lre/lre07.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- lre07.xml 2000/12/17 18:43:40     1.1
  +++ lre07.xml 2001/03/26 19:18:03     1.2
  @@ -1,4 +1,3 @@
   <?xml version="1.0"?>
  -<docs>
  -<doc/>
  -</docs>
  \ No newline at end of file
  +<doc>
  +</doc>
  \ No newline at end of file
  
  
  
  1.2       +10 -13    xml-xalan/test/tests/conf/lre/lre07.xsl
  
  Index: lre07.xsl
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/lre/lre07.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- lre07.xsl 2000/12/17 18:43:40     1.1
  +++ lre07.xsl 2001/03/26 19:18:03     1.2
  @@ -1,23 +1,20 @@
   <?xml version="1.0"?>
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; 
version="1.0"
  -                             xmlns:ped="http://www.test.com";>
  -<xsl:output indent="yes"/>
  +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; 
version="1.0">
   
     <!-- FileName: lre07 -->
     <!-- Document: http://www.w3.org/TR/xslt -->
     <!-- DocVersion: 19991116 -->
  -  <!-- Section: 7.1.2 Creating Elements with xsl:element. -->
  +  <!-- Section: 7.1.1 Literal Result Elements-->
     <!-- Creator: Paul Dick -->
  -  <!-- Purpose: The xsl:element element allows an element to be created with 
a 
  -       computed name. The expanded-name of the element to be created is 
specified 
  -       by a required name attribute and an optional namespace attribute. -->
  +  <!-- Purpose: Show that attributes from XSLT namespace are automatically 
excluded. -->
  +  <!-- Elaboration: The created element node will also have a copy of the 
namespace nodes 
  +       that were present on the element node in the stylesheet tree with the 
exception 
  +       of any namespace node whose string-value is the XSLT namespace URI, a 
namespace 
  +       URI declared as an extension namespace, or a namespace URI designated 
as an 
  +       excluded namespace. -->
   
   <xsl:template match="doc">
  - <root>
  -  <xsl:element name="out1"/>
  -  <xsl:element name="out2" namespace="http://www.test.com"/>
  -  <xsl:element name="out3" namespace="http://www.bdd.com"/>
  - </root>
  +  <out xsl:if="my if" english="to leave"/>
   </xsl:template>
   
  -</xsl:stylesheet>
  +</xsl:stylesheet>
  \ No newline at end of file
  
  
  
  1.2       +2 -5      xml-xalan/test/tests/conf/lre/lre10.xml
  
  Index: lre10.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/lre/lre10.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- lre10.xml 2000/12/17 18:43:40     1.1
  +++ lre10.xml 2001/03/26 19:18:03     1.2
  @@ -1,6 +1,3 @@
   <?xml version="1.0"?>
  -<docs>
  -  <a href="http://www.ped.com";>Out1</a>
  -  <b href="">Out2</b>
  -  <c href="http://www.bdd.com";>Out3</c>
  -</docs>
  \ No newline at end of file
  +<doc>
  +</doc>
  \ No newline at end of file
  
  
  
  1.2       +13 -13    xml-xalan/test/tests/conf/lre/lre10.xsl
  
  Index: lre10.xsl
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/lre/lre10.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- lre10.xsl 2000/12/17 18:43:40     1.1
  +++ lre10.xsl 2001/03/26 19:18:03     1.2
  @@ -1,22 +1,22 @@
   <?xml version="1.0"?>
   <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; 
version="1.0"
  -                             xmlns:ped="http://www.ped.com";>
  -<xsl:output indent="yes"/>
  +     xmlns:ext="http://somebody.elses.extension";
  +      extension-element-prefixes="ext">
   
     <!-- FileName: lre10 -->
     <!-- Document: http://www.w3.org/TR/xslt -->
     <!-- DocVersion: 19991116 -->
  -  <!-- Section: 7.1.2 Creating Elements with xsl:element. -->
  -  <!-- Creator: Paul Dick -->
  -  <!-- Purpose: If the namespace attribute is present, then it also is 
interpreted as 
  -       an attribute value template... -->
  +  <!-- Section: 7.1.1 Literal Result Elements-->
  +  <!-- Creator: David Marston -->
  +  <!-- Purpose: Show that attributes from extension namespaces cause 
inclusion of the namespace node. -->
  +  <!-- Purpose: The created element node will also have a copy of the 
namespace nodes 
  +       that were present on the element node in the stylesheet tree with the 
exception 
  +       of any namespace node whose string-value is the XSLT namespace URI, a 
namespace 
  +       URI declared as an extension namespace, or a namespace URI designated 
as an 
  +       excluded namespace. -->
   
  -<xsl:template match="/">
  - <root>
  -   <xsl:element name="{docs/a}" namespace="{docs/a/@href}"/>
  -   <xsl:element name="{docs/b}" namespace="{docs/b/@href}"/>
  -   <xsl:element name="{docs/c}" namespace="{docs/c/@href}"/>
  - </root>
  +<xsl:template match="doc">
  +  <out ext:size="big" english="to leave"/>
   </xsl:template>
   
  -</xsl:stylesheet>
  +</xsl:stylesheet>
  \ No newline at end of file
  
  
  
  1.2       +6 -9      xml-xalan/test/tests/conf/lre/lre01.xsl
  
  Index: lre01.xsl
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/lre/lre01.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- lre01.xsl 2000/12/17 18:43:40     1.1
  +++ lre01.xsl 2001/03/26 19:18:03     1.2
  @@ -1,24 +1,21 @@
   <?xml version="1.0"?>
   <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; 
version="1.0"
  -                             xmlns:ext="http://somebody.elses.extension";
  -                             xmlns:ped="http://www.test.com";
  -                             extension-element-prefixes="ext">
  +                             xmlns:ped="http://www.test.com";>
   
     <!-- FileName: lre01 -->
     <!-- Document: http://www.w3.org/TR/xslt -->
     <!-- DocVersion: 19991116 -->
     <!-- Section: 7.1.1 Literal Result Elements -->
     <!-- Creator: Paul Dick -->
  -  <!-- Purpose: In a template, an element in the stylesheet that does not 
belong to 
  +  <!-- Purpose: Basic demonstration that namespace node is added when 
namespaced attribute is instantiated. -->
  +  <!-- Elaboration: In a template, an element in the stylesheet that does 
not belong to 
     the XSLT namespace and that is not an extension element is instantiated to 
create 
  -  an element node with the same expanded-name. ... The created element node 
will 
  +  an element node with the same expanded-name.... The created element node 
will 
     have the attribute nodes that were present on the element node in the 
stylesheet 
  -  tree, other than attributes with names in the XSLT namespace -->
  +  tree, other than attributes with names in the XSLT namespace. -->
   
   <xsl:template match="doc">
  -  <out xsl:if= "my if" english="to leave" ped:attr="test">
  -  <ext:this name="my fake extension"/>
  -  </out>
  +  <out english="to leave" ped:attr="test"/>
   </xsl:template>
   
   </xsl:stylesheet>
  
  
  
  1.1                  xml-xalan/test/tests/conf/lre/lre21.xsl
  
  Index: lre21.xsl
  ===================================================================
  <?xml version="1.0"?>
  <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
        xmlns:ped="http://tester.com";
        xmlns:ext="http://somebody.elses.extension";>
  
    <!-- FileName: lre21 -->
    <!-- Document: http://www.w3.org/TR/xslt -->
    <!-- DocVersion: 19991116 -->
    <!-- Section: 7.1.1 Literal Result Elements-->
    <!-- Creator: David Marston -->
    <!-- Purpose: Exclude namespace node for an extension namespace via local 
declaration. -->
    <!-- Elaboration: The created element node will also have a copy of the 
namespace nodes 
         that were present on the element node in the stylesheet tree with the 
exception 
         of any namespace node whose string-value is the XSLT namespace URI, a 
namespace 
         URI declared as an extension namespace, or a namespace URI designated 
as an 
         excluded namespace. -->
  
  <xsl:template match="doc">
    <out english="to leave" xsl:extension-element-prefixes="ext"/>
  </xsl:template>
  
  </xsl:stylesheet>
  
  
  1.1                  xml-xalan/test/tests/conf/lre/lre20.xml
  
  Index: lre20.xml
  ===================================================================
  <?xml version="1.0"?>
  <doc>
  </doc>
  
  
  1.1                  xml-xalan/test/tests/conf/lre/lre20.xsl
  
  Index: lre20.xsl
  ===================================================================
  <?xml version="1.0"?>
  <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
        xmlns:ped="http://tester.com";
        xmlns:ext="http://somebody.elses.extension";
        extension-element-prefixes="ext">
  
    <!-- FileName: lre20 -->
    <!-- Document: http://www.w3.org/TR/xslt -->
    <!-- DocVersion: 19991116 -->
    <!-- Section: 7.1.1 Literal Result Elements-->
    <!-- Creator: Paul Dick -->
    <!-- Purpose: Show that the namespace node for an extension namespace is 
automatically excluded. -->
    <!-- Elaboration: The created element node will also have a copy of the 
namespace nodes 
         that were present on the element node in the stylesheet tree with the 
exception 
         of any namespace node whose string-value is the XSLT namespace URI, a 
namespace 
         URI declared as an extension namespace, or a namespace URI designated 
as an 
         excluded namespace. -->
  
  <xsl:template match="doc">
    <out english="to leave"/>
  </xsl:template>
  
  </xsl:stylesheet>
  
  
  1.1                  xml-xalan/test/tests/conf/lre/lre21.xml
  
  Index: lre21.xml
  ===================================================================
  <?xml version="1.0"?>
  <doc>
  </doc>
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to