You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2005/12/01 22:17:15 UTC
svn commit: r351473 - in /cocoon/branches/BRANCH_2_1_X:
src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
status.xml
Author: anathaniel
Date: Thu Dec 1 13:17:06 2005
New Revision: 351473
URL: http://svn.apache.org/viewcvs?rev=351473&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/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/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl?rev=351473&r1=351472&r2=351473&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 Thu Dec 1 13:17:06 2005
@@ -119,7 +119,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
@@ -136,13 +136,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/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=351473&r1=351472&r2=351473&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Thu Dec 1 13:17:06 2005
@@ -179,6 +179,10 @@
<release version="@version@" date="@date@">
-->
<release version="2.1.9" date="TBD">
+ <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>