svn commit: r436823 - in /cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl: src/main/resources/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl status.xml

[an...@apache.org]

Author: anathaniel
Date: Fri Aug 25 08:02:34 2006
New Revision: 436823

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

Modified:
    cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/resources/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
    cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/status.xml

Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/resources/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/resources/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl?rev=436823&r1=436822&r2=436823&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/resources/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/resources/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl Fri Aug 25 08:02:34 2006
@@ -182,8 +182,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"/>"
@@ -198,7 +199,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/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/status.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/status.xml?rev=436823&r1=436822&r2=436823&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/status.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/status.xml Fri Aug 25 08:02:34 2006
@@ -66,6 +66,9 @@
  <changes>
   <release version="@version@" date="@date@">
     <action dev="AN" type="fix">
+      XSP block: Suppress xmlns:xsp namespace declaration on XSP generated root element.
+    </action>
+    <action dev="AN" type="fix">
       XSP block: Fix regression introduced in 2.1.8 that under specific circumstances logicsheets
       were not applied, leading to compilation errors.  This manifested itself only if
       a) two XSPs referred to the same custom logicsheet by a relative location path,