svn commit: r351478 - in /cocoon: blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl trunk/status.xml

[an...@apache.org]

Author: anathaniel
Date: Thu Dec  1 13:37:38 2005
New Revision: 351478

URL: http://svn.apache.org/viewcvs?rev=351478&view=rev
Log:
XSP block: Reintroduce locally scoped xspAttr in xsp.xsl to improve backwards compatibility for pre-2.1.9 logicsheets.  (Suggestion by Vadim Gritsenko).

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

Modified: cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl?rev=351478&r1=351477&r2=351478&view=diff
==============================================================================
--- cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl (original)
+++ cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl Thu Dec  1 13:37:38 2005
@@ -118,7 +118,7 @@
 
         // Internally used list of attributes for SAX events.  Being on
         // class scope allows xsp:logic to define markup generating methods.
-        private AttributesImpl _xspAttr = new AttributesImpl();
+        private final AttributesImpl _xspAttr = new AttributesImpl();
 
         /* Built-in parameters available for use */
         // context    - org.apache.cocoon.environment.Context
@@ -135,13 +135,17 @@
          * Generate XML data.
          */
         public void generate() throws SAXException, IOException, ProcessingException {
+
+            <!-- Locally scoped xspAttr for backwards compatibility to pre-2.1.9 logicsheets. -->
+            final AttributesImpl xspAttr = _xspAttr;
+
             <!-- Do any user-defined necessary initializations -->
             <xsl:for-each select="xsp:init-page">
               <xsl:value-of select="XSLTExtension:escape($extension,.)"/>
             </xsl:for-each>
 
             this.contentHandler.startDocument();
-            _xspAttr.clear();
+            xspAttr.clear();
 
             <!-- Generate top-level processing instructions -->
             <xsl:apply-templates select="/processing-instruction()"/>

Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=351478&r1=351477&r2=351478&view=diff
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Thu Dec  1 13:37:38 2005
@@ -175,6 +175,10 @@
   <!-- These are the changes from the last 2.1.x version. -->
  <changes>
   <release version="@version@" date="@date@">
+    <action dev="AN" type="fix">
+      XSP block: Reintroduce locally scoped xspAttr in xsp.xsl to improve backwards compatibility for pre-2.1.9
+      logicsheets.  (Suggestion by Vadim Gritsenko).
+    </action>
     <action dev="JH" type="fix" fixes-bug="COCOON-1700">
       I18n: XMLResourceBundle checks now for both the new and the old namespace.
     </action>