upayavira 2004/05/07 07:42:20
Modified: src/java/org/apache/cocoon/components/flow/javascript/fom
FOM_Cocoon.java
. status.xml
Log:
Adding cocoon.redirectTo(url, isGlobal), to allow FOM to do global redirects.
Revision Changes Path
1.34 +7 -3
cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
Index: FOM_Cocoon.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- FOM_Cocoon.java 25 Apr 2004 12:12:08 -0000 1.33
+++ FOM_Cocoon.java 7 May 2004 14:42:20 -0000 1.34
@@ -281,8 +281,12 @@
(OutputStream)unwrap(outputStream));
}
- public void jsFunction_redirectTo(String uri) throws Exception {
- this.currentCall.redirector.redirect(false, uri);
+ public void jsFunction_redirectTo(String uri, boolean isGlobal) throws
Exception {
+ if (isGlobal) {
+ this.currentCall.redirector.globalRedirect(false, uri);
+ } else {
+ this.currentCall.redirector.redirect(false, uri);
+ }
}
public void jsFunction_sendStatus(int sc) {
1.314 +11 -1 cocoon-2.1/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- status.xml 6 May 2004 14:23:04 -0000 1.313
+++ status.xml 7 May 2004 14:42:20 -0000 1.314
@@ -212,6 +212,16 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="UV" type="add">
+ Extended FOM so that cocoon.redirectTo("url", true) will do a global
+ redirect. cocoon.redirectTo("url") will act as before. This enables
+ FOM to redirect when it is called from within cocoon: protocol
+ requests, aggregations, etc.
+ </action>
+ <action dev="UV" type="fix">
+ Moving check on number of specified targets within CocoonBean. This was
+ preventing the processURI(uri, outputStream) method from working.
+ </action>
<action dev="VG" type="remove">
CForms: Remove custom flow level forms validators.
</action>
