You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2004/05/10 20:53:21 UTC
cvs commit: ws-axis/java/xmls junit-frames.xsl junit-noframes.xsl
dims 2004/05/10 11:53:21
Modified: java/xmls junit-frames.xsl junit-noframes.xsl
Log:
Fix for StackOverFlowError with latest ANT/Xalan
Revision Changes Path
1.3 +4 -16 ws-axis/java/xmls/junit-frames.xsl
Index: junit-frames.xsl
===================================================================
RCS file: /home/cvs/ws-axis/java/xmls/junit-frames.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- junit-frames.xsl 25 Feb 2004 14:03:06 -0000 1.2
+++ junit-frames.xsl 10 May 2004 18:53:21 -0000 1.3
@@ -1,6 +1,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt"
xmlns:redirect="org.apache.xalan.lib.Redirect"
+ xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
extension-element-prefixes="redirect">
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
<xsl:decimal-format decimal-separator="." grouping-separator=","/>
@@ -686,23 +687,10 @@
<xsl:template name="JS-escape">
<xsl:param name="string"/>
- <xsl:choose>
- <xsl:when test="contains($string,"'")">
- <xsl:value-of select="substring-before($string,"'")"/>\'<xsl:call-template name="JS-escape">
- <xsl:with-param name="string" select="substring-after($string,"'")"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:when test="contains($string,'\')">
- <xsl:value-of select="substring-before($string,'\')"/>\\<xsl:call-template name="JS-escape">
- <xsl:with-param name="string" select="substring-after($string,'\')"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$string"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/>
+ <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/>
+ <xsl:value-of select="$tmp2"/>
</xsl:template>
-
<!--
template that will convert a carriage return into a br tag
1.3 +4 -17 ws-axis/java/xmls/junit-noframes.xsl
Index: junit-noframes.xsl
===================================================================
RCS file: /home/cvs/ws-axis/java/xmls/junit-noframes.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- junit-noframes.xsl 25 Feb 2004 14:03:06 -0000 1.2
+++ junit-noframes.xsl 10 May 2004 18:53:21 -0000 1.3
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils" version="1.0">
<xsl:output method="html" indent="yes" encoding="US-ASCII"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
<xsl:decimal-format decimal-separator="." grouping-separator="," />
@@ -429,23 +429,10 @@
<xsl:template name="JS-escape">
<xsl:param name="string"/>
- <xsl:choose>
- <xsl:when test="contains($string,"'")">
- <xsl:value-of select="substring-before($string,"'")"/>\'<xsl:call-template name="JS-escape">
- <xsl:with-param name="string" select="substring-after($string,"'")"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:when test="contains($string,'\')">
- <xsl:value-of select="substring-before($string,'\')"/>\\<xsl:call-template name="JS-escape">
- <xsl:with-param name="string" select="substring-after($string,'\')"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$string"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/>
+ <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/>
+ <xsl:value-of select="$tmp2"/>
</xsl:template>
-
<!--
template that will convert a carriage return into a br tag