vgritsenko 02/03/31 08:41:01
Modified: src/java/org/apache/cocoon/components/language/markup/xsp/java
request.xsl
src/java/org/apache/cocoon/components/language/markup/xsp/javascript
request.xsl
Log:
fix bug in the xsp-request:get-session-id reported by Dave Covert
[[EMAIL PROTECTED]]
Revision Changes Path
1.7 +4 -8
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- request.xsl 21 Feb 2002 02:51:49 -0000 1.6
+++ request.xsl 31 Mar 2002 16:41:01 -0000 1.7
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!-- $Id: request.xsl,v 1.6 2002/02/21 02:51:49 vgritsenko Exp $-->
+<!-- $Id: request.xsl,v 1.7 2002/03/31 16:41:01 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.6 $ $Date: 2002/02/21 02:51:49 $
+ * @version CVS $Revision: 1.7 $ $Date: 2002/03/31 16:41:01 $
-->
<xsl:stylesheet version="1.0"
@@ -920,16 +920,12 @@
<xsl:choose>
<xsl:when test="$as = 'string'">
- <xsp:expr>
- (XSPRequestHelper.getSessionId(objectModel))
- </xsp:expr>
+ <xsp:expr>(request.getSession().getId())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
<!-- <xsp-request:session-id> -->
<xsp:element name="xsp-request:session-id">
- <xsp:logic>
- (XSPRequestHelper.getSessionId(objectModel))
- </xsp:logic>
+ <xsp:expr>(request.getSession().getId())</xsp:expr>
</xsp:element>
</xsl:when>
</xsl:choose>
1.4 +4 -6
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/javascript/request.xsl
Index: request.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/javascript/request.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- request.xsl 11 Feb 2002 04:45:40 -0000 1.3
+++ request.xsl 31 Mar 2002 16:41:01 -0000 1.4
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!-- $Id: request.xsl,v 1.3 2002/02/11 04:45:40 vgritsenko Exp $-->
+<!-- $Id: request.xsl,v 1.4 2002/03/31 16:41:01 vgritsenko Exp $-->
<!--
*****************************************************************************
* Copyright (C) The Apache Software Foundation. All rights reserved. *
@@ -14,7 +14,7 @@
<!--
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Vadim Gritsenko</a>
- * @version CVS $Revision: 1.3 $ $Date: 2002/02/11 04:45:40 $
+ * @version CVS $Revision: 1.4 $ $Date: 2002/03/31 16:41:01 $
-->
<!-- XSP Request logicsheet for the Javascript language -->
@@ -866,14 +866,12 @@
<xsl:choose>
<xsl:when test="$as = 'string'">
- <xsp:expr>(page.getSessionId())</xsp:expr>
+ <xsp:expr>(request.getSession().getId())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
<!-- <xsp-request:session-id> -->
<xsp:element name="xsp-request:session-id">
- <xsp:logic>
- page.getSessionId(this.contentHandler);
- </xsp:logic>
+ <xsp:expr>(request.getSession().getId())</xsp:expr>
</xsp:element>
</xsl:when>
</xsl:choose>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
