cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anathan...@apache.org
Subject svn commit: r436822 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl status.xml
Date Fri, 25 Aug 2006 15:00:45 GMT
Author: anathaniel
Date: Fri Aug 25 08:00:43 2006
New Revision: 436822

URL: http://svn.apache.org/viewvc?rev=436822&view=rev
Log:
XSP block: Suppress xmlns:xsp namespace declaration on XSP generated root element.

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl?rev=436822&r1=436821&r2=436822&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
Fri Aug 25 08:00:43 2006
@@ -186,8 +186,9 @@
       <xsl:variable name="ns-prefix" select="local-name(.)"/>
       <xsl:variable name="ns-uri" select="string(.)"/>
         <!-- Declare namespaces that also exist on the parent (i.e. not locally declared),
-             and filter out "xmlns:xmlns" namespace produced by Xerces+Saxon -->
-        <xsl:if test="($ns-prefix != 'xmlns') and $parent-element/namespace::*[local-name(.)
= $ns-prefix and string(.) = $ns-uri]">
+             and filter out "xmlns:xmlns" namespace produced by Xerces+Saxon
+             and suppress xmlns:xsp which no longer occurs in output. -->
+        <xsl:if test="($ns-prefix != 'xmlns') and ($ns-uri != $xsp-uri) and $parent-element/namespace::*[local-name(.)
= $ns-prefix and string(.) = $ns-uri]">
           this.contentHandler.startPrefixMapping(
             "<xsl:value-of select="$ns-prefix"/>",
             "<xsl:value-of select="$ns-uri"/>"
@@ -202,7 +203,7 @@
     <xsl:for-each select="$content/namespace::*">
       <xsl:variable name="ns-prefix" select="local-name(.)"/>
       <xsl:variable name="ns-uri" select="string(.)"/>
-      <xsl:if test="($ns-prefix != 'xmlns') and $parent-element/namespace::*[local-name(.)
= $ns-prefix and string(.) = $ns-uri]">
+      <xsl:if test="($ns-prefix != 'xmlns') and ($ns-uri != $xsp-uri)  and $parent-element/namespace::*[local-name(.)
= $ns-prefix and string(.) = $ns-uri]">
       this.contentHandler.endPrefixMapping(
         "<xsl:value-of select="local-name(.)"/>"
       );

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=436822&r1=436821&r2=436822&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Fri Aug 25 08:00:43 2006
@@ -184,6 +184,9 @@
   <release version="@version@" date="@date@">
 -->
   <release version="2.1.10" date="TBD">
+    <action dev="AN" type="fix">
+      XSP block: Suppress xmlns:xsp namespace declaration on XSP generated root element.
+    </action>
     <action dev="VG" type="add">
       Repository: Add CachingSource source implementation (from trunk).
     </action>



Mime
View raw message