dims 02/02/01 18:42:08
Modified: src/java/org/apache/cocoon/components/language/markup/xsp
XSPRequestHelper.java
src/java/org/apache/cocoon/components/language/markup/xsp/java
request.xsl
src/webapp/docs/samples/xsp request-test.xsp
Log:
Fix for Bug 6187 - Added support for <xsp-request:get-scheme/>
Revision Changes Path
1.2 +29 -1
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java
Index: XSPRequestHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSPRequestHelper.java 3 Jan 2002 12:31:10 -0000 1.1
+++ XSPRequestHelper.java 2 Feb 2002 02:42:08 -0000 1.2
@@ -23,7 +23,7 @@
* The <code>Request</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/01/03 12:31:10 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/02/02 02:42:08 $
*/
public class XSPRequestHelper {
/**
@@ -75,6 +75,34 @@
{
XSPObjectHelper.elementData(URI, PREFIX, handler, "uri",
getURI(objectModel));
+ }
+
+ /**
+ * Output the scheme associated with the given objectModel
+ *
+ * @param objectModel The Map objectModel
+ */
+ public static String getScheme(
+ Map objectModel
+ )
+ {
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getScheme();
+ }
+
+ /**
+ * Output the scheme associated with the given objectModel
+ *
+ * @param objectModel The Map objectModel
+ */
+ public static void getScheme(
+ Map objectModel,
+ ContentHandler handler
+ )
+ throws SAXException
+ {
+ XSPObjectHelper.elementData(URI, PREFIX, handler, "scheme",
+ getScheme(objectModel));
}
/**
1.2 +23 -1
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- request.xsl 3 Jan 2002 12:31:11 -0000 1.1
+++ request.xsl 2 Feb 2002 02:42:08 -0000 1.2
@@ -11,7 +11,7 @@
<!--
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/01/03 12:31:11 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/02/02 02:42:08 $
-->
<!-- XSP Request logicsheet for the Java language -->
@@ -40,6 +40,28 @@
<!-- <xsp-request:uri> -->
<xsp:logic>
XSPRequestHelper.getURI(objectModel, this.contentHandler);
+ </xsp:logic>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="xsp-request:get-scheme">
+ <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>
+ (XSPRequestHelper.getScheme(objectModel))
+ </xsp:expr>
+ </xsl:when>
+ <xsl:when test="$as = 'xml'">
+ <!-- <xsp-request:scheme> -->
+ <xsp:logic>
+ XSPRequestHelper.getScheme(objectModel, this.contentHandler);
</xsp:logic>
</xsl:when>
</xsl:choose>
1.2 +19 -1 xml-cocoon2/src/webapp/docs/samples/xsp/request-test.xsp
Index: request-test.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/xsp/request-test.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- request-test.xsp 3 Jan 2002 12:31:42 -0000 1.1
+++ request-test.xsp 2 Feb 2002 02:42:08 -0000 1.2
@@ -8,13 +8,31 @@
>
<page>
+ <h1>Logicsheet request report</h1>
+ <para>HTTP-SCHEME : <xsp-request:get-scheme/></para>
<para>REMOTE-ADDRESS : <xsp-request:get-remote-address/></para>
<para>REMOTE_USER : <xsp-request:get-remote-user/></para>
- <para>SERVER_NAME : <xsp-request:get-server-name/></para>
+ <para>SERVER-NAME : <xsp-request:get-server-name/></para>
+ <para>SERVER-PORT: <xsp-request:get-server-port/></para>
<para>GET-METHOD : <xsp-request:get-method/></para>
<para>QUERY-STRING : <xsp-request:get-query-string/></para>
<para>GET-PROTOCOL : <xsp-request:get-protocol/></para>
<para>REMOTE-HOST : <xsp-request:get-remote-host/></para>
<para>REQUEST-URI : <xsp-request:get-uri/></para>
+
+ <xsp:logic>
+ String scheme = request.getScheme();
+ String server = request.getServerName();
+ int port = request.getServerPort();
+ String URI = request.getRequestURI();
+ String query_string = request.getQueryString();
+ </xsp:logic>
+
+ <h1>Java request report</h1>
+ <para>HTTP-SCHEME: <xsp:expr>scheme</xsp:expr></para>
+ <para>SERVER-NAME: <xsp:expr>server</xsp:expr></para>
+ <para>SERVER-PORT: <xsp:expr>port</xsp:expr></para>
+ <para>REQUEST-URI: <xsp:expr>URI</xsp:expr></para>
+ <para>QUERY-STRING: <xsp:expr>query_string</xsp:expr></para>
</page>
</xsp:page>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
