vgritsenko 2002/08/01 19:04:36
Modified: . changes.xml
src/java/org/apache/cocoon/components/language/markup/xsp/java
request.xsl response.xsl session.xsl
src/java/org/apache/cocoon/components/language/markup/xsp/javascript
request.xsl response.xsl session.xsl
Log:
Request, response, and session logicsheet were incorrectly returning
result when as="xml" is specified.
Revision Changes Path
1.225 +5 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- changes.xml 31 Jul 2002 13:13:21 -0000 1.224
+++ changes.xml 2 Aug 2002 02:04:35 -0000 1.225
@@ -39,6 +39,10 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="VG" type="fix">
+ Request, response, and session logicsheet were incorrectly returning
+ result when as="xml" is specified.
+ </action>
<action dev="SMS" type="update">
Replaced implementation from Loggable by LogEnabled to use
the Avalon Logger instead of the LogKit Logger.
1.8 +60 -62
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- request.xsl 31 Mar 2002 16:41:01 -0000 1.7
+++ request.xsl 2 Aug 2002 02:04:35 -0000 1.8
@@ -76,10 +76,9 @@
<xsp:expr>(request.getRequestURI())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <!-- <xsp-request:uri> -->
- <xsp:element name="xsp-request:uri">
+ <xsp-request:uri>
<xsp:expr>request.getRequestURI()</xsp:expr>
- </xsp:element>
+ </xsp-request:uri>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -95,10 +94,9 @@
<xsp:expr>(request.getSitemapURI())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <!-- <xsp-request:sitemap-uri> -->
- <xsp:element name="xsp-request:sitemap-uri">
+ <xsp-request:sitemap-uri>
<xsp:expr>request.getSitemapURI()</xsp:expr>
- </xsp:element>
+ </xsp-request:sitemap-uri>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -114,9 +112,9 @@
<xsp:expr>(request.getScheme())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:scheme">
+ <xsp-request:scheme>
<xsp:expr>request.getScheme()</xsp:expr>
- </xsp:element>
+ </xsp-request:scheme>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -132,9 +130,9 @@
<xsp:expr>(request.getCharacterEncoding())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:character-encoding">
+ <xsp-request:character-encoding>
<xsp:expr>request.getCharacterEncoding()</xsp:expr>
- </xsp:element>
+ </xsp-request:character-encoding>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -153,9 +151,9 @@
<xsp:expr>String.valueOf(request.getContentLength())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:content-length">
+ <xsp-request:content-length>
<xsp:expr>request.getContentLength()</xsp:expr>
- </xsp:element>
+ </xsp-request:content-length>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -171,9 +169,9 @@
<xsp:expr>request.getContentType()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:content-type">
+ <xsp-request:content-type>
<xsp:expr>request.getContentType()</xsp:expr>
- </xsp:element>
+ </xsp-request:content-type>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -334,12 +332,12 @@
<xsp:expr>request.getHeader(<xsl:copy-of select="$name"/>)</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:header">
+ <xsp-request:header>
<xsp:attribute name="name">
<xsp:expr><xsl:copy-of select="$name"/></xsp:expr>
</xsp:attribute>
<xsp:expr>request.getHeader(<xsl:copy-of select="$name"/>)</xsp:expr>
- </xsp:element>
+ </xsp-request:header>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -361,12 +359,12 @@
<xsp:expr>String.valueOf(request.getIntHeader(<xsl:copy-of
select="$name"/>))</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:int-header">
+ <xsp-request:int-header>
<xsp:attribute name="name">
<xsp:expr><xsl:copy-of select="$name"/></xsp:expr>
</xsp:attribute>
<xsp:expr>request.getIntHeader(<xsl:copy-of select="$name"/>)</xsp:expr>
- </xsp:element>
+ </xsp-request:int-header>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -396,13 +394,13 @@
<xsl:copy-of select="$name"/>, <xsl:copy-of
select="$format"/>))</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:date-header">
+ <xsp-request:date-header>
<xsp:attribute name="name">
<xsp:expr><xsl:copy-of select="$name"/></xsp:expr>
</xsp:attribute>
<xsp:expr>XSPRequestHelper.getDateHeader(objectModel,
<xsl:copy-of select="$name"/>, <xsl:copy-of
select="$format"/>))</xsp:expr>
- </xsp:element>
+ </xsp-request:date-header>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -471,12 +469,12 @@
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:attribute">
+ <xsp-request:attribute>
<xsp:attribute name="name">
<xsp:expr><xsl:copy-of select="$name"/></xsp:expr>
</xsp:attribute>
<xsp:expr>request.getAttribute(<xsl:copy-of select="$name"/>)</xsp:expr>
- </xsp:element>
+ </xsp-request:attribute>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -536,11 +534,11 @@
<xsp:expr>XSPRequestHelper.getRequestedURL(objectModel)</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:requested-url">
+ <xsp-request:requested-url>
<xsp:expr>
XSPRequestHelper.getRequestedURL(objectModel)
</xsp:expr>
- </xsp:element>
+ </xsp-request:requested-url>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -556,9 +554,9 @@
<xsp:expr>request.getRemoteAddr()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:remote-addres">
+ <xsp-request:remote-address>
<xsp:expr>request.getRemoteAddr()</xsp:expr>
- </xsp:element>
+ </xsp-request:remote-address>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -574,9 +572,9 @@
<xsp:expr>request.getRemoteUser()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:remote-user">
+ <xsp-request:remote-user>
<xsp:expr>request.getRemoteUser()</xsp:expr>
- </xsp:element>
+ </xsp-request:remote-user>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -592,9 +590,9 @@
<xsp:expr>request.getContextPath()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:context-path">
+ <xsp-request:context-path>
<xsp:expr>request.getContextPath()</xsp:expr>
- </xsp:element>
+ </xsp-request:context-path>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -610,9 +608,9 @@
<xsp:expr>request.getPathInfo()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:path-info">
+ <xsp-request:path-info>
<xsp:expr>request.getPathInfo()</xsp:expr>
- </xsp:element>
+ </xsp-request:path-info>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -628,9 +626,9 @@
<xsp:expr>request.getServerName()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:server-name">
+ <xsp-request:server-name>
<xsp:expr>request.getServerName()</xsp:expr>
- </xsp:element>
+ </xsp-request:server-name>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -649,9 +647,9 @@
<xsp:expr>String.valueOf(request.getServerPort())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:server-port">
+ <xsp-request:server-port>
<xsp:expr>request.getServerPort()</xsp:expr>
- </xsp:element>
+ </xsp-request:server-port>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -667,9 +665,9 @@
<xsp:expr>request.getMethod()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:method">
+ <xsp-request:method>
<xsp:expr>request.getMethod()</xsp:expr>
- </xsp:element>
+ </xsp-request:method>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -685,9 +683,9 @@
<xsp:expr>request.getQueryString()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:query-string">
+ <xsp-request:query-string>
<xsp:expr>request.getQueryString()</xsp:expr>
- </xsp:element>
+ </xsp-request:query-string>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -703,9 +701,9 @@
<xsp:expr>request.getProtocol()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:protocol">
+ <xsp-request:protocol>
<xsp:expr>request.getProtocol()</xsp:expr>
- </xsp:element>
+ </xsp-request:protocol>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -721,9 +719,9 @@
<xsp:expr>request.getRemoteHost()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:remote-host">
+ <xsp-request:remote-host>
<xsp:expr>request.getRemoteHost()</xsp:expr>
- </xsp:element>
+ </xsp-request:remote-host>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -742,9 +740,9 @@
<xsp:expr>String.valueOf(request.isSecure())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:secure">
+ <xsp-request:secure>
<xsp:expr>request.isSecure()</xsp:expr>
- </xsp:element>
+ </xsp-request:secure>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -760,9 +758,9 @@
<xsp:expr>request.getPathTranslated()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:path-translated">
+ <xsp-request:path-translated>
<xsp:expr>request.getPathTranslated()</xsp:expr>
- </xsp:element>
+ </xsp-request:path-translated>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -778,9 +776,9 @@
<xsp:expr>request.getServletPath()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:servlet-path">
+ <xsp-request:servlet-path>
<xsp:expr>request.getServletPath()</xsp:expr>
- </xsp:element>
+ </xsp-request:servlet-path>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -799,9 +797,9 @@
<xsp:expr>request.getUserPrincipal()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:user-principal">
+ <xsp-request:user-principal>
<xsp:expr>request.getUserPrincipal()</xsp:expr>
- </xsp:element>
+ </xsp-request:user-principal>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -817,9 +815,9 @@
<xsp:expr>request.getAuthType()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:auth-type">
+ <xsp-request:auth-type>
<xsp:expr>request.getAuthType()</xsp:expr>
- </xsp:element>
+ </xsp-request:auth-type>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -842,12 +840,12 @@
request.isUserInRole(<xsl:copy-of select="$role"/>))</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:user-in-role">
+ <xsp-request:user-in-role>
<xsp:attribute name="role">
<xsp:expr><xsl:copy-of select="$role"/></xsp:expr>
</xsp:attribute>
<xsp:expr>request.isUserInRole(<xsl:copy-of select="$role"/>)</xsp:expr>
- </xsp:element>
+ </xsp-request:user-in-role>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -863,9 +861,9 @@
<xsp:expr>request.getRequestedSessionId()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:requested-session-id">
+ <xsp-request:requested-session-id>
<xsp:expr>request.getRequestedSessionId()</xsp:expr>
- </xsp:element>
+ </xsp-request:requested-session-id>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -924,9 +922,9 @@
</xsl:when>
<xsl:when test="$as = 'xml'">
<!-- <xsp-request:session-id> -->
- <xsp:element name="xsp-request:session-id">
+ <xsp-request:session-id>
<xsp:expr>(request.getSession().getId())</xsp:expr>
- </xsp:element>
+ </xsp-request:session-id>
</xsl:when>
</xsl:choose>
</xsl:template>
1.5 +8 -8
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- response.xsl 21 Feb 2002 02:51:49 -0000 1.4
+++ response.xsl 2 Aug 2002 02:04:35 -0000 1.5
@@ -76,9 +76,9 @@
<xsp:expr>response.getCharacterEncoding()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-response:character-encoding">
+ <xsp-response:character-encoding>
<xsp:expr>response.getCharacterEncoding()</xsp:expr>
- </xsp:element>
+ </xsp-response:character-encoding>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -227,9 +227,9 @@
String.valueOf(<xsl:copy-of select="$name"/>)))</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-response:contains-header">
+ <xsp-response:contains-header>
<xsp:expr>response.containsHeader(String.valueOf(<xsl:copy-of
select="$name"/>))</xsp:expr>
- </xsp:element>
+ </xsp-response:contains-header>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -256,11 +256,11 @@
<xsp:expr>response.encodeURL(String.valueOf(<xsl:copy-of
select="$url"/>))</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-response:encode-url">
+ <xsp-response:encode-url>
<xsp:expr>
response.encodeURL(String.valueOf(<xsl:copy-of select="$url"/>))
</xsp:expr>
- </xsp:element>
+ </xsp-response:encode-url>
</xsl:when>
</xsl:choose>
</xsl:template>
1.14 +24 -24
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- session.xsl 6 Mar 2002 03:05:23 -0000 1.13
+++ session.xsl 2 Aug 2002 02:04:35 -0000 1.14
@@ -100,9 +100,9 @@
</xsl:when>
<xsl:when test="$as = 'xml'">
<!-- <xsp-session:session-id> -->
- <xsp:element name="xsp-session:session-id">
+ <xsp-session:session-id>
<xsp:expr>session.getId()</xsp:expr>
- </xsp:element>
+ </xsp-session:session-id>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -129,13 +129,13 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-session:attribute">
+ <xsp-session:attribute>
<xsp:expr>
XSPSessionHelper.getSessionAttribute(session,
String.valueOf(<xsl:copy-of select="$name"/>),
<xsl:copy-of select="$default"/>)
</xsp:expr>
- </xsp:element>
+ </xsp-session:attribute>
</xsl:when>
<xsl:when test="$as = 'object'">
<xsp:expr>
@@ -158,15 +158,15 @@
<xsp:logic>
List v = XSPSessionHelper.getSessionAttributeNames(session);
</xsp:logic>
- <xsp:element name="xsp-session:attribute-names">
+ <xsp-session:attribute-names>
<xsp:logic>
for (int i = 0; i < v.size(); i++) {
- <xsp:element name="xsp-session:attribute-name">
+ <xsp-session:attribute-name>
<xsp:expr>v.get(i)</xsp:expr>
- </xsp:element>
+ </xsp-session:attribute-name>
}
</xsp:logic>
- </xsp:element>
+ </xsp-session:attribute-names>
</xsl:when>
<xsl:when test="$as = 'array'">
<xsp:expr>
@@ -184,11 +184,11 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-session:creation-time">
+ <xsp-session:creation-time>
<xsp:expr>
new Date(session.getCreationTime())
</xsp:expr>
- </xsp:element>
+ </xsp-session:creation-time>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>
@@ -211,9 +211,9 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-session:id">
+ <xsp-session:id>
<xsp:expr>session.getId()</xsp:expr>
- </xsp:element>
+ </xsp-session:id>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>session.getId()</xsp:expr>
@@ -229,11 +229,11 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-session:last-accessed-time">
+ <xsp-session:last-accessed-time>
<xsp:expr>
new Date(session.getLastAccessedTime())
</xsp:expr>
- </xsp:element>
+ </xsp-session:last-accessed-time>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>
@@ -257,11 +257,11 @@
<xsl:choose>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-session:max-inactive-interval">
+ <xsp-session:max-inactive-interval>
<xsp:expr>
session.getMaxInactiveInterval()
</xsp:expr>
- </xsp:element>
+ </xsp-session:max-inactive-interval>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>
@@ -291,9 +291,9 @@
<xsp:expr>
<xsl:choose>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-session:is-new">
+ <xsp-session:is-new>
<xsp:expr>session.isNew()</xsp:expr>
- </xsp:element>
+ </xsp-session:is-new>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>String.valueOf(session.isNew())</xsp:expr>
@@ -349,14 +349,14 @@
<!-- 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>
- <xsp:element name="a">
+ <a>
<xsp:attribute name="href">
<xsp:expr>
response.encodeURL(String.valueOf(<xsl:copy-of select="$href"/>))
</xsp:expr>
</xsp:attribute>
<xsl:value-of select="."/>
- </xsp:element>
+ </a>
</xsl:template>
<!-- encode an URL with the session ID as a form-->
@@ -368,7 +368,7 @@
<xsl:variable name="onsubmit">"<xsl:value-of
select="@onsubmit"/>"</xsl:variable>
- <xsp:element name="form">
+ <form>
<xsp:attribute name="action">
<xsp:expr>
response.encodeURL(String.valueOf(<xsl:copy-of select="$action"/>))
@@ -381,7 +381,7 @@
<xsp:expr><xsl:copy-of select="$onsubmit"/></xsp:expr>
</xsp:attribute>
<xsl:apply-templates/>
- </xsp:element>
+ </form>
</xsl:template>
1.5 +60 -62
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- request.xsl 31 Mar 2002 16:41:01 -0000 1.4
+++ request.xsl 2 Aug 2002 02:04:36 -0000 1.5
@@ -34,10 +34,9 @@
<xsp:expr>(request.getRequestURI())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <!-- <xsp-request:uri> -->
- <xsp:element name="xsp-request:uri">
+ <xsp-request:uri>
<xsp:expr>request.getRequestURI()</xsp:expr>
- </xsp:element>
+ </xsp-request:uri>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -53,10 +52,9 @@
<xsp:expr>(request.getSitemapURI())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <!-- <xsp-request:sitemap-uri> -->
- <xsp:element name="xsp-request:sitemap-uri">
+ <xsp-request:sitemap-uri>
<xsp:expr>request.getSitemapURI()</xsp:expr>
- </xsp:element>
+ </xsp-request:sitemap-uri>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -72,9 +70,9 @@
<xsp:expr>(request.getScheme())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:scheme">
+ <xsp-request:scheme>
<xsp:expr>request.getScheme()</xsp:expr>
- </xsp:element>
+ </xsp-request:scheme>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -90,9 +88,9 @@
<xsp:expr>(request.getCharacterEncoding())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:character-encoding">
+ <xsp-request:character-encoding>
<xsp:expr>request.getCharacterEncoding()</xsp:expr>
- </xsp:element>
+ </xsp-request:character-encoding>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -111,9 +109,9 @@
<xsp:expr>String(request.getContentLength())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:content-length">
+ <xsp-request:content-length>
<xsp:expr>request.getContentLength()</xsp:expr>
- </xsp:element>
+ </xsp-request:content-length>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -129,9 +127,9 @@
<xsp:expr>request.getContentType()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:content-type">
+ <xsp-request:content-type>
<xsp:expr>request.getContentType()</xsp:expr>
- </xsp:element>
+ </xsp-request:content-type>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -289,12 +287,12 @@
<xsp:expr>request.getHeader(<xsl:copy-of select="$name"/>)</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:header">
+ <xsp-request:header>
<xsp:attribute name="name">
<xsp:expr><xsl:copy-of select="$name"/></xsp:expr>
</xsp:attribute>
<xsp:expr>request.getHeader(<xsl:copy-of select="$name"/>)</xsp:expr>
- </xsp:element>
+ </xsp-request:header>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -316,12 +314,12 @@
<xsp:expr>String(request.getIntHeader(<xsl:copy-of
select="$name"/>))</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:int-header">
+ <xsp-request:int-header>
<xsp:attribute name="name">
<xsp:expr><xsl:copy-of select="$name"/></xsp:expr>
</xsp:attribute>
<xsp:expr>request.getIntHeader(<xsl:copy-of select="$name"/>)</xsp:expr>
- </xsp:element>
+ </xsp-request:int-header>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -349,12 +347,12 @@
<xsp:expr>page.getDateHeader(<xsl:copy-of select="$name"/>, <xsl:copy-of
select="$format"/>))</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:date-header">
+ <xsp-request:date-header>
<xsp:attribute name="name">
<xsp:expr><xsl:copy-of select="$name"/></xsp:expr>
</xsp:attribute>
<xsp:expr>page.getDateHeader(<xsl:copy-of select="$name"/>, <xsl:copy-of
select="$format"/>))</xsp:expr>
- </xsp:element>
+ </xsp-request:date-header>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -419,12 +417,12 @@
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:attribute">
+ <xsp-request:attribute>
<xsp:attribute name="name">
<xsp:expr><xsl:copy-of select="$name"/></xsp:expr>
</xsp:attribute>
<xsp:expr>request.getAttribute(<xsl:copy-of select="$name"/>)</xsp:expr>
- </xsp:element>
+ </xsp-request:attribute>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -484,9 +482,9 @@
<xsp:expr>page.getRequestedURL()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:requested-url">
+ <xsp-request:requested-url>
<xsp:expr>page.getRequestedURL()</xsp:expr>
- </xsp:element>
+ </xsp-request:requested-url>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -502,9 +500,9 @@
<xsp:expr>request.getRemoteAddr()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:remote-addres">
+ <xsp-request:remote-address>
<xsp:expr>request.getRemoteAddr()</xsp:expr>
- </xsp:element>
+ </xsp-request:remote-address>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -520,9 +518,9 @@
<xsp:expr>request.getRemoteUser()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:remote-user">
+ <xsp-request:remote-user>
<xsp:expr>request.getRemoteUser()</xsp:expr>
- </xsp:element>
+ </xsp-request:remote-user>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -538,9 +536,9 @@
<xsp:expr>request.getContextPath()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:context-path">
+ <xsp-request:context-path>
<xsp:expr>request.getContextPath()</xsp:expr>
- </xsp:element>
+ </xsp-request:context-path>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -556,9 +554,9 @@
<xsp:expr>request.getPathInfo()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:path-info">
+ <xsp-request:path-info>
<xsp:expr>request.getPathInfo()</xsp:expr>
- </xsp:element>
+ </xsp-request:path-info>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -574,9 +572,9 @@
<xsp:expr>request.getServerName()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:server-name">
+ <xsp-request:server-name>
<xsp:expr>request.getServerName()</xsp:expr>
- </xsp:element>
+ </xsp-request:server-name>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -595,9 +593,9 @@
<xsp:expr>String(request.getServerPort())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:server-port">
+ <xsp-request:server-port>
<xsp:expr>request.getServerPort()</xsp:expr>
- </xsp:element>
+ </xsp-request:server-port>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -613,9 +611,9 @@
<xsp:expr>request.getMethod()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:method">
+ <xsp-request:method>
<xsp:expr>request.getMethod()</xsp:expr>
- </xsp:element>
+ </xsp-request:method>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -631,9 +629,9 @@
<xsp:expr>request.getQueryString()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:query-string">
+ <xsp-request:query-string>
<xsp:expr>request.getQueryString()</xsp:expr>
- </xsp:element>
+ </xsp-request:query-string>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -649,9 +647,9 @@
<xsp:expr>request.getProtocol()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:protocol">
+ <xsp-request:protocol>
<xsp:expr>request.getProtocol()</xsp:expr>
- </xsp:element>
+ </xsp-request:protocol>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -667,9 +665,9 @@
<xsp:expr>request.getRemoteHost()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:remote-host">
+ <xsp-request:remote-host>
<xsp:expr>request.getRemoteHost()</xsp:expr>
- </xsp:element>
+ </xsp-request:remote-host>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -688,9 +686,9 @@
<xsp:expr>String(request.isSecure())</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:secure">
+ <xsp-request:secure>
<xsp:expr>request.isSecure()</xsp:expr>
- </xsp:element>
+ </xsp-request:secure>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -706,9 +704,9 @@
<xsp:expr>request.getPathTranslated()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:path-translated">
+ <xsp-request:path-translated>
<xsp:expr>request.getPathTranslated()</xsp:expr>
- </xsp:element>
+ </xsp-request:path-translated>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -724,9 +722,9 @@
<xsp:expr>request.getServletPath()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:servlet-path">
+ <xsp-request:servlet-path>
<xsp:expr>request.getServletPath()</xsp:expr>
- </xsp:element>
+ </xsp-request:servlet-path>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -745,9 +743,9 @@
<xsp:expr>request.getUserPrincipal()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:user-principal">
+ <xsp-request:user-principal>
<xsp:expr>request.getUserPrincipal()</xsp:expr>
- </xsp:element>
+ </xsp-request:user-principal>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -763,9 +761,9 @@
<xsp:expr>request.getAuthType()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:auth-type">
+ <xsp-request:auth-type>
<xsp:expr>request.getAuthType()</xsp:expr>
- </xsp:element>
+ </xsp-request:auth-type>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -787,12 +785,12 @@
<xsp:expr>String(request.isUserInRole(<xsl:copy-of
select="$role"/>))</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:user-in-role">
+ <xsp-request:user-in-role>
<xsp:attribute name="role">
<xsp:expr><xsl:copy-of select="$role"/></xsp:expr>
</xsp:attribute>
<xsp:expr>request.isUserInRole(<xsl:copy-of select="$role"/>)</xsp:expr>
- </xsp:element>
+ </xsp-request:user-in-role>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -808,9 +806,9 @@
<xsp:expr>request.getRequestedSessionId()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-request:requested-session-id">
+ <xsp-request:requested-session-id>
<xsp:expr>request.getRequestedSessionId()</xsp:expr>
- </xsp:element>
+ </xsp-request:requested-session-id>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -870,9 +868,9 @@
</xsl:when>
<xsl:when test="$as = 'xml'">
<!-- <xsp-request:session-id> -->
- <xsp:element name="xsp-request:session-id">
+ <xsp-request:session-id>
<xsp:expr>(request.getSession().getId())</xsp:expr>
- </xsp:element>
+ </xsp-request:session-id>
</xsl:when>
</xsl:choose>
</xsl:template>
1.4 +8 -8
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/javascript/response.xsl
Index: response.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/javascript/response.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- response.xsl 11 Feb 2002 04:45:40 -0000 1.3
+++ response.xsl 2 Aug 2002 02:04:36 -0000 1.4
@@ -34,9 +34,9 @@
<xsp:expr>response.getCharacterEncoding()</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-response:character-encoding">
+ <xsp-response:character-encoding>
<xsp:expr>response.getCharacterEncoding()</xsp:expr>
- </xsp:element>
+ </xsp-response:character-encoding>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -183,9 +183,9 @@
String(<xsl:copy-of select="$name"/>)))</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-response:contains-header">
+ <xsp-response:contains-header>
<xsp:expr>response.containsHeader(String(<xsl:copy-of
select="$name"/>))</xsp:expr>
- </xsp:element>
+ </xsp-response:contains-header>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -212,11 +212,11 @@
<xsp:expr>response.encodeURL(String(<xsl:copy-of
select="$url"/>))</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-response:encode-url">
+ <xsp-response:encode-url>
<xsp:expr>
response.encodeURL(String(<xsl:copy-of select="$url"/>))
</xsp:expr>
- </xsp:element>
+ </xsp-response:encode-url>
</xsl:when>
</xsl:choose>
</xsl:template>
1.4 +24 -24
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/javascript/session.xsl
Index: session.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/javascript/session.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- session.xsl 6 Mar 2002 03:05:23 -0000 1.3
+++ session.xsl 2 Aug 2002 02:04:36 -0000 1.4
@@ -97,9 +97,9 @@
</xsl:when>
<xsl:when test="$as = 'xml'">
<!-- <xsp-session:session-id> -->
- <xsp:element name="xsp-session:session-id">
+ <xsp-session:session-id>
<xsp:expr>session.getId()</xsp:expr>
- </xsp:element>
+ </xsp-session:session-id>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -126,12 +126,12 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-session:attribute">
+ <xsp-session:attribute>
<xsp:expr>
page.getSessionAttribute(session, String(<xsl:copy-of select="$name"/>),
<xsl:copy-of select="$default"/>)
</xsp:expr>
- </xsp:element>
+ </xsp-session:attribute>
</xsl:when>
<xsl:when test="$as = 'object'">
<xsp:expr>
@@ -154,15 +154,15 @@
<xsp:logic>
_session_attribute_names_ = page.getSessionAttributeNames(session);
</xsp:logic>
- <xsp:element name="xsp-session:attribute-names">
+ <xsp-session:attribute-names>
<xsp:logic>
for (i = 0; i < _session_attribute_names_.length; i++) {
- <xsp:element name="xsp-session:attribute-name">
+ <xsp-session:attribute-name>
<xsp:expr>_session_attribute_names_[i]</xsp:expr>
- </xsp:element>
+ </xsp-session:attribute-name>
}
</xsp:logic>
- </xsp:element>
+ </xsp-session:attribute-names>
</xsl:when>
<xsl:when test="$as = 'array'">
@@ -182,11 +182,11 @@
<xsl:choose>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-session:creation-time">
+ <xsp-session:creation-time>
<xsp:expr>
Date(session.getCreationTime())
</xsp:expr>
- </xsp:element>
+ </xsp-session:creation-time>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>
@@ -209,9 +209,9 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-session:id">
+ <xsp-session:id>
<xsp:expr>session.getId()</xsp:expr>
- </xsp:element>
+ </xsp-session:id>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>session.getId()</xsp:expr>
@@ -227,11 +227,11 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-session:last-accessed-time">
+ <xsp-session:last-accessed-time>
<xsp:expr>
Date(session.getLastAccessedTime())
</xsp:expr>
- </xsp:element>
+ </xsp-session:last-accessed-time>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>
@@ -255,11 +255,11 @@
<xsl:choose>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-session:max-inactive-interval">
+ <xsp-session:max-inactive-interval>
<xsp:expr>
session.getMaxInactiveInterval()
</xsp:expr>
- </xsp:element>
+ </xsp-session:max-inactive-interval>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>
@@ -289,9 +289,9 @@
<xsp:expr>
<xsl:choose>
<xsl:when test="$as = 'xml'">
- <xsp:element name="xsp-session:is-new">
+ <xsp-session:is-new>
<xsp:expr>session.isNew()</xsp:expr>
- </xsp:element>
+ </xsp-session:is-new>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>String(session.isNew())</xsp:expr>
@@ -349,14 +349,14 @@
<xsl:variable name="href">"<xsl:value-of
select="@href"/>"</xsl:variable>
- <xsp:element name="a">
+ <a>
<xsp:attribute name="href">
<xsp:expr>
response.encodeURL(String(<xsl:copy-of select="$href"/>))
</xsp:expr>
</xsp:attribute>
<xsl:value-of select="."/>
- </xsp:element>
+ </a>
</xsl:template>
<!-- encode an URL with the session ID as a form-->
@@ -368,7 +368,7 @@
<xsl:variable name="onsubmit">"<xsl:value-of
select="@onsubmit"/>"</xsl:variable>
- <xsp:element name="form">
+ <form>
<xsp:attribute name="action">
<xsp:expr>
response.encodeURL(String(<xsl:copy-of select="$action"/>))
@@ -381,7 +381,7 @@
<xsp:expr><xsl:copy-of select="$onsubmit"/></xsp:expr>
</xsp:attribute>
<xsl:apply-templates/>
- </xsp:element>
+ </form>
</xsl:template>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
