Return-Path: <Dylan.Walsh@Kadius.com>
Mailing-List: contact cocoon-users-help@xml.apache.org; run by ezmlm
Delivered-To: mailing list cocoon-users@xml.apache.org
Received: (qmail 15858 invoked from network); 15 Jan 2001 10:38:20 -0000
Received: from unknown (HELO tssmx1.tss.ie) (195.7.49.66)
  by h31.sny.collab.net with SMTP; 15 Jan 2001 10:38:20 -0000
Received: by TSSMX1 with Internet Mail Service (5.5.2650.21)
	id <CTZR235G>; Mon, 15 Jan 2001 10:32:44 -0000
Message-ID: <8BD71A154EA6D211873E00105A125CDF4E3FF1@TSSMX1>
From: Dylan Walsh <Dylan.Walsh@Kadius.com>
To: Robin Green <greenrd@hotmail.com>, cocoon-users@xml.apache.org,
	cocoon-dev@xml.apache.org
Subject: RE: Big XSP Problem with backslashes or double quotes in attribut
	e values.
Date: Mon, 15 Jan 2001 10:32:42 -0000
MIME-Version: 1.0
X-Mailer: Internet Mail Service (5.5.2650.21)
Content-Type: multipart/mixed;
	boundary="----_=_NextPart_000_01C07EDE.7E284342"
X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N

------_=_NextPart_000_01C07EDE.7E284342
Content-Type: text/plain

Thanks to Michael Bierenfield who pointed out that the Java files are
generated with an XSL transformation:
org/apache/cocoon/processor/xsp/xsp-java.xsl.

I changed the template for attributes, and put in some code to escape
backslashes and quotes in attribute values. The search and replace is based
on an example from the XSLT FAQ. I regenerated the Cocoon.jar with the new
xsp-java.xsl. I have tested this and it fixes the problem.

Here is the corrected version of the file. Please feel free to use this in
future versions of Cocoon, if you wish. Note that the version below is for
Cocoon 1.7.4, however the changes can be applied to the 1.8 version, and the
modified templates have comments with "DW" at the start of them for easy
location.

 <<xsp-java.xsl>> 

> -----Original Message-----
> From:	Robin Green [SMTP:greenrd@hotmail.com]
> Sent:	Friday, January 12, 2001 9:20 PM
> To:	cocoon-users@xml.apache.org
> Cc:	Dylan.Walsh@Kadius.com
> Subject:	Re: Big XSP Problem with backslashes or double quotes in
> attribute va lues.
> 
> Thanks, this is a confirmed bug. You can track progress here:
> 
> http://nagoya.apache.org/bugzilla/show_bug.cgi?id=33
> 

------_=_NextPart_000_01C07EDE.7E284342
Content-Type: application/octet-stream;
	name="xsp-java.xsl"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="xsp-java.xsl"

<?xml version=3D"1.0"?>
<!--

 =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
                   The Apache Software License, Version 1.1
 =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D

    Copyright (C) 1999-2000 The Apache Software Foundation. All rights =
reserved.

 Redistribution and use in source and binary forms, with or without =
modifica-
 tion, are permitted provided that the following conditions are met:

 1. Redistributions of  source code must  retain the above copyright  =
notice,
    this list of conditions and the following disclaimer.

 2. Redistributions in binary form must reproduce the above copyright =
notice,
    this list of conditions and the following disclaimer in the =
documentation
    and/or other materials provided with the distribution.

 3. The end-user documentation included with the redistribution, if =
any, must
    include  the following  acknowledgment:  "This product includes  =
software
    developed  by the  Apache Software Foundation  =
(http://www.apache.org/)."
    Alternately, this  acknowledgment may  appear in the software =
itself,  if
    and wherever such third-party acknowledgments normally appear.

 4. The names "Cocoon" and  "Apache Software Foundation"  must not be =
used to
    endorse  or promote  products derived  from this  software without  =
prior
    written permission. For written permission, please contact
    apache@apache.org.

 5. Products  derived from this software may not  be called "Apache", =
nor may
    "Apache" appear  in their name,  without prior written permission  =
of the
    Apache Software Foundation.

 THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED =
WARRANTIES,
 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF =
MERCHANTABILITY AND
 FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT =
SHALL  THE
 APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY =
DIRECT,
 INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES =
(INCLU-
 DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR =
SERVICES; LOSS
 OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED =
AND ON
 ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  =
OR TORT
 (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  =
USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 This software  consists of voluntary contributions made  by many =
individuals
 on  behalf of the Apache Software  Foundation and was  originally =
created by
 Stefano Mazzocchi  <stefano@apache.org>. For more  information on the =
Apache
 Software Foundation, please see <http://www.apache.org/>.

-->

<!-- written by Ricardo Rocha "ricardo@apache.org" -->

<!--=20
12-Jan-2001 Changes to fix problem with backslashes or quotes in =
attribute values
Bugzilla bug #33 =
(http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3D33)

 Dylan Walsh dylan.walsh@kadius.com=20
-->

<xsl:stylesheet version=3D"1.0"
  xmlns:xsl=3D"http://www.w3.org/1999/XSL/Transform"
  xmlns:xsp=3D"http://www.apache.org/1999/XSP/Core"
>

  <xsl:output method=3D"text"/>

  <xsl:template match=3D"/">
    <code xml:space=3D"preserve">
      <xsl:apply-templates select=3D"xsp:page" />
    </code>
  </xsl:template>

  <xsl:template match=3D"xsp:page">
    package <xsl:value-of select=3D"@package"/>;

    import java.io.*;
    import java.net.*;
    import java.util.*;
    import org.w3c.dom.*;
    import org.xml.sax.*;
    import javax.servlet.*;
    import javax.servlet.http.*;

    import org.apache.cocoon.parser.*;
    import org.apache.cocoon.producer.*;
    import org.apache.cocoon.framework.*;

    import org.apache.cocoon.processor.xsp.*;
    import org.apache.cocoon.processor.xsp.library.*;

    /* User Imports */
    <xsl:for-each select=3D"xsp:structure/xsp:include">
      import <xsl:value-of select=3D"."/>;
    </xsl:for-each>

    public class <xsl:value-of select=3D"@name"/> extends XSPPage {
      /* User Class Declarations */
      <xsl:apply-templates select=3D"xsp:logic" />

      public void populateDocument(
        HttpServletRequest request,
        HttpServletResponse response,
        Document document
      )
        throws Exception
      {
	// Node stack logic variables
        Node xspParentNode =3D null;
        Node xspCurrentNode =3D document;
        Stack xspNodeStack =3D new Stack();

	<xsl:variable name=3D"create-session">
	  <xsl:choose>
	    <xsl:when test=3D"@create-session =3D 'true'">true</xsl:when>
	    <xsl:otherwise>false</xsl:otherwise>
	  </xsl:choose>
	</xsl:variable>

	// Make session object readily available
        HttpSession session =3D request.getSession(<xsl:value-of =
select=3D"$create-session"/>);

        <xsl:for-each =
select=3D"//processing-instruction()[not(starts-with(name(.),'xml-logics=
heet') or (starts-with(name(.),'cocoon-process') and =
contains(.,'xsp')))]">
          document.appendChild(
            document.createProcessingInstruction(
              "<xsl:value-of select=3D"name()"/>",
              "<xsl:value-of select=3D"."/>"
            )
          );
        </xsl:for-each>

	<!-- Method level declarations should go here... -->

        <xsl:apply-templates select=3D"*[not(starts-with(name(.), =
'xsp:'))]"/>
      }
    }
  </xsl:template>

  <xsl:template match=3D"xsp:element">
    xspParentNode =3D xspCurrentNode;
    xspNodeStack.push(xspParentNode);
    xspCurrentNode =3D
      document.createElement("<xsl:value-of select=3D"@name"/>");
    xspParentNode.appendChild(xspCurrentNode);

    <xsl:apply-templates/>

    ((Element) xspCurrentNode).normalize();
    xspCurrentNode =3D (Node) xspNodeStack.pop();
  </xsl:template>

  <xsl:template match=3D"xsp:attribute">
    ((Element) xspCurrentNode).setAttribute(
      "<xsl:value-of select=3D"@name"/>",
      <xsl:for-each select=3D"xsp:text|xsp:expr">
        <xsl:choose>
	  <xsl:when test=3D"name(.) =3D 'xsp:text'">
	    "<xsl:value-of select=3D"."/>"
	  </xsl:when>
	  <xsl:when test=3D"name(.) =3D 'xsp:expr'">
	    String.valueOf(<xsl:value-of select=3D"."/>)
	  </xsl:when>
	</xsl:choose>
	+
      </xsl:for-each>
      ""
    );
  </xsl:template>

  <xsl:template match=3D"xsp:expr">
    <xsl:choose>
      <xsl:when test=3D"starts-with(name(..), 'xsp:') and name(..) !=3D =
'xsp:content'">
        <xsl:apply-templates/>
      </xsl:when>
      <xsl:otherwise>
        xspCurrentNode.appendChild(
          xspExpr(<xsl:value-of select=3D"."/>, document)
        );
      </xsl:otherwise>
    </xsl:choose>
  </xsl:template>

  <xsl:template match=3D"xsp:content">
    <xsl:apply-templates/>
  </xsl:template>

  <xsl:template match=3D"xsp:logic">
    <xsl:apply-templates/>
  </xsl:template>

  <xsl:template match=3D"xsp:text">
    xspCurrentNode.appendChild(
      document.createTextNode("<xsl:value-of select=3D"."/>")
    );
  </xsl:template>

  <xsl:template match=3D"xsp:pi">
    <!-- Appending to xspCurrentNode doesn't work for Cocoon PIs,
         because Cocoon expects its PIs to be at the top level. -->
    document.appendChild(
       document.createProcessingInstruction(
         "<xsl:value-of select=3D"@target"/>",
         <xsl:for-each select=3D"xsp:text|xsp:expr">
           <xsl:choose>
             <xsl:when test=3D"name(.) =3D 'xsp:text'">
               "<xsl:value-of select=3D"."/>"
             </xsl:when>
             <xsl:when test=3D"name(.) =3D 'xsp:expr'">
              String.valueOf(<xsl:value-of select=3D"."/>)
             </xsl:when>
           </xsl:choose>
          +
         </xsl:for-each>
         ""
       )
     );
  </xsl:template>

  <xsl:template match=3D"xsp:comment">
    xspCurrentNode.appendChild(
      document.createTextNode("<xsl:value-of select=3D"."/>")
    );
  </xsl:template>


  <xsl:template match=3D"*">
    xspParentNode =3D xspCurrentNode;
    xspNodeStack.push(xspParentNode);
    xspCurrentNode =3D
      document.createElement("<xsl:value-of select=3D"name(.)"/>");
    xspParentNode.appendChild(xspCurrentNode);

    <xsl:apply-templates select=3D"@*"/>
    <xsl:apply-templates/>

    ((Element) xspCurrentNode).normalize();
    xspCurrentNode =3D (Node) xspNodeStack.pop();
  </xsl:template>


<!-- DW - Changed to fix Java escaping bug -->
  <xsl:template match=3D"@*">
    <xsl:variable name=3D"attribute-name">
      <xsl:choose>
        <xsl:when test=3D"starts-with(name(.), =
'xsp:')">xmlns:<xsl:value-of select=3D"substring(name(.), =
5)"/></xsl:when>
        <xsl:otherwise><xsl:value-of =
select=3D"name(.)"/></xsl:otherwise>
      </xsl:choose>
    </xsl:variable>

    ((Element) xspCurrentNode).setAttribute(
      "<xsl:value-of select=3D"$attribute-name"/>",
      "<xsl:apply-templates select=3D"." mode=3D"Escape" />"
    );
  </xsl:template>


<!-- DW - Template to escape attribute values (for Java strings) -->
  <xsl:template match=3D"@*" mode=3D"Escape">
    <xsl:variable name=3D"backslashEscaped">
      <xsl:call-template name=3D"replace-string">
        <xsl:with-param name=3D"text" select=3D"."/>
        <xsl:with-param name=3D"replace" select=3D"'\'"/>
        <xsl:with-param name=3D"with" select=3D"'\\'"/>
      </xsl:call-template>=20
    </xsl:variable>
    <xsl:variable name=3D"backslashAndQuotesEscaped">
      <xsl:call-template name=3D"replace-string">
        <xsl:with-param name=3D"text" select=3D"$backslashEscaped"/>
        <xsl:with-param name=3D"replace" select=3D"'&quot;'"/>
        <xsl:with-param name=3D"with" select=3D"'\&quot;'"/>
      </xsl:call-template>=20
    </xsl:variable>
    <xsl:value-of select=3D"$backslashAndQuotesEscaped"/>=20
  </xsl:template>

<!-- DW - String replacement template. -->
  <xsl:template name=3D"replace-string">
    <xsl:param name=3D"text"/>
    <xsl:param name=3D"replace"/>
    <xsl:param name=3D"with"/>
    <xsl:choose>=20
      <xsl:when test=3D"contains($text,$replace)">
        <xsl:value-of select=3D"substring-before($text,$replace)"/>=20
        <xsl:value-of select=3D"$with"/>=20
        <xsl:call-template name=3D"replace-string">=20
          <xsl:with-param name=3D"text" =
select=3D"substring-after($text,$replace)"/>
          <xsl:with-param name=3D"replace" select=3D"$replace"/>
          <xsl:with-param name=3D"with" select=3D"$with"/>
        </xsl:call-template>
      </xsl:when>
      <xsl:otherwise>=20
        <xsl:value-of select=3D"$text"/>=20
      </xsl:otherwise>=20
    </xsl:choose>
  </xsl:template>=20



  <!-- *** Dynamic Tag Support *** -->

  <!-- Expand dynamic tags to code -->
  <xsl:template name=3D"expr-value" match=3D"xsp:expr-value">
    <xsl:choose>
      <xsl:when test=3D"name(*[1]) =3D 'xsp:expr'">
        <xsl:value-of select=3D"*[1]"/>
      </xsl:when>
      <xsl:otherwise>"<xsl:value-of select=3D"."/>"</xsl:otherwise>
    </xsl:choose>
  </xsl:template>

  <!-- Prolog declarations required to mix code and markup -->
  <xsl:template match=3D"xsp:declare-node-stack">
    Node xspParentNode =3D null;
    Node xspCurrentNode =3D <xsl:value-of select=3D"@node-argument"/>;
    Stack xspNodeStack =3D new Stack();
    Document document =3D <xsl:value-of =
select=3D"@node-argument"/>.getOwnerDocument();
  </xsl:template>

</xsl:stylesheet>

------_=_NextPart_000_01C07EDE.7E284342--