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 util.xsl
Date Sat, 03 Aug 2002 15:11:03 GMT
vgritsenko    2002/08/03 08:11:03

  Modified:    .        Tag: cocoon_2_0_3_branch changes.xml
               .        changes.xml
               src/java/org/apache/cocoon/components/language/markup/xsp/java
                        Tag: cocoon_2_0_3_branch util.xsl
  Log:
  fix include-expr: should use String.valueOf
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.138.2.41 +4 -1      xml-cocoon2/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/changes.xml,v
  retrieving revision 1.138.2.40
  retrieving revision 1.138.2.41
  diff -u -r1.138.2.40 -r1.138.2.41
  --- changes.xml	2 Aug 2002 02:18:05 -0000	1.138.2.40
  +++ changes.xml	3 Aug 2002 15:11:03 -0000	1.138.2.41
  @@ -39,6 +39,9 @@
    </devs>
   
    <release version="@version@" date="@date@">
  +  <action dev="VG" type="fix">
  +    &lt;xsp-util:include-expr/&gt; includes any object, converting it to string.
  +  </action>
     <action dev="VG" type="update">
       XSP now verifies that value of attribute name on xsp:element does not
       contains ':'. To create namespaced elements, uri and prefix attributes
  
  
  
  1.227     +4 -1      xml-cocoon2/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/changes.xml,v
  retrieving revision 1.226
  retrieving revision 1.227
  diff -u -r1.226 -r1.227
  --- changes.xml	2 Aug 2002 02:18:26 -0000	1.226
  +++ changes.xml	3 Aug 2002 15:11:03 -0000	1.227
  @@ -39,6 +39,9 @@
    </devs>
   
    <release version="@version@" date="@date@">
  +  <action dev="VG" type="fix">
  +    &lt;xsp-util:include-expr/&gt; includes any object, converting it to string.
  +  </action>
     <action dev="VG" type="update">
       XSP now verifies that value of attribute name on xsp:element does not
       contains ':'. To create namespaced elements, uri and prefix attributes
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.2   +20 -28    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.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- util.xsl	14 Jul 2002 15:07:31 -0000	1.4.2.1
  +++ util.xsl	3 Aug 2002 15:11:03 -0000	1.4.2.2
  @@ -155,7 +155,6 @@
   
   
   
  -
     <!-- Include URL contents as SAX -->
     <xsl:template match="util:include-uri">
       <xsl:variable name="href">
  @@ -201,9 +200,9 @@
           </xsl:when>
         </xsl:choose>
       </xsl:variable>
  -
       <xsp:logic>
  -      XSPUtil.includeString(<xsl:copy-of select="$expr"/>,this.manager, this.contentHandler);
  +      XSPUtil.includeString(String.valueOf(<xsl:copy-of select="$expr"/>),
  +          this.manager, this.contentHandler);
       </xsp:logic>
     </xsl:template>
   
  @@ -222,23 +221,21 @@
   
       <xsl:choose>
         <xsl:when test="@encoding">
  -	    <xsp:expr>
  -	      XSPUtil.getFileContents(
  -		    XSPUtil.relativeFilename(
  -		          String.valueOf(<xsl:copy-of select="$name"/>),
  -		      this.objectModel
  -		    ), "<xsl:value-of select="@encoding"/>"
  -		      )
  -	    </xsp:expr>
  -	  </xsl:when>
  +        <xsp:expr>
  +          XSPUtil.getFileContents(
  +            XSPUtil.relativeFilename(
  +              String.valueOf(<xsl:copy-of select="$name"/>),
  +              this.objectModel
  +            ), "<xsl:value-of select="@encoding"/>")
  +        </xsp:expr>
  +      </xsl:when>
         <xsl:otherwise>
  -	    <xsp:expr>
  -	      XSPUtil.getFileContents(
  -		    XSPUtil.relativeFilename(
  -		          String.valueOf(<xsl:copy-of select="$name"/>),
  -		      this.objectModel
  -		    ))
  -	    </xsp:expr>
  +        <xsp:expr>
  +          XSPUtil.getFileContents(
  +            XSPUtil.relativeFilename(
  +              String.valueOf(<xsl:copy-of select="$name"/>),
  +              this.objectModel))
  +        </xsp:expr>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:template>
  @@ -268,14 +265,9 @@
           </xsl:when>
         </xsl:choose>
       </xsl:variable>
  -
       <xsp:expr>
  -      XSPUtil.formatDate(
  -        new Date(),
  -    String.valueOf(<xsl:copy-of select="$format"/>).trim()
  -      )
  +      XSPUtil.formatDate(new Date(),
  +          String.valueOf(<xsl:copy-of select="$format"/>).trim())
       </xsp:expr>
     </xsl:template>
  -
  -
   </xsl:stylesheet>
  
  
  

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