vgritsenko 2002/06/19 07:11:05
Modified: src/java/org/apache/cocoon/components/language/markup/xsp/java
Tag: cocoon_2_0_3_branch xsp.xsl
src/java/org/apache/cocoon/components/language/markup/xsp/javascript
Tag: cocoon_2_0_3_branch xsp.xsl
src/java/org/apache/cocoon/components/language/markup/xsp/java
xsp.xsl
src/java/org/apache/cocoon/components/language/markup/xsp/javascript
xsp.xsl
src/java/org/apache/cocoon/components/language/markup/xsp/python
xsp.xsl
Log:
fix bug 9693: national characters in XSP page element attributes
Revision Changes Path
No revision
No revision
1.9.2.1 +4 -4
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
Index: xsp.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- xsp.xsl 31 Mar 2002 16:51:56 -0000 1.9
+++ xsp.xsl 19 Jun 2002 14:11:04 -0000 1.9.2.1
@@ -363,7 +363,7 @@
<xsl:when test="namespace-uri(.) = $xsp-uri and local-name(.) =
'expr'">
String.valueOf(<xsl:value-of select="."/>)
</xsl:when>
- <xsl:otherwise> "<xsl:value-of select="."/>" </xsl:otherwise>
+ <xsl:otherwise> "<xsl:value-of
select="XSLTExtension:escape($extension,.)"/>" </xsl:otherwise>
</xsl:choose>
</xsl:for-each>
<xsl:if test="not(text()|xsp:expr|xsp:text)"> "" </xsl:if>
@@ -494,7 +494,7 @@
"<xsl:value-of select="local-name(.)"/>",
"<xsl:value-of select="name(.)"/>",
"CDATA",
- "<xsl:value-of select="."/>"
+ "<xsl:value-of select="XSLTExtension:escape($extension,.)"/>"
);
</xsl:if>
</xsl:template>
No revision
No revision
1.6.2.1 +6 -5
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/javascript/xsp.xsl
Index: xsp.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/javascript/xsp.xsl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- xsp.xsl 31 Mar 2002 16:51:56 -0000 1.6
+++ xsp.xsl 19 Jun 2002 14:11:04 -0000 1.6.2.1
@@ -267,7 +267,7 @@
(<xsl:value-of select="."/>)
</xsl:when>
<xsl:otherwise>
- "<xsl:value-of select="."/>"
+ "<xsl:value-of select="XSLTExtension:escape($extension,.)"/>"
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
@@ -386,8 +386,9 @@
<!-- Filter out namespace declaration attributes -->
<xsl:if test="not(starts-with(name(.), 'xmlns:'))">
xspAttr.addAttribute("<xsl:value-of select="namespace-uri(.)"/>",
- "<xsl:value-of select="local-name(.)"/>", "<xsl:value-of
select="name(.)"/>", "CDATA",
- "<xsl:value-of select="."/>");
+ "<xsl:value-of select="local-name(.)"/>", "<xsl:value-of
select="name(.)"/>",
+ "CDATA",
+ "<xsl:value-of select="XSLTExtension:escape($extension,.)"/>");
</xsl:if>
</xsl:template>
1.10 +4 -4
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
Index: xsp.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xsp.xsl 31 Mar 2002 16:51:56 -0000 1.9
+++ xsp.xsl 19 Jun 2002 14:11:05 -0000 1.10
@@ -363,7 +363,7 @@
<xsl:when test="namespace-uri(.) = $xsp-uri and local-name(.) =
'expr'">
String.valueOf(<xsl:value-of select="."/>)
</xsl:when>
- <xsl:otherwise> "<xsl:value-of select="."/>" </xsl:otherwise>
+ <xsl:otherwise> "<xsl:value-of
select="XSLTExtension:escape($extension,.)"/>" </xsl:otherwise>
</xsl:choose>
</xsl:for-each>
<xsl:if test="not(text()|xsp:expr|xsp:text)"> "" </xsl:if>
@@ -494,7 +494,7 @@
"<xsl:value-of select="local-name(.)"/>",
"<xsl:value-of select="name(.)"/>",
"CDATA",
- "<xsl:value-of select="."/>"
+ "<xsl:value-of select="XSLTExtension:escape($extension,.)"/>"
);
</xsl:if>
</xsl:template>
1.7 +6 -5
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/javascript/xsp.xsl
Index: xsp.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/javascript/xsp.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xsp.xsl 31 Mar 2002 16:51:56 -0000 1.6
+++ xsp.xsl 19 Jun 2002 14:11:05 -0000 1.7
@@ -267,7 +267,7 @@
(<xsl:value-of select="."/>)
</xsl:when>
<xsl:otherwise>
- "<xsl:value-of select="."/>"
+ "<xsl:value-of select="XSLTExtension:escape($extension,.)"/>"
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
@@ -386,8 +386,9 @@
<!-- Filter out namespace declaration attributes -->
<xsl:if test="not(starts-with(name(.), 'xmlns:'))">
xspAttr.addAttribute("<xsl:value-of select="namespace-uri(.)"/>",
- "<xsl:value-of select="local-name(.)"/>", "<xsl:value-of
select="name(.)"/>", "CDATA",
- "<xsl:value-of select="."/>");
+ "<xsl:value-of select="local-name(.)"/>", "<xsl:value-of
select="name(.)"/>",
+ "CDATA",
+ "<xsl:value-of select="XSLTExtension:escape($extension,.)"/>");
</xsl:if>
</xsl:template>
1.3 +4 -4
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/python/xsp.xsl
Index: xsp.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/python/xsp.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xsp.xsl 20 Apr 2002 03:38:20 -0000 1.2
+++ xsp.xsl 19 Jun 2002 14:11:05 -0000 1.3
@@ -375,7 +375,7 @@
</xsl:when>
<xsl:otherwise>
<xsl:text>"</xsl:text>
- <xsl:value-of select="."/>
+ <xsl:value-of select="XSLTExtension:escape($extension, .)"/>
<xsl:text>"</xsl:text>
</xsl:otherwise>
</xsl:choose>
@@ -628,7 +628,7 @@
<xsl:if test="not(starts-with(name(.), 'xmlns:'))">
<xsl:value-of select="$indent"/>
<xsl:text>xspAttr.addAttribute("</xsl:text>
- <xsl:value-of select="namespace-uri(.)"/>", "<xsl:value-of
select="local-name(.)"/>", "<xsl:value-of select="name(.)"/>", "CDATA",
"<xsl:value-of select="."/>
+ <xsl:value-of select="namespace-uri(.)"/>", "<xsl:value-of
select="local-name(.)"/>", "<xsl:value-of select="name(.)"/>", "CDATA",
"<xsl:value-of select="XSLTExtension:escape($extension, .)"/>
<xsl:text>")
</xsl:text>
</xsl:if>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
