You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bl...@apache.org on 2001/04/30 22:40:06 UTC
cvs commit: xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java request.xsl
bloritsch 01/04/30 13:40:05
Modified: src/org/apache/cocoon/components/language/markup/xsp Tag:
xml-cocoon2 XSPRequestHelper.java
src/org/apache/cocoon/components/language/markup/xsp/java
Tag: xml-cocoon2 request.xsl
Log:
updated getRequestedURL code
Revision Changes Path
No revision
No revision
1.1.2.18 +30 -4 xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPRequestHelper.java
Index: XSPRequestHelper.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPRequestHelper.java,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- XSPRequestHelper.java 2001/04/26 17:58:06 1.1.2.17
+++ XSPRequestHelper.java 2001/04/30 20:39:54 1.1.2.18
@@ -21,7 +21,7 @@
* The <code>Request</code> object helper
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/26 17:58:06 $
+ * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/30 20:39:54 $
*/
public class XSPRequestHelper extends XSPObjectHelper {
/**
@@ -268,12 +268,12 @@
* @param content The parameter value
*/
public static void setSessionAttribute(Map objectModel, String name, Object content) {
-
+
Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
Session session = request.getSession(false);
session.setAttribute(name, content);
}
-
+
/**
* Return the given session attribute value or a user-provided default if
* none was specified.
@@ -375,8 +375,8 @@
);
}
+
-
/**
* Output the login of the user making the request
* Could be null if user is not authenticated.
@@ -605,6 +605,32 @@
return request.getServerPort();
}
+ public static String getRequestedURL(Map objectModel) {
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ StringBuffer uribuf = null;
+ boolean isSecure = request.isSecure();
+ int port = request.getServerPort();
+
+ if (isSecure) {
+ uribuf = new StringBuffer("https://");
+ } else {
+ uribuf = new StringBuffer("http://");
+ }
+
+ uribuf.append(request.getServerName());
+ if (isSecure) {
+ if (port != 443) {
+ uribuf.append(":").append(port);
+ }
+ } else {
+ if (port != 80) {
+ uribuf.append(":").append(port);
+ }
+ }
+
+ uribuf.append(request.getRequestURI());
+ return uribuf.toString();
+ }
/**
* Get the session attribute names.
No revision
No revision
1.1.2.12 +8 -8 xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/request.xsl
Index: request.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/request.xsl,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- request.xsl 2001/03/25 23:01:17 1.1.2.11
+++ request.xsl 2001/04/30 20:40:01 1.1.2.12
@@ -11,7 +11,7 @@
<!--
* @author <a href="mailto:ricardo@apache.org>Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/03/25 23:01:17 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/30 20:40:01 $
-->
<!-- XSP Request logicsheet for the Java language -->
@@ -218,11 +218,11 @@
<xsl:choose>
<xsl:when test="$as = 'string'">
- <xsp:expr>new StringBuffer((XSPRequestHelper.isSecure(objectModel)) ? "https://" : "http://").append(XSPRequestHelper.getServerName(objectModel)).append(":").append(XSPRequestHelper.getServerPort(objectModel)).append("/").append(XSPRequestHelper.getUri(objectModel)).toString()</xsp:expr>
+ <xsp:expr>XSPRequestHelper.getRequestedURL(objectModel)</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
<xsp-request:requested-url>
- <xsp:expr>new StringBuffer((XSPRequestHelper.isSecure(objectModel)) ? "https://" : "http://").append(XSPRequestHelper.getServerName(objectModel)).append(":").append(XSPRequestHelper.getServerPort(objectModel)).append("/").append(XSPRequestHelper.getUri(objectModel)).toString()</xsp:expr>
+ <xsp:expr>XSPRequestHelper.getRequestedURL(objectModel)</xsp:expr>
</xsp-request:requested-url>
</xsl:when>
</xsl:choose>
@@ -352,9 +352,9 @@
</xsp:logic>
</xsl:when>
</xsl:choose>
- </xsl:template>
-
-
+ </xsl:template>
+
+
<xsl:template match="xsp-request:get-remote-host">
<xsl:variable name="as">
<xsl:call-template name="value-for-as">
@@ -375,7 +375,7 @@
</xsl:when>
</xsl:choose>
</xsl:template>
-
+
<xsl:template name="value-for-as">
<xsl:param name="default"/>
<xsl:choose>
@@ -404,7 +404,7 @@
<xsl:otherwise>"<xsl:value-of select="$content"/>"</xsl:otherwise>
</xsl:choose>
</xsl:template>
-
+
<xsl:template match="@*|*|text()|processing-instruction()">
<xsl:copy>
<xsl:apply-templates select="@*|*|text()|processing-instruction()"/>
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org