cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java esql.xsl form-validator.xsl log.xsl logicsheet-util.xsl sendmail.xsl util.xsl
Date Thu, 21 Feb 2002 03:36:10 GMT
vgritsenko    02/02/20 19:36:10

  Modified:    src/java/org/apache/cocoon/components/language/markup/xsp/java
                        esql.xsl form-validator.xsl log.xsl
                        logicsheet-util.xsl sendmail.xsl util.xsl
  Log:
  Fix get-nested-content template: xsp:text should be treated as text
  
  Revision  Changes    Path
  1.12      +3 -2      xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
  
  Index: esql.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- esql.xsl	20 Feb 2002 11:31:27 -0000	1.11
  +++ esql.xsl	21 Feb 2002 03:36:09 -0000	1.12
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<!-- $Id: esql.xsl,v 1.11 2002/02/20 11:31:27 tcurdt Exp $-->
  +<!-- $Id: esql.xsl,v 1.12 2002/02/21 03:36:09 vgritsenko Exp $-->
   <!--
   
    ============================================================================
  @@ -56,7 +56,7 @@
    * ESQL Logicsheet
    *
    * @author ?
  - * @version CVS $Revision: 1.11 $ $Date: 2002/02/20 11:31:27 $
  + * @version CVS $Revision: 1.12 $ $Date: 2002/02/21 03:36:09 $
   -->
   
   <xsl:stylesheet version="1.0"
  @@ -107,6 +107,7 @@
   <xsl:template name="get-nested-content">
     <xsl:param name="content"/>
     <xsl:choose>
  +    <xsl:when test="$content/xsp:text">"<xsl:value-of select="$content"/>"</xsl:when>
       <xsl:when test="$content/*">
         <xsl:apply-templates select="$content/*"/>
       </xsl:when>
  
  
  
  1.4       +4 -3      xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/form-validator.xsl
  
  Index: form-validator.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/form-validator.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- form-validator.xsl	13 Feb 2002 01:09:07 -0000	1.3
  +++ form-validator.xsl	21 Feb 2002 03:36:09 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0" encoding="ISO-8859-1"?><!-- -*- xsl -*- -->
   
  -<!-- $Id: form-validator.xsl,v 1.3 2002/02/13 01:09:07 vgritsenko Exp $ -->
  +<!-- $Id: form-validator.xsl,v 1.4 2002/02/21 03:36:09 vgritsenko Exp $ -->
   <!--
   
    ============================================================================
  @@ -56,7 +56,7 @@
    * XSP Form-Validator logicsheet for the Java language
    *
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de>Christian Haul</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2002/02/13 01:09:07 $
  + * @version CVS $Revision: 1.4 $ $Date: 2002/02/21 03:36:09 $
   -->
   
   <xsl:stylesheet
  @@ -686,8 +686,9 @@
     <xsl:template name="get-nested-content">
       <xsl:param name="content"/>
       <xsl:choose>
  +      <xsl:when test="$content/xsp:text">"<xsl:value-of select="$content"/>"</xsl:when>
         <xsl:when test="$content/*">
  -      <xsl:apply-templates select="$content/*|$content/text()"/>
  +        <xsl:apply-templates select="$content/*|$content/text()"/>
         </xsl:when>
         <xsl:otherwise>"<xsl:value-of select="$content"/>"</xsl:otherwise>
       </xsl:choose>
  
  
  
  1.4       +3 -2      xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/log.xsl
  
  Index: log.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/log.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- log.xsl	13 Feb 2002 01:09:07 -0000	1.3
  +++ log.xsl	21 Feb 2002 03:36:09 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<!-- $Id: log.xsl,v 1.3 2002/02/13 01:09:07 vgritsenko Exp $-->
  +<!-- $Id: log.xsl,v 1.4 2002/02/21 03:36:09 vgritsenko Exp $-->
   <!--
   
    ============================================================================
  @@ -56,7 +56,7 @@
    * XSP Logger logicsheet for the Java language
    *
    * @author <a href="mailto:bloritsch@apache.org>Berin Loritsch</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2002/02/13 01:09:07 $
  + * @version CVS $Revision: 1.4 $ $Date: 2002/02/21 03:36:09 $
   -->
   
   <xsl:stylesheet
  @@ -168,6 +168,7 @@
     <xsl:template name="get-nested-content">
       <xsl:param name="content"/>
       <xsl:choose>
  +      <xsl:when test="$content/xsp:text">"<xsl:value-of select="$content"/>"</xsl:when>
         <xsl:when test="$content/*">
           <xsl:apply-templates select="$content/*"/>
         </xsl:when>
  
  
  
  1.3       +3 -2      xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/logicsheet-util.xsl
  
  Index: logicsheet-util.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/logicsheet-util.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- logicsheet-util.xsl	13 Feb 2002 01:09:07 -0000	1.2
  +++ logicsheet-util.xsl	21 Feb 2002 03:36:09 -0000	1.3
  @@ -1,6 +1,6 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
   
  -<!-- $Id: logicsheet-util.xsl,v 1.2 2002/02/13 01:09:07 vgritsenko Exp $-->
  +<!-- $Id: logicsheet-util.xsl,v 1.3 2002/02/21 03:36:09 vgritsenko Exp $-->
   <!--
   
    ============================================================================
  @@ -63,7 +63,7 @@
    * be set in the including logicsheet to its namespace URI.
    *
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2002/02/13 01:09:07 $
  + * @version CVS $Revision: 1.3 $ $Date: 2002/02/21 03:36:09 $
   -->
   
   <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  @@ -256,6 +256,7 @@
     <xsl:template name="get-nested-content">
       <xsl:param name="content"/>
       <xsl:choose>
  +      <xsl:when test="$content/xsp:text">"<xsl:value-of select="$content"/>"</xsl:when>
         <xsl:when test="$content/*">
           <xsl:apply-templates select="$content/*"/>
         </xsl:when>
  
  
  
  1.4       +3 -2      xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/sendmail.xsl
  
  Index: sendmail.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/sendmail.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sendmail.xsl	13 Feb 2002 01:09:07 -0000	1.3
  +++ sendmail.xsl	21 Feb 2002 03:36:09 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<!-- $Id: sendmail.xsl,v 1.3 2002/02/13 01:09:07 vgritsenko Exp $-->
  +<!-- $Id: sendmail.xsl,v 1.4 2002/02/21 03:36:09 vgritsenko Exp $-->
   <!--
   
    ============================================================================
  @@ -56,7 +56,7 @@
    * This is a stylesheet to send mail via the java mail API.
    *
    * @author Donald A. Ball Jr.
  - * @version CVS $Revision: 1.3 $ $Date: 2002/02/13 01:09:07 $
  + * @version CVS $Revision: 1.4 $ $Date: 2002/02/21 03:36:09 $
   -->
   
   <xsl:stylesheet
  @@ -105,6 +105,7 @@
   <xsl:template name="get-nested-content">
     <xsl:param name="content"/>
     <xsl:choose>
  +    <xsl:when test="$content/xsp:text">"<xsl:value-of select="$content"/>"</xsl:when>
       <xsl:when test="$content/*">
         <xsl:apply-templates select="$content/*"/>
       </xsl:when>
  
  
  
  1.4       +3 -2      xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/util.xsl
  
  Index: util.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/util.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- util.xsl	13 Feb 2002 01:09:07 -0000	1.3
  +++ util.xsl	21 Feb 2002 03:36:09 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<!-- $Id: util.xsl,v 1.3 2002/02/13 01:09:07 vgritsenko Exp $-->
  +<!-- $Id: util.xsl,v 1.4 2002/02/21 03:36:09 vgritsenko Exp $-->
   <!--
   
    ============================================================================
  @@ -57,7 +57,7 @@
    *
    * @author <a href="mailto:ricardo@apache.org>Ricardo Rocha</a>
    * @author ported by <a href="mailto:bloritsch@apache.org>Berin Loritsch</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2002/02/13 01:09:07 $
  + * @version CVS $Revision: 1.4 $ $Date: 2002/02/21 03:36:09 $
   -->
   
   <xsl:stylesheet version="1.0"
  @@ -306,6 +306,7 @@
     <xsl:template name="get-nested-content">
       <xsl:param name="content"/>
       <xsl:choose>
  +      <xsl:when test="$content/xsp:text">"<xsl:value-of select="$content"/>"</xsl:when>
         <xsl:when test="$content/*">
           <xsl:apply-templates select="$content/*"/>
         </xsl:when>
  
  
  

----------------------------------------------------------------------
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


Mime
View raw message