You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2004/06/23 19:13:00 UTC
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/source/impl SitemapSource.java
cziegeler 2004/06/23 10:13:00
Modified: src/java/org/apache/cocoon/environment/wrapper
MutableEnvironmentFacade.java
EnvironmentWrapper.java
src/java/org/apache/cocoon/components/treeprocessor
InvokeContext.java
src/java/org/apache/cocoon/components/source/impl
SitemapSource.java
Log:
Fix bug in internal pipeline calls. This should fix bug 29738
Revision Changes Path
1.13 +4 -1 cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/MutableEnvironmentFacade.java
Index: MutableEnvironmentFacade.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/MutableEnvironmentFacade.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MutableEnvironmentFacade.java 22 Jun 2004 22:13:43 -0000 1.12
+++ MutableEnvironmentFacade.java 23 Jun 2004 17:13:00 -0000 1.13
@@ -51,6 +51,9 @@
this.env = env;
}
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.environment.Environment#setURI(java.lang.String, java.lang.String)
+ */
public void setURI(String prefix, String uri) {
this.env.setURI(prefix, uri);
}
1.20 +9 -9 cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
Index: EnvironmentWrapper.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- EnvironmentWrapper.java 7 Jun 2004 08:18:17 -0000 1.19
+++ EnvironmentWrapper.java 23 Jun 2004 17:13:00 -0000 1.20
@@ -41,8 +41,7 @@
* @version CVS $Id$
*/
public class EnvironmentWrapper
- extends AbstractEnvironment
- implements Environment {
+ extends AbstractEnvironment {
/** The wrapped environment */
protected Environment environment;
@@ -86,6 +85,7 @@
String view) {
super(env.getURI(), view, env.getAction());
init(env, requestURI, queryString, logger, rawMode, view);
+ this.setURI(env.getURIPrefix(), env.getURI());
}
/**
@@ -137,8 +137,8 @@
this.objectModel.put(ObjectModelHelper.REQUEST_OBJECT, this.request);
}
- /**
- * Redirect the client to a new URL is not allowed
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.environment.Environment#redirect(java.lang.String, boolean, boolean)
*/
public void redirect(String newURL, boolean global, boolean permanent)
throws IOException {
@@ -149,8 +149,8 @@
}
}
- /**
- * Get the output stream
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.environment.Environment#getOutputStream(int)
*/
public OutputStream getOutputStream(int bufferSize)
throws IOException {
@@ -233,8 +233,8 @@
return this.contentType;
}
- /**
- * Get the underlying object model
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.environment.Environment#getObjectModel()
*/
public Map getObjectModel() {
return this.objectModel;
1.10 +6 -1 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java
Index: InvokeContext.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- InvokeContext.java 11 Jun 2004 12:24:21 -0000 1.9
+++ InvokeContext.java 23 Jun 2004 17:13:00 -0000 1.10
@@ -171,6 +171,11 @@
this.pipelinesManager = desc.pipelineManager;
this.lastProcessor = desc.lastProcessor;
this.pipelineSelector = desc.pipelineSelector;
+ this.internalPipelineDescription = new Processor.InternalPipelineDescription(
+ this.processingPipeline, this.pipelineSelector, this.pipelinesManager);
+ this.internalPipelineDescription.lastProcessor = this.lastProcessor;
+ this.internalPipelineDescription.prefix = desc.prefix;
+ this.internalPipelineDescription.uri = desc.uri;
}
/**
1.21 +1 -2 cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
Index: SitemapSource.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SitemapSource.java 16 Jun 2004 14:29:31 -0000 1.20
+++ SitemapSource.java 23 Jun 2004 17:13:00 -0000 1.21
@@ -114,7 +114,6 @@
if ( env == null ) {
throw new MalformedURLException("The cocoon protocol can not be used outside an environment.");
}
-
this.manager = manager;
this.enableLogging(logger);