vgritsenko 02/02/20 18:51:49
Modified: src/java/org/apache/cocoon/components/language/markup/xsp/java
request.xsl response.xsl session.xsl
Log:
Fix xsp-session:set-attribute bug reported by Paolo Scaffardi [[EMAIL PROTECTED]]
Revision Changes Path
1.6 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/request.xsl
Index: request.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/request.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- request.xsl 13 Feb 2002 01:09:07 -0000 1.5
+++ request.xsl 21 Feb 2002 02:51:49 -0000 1.6
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!-- $Id: request.xsl,v 1.5 2002/02/13 01:09:07 vgritsenko Exp $-->
+<!-- $Id: request.xsl,v 1.6 2002/02/21 02:51:49 vgritsenko Exp $-->
<!--
============================================================================
@@ -57,7 +57,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Vadim Gritsenko</a>
- * @version CVS $Revision: 1.5 $ $Date: 2002/02/13 01:09:07 $
+ * @version CVS $Revision: 1.6 $ $Date: 2002/02/21 02:51:49 $
-->
<xsl:stylesheet version="1.0"
@@ -1011,6 +1011,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/response.xsl
Index: response.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/response.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- response.xsl 13 Feb 2002 01:09:07 -0000 1.3
+++ response.xsl 21 Feb 2002 02:51:49 -0000 1.4
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!-- $Id: response.xsl,v 1.3 2002/02/13 01:09:07 vgritsenko Exp $-->
+<!-- $Id: response.xsl,v 1.4 2002/02/21 02:51:49 vgritsenko Exp $-->
<!--
============================================================================
@@ -56,7 +56,7 @@
* XSP Response logicsheet for the Java language
*
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
- * @version CVS $Revision: 1.3 $ $Date: 2002/02/13 01:09:07 $
+ * @version CVS $Revision: 1.4 $ $Date: 2002/02/21 02:51:49 $
-->
<xsl:stylesheet version="1.0"
@@ -381,6 +381,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.10 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/session.xsl
Index: session.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/session.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- session.xsl 13 Feb 2002 01:09:07 -0000 1.9
+++ session.xsl 21 Feb 2002 02:51:49 -0000 1.10
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!-- $Id: session.xsl,v 1.9 2002/02/13 01:09:07 vgritsenko Exp $-->
+<!-- $Id: session.xsl,v 1.10 2002/02/21 02:51:49 vgritsenko Exp $-->
<!--
============================================================================
@@ -56,7 +56,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
* @author ported by <a href="mailto:[EMAIL PROTECTED]>Berin Loritsch</a>
- * @version CVS $Revision: 1.9 $ $Date: 2002/02/13 01:09:07 $
+ * @version CVS $Revision: 1.10 $ $Date: 2002/02/21 02:51:49 $
-->
<xsl:stylesheet version="1.0"
@@ -310,7 +310,7 @@
<xsl:variable name="content">
<xsl:call-template name="get-nested-content">
- <xsl:with-param name="content" select="*|text()"/>
+ <xsl:with-param name="content" select="."/>
</xsl:call-template>
</xsl:variable>
@@ -395,6 +395,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: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
