sylvain 02/03/12 07:51:02
Modified: src/java/org/apache/cocoon/components/treeprocessor/sitemap
PipelinesNode.java
Removed: src/java/org/apache/cocoon/components/treeprocessor
EnvironmentSourceResolver.java
src/java/org/apache/cocoon/components/treeprocessor/sitemap
SitemapNode.java
Log:
Remove useless EnvironmentSourceResolver (reported by Carsten)
Revision Changes Path
1.2 +3 -12
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNode.java
Index: PipelinesNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PipelinesNode.java 5 Mar 2002 08:26:23 -0000 1.1
+++ PipelinesNode.java 12 Mar 2002 15:51:02 -0000 1.2
@@ -61,7 +61,6 @@
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.components.pipeline.EventPipeline;
import org.apache.cocoon.components.pipeline.StreamPipeline;
-import org.apache.cocoon.components.treeprocessor.EnvironmentSourceResolver;
import org.apache.cocoon.components.treeprocessor.SimpleParentProcessingNode;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
@@ -73,7 +72,7 @@
* Handles <map:pipelines>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: PipelinesNode.java,v 1.1 2002/03/05 08:26:23 sylvain Exp $
+ * @version CVS $Id: PipelinesNode.java,v 1.2 2002/03/12 15:51:02 sylvain Exp $
*/
public final class PipelinesNode extends SimpleParentProcessingNode
@@ -104,7 +103,7 @@
}
/**
- * Process the environment. Also adds an <code>EnvironmentSourceResolver</code>
+ * Process the environment. Also adds a <code>SourceResolver</code>
* and a <code>Redirector</code> in the object model. The previous resolver and
* redirector, if any, are restored before return.
*/
@@ -114,12 +113,6 @@
// Recompose context (and pipelines) to the local component manager
context.recompose(this.manager);
- // Create the source resolver relative to the environment.
-
- // Design note : creating the SourceResolver could also have been done
- // in TreeProcessor.invoke(), but doing it here ensures we use the local
- // component manager used by all other nodes.
- EnvironmentSourceResolver resolver = new
EnvironmentSourceResolver(this.manager, env);
SitemapRedirector redirector = new SitemapRedirector(env);
Map objectModel = env.getObjectModel();
@@ -127,7 +120,7 @@
Object oldResolver = objectModel.get(OBJECT_SOURCE_RESOLVER);
Object oldRedirector = env.getAttribute(REDIRECTOR_ATTR);
- objectModel.put(OBJECT_SOURCE_RESOLVER, resolver);
+ objectModel.put(OBJECT_SOURCE_RESOLVER, env);
env.setAttribute(REDIRECTOR_ATTR, redirector);
try {
@@ -142,8 +135,6 @@
env.setAttribute(REDIRECTOR_ATTR, oldRedirector);
objectModel.put(OBJECT_SOURCE_RESOLVER, oldResolver);
- // Dispose the resolver
- resolver.dispose();
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
