dims 01/03/23 11:38:21
Modified: src/org/apache/cocoon/components/language/markup/sitemap/java
Tag: xml-cocoon2 sitemap.xsl
src/org/apache/cocoon/components/language/markup/xsp Tag:
xml-cocoon2 XSPRequestHelper.java
XSPResponseHelper.java XSPUtil.java
src/org/apache/cocoon/components/language/markup/xsp/java
Tag: xml-cocoon2 request.xsl response.xsl
session.xsl util.xsl
src/org/apache/cocoon/generation Tag: xml-cocoon2
RequestGenerator.java
src/org/apache/cocoon/matching Tag: xml-cocoon2
RegexpTargetHostMatcherFactory.java
RegexpURIMatcherFactory.java
WildcardURIMatcherFactory.java
src/org/apache/cocoon/selection Tag: xml-cocoon2
BrowserSelectorFactory.java
HostSelectorFactory.java
webapp/docs/samples/xsp Tag: xml-cocoon2 upload.xsp
Log:
This is Part II of the effort to eliminate dependency on javax.servlet.http.*;
1. With this you should be able to use tomcat 4.0 latest from cvs (or nightly
build)
2. Am unable to test request.xsl, response.xsl, util.xsl and session.xsl
thoroughly.
3. Can everyone test their XSP's to make sure that nothing is broken??
Yes, Part III will actually be org.apache.cocoon.environment.Request
and org.apache.cocoon.environment.Response interfaces for use by all the
components to gain independancy.
Revision Changes Path
No revision
No revision
1.1.2.93 +3 -3
xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl,v
retrieving revision 1.1.2.92
retrieving revision 1.1.2.93
diff -u -r1.1.2.92 -r1.1.2.93
--- sitemap.xsl 2001/03/23 13:48:52 1.1.2.92
+++ sitemap.xsl 2001/03/23 19:38:04 1.1.2.93
@@ -86,15 +86,15 @@
import org.apache.cocoon.sitemap.Sitemap;
import org.apache.cocoon.sitemap.ErrorNotifier;
import org.apache.cocoon.sitemap.Manager;
- import org.apache.cocoon.environment.http.HttpRequest;
- import org.apache.cocoon.environment.http.HttpResponse;
+ import org.apache.cocoon.components.language.markup.xsp.XSPRequestHelper;
+ import
org.apache.cocoon.components.language.markup.xsp.XSPResponseHelper;
/**
* This is the automatically generated class from the sitemap definitions
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo
Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin
Loritsch</a>
- * @version CVS $Id: sitemap.xsl,v 1.1.2.92 2001/03/23 13:48:52 dims Exp
$
+ * @version CVS $Id: sitemap.xsl,v 1.1.2.93 2001/03/23 19:38:04 dims Exp
$
*/
public class <xsl:value-of select="@file-name"/> extends AbstractSitemap
{
static final String LOCATION = "<xsl:value-of
select="translate(@file-path, '/', '.')"/>.<xsl:value-of select="@file-name"/>";
No revision
No revision
1.1.2.8 +233 -25
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.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- XSPRequestHelper.java 2001/02/15 20:28:53 1.1.2.7
+++ XSPRequestHelper.java 2001/03/23 19:38:06 1.1.2.8
@@ -9,8 +9,10 @@
import java.util.Enumeration;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.cocoon.environment.http.HttpRequest;
import javax.servlet.http.HttpSession;
+import java.util.Map;
+import java.util.Vector;
import org.xml.sax.ContentHandler;
import org.xml.sax.helpers.AttributesImpl;
@@ -22,7 +24,7 @@
* The <code>HttpServletRequest</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/02/15 20:28:53 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/03/23 19:38:06 $
*/
public class XSPRequestHelper extends XSPObjectHelper {
/**
@@ -36,32 +38,47 @@
/**
* Output the uri associated with the given <code>HttpServletRequest</code>
*
- * @param request The HttpServletRequest request
+ * @param objectModel The Map objectModel
* @param contentHandler The SAX content handler
* @exception SAXException If a SAX error occurs
*/
public static void getUri(
- HttpServletRequest request,
+ Map objectModel,
ContentHandler contentHandler
)
throws SAXException
{
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
elementData(contentHandler, "uri", request.getRequestURI());
}
/**
+ * Output the uri associated with the given objectModel
+ *
+ * @param objectModel The Map objectModel
+ */
+ public static String getUri(
+ Map objectModel
+ )
+ {
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getRequestURI();
+ }
+
+ /**
* Return the given request parameter value or a user-provided default if
* none was specified.
*
- * @param request The HttpServletRequest request
+ * @param objectModel The Map objectModel
* @param name The parameter name
* @param defaultValue Value to substitute in absence of a parameter value
*/
public static String getParameter(
- HttpServletRequest request,
+ Map objectModel,
String name,
String defaultValue
) {
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
String value = request.getParameter(name);
if (value == null) {
@@ -75,27 +92,28 @@
* Output the given request parameter value or a user-provided default if
* none was specified.
*
- * @param request The HttpServletRequest request
+ * @param objectModel The Map objectModel
* @param contentHandler The SAX content handler
* @param name The parameter name
* @param defaultValue Value to substitute in absence of a parameter value
* @exception SAXException If a SAX error occurs
*/
public static void getParameter(
- HttpServletRequest request,
+ Map objectModel,
ContentHandler contentHandler,
String name,
String defaultValue
)
throws SAXException
{
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
AttributesImpl attr = new AttributesImpl();
addAttribute(attr, "name", name);
elementData(
contentHandler,
"parameter",
- getParameter(request, name, defaultValue),
+ getParameter(objectModel, name, defaultValue),
attr
);
}
@@ -103,17 +121,18 @@
/**
* Output the request parameter values for a given name
*
- * @param request The HttpServletRequest request
+ * @param objectModel The Map objectModel
* @param contentHandler The SAX content handler
* @exception SAXException If a SAX error occurs
*/
public static void getParameterValues(
- HttpServletRequest request,
+ Map objectModel,
ContentHandler contentHandler,
String name
)
throws SAXException
{
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
AttributesImpl attr = new AttributesImpl();
addAttribute(attr, "name", name);
@@ -133,16 +152,17 @@
/**
* Output parameter names for a given request
*
- * @param request The HttpServletRequest request
+ * @param objectModel The Map objectModel
* @param contentHandler The SAX content handler
* @exception SAXException If a SAX error occurs
*/
public static void getParameterNames(
- HttpServletRequest request,
+ Map objectModel,
ContentHandler contentHandler
)
throws SAXException
{
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
start(contentHandler, "parameter-names");
Enumeration e = request.getParameterNames();
@@ -157,35 +177,37 @@
/**
* Return the request header value for a given name
*
- * @param request The HttpServletRequest request
+ * @param objectModel The Map objectModel
* @param name The parameter name
*/
public static String getHeader(
- HttpServletRequest request,
+ Map objectModel,
String name
) {
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
return request.getHeader(name);
}
/**
* Output the request header value for a given name
*
- * @param request The HttpServletRequest request
+ * @param objectModel The Map objectModel
* @param contentHandler The SAX content handler
* @param name The parameter name
* @exception SAXException If a SAX error occurs
*/
public static void getHeader(
- HttpServletRequest request,
+ Map objectModel,
ContentHandler contentHandler,
String name
)
throws SAXException
{
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
AttributesImpl attr = new AttributesImpl();
addAttribute(attr, "name", name);
- String value = getHeader(request, name);
+ String value = getHeader(objectModel, name);
if (value == null) {
value = "";
}
@@ -201,16 +223,17 @@
/**
* Output the header names for a given request
*
- * @param request The HttpServletRequest request
+ * @param objectModel The Map objectModel
* @param contentHandler The SAX content handler
* @exception SAXException If a SAX error occurs
*/
public static void getHeaderNames(
- HttpServletRequest request,
+ Map objectModel,
ContentHandler contentHandler
)
throws SAXException
{
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
start(contentHandler, "header-names");
Enumeration e = request.getHeaderNames();
@@ -225,16 +248,34 @@
/**
* Return the given session attribute value or a user-provided default if
* none was specified.
+ *
+ * @param objectModel The Map objectModel
+ * @param name The parameter name
+ * @param defaultValue Value to substitute in absence of a parameter value
+ */
+ public static String getSessionAttribute(
+ Map objectModel,
+ String name) {
+
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ HttpSession session = request.getSession(false);
+ return (String) session.getAttribute(name);
+ }
+
+ /**
+ * Return the given session attribute value or a user-provided default if
+ * none was specified.
*
- * @param request The HttpServletRequest request
+ * @param objectModel The Map objectModel
* @param name The parameter name
* @param defaultValue Value to substitute in absence of a parameter value
*/
public static String getSessionAttribute(
- HttpServletRequest request,
+ Map objectModel,
String name,
String defaultValue) {
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
HttpSession session = request.getSession(false);
String value = null;
@@ -250,31 +291,198 @@
}
/**
+ * Remove the specified attribute
+ *
+ * @param objectModel The Map objectModel
+ * @param name The parameter name
+ */
+ public static void removeAttribute(
+ Map objectModel,
+ String name) {
+
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ request.removeAttribute(name);
+ }
+
+ /**
* Output the given session attribute value or a user-provided default if
* none was specified.
*
- * @param request The HttpServletRequest request
+ * @param objectModel The Map objectModel
* @param contentHandler The SAX content handler
* @param name The parameter name
* @param defaultValue Value to substitute in absence of a parameter value
* @exception SAXException If a SAX error occurs
*/
public static void getSessionAttribute(
- HttpServletRequest request,
+ Map objectModel,
ContentHandler contentHandler,
String name,
String defaultValue
)
throws SAXException
{
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
AttributesImpl attr = new AttributesImpl();
addAttribute(attr, "name", name);
elementData(
contentHandler,
"attribute",
- getSessionAttribute(request, name, defaultValue),
+ getSessionAttribute(objectModel, name, defaultValue),
attr
);
+ }
+
+ /**
+ * Checks the secure flag
+ *
+ * @param objectModel The Map objectModel
+ */
+ public static boolean isSecure(
+ Map objectModel) {
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.isSecure();
+ }
+
+
+ /**
+ * Remove the specified attribute
+ *
+ * @param objectModel The Map objectModel
+ */
+ public static String getServerName(
+ Map objectModel) {
+
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getServerName();
+ }
+
+ /**
+ * Remove the specified attribute
+ *
+ * @param objectModel The Map objectModel
+ */
+ public static int getServerPort(
+ Map objectModel) {
+
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getServerPort();
+ }
+
+
+ /**
+ * Get the session attribute names.
+ *
+ * @param objectModel The Map objectModel
+ */
+ public static Vector getSessionAttributeNames (
+ Map objectModel) {
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Vector v = new Vector();
+ Enumeration e = request.getSession().getAttributeNames();
+
+ while (e.hasMoreElements()) {
+ v.addElement(request.getSession().getAttribute((String)
e.nextElement()));
+ }
+
+ String[] attributeNames = new String[v.size()];
+ v.copyInto(attributeNames);
+ return v;
+ }
+
+
+ /**
+ * Get the session creation time
+ *
+ * @param objectModel The Map objectModel
+ */
+ public static long getSessionCreationTime (
+ Map objectModel) {
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getSession().getCreationTime();
+ }
+
+ /**
+ * Get the session id
+ *
+ * @param objectModel The Map objectModel
+ */
+ public static String getSessionId (
+ Map objectModel) {
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getSession().getId();
+ }
+
+ /**
+ * Get the session last accessed time
+ *
+ * @param objectModel The Map objectModel
+ */
+ public static long getSessionLastAccessedTime (
+ Map objectModel) {
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getSession().getLastAccessedTime();
+ }
+
+ /**
+ * Get the session max inactive interval
+ *
+ * @param objectModel The Map objectModel
+ */
+ public static long getSessionMaxInactiveInterval (
+ Map objectModel) {
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getSession().getMaxInactiveInterval();
+ }
+
+ /**
+ * Set the session max inactive interval
+ *
+ * @param objectModel The Map objectModel
+ * @param interval max inactive interval
+ */
+ public static void setSessionMaxInactiveInterval (
+ Map objectModel,
+ int interval) {
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ request.getSession().setMaxInactiveInterval(interval);
+ }
+
+ /**
+ * Invalidate the session
+ *
+ * @param objectModel The Map objectModel
+ */
+ public static void invalidateSession (
+ Map objectModel) {
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ request.getSession().invalidate();
+ }
+
+
+ /**
+ * Checks the isNew flag
+ *
+ * @param objectModel The Map objectModel
+ */
+ public static boolean isSessionNew(
+ Map objectModel) {
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getSession().isNew();
+ }
+
+ /**
+ * Remove the specified attribute
+ *
+ * @param objectModel The Map objectModel
+ * @param name The parameter name
+ */
+ public static void removeSessionAttribute(
+ Map objectModel,
+ String name) {
+
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ request.getSession().removeAttribute(name);
}
}
1.1.2.10 +43 -8
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPResponseHelper.java
Index: XSPResponseHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPResponseHelper.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- XSPResponseHelper.java 2001/02/15 20:28:57 1.1.2.9
+++ XSPResponseHelper.java 2001/03/23 19:38:07 1.1.2.10
@@ -9,8 +9,9 @@
import java.io.IOException;
import java.util.Enumeration;
+import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
+import org.apache.cocoon.environment.http.HttpResponse;
import org.xml.sax.ContentHandler;
import org.xml.sax.helpers.AttributesImpl;
@@ -24,7 +25,7 @@
* The XSP <code>HttpResponse</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/15 20:28:57 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/03/23 19:38:07 $
*/
public class XSPResponseHelper extends XSPObjectHelper {
/**
@@ -38,34 +39,68 @@
/**
* Set the content header for a given response
*
- * @param response The <code>HttpServletResponse</code>
+ * @param objectModel The Map objectModel
* @param name The header name
* @param value The header value
*/
- public static void setHeader(HttpServletResponse response, String name,
String value) {
+ public static void setHeader(Map objectModel, String name, String value) {
+ HttpResponse response =
(HttpResponse)objectModel.get(Constants.RESPONSE_OBJECT);
response.setHeader(name, value);
}
/**
+ * Set the content header for a given response
+ *
+ * @param objectModel The Map objectModel
+ * @param name The parameter name
+ * @param value The parameter value
+ */
+ public static void addHeader(
+ Map objectModel,
+ String name,
+ String value
+ ) {
+ HttpResponse response =
(HttpResponse)objectModel.get(Constants.RESPONSE_OBJECT);
+ response.addHeader(name, value);
+ }
+
+ /**
* Set the content type for a given response
*
- * @param response The <code>HttpServletResponse</code>
+ * @param objectModel The Map objectModel
* @param type The content type
*/
- public static void setContentType(HttpServletResponse response, String
type) {
+ public static void setContentType(Map objectModel, String type) {
+ HttpResponse response =
(HttpResponse)objectModel.get(Constants.RESPONSE_OBJECT);
response.setContentType(type);
}
/**
* Send an HTTP redirect
*
- * @param response The <code>HttpServletResponse</code>
+ * @param objectModel The Map objectModel
* @param location The location URL
*/
- public static void sendRedirect(HttpServletResponse response, String
location) {
+ public static void sendRedirect(Map objectModel, String location) {
try {
+ HttpResponse response =
(HttpResponse)objectModel.get(Constants.RESPONSE_OBJECT);
response.sendRedirect(response.encodeRedirectURL(location));
}
catch (IOException e)
{LogKit.getLoggerFor("cocoon").warn("XSPResponseHelper.sendRedirect", e);}
}
+
+ /**
+ * Encode the URL
+ *
+ * @param objectModel The Map objectModel
+ * @param name The input url string
+ */
+ public static String encodeURL(
+ Map objectModel,
+ String input
+ ) {
+ HttpResponse response =
(HttpResponse)objectModel.get(Constants.RESPONSE_OBJECT);
+ return response.encodeURL(input);
+ }
+
}
1.1.2.9 +14 -7
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPUtil.java
Index: XSPUtil.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPUtil.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- XSPUtil.java 2001/03/12 05:55:19 1.1.2.8
+++ XSPUtil.java 2001/03/23 19:38:08 1.1.2.9
@@ -25,6 +25,7 @@
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Map;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
@@ -32,6 +33,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
+import org.apache.cocoon.Constants;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.util.IOUtils;
@@ -42,11 +44,13 @@
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.dom.DOMBuilder;
+import javax.servlet.ServletContext;
+
/**
* The XSP <code>Utility</code> object helper
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Berin Loritsch</a>
- * @version $Revision: 1.1.2.8 $ $Date: 2001/03/12 05:55:19 $
+ * @version $Revision: 1.1.2.9 $ $Date: 2001/03/23 19:38:08 $
*/
public class XSPUtil {
public static String pathComponent(String filename) {
@@ -97,8 +101,9 @@
return buffer.toString();
}
- public static String relativeFilename(String filename,
HttpServletRequest request,
- ServletContext context) throws IOException {
+ public static String relativeFilename(String filename, Map objectModel)
+ throws IOException {
+ ServletContext context = (ServletContext)
objectModel.get(Constants.CONTEXT_OBJECT);
File file = new File(filename);
if (file.isAbsolute()) {
return filename;
@@ -106,10 +111,6 @@
return
NetUtils.getPath(context.getResource(filename).toExternalForm());
}
- public static String relativeFilename(String filename,
HttpServletRequest request) throws IOException {
- return relativeFilename(filename, request, null);
- }
-
public static boolean isAlphaNumeric(char c) {
return c == '_' || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
|| (c >= '0' && c <= '9');
}
@@ -276,5 +277,11 @@
session.setAttribute("util.counter",
new Integer(cnt));
return cnt;
+ }
+
+ public static Object getContextAttribute(Map objectModel, String name)
+ {
+ ServletContext context = (ServletContext)
objectModel.get(Constants.CONTEXT_OBJECT);
+ return context.getAttribute(name);
}
}
No revision
No revision
1.1.2.10 +18 -18
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.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- request.xsl 2001/03/16 16:13:27 1.1.2.9
+++ request.xsl 2001/03/23 19:38:10 1.1.2.10
@@ -11,7 +11,7 @@
<!--
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/03/16 16:13:27 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/03/23 19:38:10 $
-->
<!-- XSP Request logicsheet for the Java language -->
@@ -32,13 +32,13 @@
<xsl:choose>
<xsl:when test="$as = 'string'">
<xsp:expr>
- (this.request.getRequestURI())
+ (XSPRequestHelper.getUri(objectModel))
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
<!-- <xsp-request:uri> -->
<xsp:logic>
- XSPRequestHelper.getUri(request, this.contentHandler);
+ XSPRequestHelper.getUri(objectModel, this.contentHandler);
</xsp:logic>
</xsl:when>
</xsl:choose>
@@ -70,12 +70,12 @@
<xsl:choose>
<xsl:when test="$as = 'string'">
<xsp:expr>
- (XSPRequestHelper.getSessionAttribute(request, <xsl:copy-of
select="$name"/>, <xsl:copy-of select="$default"/>))
+ (XSPRequestHelper.getSessionAttribute(objectModel, <xsl:copy-of
select="$name"/>, <xsl:copy-of select="$default"/>))
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
<xsp:logic>
- XSPRequestHelper.getSessionAttribute(request, this.contentHandler,
<xsl:copy-of select="$name"/>, <xsl:copy-of select="$default"/>);
+ XSPRequestHelper.getSessionAttribute(objectModel,
this.contentHandler, <xsl:copy-of select="$name"/>, <xsl:copy-of
select="$default"/>);
</xsp:logic>
</xsl:when>
</xsl:choose>
@@ -107,13 +107,13 @@
<xsl:choose>
<xsl:when test="$as = 'string'">
<xsp:expr>
- (XSPRequestHelper.getParameter(request, <xsl:copy-of
select="$name"/>, <xsl:copy-of select="$default"/>))
+ (XSPRequestHelper.getParameter(objectModel, <xsl:copy-of
select="$name"/>, <xsl:copy-of select="$default"/>))
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
<!-- <xsp-request:uri> -->
<xsp:logic>
- XSPRequestHelper.getParameter(request, this.contentHandler,
<xsl:copy-of select="$name"/>, <xsl:copy-of select="$default"/>);
+ XSPRequestHelper.getParameter(objectModel, this.contentHandler,
<xsl:copy-of select="$name"/>, <xsl:copy-of select="$default"/>);
</xsp:logic>
</xsl:when>
</xsl:choose>
@@ -125,13 +125,13 @@
</xsl:variable>
<xsp:logic>
- XSPRequestHelper.getParameterValues(request, this.contentHandler,
<xsl:copy-of select="$name"/>);
+ XSPRequestHelper.getParameterValues(objectModel,
this.contentHandler, <xsl:copy-of select="$name"/>);
</xsp:logic>
</xsl:template>
<xsl:template match="xsp-request:get-parameter-names">
<xsp:logic>
- XSPRequestHelper.getParameterNames(request, this.contentHandler);
+ XSPRequestHelper.getParameterNames(objectModel, this.contentHandler);
</xsp:logic>
</xsl:template>
@@ -149,13 +149,13 @@
<xsl:choose>
<xsl:when test="$as = 'string'">
<xsp:expr>
- (XSPRequestHelper.getHeader(request, <xsl:copy-of
select="$name"/>))
+ (XSPRequestHelper.getHeader(objectModel, <xsl:copy-of
select="$name"/>))
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
<!-- <xsp-request:uri> -->
<xsp:logic>
- XSPRequestHelper.getHeader(request, this.contentHandler,
<xsl:copy-of select="$name"/>);
+ XSPRequestHelper.getHeader(objectModel, this.contentHandler,
<xsl:copy-of select="$name"/>);
</xsp:logic>
</xsl:when>
</xsl:choose>
@@ -163,7 +163,7 @@
<xsl:template match="xsp-request:get-header-names">
<xsp:logic>
- XSPRequestHelper.getHeaderNames(request, this.contentHandler);
+ XSPRequestHelper.getHeaderNames(objectModel, this.contentHandler);
</xsp:logic>
</xsl:template>
@@ -181,18 +181,18 @@
<xsl:choose>
<xsl:when test="$as = 'string'">
<xsp:expr>
- String.valueOf(request.getAttribute(<xsl:copy-of select="$name"/>))
+
String.valueOf(XSPRequestHelper.getAttribute(objectModel,<xsl:copy-of
select="$name"/>))
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'object'">
<xsp:expr>
- request.getAttribute(<xsl:copy-of select="$name"/>)
+ XSPRequestHelper.getAttribute(objectModel,<xsl:copy-of
select="$name"/>)
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
<xsp:element name="xsp-request:attribute">
<xsp:expr>
- request.getAttribute(<xsl:copy-of select="$name"/>)
+ XSPRequestHelper.getAttribute(objectModel,<xsl:copy-of
select="$name"/>)
</xsp:expr>
</xsp:element>
</xsl:when>
@@ -205,7 +205,7 @@
</xsl:variable>
<xsp:logic>
- request.removeAttribute(<xsl:value-of select="$name"/>);
+ XSPRequestHelper.removeAttribute(objectModel,<xsl:value-of
select="$name"/>);
</xsp:logic>
</xsl:template>
@@ -218,11 +218,11 @@
<xsl:choose>
<xsl:when test="$as = 'string'">
- <xsp:expr>new StringBuffer((request.isSecure()) ? "https://"; :
"http://";).append(request.getServerName()).append(":").append(request.getServerPort()).append("/").append(request.getRequestURI()).toString()</xsp:expr>
+ <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>
</xsl:when>
<xsl:when test="$as = 'xml'">
<xsp-request:requested-url>
- <xsp:expr>new StringBuffer((request.isSecure()) ? "https://"; :
"http://";).append(request.getServerName()).append(":").append(request.getServerPort()).append("/").append(request.getRequestURI()).toString()</xsp:expr>
+ <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-request:requested-url>
</xsl:when>
</xsl:choose>
1.1.2.9 +4 -4
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/response.xsl
Index: response.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/response.xsl,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- response.xsl 2001/03/16 17:03:47 1.1.2.8
+++ response.xsl 2001/03/23 19:38:11 1.1.2.9
@@ -11,7 +11,7 @@
<!--
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/03/16 17:03:47 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/03/23 19:38:11 $
-->
<!-- XSP Response logicsheet for the Java language -->
@@ -47,7 +47,7 @@
</xsl:variable>
<xsp:logic>
- XSPResponseHelper.setHeader(response, <xsl:value-of select="$name"/>,
<xsl:value-of select="$value"/>);
+ XSPResponseHelper.setHeader(objectModel, <xsl:value-of
select="$name"/>, <xsl:value-of select="$value"/>);
</xsp:logic>
</xsl:template>
@@ -64,7 +64,7 @@
</xsl:variable>
<xsp:logic>
- XSPResponseHelper.setContentType(response, <xsl:value-of
select="$type"/>);
+ XSPResponseHelper.setContentType(objectModel, <xsl:value-of
select="$type"/>);
</xsp:logic>
</xsl:template>
@@ -80,7 +80,7 @@
</xsl:choose>
</xsl:variable>
<xsp:logic>
- XSPResponseHelper.sendRedirect(response, <xsl:value-of
select="$location"/>);
+ XSPResponseHelper.sendRedirect(objectModel, <xsl:value-of
select="$location"/>);
</xsp:logic>
</xsl:template>
1.1.2.4 +22 -30
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/session.xsl
Index: session.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/session.xsl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- session.xsl 2001/02/21 12:17:03 1.1.2.3
+++ session.xsl 2001/03/23 19:38:11 1.1.2.4
@@ -75,11 +75,11 @@
<xsl:choose>
<xsl:when test="$as = 'xml'">
<xsp:element name="session:attribute">
-
<xsp:expr>request.getSession().getAttribute(String.valueOf(<xsl:copy-of
select="$name"/>))</xsp:expr>
+ <xsp:expr>XSPRequestHelper.getSessionAttribute(objectModel,
String.valueOf(<xsl:copy-of select="$name"/>))</xsp:expr>
</xsp:element>
</xsl:when>
<xsl:when test="$as = 'object'">
- <xsp:expr>request.getSession().getAttribute(
+ <xsp:expr>XSPRequestHelper.getSessionAttribute(objectModel,
String.valueOf(<xsl:copy-of select="$name"/>)
)</xsp:expr>
</xsl:when>
@@ -94,15 +94,7 @@
</xsl:variable>
<xsp:logic>
- Vector v = new Vector();
- Enumeration e = request.getSession().getAttributeNames();
-
- while (e.hasMoreElements()) {
- v.addElement(request.getSession().getAttribute((String)
e.nextElement()));
- }
-
- String[] attributeNames = new String[v.size()];
- v.copyInto(attributeNames);
+ Vector v = XSPRequestHelper.getSessionAttributeNames(objectModel);
</xsp:logic>
<xsl:choose>
@@ -133,14 +125,14 @@
<xsl:choose>
<xsl:when test="$as = 'xml'">
<xsp:element name="session:creation-time">
- <xsp:expr>new
Date(request.getSession().getCreationTime())</xsp:expr>
+ <xsp:expr>new
Date(XSPRequestHelper.getSessionCreationTime(objectModel))</xsp:expr>
</xsp:element>
</xsl:when>
<xsl:when test="$as = 'string'">
- <xsp:expr>new
Date(request.getSession().getCreationTime())</xsp:expr>
+ <xsp:expr>new
Date(XSPRequestHelper.getSessionCreationTime(objectModel))</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'long'">
- <xsp:expr>request.getSession().getCreationTime()</xsp:expr>
+
<xsp:expr>XSPRequestHelper.getSessionCreationTime(objectModel)</xsp:expr>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -155,11 +147,11 @@
<xsl:choose>
<xsl:when test="$as = 'xml'">
<xsp:element name="session:id">
- <xsp:expr>request.getSession().getId()</xsp:expr>
+ <xsp:expr>XSPRequestHelper.getSessionId(objectModel)</xsp:expr>
</xsp:element>
</xsl:when>
<xsl:when test="$as = 'string'">
- <xsp:expr>request.getSession().getId()</xsp:expr>
+ <xsp:expr>XSPRequestHelper.getSessionId(objectModel)</xsp:expr>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -174,14 +166,14 @@
<xsl:choose>
<xsl:when test="$as = 'xml'">
<xsp:element name="session:last-accessed-time">
- <xsp:expr>new
Date(request.getSession().getLastAccessedTime())</xsp:expr>
+ <xsp:expr>new
Date(XSPRequestHelper.getSessionLastAccessedTime(objectModel))</xsp:expr>
</xsp:element>
</xsl:when>
<xsl:when test="$as = 'string'">
- <xsp:expr>new
Date(request.getSession().getLastAccessedTime())</xsp:expr>
+ <xsp:expr>new
Date(XSPRequestHelper.getSessionLastAccessedTime(objectModel))</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'long'">
- <xsp:expr>request.getSession().getLastAccessedTime()</xsp:expr>
+
<xsp:expr>XSPRequestHelper.getSessionLastAccessedTime(objectModel)</xsp:expr>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -196,21 +188,21 @@
<xsl:choose>
<xsl:when test="$as = 'xml'">
<xsp:element name="session:max-inactive-interval">
- <xsp:expr>request.getSession().getMaxInactiveInterval()</xsp:expr>
+
<xsp:expr>XSPRequestHelper.getSessionMaxInactiveInterval(objectModel)</xsp:expr>
</xsp:element>
</xsl:when>
<xsl:when test="$as = 'string'">
-
<xsp:expr>String.valueOf(request.getSession().getMaxInactiveInterval())</xsp:expr>
+
<xsp:expr>String.valueOf(XSPRequestHelper.getSessionMaxInactiveInterval(objectModel))</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'int'">
- <xsp:expr>request.getSession().getMaxInactiveInterval()</xsp:expr>
+
<xsp:expr>XSPRequestHelper.getSessionMaxInactiveInterval(objectModel)</xsp:expr>
</xsl:when>
</xsl:choose>
</xsl:template>
<xsl:template match="session:invalidate">
<xsp:logic>
- request.getSession().invalidate();
+ XSPRequestHelper.invalidateSession(objectModel);
</xsp:logic>
</xsl:template>
@@ -225,14 +217,14 @@
<xsl:choose>
<xsl:when test="$as = 'xml'">
<xsp:element name="session:is-new">
- <xsp:expr>request.getSession().isNew()</xsp:expr>
+ <xsp:expr>XSPRequestHelper.isSessionNew(objectModel)</xsp:expr>
</xsp:element>
</xsl:when>
<xsl:when test="$as = 'string'">
- <xsp:expr>String.valueOf(request.getSession().isNew())</xsp:expr>
+
<xsp:expr>String.valueOf(XSPRequestHelper.isSessionNew(objectModel))</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'boolean'">
- <xsp:expr>request.getSession().isNew()</xsp:expr>
+ <xsp:expr>XSPRequestHelper.isSessionNew(objectModel)</xsp:expr>
</xsl:when>
</xsl:choose>
</xsp:expr>
@@ -244,7 +236,7 @@
</xsl:variable>
<xsp:logic>
- request.getSession().removeAttribute(
+ XSPRequestHelper.removeSessionAttribute(objectModel,
String.valueOf(<xsl:copy-of select="$name"/>)
);
</xsp:logic>
@@ -262,7 +254,7 @@
</xsl:variable>
<xsp:logic>
- request.getSession().setAttribute(
+ XSPRequestHelper.setSessionAttribute(objectModel,
String.valueOf(<xsl:copy-of select="$name"/>),
<xsl:copy-of select="$content"/>
);
@@ -300,7 +292,7 @@
<xsp:element name="a">
<xsp:attribute name="href">
- <xsp:expr>response.encodeURL(String.valueOf(<xsl:copy-of
select="$href"/>))</xsp:expr>
+ <xsp:expr>XSPResponseHelper.encodeURL(objectModel,
String.valueOf(<xsl:copy-of select="$href"/>))</xsp:expr>
</xsp:attribute>
<xsl:value-of select="."/>
</xsp:element>
@@ -321,7 +313,7 @@
<xsp:element name="form">
<xsp:attribute name="action">
- <xsp:expr>response.encodeURL(String.valueOf(<xsl:copy-of
select="$action"/>))</xsp:expr>
+
<xsp:expr>XSPResponseHelper.encodeURL(objectModel,String.valueOf(<xsl:copy-of
select="$action"/>))</xsp:expr>
</xsp:attribute>
<xsp:attribute name="method">
<xsp:expr><xsl:copy-of select="$method"/></xsp:expr>
1.1.2.8 +3 -5
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/util.xsl
Index: util.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/util.xsl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- util.xsl 2001/03/21 18:51:14 1.1.2.7
+++ util.xsl 2001/03/23 19:38:12 1.1.2.8
@@ -175,9 +175,8 @@
new FileReader(
XSPUtil.relativeFilename(
<xsl:copy-of select="$name"/>,
- this.request,
- this.context
- )
+ objectModel
+ )
)
);
@@ -243,8 +242,7 @@
XSPUtil.getFileContents(
XSPUtil.relativeFilename(
String.valueOf(<xsl:copy-of select="$name"/>),
- this.request,
- this.context
+ this.objectModel
), "<xsl:value-of select="@encoding"/>"
)
</xsp:expr>
No revision
No revision
1.1.2.10 +11 -6
xml-cocoon/src/org/apache/cocoon/generation/Attic/RequestGenerator.java
Index: RequestGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/RequestGenerator.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- RequestGenerator.java 2001/02/22 17:10:34 1.1.2.9
+++ RequestGenerator.java 2001/03/23 19:38:15 1.1.2.10
@@ -15,12 +15,15 @@
import org.apache.avalon.Poolable;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.http.HttpRequest;
+
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/22 17:10:34 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/03/23 19:38:15 $
*/
public class RequestGenerator extends ServletGenerator implements Poolable {
@@ -32,11 +35,13 @@
*/
public void generate()
throws SAXException {
+
+ HttpRequest request = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);
this.contentHandler.startDocument();
this.contentHandler.startPrefixMapping("",URI);
AttributesImpl attr=new AttributesImpl();
- this.attribute(attr,"target",this.request.getRequestURI());
+ this.attribute(attr,"target",request.getRequestURI());
this.attribute(attr,"source",this.source);
this.start("request",attr);
this.data("\n");
@@ -45,13 +50,13 @@
this.data(" ");
this.start("requestHeaders",attr);
this.data("\n");
- Enumeration headers=this.request.getHeaderNames();
+ Enumeration headers=request.getHeaderNames();
while (headers.hasMoreElements()) {
String header=(String)headers.nextElement();
this.attribute(attr,"name",header);
this.data(" ");
this.start("header",attr);
- this.data(this.request.getHeader(header));
+ this.data(request.getHeader(header));
this.end("header");
this.data("\n");
}
@@ -63,14 +68,14 @@
this.data(" ");
this.start("requestParameters",attr);
this.data("\n");
- Enumeration parameters=this.request.getParameterNames();
+ Enumeration parameters=request.getParameterNames();
while (parameters.hasMoreElements()) {
String parameter=(String)parameters.nextElement();
this.attribute(attr,"name",parameter);
this.data(" ");
this.start("parameter",attr);
this.data("\n");
- String values[]=this.request.getParameterValues(parameter);
+ String values[]=request.getParameterValues(parameter);
if (values!=null) for (int x=0; x<values.length; x++) {
this.data(" ");
this.start("value",attr);
No revision
No revision
1.1.2.12 +2 -2
xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpTargetHostMatcherFactory.java
Index: RegexpTargetHostMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpTargetHostMatcherFactory.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- RegexpTargetHostMatcherFactory.java 2001/03/23 13:48:53 1.1.2.11
+++ RegexpTargetHostMatcherFactory.java 2001/03/23 19:38:17 1.1.2.12
@@ -27,7 +27,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/03/23 13:48:53 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/23 19:38:17 $
*/
public class RegexpTargetHostMatcherFactory implements CodeFactory, Loggable
{
@@ -87,7 +87,7 @@
throws ConfigurationException {
StringBuffer sb = new StringBuffer ();
sb.append("HashMap map = new HashMap ();")
- .append("String host =
((HttpRequest)objectModel.get(Constants.REQUEST_OBJECT)).getHeader(\"Host\");")
+ .append("String host =
XSPRequestHelper.getHeader(objectModel,\"Host\");")
.append("getLogger().debug(\"Matching against host: \" + host +
\".\");")
.append("if(pattern.match(host)) {");
/* Handle parenthesised subexpressions. XXX: could be faster if we
count
1.1.2.24 +2 -2
xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java
Index: RegexpURIMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- RegexpURIMatcherFactory.java 2001/03/23 13:48:53 1.1.2.23
+++ RegexpURIMatcherFactory.java 2001/03/23 19:38:18 1.1.2.24
@@ -26,7 +26,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/03/23 13:48:53 $
+ * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/03/23 19:38:18 $
*/
public class RegexpURIMatcherFactory implements CodeFactory, Loggable {
@@ -102,7 +102,7 @@
throws ConfigurationException {
StringBuffer sb = new StringBuffer ();
sb.append("HashMap map = new HashMap ();")
- .append("String uri =
((HttpRequest)objectModel.get(Constants.REQUEST_OBJECT)).getRequestURI();")
+ .append("String uri = XSPRequestHelper.getUri(objectModel);")
.append("if(uri.startsWith(\"/\")) uri = uri.substring(1);")
.append("if(pattern.match(uri)) {");
/* Handle parenthesised subexpressions. XXX: could be faster if we
count
1.1.2.32 +2 -3
xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java
Index: WildcardURIMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java,v
retrieving revision 1.1.2.31
retrieving revision 1.1.2.32
diff -u -r1.1.2.31 -r1.1.2.32
--- WildcardURIMatcherFactory.java 2001/03/23 13:48:53 1.1.2.31
+++ WildcardURIMatcherFactory.java 2001/03/23 19:38:18 1.1.2.32
@@ -24,7 +24,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.31 $ $Date: 2001/03/23 13:48:53 $
+ * @version CVS $Revision: 1.1.2.32 $ $Date: 2001/03/23 19:38:18 $
*/
public class WildcardURIMatcherFactory implements CodeFactory, Loggable {
@@ -63,9 +63,8 @@
*/
public String generateMethodSource (NodeList conf)
throws ConfigurationException {
- //"String uri =
((org.apache.cocoon.environment.http.HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT)).getRequestURI();" +
return "HashMap map = new HashMap();" +
- "String uri = ((HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT)).getRequestURI();" +
+ "String uri = XSPRequestHelper.getUri(objectModel);" +
"if (uri.startsWith(\"/\")) uri = uri.substring(1);" +
"if
(org.apache.cocoon.matching.helpers.WildcardURIMatcher.match (map, uri,
pattern)) {" +
"return map;" +
No revision
No revision
1.1.2.17 +3 -5
xml-cocoon/src/org/apache/cocoon/selection/Attic/BrowserSelectorFactory.java
Index: BrowserSelectorFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/BrowserSelectorFactory.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- BrowserSelectorFactory.java 2001/03/23 13:48:55 1.1.2.16
+++ BrowserSelectorFactory.java 2001/03/23 19:38:19 1.1.2.17
@@ -26,7 +26,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/03/23 13:48:55 $
+ * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/03/23 19:38:19 $
*/
@@ -73,10 +73,8 @@
throws ConfigurationException {
StringBuffer sb = new StringBuffer();
sb.append("if (pattern != null &&
objectModel.get(Constants.REQUEST_OBJECT) != null) {")
- .append("HttpRequest request = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);")
- .append("String userAgent = request.getHeader(\"User-Agent\");")
- .append("HttpResponse response = (HttpResponse)
objectModel.get(Constants.RESPONSE_OBJECT);")
- .append("response.addHeader(\"Vary\", \"User-Agent\");")
+ .append("String userAgent =
XSPRequestHelper.getHeader(objectModel,\"User-Agent\");")
+ .append("XSPResponseHelper.addHeader(objectModel, \"Vary\",
\"User-Agent\");")
.append("for (int i = 0; i < pattern.length; i++) {")
.append("if (userAgent.indexOf(pattern[i]) != -1) return true;}");
return sb.append("} return false;").toString();
1.1.2.3 +3 -5
xml-cocoon/src/org/apache/cocoon/selection/Attic/HostSelectorFactory.java
Index: HostSelectorFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/HostSelectorFactory.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- HostSelectorFactory.java 2001/03/23 13:48:55 1.1.2.2
+++ HostSelectorFactory.java 2001/03/23 19:38:19 1.1.2.3
@@ -38,7 +38,7 @@
* </map:select>
*
* @author
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/03/23 13:48:55 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/03/23 19:38:19 $
*/
@@ -85,10 +85,8 @@
throws ConfigurationException {
StringBuffer sb = new StringBuffer();
sb.append("if (pattern != null &&
objectModel.get(Constants.REQUEST_OBJECT) != null) {")
- .append("HttpRequest request = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);")
- .append("String hostServer = request.getHeader(\"host\");")
- .append("HttpResponse response = (HttpResponse)
objectModel.get(Constants.RESPONSE_OBJECT);")
- .append("response.addHeader(\"Vary\", \"host\");")
+ .append("String hostServer =
XSPRequestHelper.getHeader(objectModel, \"host\");")
+ .append("XSPResponseHelper.addHeader(objectModel, \"Vary\",
\"host\");")
.append("for (int i = 0; i < pattern.length; i++) {")
.append("if (hostServer.indexOf(pattern[i]) != -1) return true;}");
return sb.append("} return false;").toString();
No revision
No revision
1.1.2.2 +5 -1 xml-cocoon/webapp/docs/samples/xsp/Attic/upload.xsp
Index: upload.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/docs/samples/xsp/Attic/upload.xsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- upload.xsp 2001/02/22 18:04:54 1.1.2.1
+++ upload.xsp 2001/03/23 19:38:20 1.1.2.2
@@ -7,6 +7,10 @@
xmlns:xsp-response="http://apache.org/xsp/response";
xmlns:log="http://apache.org/xsp/log";
>
+ <xsp:structure>
+
<xsp:include>org.apache.cocoon.components.language.markup.xsp.XSPUtil</xsp:include>
+ </xsp:structure>
+
<page>
<title>This form allows you upload files</title>
<content>
@@ -19,7 +23,7 @@
<para>
<ul>
<xsp:logic>
- File workDir = (File)
this.context.getAttribute("javax.servlet.context.tempdir");
+ File workDir = (File) XSPUtil.getContextAttribute(objectModel,
"javax.servlet.context.tempdir");
File uploadDir = IOUtils.createFile(workDir, "image-dir" +
File.separator);
String[] filelist = uploadDir.list();
for (int i = 0; i < filelist.length; i++) {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
