unico 2003/11/14 10:57:44
Modified: src/java/org/apache/cocoon/sitemap SitemapRedirector.java
src/test/org/apache/cocoon/environment/mock
MockRedirector.java
src/java/org/apache/cocoon/environment/commandline
AbstractCommandLineEnvironment.java
src/java/org/apache/cocoon/environment
ForwardRedirector.java Redirector.java
src/java/org/apache/cocoon/environment/http
HttpEnvironment.java
Log:
add sendStatus method for empty responses.
Hopefully did this correctly. My tests on the webdav samples went well.
Please cross check the changes.
Revision Changes Path
1.4 +6 -1
cocoon-2.1/src/java/org/apache/cocoon/sitemap/SitemapRedirector.java
Index: SitemapRedirector.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/sitemap/SitemapRedirector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SitemapRedirector.java 24 Oct 2003 13:45:10 -0000 1.3
+++ SitemapRedirector.java 14 Nov 2003 18:57:43 -0000 1.4
@@ -90,6 +90,11 @@
this.hasRedirected = true;
}
+ public void sendStatus(int sc) {
+ e.setStatus(sc);
+ this.hasRedirected = true;
+ }
+
/**
* Perform check on whether redirection has occured or not
*/
1.3 +4 -0
cocoon-2.1/src/test/org/apache/cocoon/environment/mock/MockRedirector.java
Index: MockRedirector.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/environment/mock/MockRedirector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MockRedirector.java 4 May 2003 19:01:59 -0000 1.2
+++ MockRedirector.java 14 Nov 2003 18:57:43 -0000 1.3
@@ -83,5 +83,9 @@
redirect = null;
hasRedirected = false;
}
+
+ public void sendStatus(int sc) {
+ hasRedirected = true;
+ }
}
1.5 +6 -1
cocoon-2.1/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
Index: AbstractCommandLineEnvironment.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractCommandLineEnvironment.java 6 Jul 2003 20:37:48 -0000
1.4
+++ AbstractCommandLineEnvironment.java 14 Nov 2003 18:57:43 -0000
1.5
@@ -163,6 +163,11 @@
}
}
+ public void sendStatus(int sc) {
+ setStatus(sc);
+ this.hasRedirected = true;
+ }
+
public boolean hasRedirected() {
return this.hasRedirected;
}
1.10 +10 -1
cocoon-2.1/src/java/org/apache/cocoon/environment/ForwardRedirector.java
Index: ForwardRedirector.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/ForwardRedirector.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ForwardRedirector.java 29 Oct 2003 14:52:09 -0000 1.9
+++ ForwardRedirector.java 14 Nov 2003 18:57:43 -0000 1.10
@@ -144,4 +144,13 @@
public boolean hasRedirected() {
return this.hasRedirected;
}
+
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.environment.Redirector#sendStatus(int)
+ */
+ public void sendStatus(int sc) {
+ env.setStatus(sc);
+ this.hasRedirected = true;
+ }
+
}
1.2 +8 -1
cocoon-2.1/src/java/org/apache/cocoon/environment/Redirector.java
Index: Redirector.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/Redirector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Redirector.java 9 Mar 2003 00:09:28 -0000 1.1
+++ Redirector.java 14 Nov 2003 18:57:44 -0000 1.2
@@ -72,5 +72,12 @@
* Was one of the redirection methods called ?
*/
boolean hasRedirected();
+
+ /**
+ * Send an content-less response with the given status code.
+ *
+ * @param sc an http status code.
+ */
+ void sendStatus(int sc);
}
1.14 +6 -1
cocoon-2.1/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java
Index: HttpEnvironment.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- HttpEnvironment.java 30 Oct 2003 16:42:58 -0000 1.13
+++ HttpEnvironment.java 14 Nov 2003 18:57:44 -0000 1.14
@@ -135,6 +135,11 @@
doRedirect(sessionmode, newURL, true);
}
+ public void sendStatus(int sc) {
+ setStatus(sc);
+ this.hasRedirected = true;
+ }
+
/**
* Redirect the client to new URL with session mode
*/
