Return-Path: 
 <cocoon-cvs-return-3453-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 42490 invoked by uid 500); 14 Sep 2001 13:03:28 -0000
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
list-help: <mailto:cocoon-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-cvs@xml.apache.org>
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 42480 invoked by uid 500); 14 Sep 2001 13:03:28 -0000
Delivered-To: apmail-xml-cocoon2-cvs@apache.org
Date: 14 Sep 2001 12:58:33 -0000
Message-ID: <20010914125833.76625.qmail@icarus.apache.org>
From: sylvain@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit:
 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java xsp.xsl
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

sylvain     01/09/14 05:58:33

  Modified:    src/org/apache/cocoon/components/language/markup/xsp/java
                        xsp.xsl
  Log:
  Allow <xsp:attribute> inside <xsp:logic>
  Reported by Torsten Curdt <tcurdt@dff.st>
  
  Revision  Changes    Path
  1.8       +5 -5      xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
  
  Index: xsp.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- xsp.xsl	2001/08/14 13:59:14	1.7
  +++ xsp.xsl	2001/09/14 12:58:33	1.8
  @@ -12,7 +12,7 @@
   <!--
    * @author <a href="mailto:ricardo@apache.org>Ricardo Rocha</a>
    * @author <a href="sylvain.wallez@anyware-tech.com">Sylvain Wallez</a>
  - * @version CVS $Revision: 1.7 $ $Date: 2001/08/14 13:59:14 $
  + * @version CVS $Revision: 1.8 $ $Date: 2001/09/14 12:58:33 $
   -->
   
   <!-- XSP Core logicsheet for the Java language -->
  @@ -211,7 +211,7 @@
         </xsl:if>
       </xsl:for-each>
   
  -    <xsl:apply-templates select="xsp:attribute"/>
  +    <xsl:apply-templates select="xsp:attribute | xsp:logic[xsp:attribute]"/>
   
       this.contentHandler.startElement(
         <xsl:copy-of select="$uri"/>,
  @@ -222,7 +222,7 @@
   
       xspAttr.clear();
   
  -    <xsl:apply-templates select="node()[not(name(.) = 'xsp:attribute')]"/>
  +    <xsl:apply-templates select="node()[not(name(.) = 'xsp:attribute' or (name(.) = 'xsp:logic' and ./xsp:attribute))]"/>
   
       this.contentHandler.endElement(
         <xsl:copy-of select="$uri"/>,
  @@ -385,7 +385,7 @@
   
       <xsl:apply-templates select="@*"/>
   
  -    <xsl:apply-templates select="xsp:attribute"/>
  +    <xsl:apply-templates select="xsp:attribute | xsp:logic[xsp:attribute]"/>
   
       this.contentHandler.startElement(
         "<xsl:value-of select="namespace-uri(.)"/>",
  @@ -396,7 +396,7 @@
   
       xspAttr.clear();
   
  -    <xsl:apply-templates select="node()[not(name(.) = 'xsp:attribute')]"/>
  +    <xsl:apply-templates select="node()[not(name(.) = 'xsp:attribute' or (name(.) = 'xsp:logic' and ./xsp:attribute))]"/>
   
       this.contentHandler.endElement(
         "<xsl:value-of select="namespace-uri(.)"/>",
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org