joerg 2004/01/14 16:36:18
Modified: src/java/org/apache/cocoon/components/treeprocessor/sitemap
CallFunctionNode.java
src/java/org/apache/cocoon/components/flow
AbstractInterpreter.java
Log:
clean up
Revision Changes Path
1.7 +3 -4
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/CallFunctionNode.java
Index: CallFunctionNode.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/CallFunctionNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CallFunctionNode.java 14 Jan 2004 15:10:53 -0000 1.6
+++ CallFunctionNode.java 15 Jan 2004 00:36:18 -0000 1.7
@@ -49,11 +49,13 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.flow.Interpreter;
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNode;
@@ -61,7 +63,6 @@
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.sitemap.PatternException;
/**
@@ -134,8 +135,6 @@
}
public boolean invoke(Environment env, InvokeContext context) throws
Exception {
- Redirector redirector = PipelinesNode.getRedirector(env);
-
List params = null;
// Resolve parameters
1.13 +7 -6
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AbstractInterpreter.java 14 Jan 2004 06:39:55 -0000 1.12
+++ AbstractInterpreter.java 15 Jan 2004 00:36:18 -0000 1.13
@@ -45,6 +45,10 @@
*/
package org.apache.cocoon.components.flow;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Map;
+
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
@@ -60,18 +64,15 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.SingleThreaded;
+
import org.apache.cocoon.Constants;
import org.apache.cocoon.Processor;
import org.apache.cocoon.components.CocoonComponentManager;
-import org.apache.cocoon.components.treeprocessor.sitemap.PipelinesNode;
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.wrapper.EnvironmentWrapper;
-import org.apache.excalibur.source.SourceUtil;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Map;
+import org.apache.excalibur.source.SourceUtil;
/**
* Abstract superclass for various scripting languages used by Cocoon
