haul 2002/12/18 08:57:28
Added: src/blocks/session-fw/conf session-xsp.xconf
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/language/markup/xsp
XSPSessionHelper.java
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/language/markup/xsp/java
session.xsl
Log:
<action dev="CH" type="add"due-to-email="[EMAIL PROTECTED]"
due-to="Antonio Gallardo" fixes-bug="13070">
Add a new tag xsp-session:getxml to XSP. In this course moved session.xsl
for JAVA as well as XSPSessionHelper to session-fw block. Removed
dependencies to XSPSessionHelper and moved functionality to XSPRequestHelper
which already deals with session.
</action>
Revision Changes Path
1.1 xml-cocoon2/src/blocks/session-fw/conf/session-xsp.xconf
Index: session-xsp.xconf
===================================================================
<?xml version="1.0"?>
<xconf
xpath="/cocoon/markup-languages/xsp-language[@name='xsp']/target-language[@name='java']"
unless="builtin-logicsheet/parameter[@name='prefix' and @value='xsp-session']">
<!-- The Session logicsheet (taglib) is an XSP logicsheet that wraps XML
tags around
standard session operations. Specifically, the Session logicsheet
provides an
XML interface to most methods of the HttpSession object (see the Java
Servlet API
Specification, version 2.2 ) for more information. -->
<builtin-logicsheet>
<parameter name="prefix" value="xsp-session"/>
<parameter name="uri" value="http://apache.org/xsp/session/2.0"/>
<parameter name="href"
value="resource://org/apache/cocoon/webapps/session/components/language/markup/xsp/java/session.xsl"/>
</builtin-logicsheet>
</xconf>
1.1
xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/language/markup/xsp/XSPSessionHelper.java
Index: XSPSessionHelper.java
===================================================================
/*
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.cocoon.webapps.session.components.language.markup.xsp;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.webapps.session.components.SessionManager;
import org.w3c.dom.DocumentFragment;
/**
* The <code>Session</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Antonio Gallardo</a>
* @version CVS $Id: XSPSessionHelper.java,v 1.1 2002/12/18 16:57:27 haul Exp $
*/
public class XSPSessionHelper {
/** GetXML Fragment from the given session context and path
*
*
* @param session The Session object
* @param context The Session context tha define where to search
* @param path The parameter path
* @param defaultValue Value to substitute in absence of the required Fragment
**/
public static DocumentFragment getXML(ComponentManager cm, String context,
String path) throws ProcessingException {
DocumentFragment df = null;
SessionManager sm = null;
try {
// Start looking up the manager
sm = (SessionManager)cm.lookup(SessionManager.ROLE);
// Make our work
df = sm.getContextFragment(context, path);
if (sm != null) {
cm.release(sm);
}
} catch (ComponentException ce) {
throw new ProcessingException("Error during lookup of SessionManager
component.", ce);
}
// End releasing the sessionmanager
return df;
}
}
1.1
xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/language/markup/xsp/java/session.xsl
Index: session.xsl
===================================================================
<?xml version="1.0"?>
<!-- $Id: session.xsl,v 1.1 2002/12/18 16:57:27 haul Exp $-->
<!--
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Cocoon" and "Apache Software Foundation" must not be used to
endorse or promote products derived from this software without prior
written permission. For written permission, please contact
[EMAIL PROTECTED]
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
-->
<!--
* XSP Session logicsheet for the Java language
*
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
* @author ported by <a href="mailto:[EMAIL PROTECTED]>Berin Loritsch</a>
* @version CVS $Revision: 1.1 $ $Date: 2002/12/18 16:57:27 $
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:xsp="http://apache.org/xsp";
xmlns:xsp-session="http://apache.org/xsp/session/2.0";>
<!-- *** ServletSession Templates *** -->
<xsl:template match="xsp:page">
<xsp:page>
<xsl:apply-templates select="@*"/>
<xsp:structure>
<xsp:include>org.apache.cocoon.environment.Session</xsp:include>
<xsp:include>org.apache.cocoon.components.language.markup.xsp.XSPRequestHelper</xsp:include>
<xsp:include>org.apache.cocoon.webapps.session.components.language.markup.xsp.XSPSessionHelper</xsp:include>
</xsp:structure>
<xsl:variable name="create">
<xsl:choose>
<xsl:when test="@create-session='yes' or
@create-session='true'">true</xsl:when>
<xsl:when test="@create-session='no' or
@create-session='false'">false</xsl:when>
<xsl:otherwise>true</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsp:init-page>
Session session = request.getSession(<xsl:value-of select="$create"/>);
</xsp:init-page>
<xsl:apply-templates/>
</xsp:page>
</xsl:template>
<xsl:template match="xsp-session:get-session-id">
<xsl:variable name="as">
<xsl:call-template name="value-for-as">
<xsl:with-param name="default" select="'string'"/>
</xsl:call-template>
</xsl:variable>
<xsl:choose>
<xsl:when test="$as = 'string'">
<xsp:expr> (session.getId()) </xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
<!-- <xsp-session:session-id> -->
<xsp-session:session-id>
<xsp:expr>session.getId()</xsp:expr>
</xsp-session:session-id>
</xsl:when>
</xsl:choose>
</xsl:template>
<xsl:template match="xsp-session:get-attribute">
<xsl:variable name="name">
<xsl:call-template name="value-for-name"/>
</xsl:variable>
<xsl:variable name="as">
<xsl:call-template name="value-for-as">
<xsl:with-param name="default" select="'object'"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="default">
<xsl:choose>
<xsl:when test="@default">"<xsl:value-of select="@default"/>"</xsl:when>
<xsl:when test="xsp-session:default">
<xsl:call-template name="get-nested-content">
<xsl:with-param name="content" select="xsp-session:default"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>null</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:choose>
<xsl:when test="$as = 'xml'">
<xsp-session:attribute>
<xsp:expr>
XSPRequestHelper.getSessionAttribute(this.objectModel,
String.valueOf(<xsl:copy-of select="$name"/>),
<xsl:copy-of select="$default"/>)
</xsp:expr>
</xsp-session:attribute>
</xsl:when>
<xsl:when test="$as = 'object'">
<xsp:expr>
XSPRequestHelper.getSessionAttribute(this.objectModel,
String.valueOf(<xsl:copy-of select="$name"/>),
<xsl:copy-of select="$default"/>)
</xsp:expr>
</xsl:when>
</xsl:choose>
</xsl:template>
<xsl:template match="xsp-session:getxml">
<xsl:variable name="context">
<xsl:call-template name="value-for-context"/>
</xsl:variable>
<xsl:variable name="path">
<xsl:call-template name="value-for-path"/>
</xsl:variable>
<xsl:variable name="as">
<xsl:call-template name="value-for-as">
<xsl:with-param name="default" select="'object'"/>
</xsl:call-template>
</xsl:variable>
<xsl:choose>
<xsl:when test="$as='xml'">
<xsp-session:xml>
<xsp:expr>XSPSessionHelper.getXML(this.manager,
String.valueOf(<xsl:copy-of select="$context"/>),
String.valueOf(<xsl:copy-of select="$path"/>))</xsp:expr>
</xsp-session:xml>
</xsl:when>
<xsl:when test="$as='object'">
<xsp:expr>XSPSessionHelper.getXML(this.manager,
String.valueOf(<xsl:copy-of select="$context"/>),
String.valueOf(<xsl:copy-of select="$path"/>))</xsp:expr>
</xsl:when>
<xsl:when test="$as='string'">
<xsp:expr>(XSPSessionHelper.getXML(this.manager,
String.valueOf(<xsl:copy-of select="$context"/>),
String.valueOf(<xsl:copy-of
select="$path"/>))).getFirstChild().getNodeValue()</xsp:expr>
</xsl:when>
</xsl:choose>
</xsl:template>
<xsl:template match="xsp-session:get-attribute-names">
<xsl:variable name="as">
<xsl:call-template name="value-for-as">
<xsl:with-param name="default" select="'array'"/>
</xsl:call-template>
</xsl:variable>
<xsl:choose>
<xsl:when test="$as = 'xml'">
<xsp:logic>
List v = XSPRequestHelper.getSessionAttributeNames(this.objectModel);
</xsp:logic>
<xsp-session:attribute-names>
<xsp:logic>
for (int i = 0; i < v.size(); i++) {
<xsp-session:attribute-name>
<xsp:expr>v.get(i)</xsp:expr>
</xsp-session:attribute-name>
}
</xsp:logic>
</xsp-session:attribute-names>
</xsl:when>
<xsl:when test="$as = 'array'">
<xsp:expr>
XSPRequestHelper.getSessionAttributeNames(this.objectModel)
</xsp:expr>
</xsl:when>
</xsl:choose>
</xsl:template>
<xsl:template match="xsp-session:get-creation-time">
<xsl:variable name="as">
<xsl:call-template name="value-for-as">
<xsl:with-param name="default" select="'long'"/>
</xsl:call-template>
</xsl:variable>
<xsl:choose>
<xsl:when test="$as = 'xml'">
<xsp-session:creation-time>
<xsp:expr>
new Date(session.getCreationTime())
</xsp:expr>
</xsp-session:creation-time>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>
new Date(session.getCreationTime())
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'long'">
<xsp:expr>
session.getCreationTime()
</xsp:expr>
</xsl:when>
</xsl:choose>
</xsl:template>
<xsl:template match="xsp-session:get-id">
<xsl:variable name="as">
<xsl:call-template name="value-for-as">
<xsl:with-param name="default" select="'string'"/>
</xsl:call-template>
</xsl:variable>
<xsl:choose>
<xsl:when test="$as = 'xml'">
<xsp-session:id>
<xsp:expr>session.getId()</xsp:expr>
</xsp-session:id>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>session.getId()</xsp:expr>
</xsl:when>
</xsl:choose>
</xsl:template>
<xsl:template match="xsp-session:get-last-accessed-time">
<xsl:variable name="as">
<xsl:call-template name="value-for-as">
<xsl:with-param name="default" select="'long'"/>
</xsl:call-template>
</xsl:variable>
<xsl:choose>
<xsl:when test="$as = 'xml'">
<xsp-session:last-accessed-time>
<xsp:expr>
new Date(session.getLastAccessedTime())
</xsp:expr>
</xsp-session:last-accessed-time>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>
new Date(session.getLastAccessedTime())
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'long'">
<xsp:expr>
session.getLastAccessedTime()
</xsp:expr>
</xsl:when>
</xsl:choose>
</xsl:template>
<xsl:template match="xsp-session:get-max-inactive-interval">
<xsl:variable name="as">
<xsl:call-template name="value-for-as">
<xsl:with-param name="default" select="'int'"/>
</xsl:call-template>
</xsl:variable>
<xsl:choose>
<xsl:when test="$as = 'xml'">
<xsp-session:max-inactive-interval>
<xsp:expr>
session.getMaxInactiveInterval()
</xsp:expr>
</xsp-session:max-inactive-interval>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>
String.valueOf(session.getMaxInactiveInterval())
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'int'">
<xsp:expr>
session.getMaxInactiveInterval()
</xsp:expr>
</xsl:when>
</xsl:choose>
</xsl:template>
<xsl:template match="xsp-session:invalidate">
<xsp:logic>
session.invalidate();
</xsp:logic>
</xsl:template>
<xsl:template match="xsp-session:is-new">
<xsl:variable name="as">
<xsl:call-template name="value-for-as">
<xsl:with-param name="default" select="'boolean'"/>
</xsl:call-template>
</xsl:variable>
<xsp:expr>
<xsl:choose>
<xsl:when test="$as = 'xml'">
<xsp-session:is-new>
<xsp:expr>session.isNew()</xsp:expr>
</xsp-session:is-new>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>String.valueOf(session.isNew())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'boolean'">
<xsp:expr>session.isNew()</xsp:expr>
</xsl:when>
</xsl:choose>
</xsp:expr>
</xsl:template>
<xsl:template match="xsp-session:remove-attribute">
<xsl:variable name="name">
<xsl:call-template name="value-for-name"/>
</xsl:variable>
<xsp:logic>
session.removeAttribute(String.valueOf(<xsl:copy-of select="$name"/>));
</xsp:logic>
</xsl:template>
<xsl:template match="xsp-session:set-attribute">
<xsl:variable name="name">
<xsl:call-template name="value-for-name"/>
</xsl:variable>
<xsl:variable name="content">
<xsl:call-template name="get-nested-content">
<xsl:with-param name="content" select="."/>
</xsl:call-template>
</xsl:variable>
<xsp:logic>
session.setAttribute(String.valueOf(<xsl:copy-of select="$name"/>),
<xsl:copy-of select="$content"/>);
</xsp:logic>
</xsl:template>
<xsl:template match="xsp-session:set-max-inactive-interval">
<xsl:variable name="interval">
<xsl:choose>
<xsl:when test="@interval">"<xsl:value-of select="@interval"/>"</xsl:when>
<xsl:when test="xsp-session:interval">
<xsl:call-template name="get-nested-content">
<xsl:with-param name="content" select="xsp-session:interval"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>0</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsp:logic>
session.setMaxInactiveInterval(Integer.parseInt(String.valueOf(<xsl:copy-of
select="$interval"/>)));
</xsp:logic>
</xsl:template>
<!-- encode an URL with the session ID -->
<xsl:template match="xsp-session:encode-url">
<xsl:variable name="href">"<xsl:value-of select="@href"/>"</xsl:variable>
<a>
<xsp:attribute name="href">
<xsp:expr>
response.encodeURL(String.valueOf(<xsl:copy-of select="$href"/>))
</xsp:expr>
</xsp:attribute>
<xsl:value-of select="."/>
</a>
</xsl:template>
<!-- encode an URL with the session ID as a form-->
<xsl:template match="xsp-session:form-encode-url">
<xsl:variable name="action">"<xsl:value-of select="@action"/>"</xsl:variable>
<xsl:variable name="method">"<xsl:value-of select="@method"/>"</xsl:variable>
<xsl:variable name="onsubmit">"<xsl:value-of select="@onsubmit"/>"</xsl:variable>
<form>
<xsp:attribute name="action">
<xsp:expr>
response.encodeURL(String.valueOf(<xsl:copy-of select="$action"/>))
</xsp:expr>
</xsp:attribute>
<xsp:attribute name="method">
<xsp:expr><xsl:copy-of select="$method"/></xsp:expr>
</xsp:attribute>
<xsp:attribute name="onsubmit">
<xsp:expr><xsl:copy-of select="$onsubmit"/></xsp:expr>
</xsp:attribute>
<xsl:apply-templates/>
</form>
</xsl:template>
<xsl:template name="value-for-context">
<xsl:choose>
<xsl:when test="@context">"<xsl:value-of select="@context"/>"</xsl:when>
<xsl:otherwise>""</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="value-for-path">
<xsl:choose>
<xsl:when test="@path">"<xsl:value-of select="@path"/>"</xsl:when>
<xsl:otherwise>""</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="value-for-name">
<xsl:choose>
<xsl:when test="@name">"<xsl:value-of select="@name"/>"</xsl:when>
<xsl:when test="xsp-session:name">
<xsl:call-template name="get-nested-content">
<xsl:with-param name="content" select="xsp-session:name"/>
</xsl:call-template>
</xsl:when>
</xsl:choose>
</xsl:template>
<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>
<xsl:otherwise>"<xsl:value-of select="$content"/>"</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="value-for-as">
<xsl:param name="default"/>
<xsl:choose>
<xsl:when test="@as"><xsl:value-of select="@as"/></xsl:when>
<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="value-for-default">
<xsl:choose>
<xsl:when test="@default">"<xsl:value-of select="@default"/>"</xsl:when>
<xsl:otherwise>""</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template match="@*|*|text()|processing-instruction()">
<xsl:copy>
<xsl:apply-templates select="@*|*|text()|processing-instruction()"/>
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
