You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by co...@apache.org on 2004/01/19 05:37:37 UTC
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor TreeProcessor.java
coliver 2004/01/18 20:37:37
Modified: src/java/org/apache/cocoon/components/flow
AbstractInterpreter.java
src/java/org/apache/cocoon/components/treeprocessor
TreeProcessor.java
Log:
Reverted AbstractInterpreter.forwardTo to use redirect and defined missing TreeProcessor.COCOON_REDIRECT_ATTR constant
Revision Changes Path
1.14 +8 -2 cocoon-2.1/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
Index: AbstractInterpreter.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AbstractInterpreter.java 15 Jan 2004 00:36:18 -0000 1.13
+++ AbstractInterpreter.java 19 Jan 2004 04:37:36 -0000 1.14
@@ -73,6 +73,7 @@
import org.apache.cocoon.environment.wrapper.EnvironmentWrapper;
import org.apache.excalibur.source.SourceUtil;
+import org.apache.cocoon.components.treeprocessor.sitemap.PipelinesNode;
/**
* Abstract superclass for various scripting languages used by Cocoon
@@ -261,8 +262,13 @@
Environment environment)
throws Exception
{
+ if (SourceUtil.indexOfSchemeColon(uri) != -1) {
+ throw new Exception("uri is not allowed to contain a scheme (cocoon:/ is always automatically used)");
+ }
Map objectModel = environment.getObjectModel();
FlowHelper.setWebContinuation(objectModel, continuation);
- process(uri, bizData, null, environment);
+ FlowHelper.setContextObject(objectModel, bizData);
+ PipelinesNode.getRedirector(environment).redirect(false, uri);
+ //process(uri, bizData, null, environment);
}
}
1.18 +2 -1 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
Index: TreeProcessor.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TreeProcessor.java 18 Jan 2004 22:27:14 -0000 1.17
+++ TreeProcessor.java 19 Jan 2004 04:37:37 -0000 1.18
@@ -109,6 +109,7 @@
Disposable {
public static final String REDIRECTOR_ATTR = "sitemap:redirector";
+ public static final String COCOON_REDIRECT_ATTR = "sitemap:cocoon-redirect";
private static final String OBJECT_SOURCE_RESOLVER = "sitemap:sourceresolver";