cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Carsten Ziegeler <cziege...@apache.org>
Subject Re: svn commit: r393320 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl status.xml
Date Wed, 12 Apr 2006 06:37:01 GMT
Hi,

can you please also apply these changes to trunk?

Thanks
Carsten

anathaniel@apache.org schrieb:
> Author: anathaniel
> Date: Tue Apr 11 15:14:28 2006
> New Revision: 393320
> 
> URL: http://svn.apache.org/viewcvs?rev=393320&view=rev
> Log:
> XSP block: Use private methods to call start/endElement in xsp.xsl.
> That generates smaller bytecode allowing to compiler larger XSPs before hitting the
> 64k limit for the size of the generate() method.
> 
> 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=393320&r1=393319&r2=393320&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
Tue Apr 11 15:14:28 2006
> @@ -120,6 +120,15 @@
>          // Internally used list of attributes for SAX events.  Being on
>          // class scope allows xsp:logic to define markup generating methods.
>          private final AttributesImpl _xspAttr = new AttributesImpl();
> +      
> +        private void _startElem(String namespace, String localname, String name) throws
SAXException {
> +            this.contentHandler.startElement(namespace, localname, name, _xspAttr);
> +            _xspAttr.clear();
> +        }
> +
> +        private void _endElem(String namespace, String localname, String name) throws
SAXException {
> +            this.contentHandler.endElement(namespace, localname, name);
> +        }
>  
>          /* Built-in parameters available for use */
>          // context    - org.apache.cocoon.environment.Context
> @@ -131,7 +140,7 @@
>  
>          /* User Class Declarations */
>          <xsl:apply-templates select="xsp:logic"/>
> -
> +      
>          /**
>           * Generate XML data.
>           */
> @@ -460,20 +469,18 @@
>  
>      <xsl:apply-templates select="xsp:attribute | xsp:logic[xsp:attribute]"/>
>  
> -    this.contentHandler.startElement(
> +    _startElem(
>        "<xsl:value-of select="namespace-uri(.)"/>",
>        "<xsl:value-of select="local-name(.)"/>",
> -      "<xsl:value-of select="name(.)"/>",
> -      _xspAttr
> +      "<xsl:value-of select="name(.)"/>"
>      );
> -    _xspAttr.clear();
>  
>      <xsl:apply-templates select="node()[not(
>          (namespace-uri(.) = $xsp-uri and local-name(.) = 'attribute') or
>          (namespace-uri(.) = $xsp-uri and local-name(.) = 'logic' and ./xsp:attribute)
>        )]"/>
>  
> -    this.contentHandler.endElement(
> +    _endElem(
>        "<xsl:value-of select="namespace-uri(.)"/>",
>        "<xsl:value-of select="local-name(.)"/>",
>        "<xsl:value-of select="name(.)"/>"
> 
> Modified: cocoon/branches/BRANCH_2_1_X/status.xml
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=393320&r1=393319&r2=393320&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/status.xml (original)
> +++ cocoon/branches/BRANCH_2_1_X/status.xml Tue Apr 11 15:14:28 2006
> @@ -1,6 +1,6 @@
>  <?xml version="1.0"?>
>  <!--
> -  Copyright 1999-2005 The Apache Software Foundation
> +  Copyright 1999-2006 The Apache Software Foundation
>  
>    Licensed under the Apache License, Version 2.0 (the "License");
>    you may not use this file except in compliance with the License.
> @@ -182,6 +182,11 @@
>  -->
>    <release version="2.1.10" date="TBD">
>      <action dev="NN" type="add">DUMMY</action>
> +    <action dev="AN" type="add">
> +      XSP block: Use private methods to call start/endElement in xsp.xsl.
> +      That generates smaller bytecode allowing to compiler larger XSPs before hitting
the
> +      64k limit for the size of the generate() method.
> +    </action>
>    </release>
>    <release version="2.1.9" date="April 7 2006">
>      <action dev="JBQ" type="fix">
> 
> 
> 


-- 
Carsten Ziegeler - Open Source Group, S&N AG
http://www.s-und-n.de
http://www.osoco.org/weblogs/rael/

Mime
View raw message