cziegeler 2002/12/05 02:25:52
Modified: src/java/org/apache/cocoon/components/treeprocessor/sitemap
MountNode.java SwitchSelectNode.java
MatchNodeBuilder.java HandleErrorsNode.java
ReadNode.java ReadNodeBuilder.java CallNode.java
SitemapNodeBuilder.java PreparableMatchNode.java
RedirectToURINode.java ScriptNode.java
TransformNodeBuilder.java FlowNode.java
SelectNodeBuilder.java RedirectToNodeBuilder.java
SerializeNodeBuilder.java GenerateNodeBuilder.java
MatchNode.java SelectNode.java
MountNodeBuilder.java SitemapLanguage.java
TransformNode.java PipelinesNodeBuilder.java
ViewNodeBuilder.java
src/java/org/apache/cocoon/environment/commandline
AbstractCommandLineEnvironment.java
src/java/org/apache/cocoon/components/treeprocessor/variables
NOPVariableResolver.java
PreparedVariableResolver.java VariableResolver.java
VariableResolverFactory.java
src/java/org/apache/cocoon/environment/http
HttpEnvironment.java
Log:
Removing unused imports
Revision Changes Path
1.9 +7 -4
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java
Index: MountNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MountNode.java 12 Oct 2002 05:11:39 -0000 1.8
+++ MountNode.java 5 Dec 2002 10:25:51 -0000 1.9
@@ -55,12 +55,15 @@
import org.apache.avalon.framework.component.Composable;
import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNode;
-import org.apache.cocoon.components.treeprocessor.TreeProcessor;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
+import org.apache.cocoon.components.treeprocessor.TreeProcessor;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.sitemap.PatternException;
-import java.util.*;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
/**
*
1.6 +5 -12
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SwitchSelectNode.java
Index: SwitchSelectNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SwitchSelectNode.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SwitchSelectNode.java 12 Oct 2002 05:11:39 -0000 1.5
+++ SwitchSelectNode.java 5 Dec 2002 10:25:51 -0000 1.6
@@ -51,28 +51,21 @@
package org.apache.cocoon.components.treeprocessor.sitemap;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.environment.Environment;
-
-import org.apache.cocoon.selection.Selector;
-import org.apache.cocoon.selection.SwitchSelector;
-
-import org.apache.cocoon.sitemap.PatternException;
-
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.SimpleSelectorProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.selection.Selector;
+import org.apache.cocoon.selection.SwitchSelector;
+import org.apache.cocoon.sitemap.PatternException;
-import java.util.List;
import java.util.Map;
/**
1.8 +3 -8
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MatchNodeBuilder.java
Index: MatchNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MatchNodeBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MatchNodeBuilder.java 12 Oct 2002 05:11:39 -0000 1.7
+++ MatchNodeBuilder.java 5 Dec 2002 10:25:51 -0000 1.8
@@ -50,20 +50,15 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.matching.Matcher;
-import org.apache.cocoon.matching.PreparableMatcher;
import
org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.SimpleSelectorProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-
-import java.util.*;
+import org.apache.cocoon.matching.Matcher;
+import org.apache.cocoon.matching.PreparableMatcher;
/**
*
1.5 +2 -10
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java
Index: HandleErrorsNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HandleErrorsNode.java 9 Sep 2002 12:00:42 -0000 1.4
+++ HandleErrorsNode.java 5 Dec 2002 10:25:51 -0000 1.5
@@ -50,19 +50,11 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.parameters.Parameters;
-
-import org.apache.cocoon.ResourceNotFoundException;
-
-import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-
-import java.util.*;
+import org.apache.cocoon.environment.Environment;
/**
* Handles <map:handle-errors>
1.5 +2 -4
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ReadNode.java
Index: ReadNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ReadNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ReadNode.java 12 Oct 2002 05:11:39 -0000 1.4
+++ ReadNode.java 5 Dec 2002 10:25:51 -0000 1.5
@@ -51,14 +51,12 @@
package org.apache.cocoon.components.treeprocessor.sitemap;
import org.apache.cocoon.components.pipeline.ProcessingPipeline;
-import org.apache.cocoon.environment.Environment;
-
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
+import org.apache.cocoon.environment.Environment;
-import java.util.List;
import java.util.Map;
/**
1.3 +2 -6
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ReadNodeBuilder.java
Index: ReadNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ReadNodeBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReadNodeBuilder.java 24 Jun 2002 20:32:19 -0000 1.2
+++ ReadNodeBuilder.java 5 Dec 2002 10:25:51 -0000 1.3
@@ -51,15 +51,11 @@
package org.apache.cocoon.components.treeprocessor.sitemap;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.reading.Reader;
-
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
+import org.apache.cocoon.reading.Reader;
/**
*
1.7 +4 -9
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/CallNode.java
Index: CallNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/CallNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CallNode.java 12 Oct 2002 05:11:39 -0000 1.6
+++ CallNode.java 5 Dec 2002 10:25:51 -0000 1.7
@@ -51,14 +51,9 @@
package org.apache.cocoon.components.treeprocessor.sitemap;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentException;
-
-import org.apache.cocoon.environment.Environment;
-
-import org.apache.cocoon.sitemap.PatternException;
-
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNode;
import org.apache.cocoon.components.treeprocessor.CategoryNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
@@ -66,8 +61,8 @@
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
+import org.apache.cocoon.environment.Environment;
-import java.util.List;
import java.util.Map;
/**
1.3 +1 -5
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapNodeBuilder.java
Index: SitemapNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapNodeBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SitemapNodeBuilder.java 11 Sep 2002 10:08:35 -0000 1.2
+++ SitemapNodeBuilder.java 5 Dec 2002 10:25:51 -0000 1.3
@@ -53,12 +53,8 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
-
import
org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.components.treeprocessor.ProcessingNodeBuilder;
-
-import java.util.*;
/**
* Builds all nodes below the top-level <sitemap> element, and returns the
1.8 +11 -13
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java
Index: PreparableMatchNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PreparableMatchNode.java 12 Oct 2002 05:11:39 -0000 1.7
+++ PreparableMatchNode.java 5 Dec 2002 10:25:51 -0000 1.8
@@ -50,24 +50,22 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.sitemap.PatternException;
-import org.apache.cocoon.components.treeprocessor.SimpleSelectorProcessingNode;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-import org.apache.cocoon.matching.Matcher;
-import org.apache.cocoon.matching.PreparableMatcher;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
+import org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
+import org.apache.cocoon.components.treeprocessor.SimpleSelectorProcessingNode;
+import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.matching.Matcher;
+import org.apache.cocoon.matching.PreparableMatcher;
+import org.apache.cocoon.sitemap.PatternException;
-import java.util.*;
+import java.util.Map;
/**
*
1.7 +3 -10
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/RedirectToURINode.java
Index: RedirectToURINode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/RedirectToURINode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RedirectToURINode.java 12 Oct 2002 05:11:39 -0000 1.6
+++ RedirectToURINode.java 5 Dec 2002 10:25:51 -0000 1.7
@@ -50,18 +50,11 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.Redirector;
-
-import org.apache.cocoon.sitemap.PatternException;
-
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
-import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
-
-import java.util.List;
-import java.util.Map;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.sitemap.PatternException;
/**
*
1.4 +1 -9
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ScriptNode.java
Index: ScriptNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ScriptNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ScriptNode.java 24 Sep 2002 08:30:33 -0000 1.3
+++ ScriptNode.java 5 Dec 2002 10:25:51 -0000 1.4
@@ -45,18 +45,10 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentSelector;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.components.flow.Interpreter;
import org.apache.cocoon.components.flow.AbstractInterpreter;
+import org.apache.cocoon.components.flow.Interpreter;
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
-import org.apache.cocoon.environment.Context;
import org.apache.cocoon.environment.Environment;
/**
1.4 +4 -6
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNodeBuilder.java
Index: TransformNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNodeBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TransformNodeBuilder.java 29 Sep 2002 20:24:22 -0000 1.3
+++ TransformNodeBuilder.java 5 Dec 2002 10:25:51 -0000 1.4
@@ -51,16 +51,14 @@
package org.apache.cocoon.components.treeprocessor.sitemap;
import org.apache.avalon.framework.configuration.Configuration;
-
-import org.apache.cocoon.transformation.Transformer;
-
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
+import org.apache.cocoon.transformation.Transformer;
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
/**
*
1.2 +0 -1
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/FlowNode.java
Index: FlowNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/FlowNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FlowNode.java 24 Sep 2002 08:28:10 -0000 1.1
+++ FlowNode.java 5 Dec 2002 10:25:51 -0000 1.2
@@ -53,7 +53,6 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.flow.Interpreter;
-import org.apache.cocoon.components.flow.AbstractInterpreter;
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import org.apache.cocoon.environment.Context;
1.7 +5 -8
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SelectNodeBuilder.java
Index: SelectNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SelectNodeBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SelectNodeBuilder.java 11 Sep 2002 10:08:34 -0000 1.6
+++ SelectNodeBuilder.java 5 Dec 2002 10:25:51 -0000 1.7
@@ -52,18 +52,15 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.selection.Selector;
-import org.apache.cocoon.selection.SwitchSelector;
-
import
org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNodeBuilder;
-import org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
+import org.apache.cocoon.selection.Selector;
+import org.apache.cocoon.selection.SwitchSelector;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
/**
*
1.5 +3 -7
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/RedirectToNodeBuilder.java
Index: RedirectToNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/RedirectToNodeBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RedirectToNodeBuilder.java 25 Nov 2002 22:13:10 -0000 1.4
+++ RedirectToNodeBuilder.java 5 Dec 2002 10:25:51 -0000 1.5
@@ -52,19 +52,15 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.CategoryNode;
import org.apache.cocoon.components.treeprocessor.CategoryNodeBuilder;
import org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-import java.util.*;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
+import java.util.HashMap;
+import java.util.Map;
/**
*
1.3 +4 -7
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNodeBuilder.java
Index: SerializeNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNodeBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SerializeNodeBuilder.java 29 Sep 2002 20:24:22 -0000 1.2
+++ SerializeNodeBuilder.java 5 Dec 2002 10:25:51 -0000 1.3
@@ -51,16 +51,13 @@
package org.apache.cocoon.components.treeprocessor.sitemap;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.serialization.Serializer;
-
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
+import org.apache.cocoon.serialization.Serializer;
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
/**
*
1.4 +4 -6
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/GenerateNodeBuilder.java
Index: GenerateNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/GenerateNodeBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GenerateNodeBuilder.java 29 Sep 2002 20:24:22 -0000 1.3
+++ GenerateNodeBuilder.java 5 Dec 2002 10:25:51 -0000 1.4
@@ -51,16 +51,14 @@
package org.apache.cocoon.components.treeprocessor.sitemap;
import org.apache.avalon.framework.configuration.Configuration;
-
-import org.apache.cocoon.generation.Generator;
-
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
+import org.apache.cocoon.generation.Generator;
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
/**
*
1.7 +11 -11
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MatchNode.java
Index: MatchNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MatchNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MatchNode.java 12 Oct 2002 05:11:39 -0000 1.6
+++ MatchNode.java 5 Dec 2002 10:25:51 -0000 1.7
@@ -50,22 +50,22 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.sitemap.PatternException;
-import org.apache.cocoon.components.treeprocessor.SimpleSelectorProcessingNode;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
-import org.apache.cocoon.matching.Matcher;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
-
-import java.util.*;
import org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
+import org.apache.cocoon.components.treeprocessor.SimpleSelectorProcessingNode;
+import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.matching.Matcher;
+import org.apache.cocoon.sitemap.PatternException;
+
+import java.util.List;
import java.util.Map;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.component.ComponentManager;
/**
*
1.7 +4 -11
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SelectNode.java
Index: SelectNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SelectNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SelectNode.java 12 Oct 2002 05:11:39 -0000 1.6
+++ SelectNode.java 5 Dec 2002 10:25:51 -0000 1.7
@@ -51,27 +51,20 @@
package org.apache.cocoon.components.treeprocessor.sitemap;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.environment.Environment;
-
-import org.apache.cocoon.selection.Selector;
-
-import org.apache.cocoon.sitemap.PatternException;
-
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.SimpleSelectorProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.selection.Selector;
+import org.apache.cocoon.sitemap.PatternException;
-import java.util.List;
import java.util.Map;
/**
1.3 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNodeBuilder.java
Index: MountNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNodeBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MountNodeBuilder.java 24 Jun 2002 20:32:19 -0000 1.2
+++ MountNodeBuilder.java 5 Dec 2002 10:25:51 -0000 1.3
@@ -52,10 +52,8 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.thread.ThreadSafe;
-
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
/**
1.12 +4 -18
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
Index: SitemapLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SitemapLanguage.java 8 Oct 2002 07:31:01 -0000 1.11
+++ SitemapLanguage.java 5 Dec 2002 10:25:51 -0000 1.12
@@ -50,37 +50,23 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
-
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-
-import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
-import org.apache.avalon.excalibur.component.RoleManager;
-
import org.apache.cocoon.components.CocoonComponentManager;
import org.apache.cocoon.components.ExtendedComponentSelector;
import org.apache.cocoon.components.LifecycleHelper;
-
-import org.apache.cocoon.generation.Generator;
-import org.apache.cocoon.transformation.Transformer;
-import org.apache.cocoon.serialization.Serializer;
-import org.apache.cocoon.sitemap.SitemapComponentSelector;
-
import org.apache.cocoon.components.treeprocessor.CategoryNode;
import org.apache.cocoon.components.treeprocessor.CategoryNodeBuilder;
import org.apache.cocoon.components.treeprocessor.DefaultTreeBuilder;
-
-
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-
+import org.apache.cocoon.generation.Generator;
+import org.apache.cocoon.serialization.Serializer;
import org.apache.cocoon.sitemap.PatternException;
+import org.apache.cocoon.sitemap.SitemapComponentSelector;
import org.apache.cocoon.util.StringUtils;
-
import org.apache.regexp.RE;
import java.util.*;
1.9 +4 -7
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNode.java
Index: TransformNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TransformNode.java 12 Oct 2002 05:11:39 -0000 1.8
+++ TransformNode.java 5 Dec 2002 10:25:51 -0000 1.9
@@ -50,18 +50,15 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.sitemap.PatternException;
-
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
import
org.apache.cocoon.components.treeprocessor.PipelineEventComponentProcessingNode;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.sitemap.PatternException;
-import org.apache.avalon.framework.parameters.Parameters;
-
-import java.util.List;
import java.util.Map;
/**
1.7 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java
Index: PipelinesNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PipelinesNodeBuilder.java 8 Oct 2002 09:48:01 -0000 1.6
+++ PipelinesNodeBuilder.java 5 Dec 2002 10:25:51 -0000 1.7
@@ -55,8 +55,6 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.treeprocessor.ContainerNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import java.util.HashMap;
-import java.util.Map;
/**
* Builds a <map:pipelines>
1.3 +1 -7
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ViewNodeBuilder.java
Index: ViewNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ViewNodeBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ViewNodeBuilder.java 11 Sep 2002 10:08:35 -0000 1.2
+++ ViewNodeBuilder.java 5 Dec 2002 10:25:51 -0000 1.3
@@ -53,15 +53,9 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
-
import org.apache.cocoon.components.treeprocessor.NamedContainerNodeBuilder;
import org.apache.cocoon.components.treeprocessor.NamedProcessingNode;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.components.treeprocessor.TreeBuilder;
-
-import org.apache.cocoon.util.StringUtils;
-
-import java.util.*;
/**
* Builds a <map:view>
1.13 +2 -4
xml-cocoon2/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
Index: AbstractCommandLineEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AbstractCommandLineEnvironment.java 13 Sep 2002 07:30:50 -0000 1.12
+++ AbstractCommandLineEnvironment.java 5 Dec 2002 10:25:52 -0000 1.13
@@ -51,20 +51,18 @@
package org.apache.cocoon.environment.commandline;
import org.apache.avalon.framework.logger.Logger;
-
import org.apache.cocoon.CascadingIOException;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.AbstractEnvironment;
import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Session;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.xml.sax.SAXException;
import java.io.File;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException;
1.5 +0 -1
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/variables/NOPVariableResolver.java
Index: NOPVariableResolver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/variables/NOPVariableResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NOPVariableResolver.java 25 Nov 2002 22:13:10 -0000 1.4
+++ NOPVariableResolver.java 5 Dec 2002 10:25:52 -0000 1.5
@@ -52,7 +52,6 @@
import org.apache.cocoon.components.treeprocessor.InvokeContext;
-import java.util.List;
import java.util.Map;
/**
1.8 +0 -1
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java
Index: PreparedVariableResolver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PreparedVariableResolver.java 25 Nov 2002 22:13:10 -0000 1.7
+++ PreparedVariableResolver.java 5 Dec 2002 10:25:52 -0000 1.8
@@ -56,7 +56,6 @@
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
-
import org.apache.cocoon.components.modules.input.InputModule;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import org.apache.cocoon.sitemap.PatternException;
1.5 +3 -5
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/variables/VariableResolver.java
Index: VariableResolver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/variables/VariableResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VariableResolver.java 25 Nov 2002 22:13:10 -0000 1.4
+++ VariableResolver.java 5 Dec 2002 10:25:52 -0000 1.5
@@ -51,14 +51,12 @@
package org.apache.cocoon.components.treeprocessor.variables;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.sitemap.PatternException;
-import org.apache.cocoon.util.HashUtil;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
+import org.apache.cocoon.sitemap.PatternException;
import java.util.Collections;
-import java.util.Iterator;
import java.util.HashMap;
-import java.util.List;
+import java.util.Iterator;
import java.util.Map;
/**
1.2 +0 -5
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/variables/VariableResolverFactory.java
Index: VariableResolverFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/variables/VariableResolverFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VariableResolverFactory.java 24 Jun 2002 20:32:20 -0000 1.1
+++ VariableResolverFactory.java 5 Dec 2002 10:25:52 -0000 1.2
@@ -51,14 +51,9 @@
package org.apache.cocoon.components.treeprocessor.variables;
import org.apache.avalon.framework.component.ComponentManager;
-
import org.apache.cocoon.sitemap.PatternException;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
public class VariableResolverFactory {
1.19 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java
Index: HttpEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- HttpEnvironment.java 29 Oct 2002 04:49:52 -0000 1.18
+++ HttpEnvironment.java 5 Dec 2002 10:25:52 -0000 1.19
@@ -61,8 +61,8 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import java.io.IOException;
-import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
