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/01/05 09:17:32 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/matching/modular CachingRegexpMatcher.java WildcardMatcher.java
cziegeler 2004/01/05 00:17:32
Modified: src/java/org/apache/cocoon/components/cprocessor/sitemap
SerializeNode.java ReadNode.java ComponentNode.java
FlowNode.java PipelinesNode.java
CallFunctionNode.java HandleErrorsNode.java
GenerateNode.java ErrorHandlerHelper.java
RedirectToURINode.java ActionSetNode.java
PipelineEventComponentProcessingNode.java
PipelineNode.java AggregateNode.java
src/java/org/apache/cocoon/components/language/generator
CompiledComponent.java ProgramGeneratorImpl.java
ProgramGenerator.java
src/java/org/apache/cocoon/matching
RegexpParameterMatcher.java
SessionAttributeMatcher.java
WildcardRequestParameterMatcher.java
RegexpSessionAttributeMatcher.java
AbstractRegexpMatcher.java
RequestParameterMatcher.java
WildcardParameterMatcher.java
WildcardHeaderMatcher.java
RequestAttributeMatcher.java CookieMatcher.java
RegexpHeaderMatcher.java
WildcardRequestAttributeMatcher.java
WildcardSessionAttributeMatcher.java
AbstractWildcardMatcher.java ParameterMatcher.java
Matcher.java PreparableMatcher.java
RegexpHostMatcher.java RegexpURIMatcher.java
RegexpRequestAttributeMatcher.java
WildcardHostMatcher.java
AbstractPreparableMatcher.java HeaderMatcher.java
RegexpRequestParameterMatcher.java
WildcardURIMatcher.java
src/java/org/apache/cocoon/components/flow FlowHelper.java
ContinuationsManagerImpl.java
AbstractInterpreter.java Interpreter.java
src/java/org/apache/cocoon/generation
JXTemplateGenerator.java
src/java/org/apache/cocoon/matching/modular
CachingRegexpMatcher.java WildcardMatcher.java
Log:
Remove unused imports
Revision Changes Path
1.3 +2 -2 cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/SerializeNode.java
Index: SerializeNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/SerializeNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SerializeNode.java 28 Dec 2003 22:11:19 -0000 1.2
+++ SerializeNode.java 5 Jan 2004 08:17:30 -0000 1.3
@@ -56,11 +56,11 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.components.cprocessor.InvokeContext;
import org.apache.cocoon.components.cprocessor.ProcessingNode;
import org.apache.cocoon.components.cprocessor.variables.VariableResolver;
import org.apache.cocoon.components.cprocessor.variables.VariableResolverFactory;
+import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.serialization.Serializer;
import org.apache.cocoon.sitemap.PatternException;
1.2 +2 -2 cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/ReadNode.java
Index: ReadNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/ReadNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReadNode.java 28 Dec 2003 21:03:17 -0000 1.1
+++ ReadNode.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -54,12 +54,12 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.components.cprocessor.AbstractProcessingNode;
import org.apache.cocoon.components.cprocessor.InvokeContext;
import org.apache.cocoon.components.cprocessor.ProcessingNode;
import org.apache.cocoon.components.cprocessor.variables.VariableResolver;
import org.apache.cocoon.components.cprocessor.variables.VariableResolverFactory;
+import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.reading.Reader;
import org.apache.cocoon.sitemap.PatternException;
1.2 +0 -1 cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/ComponentNode.java
Index: ComponentNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/ComponentNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComponentNode.java 28 Dec 2003 21:03:17 -0000 1.1
+++ ComponentNode.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -13,7 +13,6 @@
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.components.cprocessor.AbstractProcessingNode;
import org.apache.cocoon.util.StringUtils;
/**
1.2 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/FlowNode.java
Index: FlowNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/FlowNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FlowNode.java 28 Dec 2003 21:03:17 -0000 1.1
+++ FlowNode.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -51,10 +51,10 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.components.flow.AbstractInterpreter;
-import org.apache.cocoon.components.flow.Interpreter;
import org.apache.cocoon.components.cprocessor.AbstractProcessingNode;
import org.apache.cocoon.components.cprocessor.InvokeContext;
+import org.apache.cocoon.components.flow.AbstractInterpreter;
+import org.apache.cocoon.components.flow.Interpreter;
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.environment.Environment;
1.2 +1 -2 cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/PipelinesNode.java
Index: PipelinesNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/PipelinesNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PipelinesNode.java 28 Dec 2003 21:03:17 -0000 1.1
+++ PipelinesNode.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -53,7 +53,6 @@
import java.util.ArrayList;
import java.util.Map;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.Logger;
1.3 +2 -2 cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/CallFunctionNode.java
Index: CallFunctionNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/CallFunctionNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CallFunctionNode.java 30 Dec 2003 04:30:57 -0000 1.2
+++ CallFunctionNode.java 5 Jan 2004 08:17:30 -0000 1.3
@@ -56,12 +56,12 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.flow.Interpreter;
import org.apache.cocoon.components.cprocessor.AbstractProcessingNode;
import org.apache.cocoon.components.cprocessor.InvokeContext;
import org.apache.cocoon.components.cprocessor.ProcessingNode;
import org.apache.cocoon.components.cprocessor.variables.VariableResolver;
import org.apache.cocoon.components.cprocessor.variables.VariableResolverFactory;
+import org.apache.cocoon.components.flow.Interpreter;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.sitemap.PatternException;
1.2 +1 -3 cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/HandleErrorsNode.java
Index: HandleErrorsNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/HandleErrorsNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HandleErrorsNode.java 28 Dec 2003 21:03:17 -0000 1.1
+++ HandleErrorsNode.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -54,9 +54,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.cprocessor.AbstractParentProcessingNode;
import org.apache.cocoon.components.cprocessor.InvokeContext;
-import org.apache.cocoon.components.cprocessor.ProcessingNode;
import org.apache.cocoon.components.cprocessor.SimpleParentProcessingNode;
import org.apache.cocoon.environment.Environment;
1.3 +1 -4 cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/GenerateNode.java
Index: GenerateNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/GenerateNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GenerateNode.java 28 Dec 2003 22:11:19 -0000 1.2
+++ GenerateNode.java 5 Jan 2004 08:17:30 -0000 1.3
@@ -50,14 +50,11 @@
*/
package org.apache.cocoon.components.cprocessor.sitemap;
-import java.util.Collection;
import java.util.Map;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.components.cprocessor.InvokeContext;
import org.apache.cocoon.components.cprocessor.ProcessingNode;
import org.apache.cocoon.components.cprocessor.variables.VariableResolver;
1.2 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/ErrorHandlerHelper.java
Index: ErrorHandlerHelper.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/ErrorHandlerHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ErrorHandlerHelper.java 28 Dec 2003 21:03:17 -0000 1.1
+++ ErrorHandlerHelper.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -56,10 +56,10 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.components.notification.Notifying;
-import org.apache.cocoon.components.notification.NotifyingBuilder;
import org.apache.cocoon.components.cprocessor.InvokeContext;
import org.apache.cocoon.components.cprocessor.ProcessingNode;
+import org.apache.cocoon.components.notification.Notifying;
+import org.apache.cocoon.components.notification.NotifyingBuilder;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.ObjectModelHelper;
1.2 +2 -2 cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/RedirectToURINode.java
Index: RedirectToURINode.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/RedirectToURINode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RedirectToURINode.java 28 Dec 2003 21:03:17 -0000 1.1
+++ RedirectToURINode.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -58,8 +58,8 @@
import org.apache.cocoon.components.cprocessor.variables.VariableResolver;
import org.apache.cocoon.components.cprocessor.variables.VariableResolverFactory;
import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.PermanentRedirector;
+import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.sitemap.PatternException;
/**
1.2 +1 -2 cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/ActionSetNode.java
Index: ActionSetNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/ActionSetNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ActionSetNode.java 29 Dec 2003 17:13:15 -0000 1.1
+++ ActionSetNode.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -57,7 +57,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.components.cprocessor.InvokeContext;
-import org.apache.cocoon.components.cprocessor.NamedProcessingNode;
import org.apache.cocoon.components.cprocessor.ProcessingNode;
import org.apache.cocoon.components.cprocessor.SimpleParentProcessingNode;
import org.apache.cocoon.environment.Environment;
1.2 +1 -2 cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/PipelineEventComponentProcessingNode.java
Index: PipelineEventComponentProcessingNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/PipelineEventComponentProcessingNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PipelineEventComponentProcessingNode.java 28 Dec 2003 21:03:17 -0000 1.1
+++ PipelineEventComponentProcessingNode.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -52,7 +52,6 @@
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
1.2 +1 -2 cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/PipelineNode.java
Index: PipelineNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/PipelineNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PipelineNode.java 28 Dec 2003 21:03:17 -0000 1.1
+++ PipelineNode.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -56,7 +56,6 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.ConnectionResetException;
import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.components.cprocessor.AbstractParentProcessingNode;
import org.apache.cocoon.components.cprocessor.InvokeContext;
import org.apache.cocoon.components.cprocessor.ProcessingNode;
import org.apache.cocoon.components.cprocessor.SimpleParentProcessingNode;
1.2 +2 -2 cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/AggregateNode.java
Index: AggregateNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/AggregateNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AggregateNode.java 28 Dec 2003 21:03:17 -0000 1.1
+++ AggregateNode.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -60,12 +60,12 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.components.cprocessor.AbstractProcessingNode;
import org.apache.cocoon.components.cprocessor.InvokeContext;
import org.apache.cocoon.components.cprocessor.ProcessingNode;
import org.apache.cocoon.components.cprocessor.variables.VariableResolver;
import org.apache.cocoon.components.cprocessor.variables.VariableResolverFactory;
+import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.sitemap.ContentAggregator;
import org.apache.cocoon.sitemap.PatternException;
1.4 +1 -2 cocoon-2.2/src/java/org/apache/cocoon/components/language/generator/CompiledComponent.java
Index: CompiledComponent.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/generator/CompiledComponent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CompiledComponent.java 29 Dec 2003 13:30:24 -0000 1.3
+++ CompiledComponent.java 5 Jan 2004 08:17:30 -0000 1.4
@@ -50,7 +50,6 @@
*/
package org.apache.cocoon.components.language.generator;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.Modifiable;
1.8 +1 -3 cocoon-2.2/src/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ProgramGeneratorImpl.java 29 Dec 2003 13:30:36 -0000 1.7
+++ ProgramGeneratorImpl.java 5 Jan 2004 08:17:30 -0000 1.8
@@ -63,9 +63,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.classloader.ClassLoaderManager;
1.5 +2 -2 cocoon-2.2/src/java/org/apache/cocoon/components/language/generator/ProgramGenerator.java
Index: ProgramGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/generator/ProgramGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProgramGenerator.java 29 Dec 2003 13:30:11 -0000 1.4
+++ ProgramGenerator.java 5 Jan 2004 08:17:30 -0000 1.5
@@ -51,8 +51,8 @@
package org.apache.cocoon.components.language.generator;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.excalibur.source.Source;
import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.source.Source;
/**
* This interface defines a loader for programs automatically built from XML
1.3 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/matching/RegexpParameterMatcher.java
Index: RegexpParameterMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/RegexpParameterMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegexpParameterMatcher.java 29 Dec 2003 15:24:35 -0000 1.2
+++ RegexpParameterMatcher.java 5 Jan 2004 08:17:30 -0000 1.3
@@ -50,12 +50,12 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-
-import java.util.Map;
/**
* Matches a sitemap parameter against a regular expression.
1.2 +4 -4 cocoon-2.2/src/java/org/apache/cocoon/matching/SessionAttributeMatcher.java
Index: SessionAttributeMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/SessionAttributeMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionAttributeMatcher.java 9 Mar 2003 00:09:33 -0000 1.1
+++ SessionAttributeMatcher.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -50,12 +50,12 @@
*/
package org.apache.cocoon.matching;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* This class allows for matching based on a session attribute.
1.3 +3 -4 cocoon-2.2/src/java/org/apache/cocoon/matching/WildcardRequestParameterMatcher.java
Index: WildcardRequestParameterMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/WildcardRequestParameterMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WildcardRequestParameterMatcher.java 29 Dec 2003 15:24:35 -0000 1.2
+++ WildcardRequestParameterMatcher.java 5 Jan 2004 08:17:30 -0000 1.3
@@ -50,14 +50,13 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.Map;
/**
* Matches a request parameter against a wildcard expression.
1.2 +3 -4 cocoon-2.2/src/java/org/apache/cocoon/matching/RegexpSessionAttributeMatcher.java
Index: RegexpSessionAttributeMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/RegexpSessionAttributeMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegexpSessionAttributeMatcher.java 9 Mar 2003 00:09:33 -0000 1.1
+++ RegexpSessionAttributeMatcher.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -50,14 +50,13 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.Map;
/**
* Matches a session attribute against a regular expression.
1.3 +4 -5 cocoon-2.2/src/java/org/apache/cocoon/matching/AbstractRegexpMatcher.java
Index: AbstractRegexpMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/AbstractRegexpMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractRegexpMatcher.java 29 Dec 2003 15:24:35 -0000 1.2
+++ AbstractRegexpMatcher.java 5 Jan 2004 08:17:30 -0000 1.3
@@ -50,16 +50,15 @@
*/
package org.apache.cocoon.matching;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.sitemap.PatternException;
import org.apache.regexp.RE;
import org.apache.regexp.RECompiler;
import org.apache.regexp.REProgram;
import org.apache.regexp.RESyntaxException;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* Base class for all matchers using a regular expression pattern.
1.3 +4 -5 cocoon-2.2/src/java/org/apache/cocoon/matching/RequestParameterMatcher.java
Index: RequestParameterMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/RequestParameterMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestParameterMatcher.java 29 Dec 2003 15:24:35 -0000 1.2
+++ RequestParameterMatcher.java 5 Jan 2004 08:17:30 -0000 1.3
@@ -50,13 +50,12 @@
*/
package org.apache.cocoon.matching;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* This class allows for matching based on a request parameter.
1.2 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/matching/WildcardParameterMatcher.java
Index: WildcardParameterMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/WildcardParameterMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WildcardParameterMatcher.java 9 Mar 2003 00:09:34 -0000 1.1
+++ WildcardParameterMatcher.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -50,12 +50,12 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-
-import java.util.Map;
/**
* Matches a sitemap parameter against a wildcard expression.
1.2 +3 -4 cocoon-2.2/src/java/org/apache/cocoon/matching/WildcardHeaderMatcher.java
Index: WildcardHeaderMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/WildcardHeaderMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WildcardHeaderMatcher.java 9 Mar 2003 00:09:33 -0000 1.1
+++ WildcardHeaderMatcher.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -50,14 +50,13 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.Map;
/**
* Matches a request header (e.g. "referer") against a wildcard expression.
1.2 +4 -4 cocoon-2.2/src/java/org/apache/cocoon/matching/RequestAttributeMatcher.java
Index: RequestAttributeMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/RequestAttributeMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestAttributeMatcher.java 9 Mar 2003 00:09:33 -0000 1.1
+++ RequestAttributeMatcher.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -50,12 +50,12 @@
*/
package org.apache.cocoon.matching;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* This class allows for matching based on a request attribute.
1.6 +5 -6 cocoon-2.2/src/java/org/apache/cocoon/matching/CookieMatcher.java
Index: CookieMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/CookieMatcher.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CookieMatcher.java 29 Dec 2003 15:24:35 -0000 1.5
+++ CookieMatcher.java 5 Jan 2004 08:17:30 -0000 1.6
@@ -50,16 +50,15 @@
*/
package org.apache.cocoon.matching;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.environment.Cookie;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
import org.apache.cocoon.sitemap.PatternException;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* Matches cookies agains given name. Returns value of the matched cookie.
1.2 +3 -4 cocoon-2.2/src/java/org/apache/cocoon/matching/RegexpHeaderMatcher.java
Index: RegexpHeaderMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/RegexpHeaderMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegexpHeaderMatcher.java 9 Mar 2003 00:09:33 -0000 1.1
+++ RegexpHeaderMatcher.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -50,14 +50,13 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.Map;
/**
* Matches a request header (e.g. "referer") against a regular expression.
1.2 +3 -4 cocoon-2.2/src/java/org/apache/cocoon/matching/WildcardRequestAttributeMatcher.java
Index: WildcardRequestAttributeMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/WildcardRequestAttributeMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WildcardRequestAttributeMatcher.java 9 Mar 2003 00:09:34 -0000 1.1
+++ WildcardRequestAttributeMatcher.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -50,14 +50,13 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.Map;
/**
* Matches a request attribute against a wildcard expression.
1.2 +3 -4 cocoon-2.2/src/java/org/apache/cocoon/matching/WildcardSessionAttributeMatcher.java
Index: WildcardSessionAttributeMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/WildcardSessionAttributeMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WildcardSessionAttributeMatcher.java 9 Mar 2003 00:09:34 -0000 1.1
+++ WildcardSessionAttributeMatcher.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -50,14 +50,13 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.Map;
/**
* Matches a session attribute against a wildcard expression.
1.3 +4 -5 cocoon-2.2/src/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java
Index: AbstractWildcardMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractWildcardMatcher.java 29 Dec 2003 15:24:35 -0000 1.2
+++ AbstractWildcardMatcher.java 5 Jan 2004 08:17:30 -0000 1.3
@@ -50,12 +50,11 @@
*/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.matching.helpers.WildcardHelper;
-
import java.util.HashMap;
import java.util.Map;
+
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.matching.helpers.WildcardHelper;
/**
* Base class for wildcard matchers
1.3 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/matching/ParameterMatcher.java
Index: ParameterMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/ParameterMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParameterMatcher.java 29 Dec 2003 15:24:35 -0000 1.2
+++ ParameterMatcher.java 5 Jan 2004 08:17:30 -0000 1.3
@@ -50,10 +50,10 @@
*/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.parameters.Parameters;
-
import java.util.HashMap;
import java.util.Map;
+
+import org.apache.avalon.framework.parameters.Parameters;
/**
* This class allows for matching based on a parameter provided from the sitemap.
1.3 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/matching/Matcher.java
Index: Matcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/Matcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Matcher.java 25 Oct 2003 21:59:50 -0000 1.2
+++ Matcher.java 5 Jan 2004 08:17:30 -0000 1.3
@@ -50,10 +50,10 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.sitemap.PatternException;
-
-import java.util.Map;
/**
*
1.2 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/matching/PreparableMatcher.java
Index: PreparableMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/PreparableMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PreparableMatcher.java 9 Mar 2003 00:09:33 -0000 1.1
+++ PreparableMatcher.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -50,10 +50,10 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.sitemap.PatternException;
-
-import java.util.Map;
/**
* A matcher that can prepare patterns during sitemap setup for faster match at request time.
1.2 +3 -2 cocoon-2.2/src/java/org/apache/cocoon/matching/RegexpHostMatcher.java
Index: RegexpHostMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/RegexpHostMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegexpHostMatcher.java 9 Mar 2003 00:09:33 -0000 1.1
+++ RegexpHostMatcher.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -50,9 +50,10 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.environment.ObjectModelHelper;
-import java.util.Map;
/**
* Matches the target host ("Host" request header) against a regular expression.
1.3 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/matching/RegexpURIMatcher.java
Index: RegexpURIMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/RegexpURIMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegexpURIMatcher.java 29 Dec 2003 15:24:35 -0000 1.2
+++ RegexpURIMatcher.java 5 Jan 2004 08:17:30 -0000 1.3
@@ -50,10 +50,10 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.Map;
/**
* Matches the request URIs against a regular expression pattern.
1.2 +3 -4 cocoon-2.2/src/java/org/apache/cocoon/matching/RegexpRequestAttributeMatcher.java
Index: RegexpRequestAttributeMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/RegexpRequestAttributeMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegexpRequestAttributeMatcher.java 9 Mar 2003 00:09:33 -0000 1.1
+++ RegexpRequestAttributeMatcher.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -50,14 +50,13 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.Map;
/**
* Matches a request attribute against a regular expression.
1.2 +3 -2 cocoon-2.2/src/java/org/apache/cocoon/matching/WildcardHostMatcher.java
Index: WildcardHostMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/WildcardHostMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WildcardHostMatcher.java 9 Mar 2003 00:09:33 -0000 1.1
+++ WildcardHostMatcher.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -50,9 +50,10 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.environment.ObjectModelHelper;
-import java.util.Map;
/**
* Matches the target host ("Host" request header) against a wildcard expression.
1.2 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/matching/AbstractPreparableMatcher.java
Index: AbstractPreparableMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/AbstractPreparableMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractPreparableMatcher.java 9 Mar 2003 00:09:33 -0000 1.1
+++ AbstractPreparableMatcher.java 5 Jan 2004 08:17:30 -0000 1.2
@@ -50,11 +50,11 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.sitemap.PatternException;
-
-import java.util.Map;
/**
* A matcher that can prepare patterns during sitemap setup for faster match at request time.
1.3 +4 -5 cocoon-2.2/src/java/org/apache/cocoon/matching/HeaderMatcher.java
Index: HeaderMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/HeaderMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HeaderMatcher.java 29 Dec 2003 15:24:35 -0000 1.2
+++ HeaderMatcher.java 5 Jan 2004 08:17:30 -0000 1.3
@@ -50,13 +50,12 @@
*/
package org.apache.cocoon.matching;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* This class allows for matching based on a request header.
1.2 +3 -4 cocoon-2.2/src/java/org/apache/cocoon/matching/RegexpRequestParameterMatcher.java
Index: RegexpRequestParameterMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/RegexpRequestParameterMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegexpRequestParameterMatcher.java 9 Mar 2003 00:09:33 -0000 1.1
+++ RegexpRequestParameterMatcher.java 5 Jan 2004 08:17:31 -0000 1.2
@@ -50,14 +50,13 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.Map;
/**
* Matches a request parameter against a regular expression.
1.4 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/matching/WildcardURIMatcher.java
Index: WildcardURIMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/WildcardURIMatcher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WildcardURIMatcher.java 29 Dec 2003 15:24:35 -0000 1.3
+++ WildcardURIMatcher.java 5 Jan 2004 08:17:31 -0000 1.4
@@ -50,10 +50,10 @@
*/
package org.apache.cocoon.matching;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.Map;
/**
* Match the request URI against a wildcard expression.
1.2 +2 -1 cocoon-2.2/src/java/org/apache/cocoon/components/flow/FlowHelper.java
Index: FlowHelper.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/FlowHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FlowHelper.java 18 May 2003 16:36:40 -0000 1.1
+++ FlowHelper.java 5 Jan 2004 08:17:31 -0000 1.2
@@ -45,9 +45,10 @@
*/
package org.apache.cocoon.components.flow;
+import java.util.Map;
+
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import java.util.Map;
/**
* Provides the interface between the flow controller layer and the
1.10 +1 -3 cocoon-2.2/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Index: ContinuationsManagerImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ContinuationsManagerImpl.java 26 Dec 2003 18:43:39 -0000 1.9
+++ ContinuationsManagerImpl.java 5 Jan 2004 08:17:31 -0000 1.10
@@ -56,14 +56,12 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.excalibur.event.Queue;
import org.apache.excalibur.event.Sink;
import org.apache.excalibur.event.command.RepeatedCommand;
1.15 +5 -5 cocoon-2.2/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
Index: AbstractInterpreter.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractInterpreter.java 28 Dec 2003 21:09:59 -0000 1.14
+++ AbstractInterpreter.java 5 Jan 2004 08:17:31 -0000 1.15
@@ -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.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -63,10 +67,6 @@
import org.apache.cocoon.environment.EnvironmentHelper;
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;
/**
* Abstract superclass for various scripting languages used by Cocoon
1.5 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/components/flow/Interpreter.java
Index: Interpreter.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/Interpreter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Interpreter.java 22 Oct 2003 18:10:48 -0000 1.4
+++ Interpreter.java 5 Jan 2004 08:17:31 -0000 1.5
@@ -45,9 +45,9 @@
*/
package org.apache.cocoon.components.flow;
-import org.apache.cocoon.environment.Environment;
-
import java.util.List;
+
+import org.apache.cocoon.environment.Environment;
/**
* The interface to the flow scripting languages. This interface is
1.25 +1 -5 cocoon-2.2/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Index: JXTemplateGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- JXTemplateGenerator.java 29 Dec 2003 15:24:35 -0000 1.24
+++ JXTemplateGenerator.java 5 Jan 2004 08:17:31 -0000 1.25
@@ -62,14 +62,12 @@
import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Set;
import java.util.Stack;
import java.util.TimeZone;
@@ -82,7 +80,6 @@
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.transformation.AbstractTransformer;
import org.apache.cocoon.xml.XMLConsumer;
@@ -97,7 +94,6 @@
import org.apache.commons.jexl.util.introspection.VelPropertySet;
import org.apache.commons.jxpath.CompiledExpression;
import org.apache.commons.jxpath.DynamicPropertyHandler;
-import org.apache.commons.jxpath.ExpressionContext;
import org.apache.commons.jxpath.JXPathBeanInfo;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathContextFactory;
1.3 +5 -11 cocoon-2.2/src/java/org/apache/cocoon/matching/modular/CachingRegexpMatcher.java
Index: CachingRegexpMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/modular/CachingRegexpMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CachingRegexpMatcher.java 29 Dec 2003 15:24:35 -0000 1.2
+++ CachingRegexpMatcher.java 5 Jan 2004 08:17:31 -0000 1.3
@@ -50,27 +50,21 @@
*/
package org.apache.cocoon.matching.modular;
+import java.util.Map;
+
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-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.Composable;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
-
import org.apache.cocoon.components.modules.input.InputModule;
-
import org.apache.cocoon.matching.AbstractRegexpMatcher;
import org.apache.cocoon.matching.Matcher;
-
-import java.util.Map;
/**
* Matches against a regular expression. Needs an input module to
1.3 +4 -9 cocoon-2.2/src/java/org/apache/cocoon/matching/modular/WildcardMatcher.java
Index: WildcardMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/modular/WildcardMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WildcardMatcher.java 29 Dec 2003 15:24:35 -0000 1.2
+++ WildcardMatcher.java 5 Jan 2004 08:17:31 -0000 1.3
@@ -50,6 +50,9 @@
*/
package org.apache.cocoon.matching.modular;
+import java.util.Map;
+
+import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -57,16 +60,8 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-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.Composable;
-
import org.apache.cocoon.components.modules.input.InputModule;
-
import org.apache.cocoon.matching.AbstractWildcardMatcher;
-
-import java.util.Map;
/**
* Matches against a wildcard expression. Needs an input module to