cziegeler 2002/12/05 02:32:58
Modified: src/java/org/apache/cocoon/generation
WebServiceProxyGenerator.java HTMLGenerator.java
StreamGenerator.java MP3DirectoryGenerator.java
XMLDBGenerator.java XMLDBCollectionGenerator.java
RequestGenerator.java StatusGenerator.java
ProfilerGenerator.java SWFGenerator.java
SessionAttributeGenerator.java
ServerPagesGenerator.java VelocityGenerator.java
src/java/org/apache/cocoon/transformation
XMLFormTransformer.java
src/java/org/apache/cocoon/matching
AbstractRegexpMatcher.java WildcardURIMatcher.java
WildcardParameterMatcher.java
AbstractPreparableMatcher.java
PreparableMatcher.java ParameterMatcher.java
RegexpURIMatcher.java RegexpParameterMatcher.java
AbstractWildcardMatcher.java
src/java/org/apache/cocoon/i18n AbstractBunldeFactory.java
src/java/org/apache/cocoon/reading ResourceReader.java
Log:
Removing unused imports
Revision Changes Path
1.4 +8 -28
xml-cocoon2/src/java/org/apache/cocoon/generation/WebServiceProxyGenerator.java
Index: WebServiceProxyGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/WebServiceProxyGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebServiceProxyGenerator.java 13 Nov 2002 04:40:16 -0000 1.3
+++ WebServiceProxyGenerator.java 5 Dec 2002 10:32:57 -0000 1.4
@@ -50,48 +50,28 @@
*/
package org.apache.cocoon.generation;
+import org.apache.avalon.excalibur.xml.Parser;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.apache.cocoon.xml.XMLUtils;
+import org.apache.commons.httpclient.HttpMultiClient;
+import org.apache.commons.httpclient.NameValuePair;
+import org.apache.commons.httpclient.methods.UrlGetMethod;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.avalon.framework.component.ComponentException;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
-// HttpClient imports
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HttpMultiClient;
-import org.apache.commons.httpclient.HttpConnection;
-import org.apache.commons.httpclient.HttpState;
-import org.apache.commons.httpclient.methods.UrlGetMethod;
-import org.apache.commons.httpclient.NameValuePair;
-
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXResult;
-
-import java.io.BufferedInputStream;
-import java.io.StringWriter;
-import java.io.PrintWriter;
import java.io.IOException;
import java.io.StringReader;
+import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Map;
-import java.util.ArrayList;
/**
*
1.21 +11 -12
xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- HTMLGenerator.java 1 Dec 2002 22:11:24 -0000 1.20
+++ HTMLGenerator.java 5 Dec 2002 10:32:57 -0000 1.21
@@ -50,27 +50,26 @@
*/
package org.apache.cocoon.generation;
-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.excalibur.xml.xpath.XPathProcessor;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+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.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
-import org.apache.cocoon.components.url.URLFactory;
-import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.environment.URLFactorySourceResolver;
-import org.apache.cocoon.xml.dom.DOMStreamer;
import org.apache.cocoon.xml.XMLUtils;
+import org.apache.cocoon.xml.dom.DOMStreamer;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceValidity;
@@ -83,11 +82,11 @@
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXResult;
+
import java.io.BufferedInputStream;
-import java.io.StringWriter;
-import java.io.PrintWriter;
import java.io.IOException;
-import java.util.Enumeration;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.Map;
import java.util.Properties;
1.12 +3 -4
xml-cocoon2/src/java/org/apache/cocoon/generation/StreamGenerator.java
Index: StreamGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/StreamGenerator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StreamGenerator.java 28 Sep 2002 16:24:16 -0000 1.11
+++ StreamGenerator.java 5 Dec 2002 10:32:57 -0000 1.12
@@ -51,15 +51,14 @@
package org.apache.cocoon.generation;
import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.avalon.framework.component.Component;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.environment.http.HttpEnvironment;
-import javax.servlet.http.HttpServletRequest;
import org.apache.cocoon.util.PostInputStream;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+
+import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.StringReader;
1.5 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java
Index: MP3DirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MP3DirectoryGenerator.java 22 Feb 2002 07:03:51 -0000 1.4
+++ MP3DirectoryGenerator.java 5 Dec 2002 10:32:57 -0000 1.5
@@ -50,11 +50,11 @@
*/
package org.apache.cocoon.generation;
+import org.xml.sax.SAXException;
+
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.RandomAccessFile;
-import org.xml.sax.SAXException;
/**
* An extension of DirectoryGenerators that adds extra attributes for MP3
1.8 +1 -5
xml-cocoon2/src/java/org/apache/cocoon/generation/XMLDBGenerator.java
Index: XMLDBGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/XMLDBGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLDBGenerator.java 4 Jun 2002 09:42:01 -0000 1.7
+++ XMLDBGenerator.java 5 Dec 2002 10:32:57 -0000 1.8
@@ -63,13 +63,9 @@
import org.apache.cocoon.environment.SourceResolver;
import org.apache.excalibur.source.SourceValidity;
import org.xml.sax.SAXException;
-
import org.xmldb.api.DatabaseManager;
import org.xmldb.api.base.Collection;
import org.xmldb.api.base.Database;
-import org.xmldb.api.base.ErrorCodes;
-import org.xmldb.api.base.Resource;
-import org.xmldb.api.base.Service;
import org.xmldb.api.base.XMLDBException;
import org.xmldb.api.modules.XMLResource;
1.8 +1 -6
xml-cocoon2/src/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java
Index: XMLDBCollectionGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLDBCollectionGenerator.java 4 Jun 2002 09:42:01 -0000 1.7
+++ XMLDBCollectionGenerator.java 5 Dec 2002 10:32:57 -0000 1.8
@@ -64,15 +64,10 @@
import org.apache.excalibur.source.SourceValidity;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
import org.xmldb.api.DatabaseManager;
import org.xmldb.api.base.Collection;
import org.xmldb.api.base.Database;
-import org.xmldb.api.base.ErrorCodes;
-import org.xmldb.api.base.Resource;
-import org.xmldb.api.base.Service;
import org.xmldb.api.base.XMLDBException;
-import org.xmldb.api.modules.XMLResource;
import java.io.IOException;
import java.util.Map;
1.10 +2 -4
xml-cocoon2/src/java/org/apache/cocoon/generation/RequestGenerator.java
Index: RequestGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/RequestGenerator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RequestGenerator.java 21 Nov 2002 18:18:49 -0000 1.9
+++ RequestGenerator.java 5 Dec 2002 10:32:57 -0000 1.10
@@ -51,10 +51,9 @@
package org.apache.cocoon.generation;
import org.apache.avalon.framework.CascadingRuntimeException;
+import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
@@ -65,7 +64,6 @@
import java.io.IOException;
import java.util.Enumeration;
-import java.util.Iterator;
import java.util.Map;
/**
1.9 +1 -4
xml-cocoon2/src/java/org/apache/cocoon/generation/StatusGenerator.java
Index: StatusGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/StatusGenerator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StatusGenerator.java 22 Oct 2002 03:54:09 -0000 1.8
+++ StatusGenerator.java 5 Dec 2002 10:32:57 -0000 1.9
@@ -52,11 +52,8 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-
import org.apache.excalibur.store.Store;
import org.apache.excalibur.store.StoreJanitor;
-
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
1.3 +3 -7
xml-cocoon2/src/java/org/apache/cocoon/generation/ProfilerGenerator.java
Index: ProfilerGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/ProfilerGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProfilerGenerator.java 3 Sep 2002 07:46:13 -0000 1.2
+++ ProfilerGenerator.java 5 Dec 2002 10:32:57 -0000 1.3
@@ -53,19 +53,15 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.parameters.ParameterException;
-
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.profiler.EnvironmentInfo;
import org.apache.cocoon.components.profiler.Profiler;
import org.apache.cocoon.components.profiler.ProfilerResult;
import org.apache.cocoon.components.sax.XMLDeserializer;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.IncludeXMLConsumer;
-
-import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
1.2 +7 -9
xml-cocoon2/src/java/org/apache/cocoon/generation/SWFGenerator.java
Index: SWFGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/SWFGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SWFGenerator.java 23 Jul 2002 19:37:59 -0000 1.1
+++ SWFGenerator.java 5 Dec 2002 10:32:57 -0000 1.2
@@ -51,24 +51,22 @@
package org.apache.cocoon.generation;
+import de.tivano.flash.swf.parser.SWFReader;
+import de.tivano.flash.swf.parser.SWFVerboseDefineFont2Reader;
+import de.tivano.flash.swf.parser.SWFVerboseDefineFontReader;
+
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.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.SourceResolver;
import org.apache.excalibur.source.SourceException;
-import org.xml.sax.SAXException;
import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
-import java.util.Map;
import java.io.IOException;
-
-import de.tivano.flash.swf.parser.SWFReader;
-import de.tivano.flash.swf.parser.SWFVerboseDefineFont2Reader;
-import de.tivano.flash.swf.parser.SWFVerboseDefineFontReader;
+import java.util.Map;
/**
* uses the project http://developer.berlios.de/projects/spark-xml/
1.4 +7 -12
xml-cocoon2/src/java/org/apache/cocoon/generation/SessionAttributeGenerator.java
Index: SessionAttributeGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/SessionAttributeGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionAttributeGenerator.java 23 Oct 2002 03:42:22 -0000 1.3
+++ SessionAttributeGenerator.java 5 Dec 2002 10:32:57 -0000 1.4
@@ -51,21 +51,16 @@
package org.apache.cocoon.generation;
import org.apache.avalon.framework.parameters.Parameters;
-
-import org.apache.cocoon.components.language.markup.xsp.XSPObjectHelper;
+import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.generation.AbstractGenerator;
-import org.apache.cocoon.xml.XMLizable;
+import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.XMLUtils;
-import org.apache.cocoon.ProcessingException;
-
-import org.xml.sax.helpers.AttributesImpl;
-import org.xml.sax.SAXException;
-
+import org.apache.cocoon.xml.XMLizable;
import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
import java.io.IOException;
import java.util.Map;
1.22 +2 -8
xml-cocoon2/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ServerPagesGenerator.java 27 Sep 2002 16:27:38 -0000 1.21
+++ ServerPagesGenerator.java 5 Dec 2002 10:32:57 -0000 1.22
@@ -50,6 +50,7 @@
*/
package org.apache.cocoon.generation;
+import org.apache.avalon.excalibur.collections.ArrayStack;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -58,28 +59,21 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
-
-import org.apache.avalon.excalibur.collections.ArrayStack;
-
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.components.language.generator.ProgramGenerator;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.util.HashUtil;
import org.apache.cocoon.xml.AbstractXMLPipe;
-
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceValidity;
-
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import java.io.IOException;
import java.io.Serializable;
-import java.util.HashMap;
import java.util.Map;
/**
1.12 +4 -6
xml-cocoon2/src/java/org/apache/cocoon/generation/VelocityGenerator.java
Index: VelocityGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/VelocityGenerator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- VelocityGenerator.java 2 Aug 2002 07:06:21 -0000 1.11
+++ VelocityGenerator.java 5 Dec 2002 10:32:57 -0000 1.12
@@ -60,24 +60,22 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.excalibur.source.Source;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.commons.collections.ExtendedProperties;
+import org.apache.excalibur.source.Source;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.log.LogSystem;
import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.resource.loader.ResourceLoader;
+import org.apache.velocity.runtime.log.LogSystem;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.StringReader;
import java.io.StringWriter;
import java.util.ArrayList;
1.16 +13 -25
xml-cocoon2/src/java/org/apache/cocoon/transformation/XMLFormTransformer.java
Index: XMLFormTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/XMLFormTransformer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XMLFormTransformer.java 27 Oct 2002 07:25:19 -0000 1.15
+++ XMLFormTransformer.java 5 Dec 2002 10:32:57 -0000 1.16
@@ -51,36 +51,24 @@
package org.apache.cocoon.transformation;
-import java.io.IOException;
-import java.util.Map;
-import java.util.List;
-import java.util.Iterator;
-import java.util.Collection;
-import java.util.SortedSet;
-import java.util.Stack;
-import java.lang.reflect.Array;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import org.w3c.dom.DocumentFragment;
-
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.caching.CacheValidity;
-import org.apache.cocoon.caching.NOPCacheValidity;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.components.validation.Violation;
+import org.apache.cocoon.components.xmlform.Form;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.transformation.AbstractTransformer;
-import org.apache.cocoon.transformation.AbstractSAXTransformer;
import org.apache.cocoon.xml.dom.DOMStreamer;
+import org.w3c.dom.DocumentFragment;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
-import org.apache.cocoon.components.validation.Violation;
-import org.apache.cocoon.components.xmlform.Form;
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.SortedSet;
+import java.util.Stack;
/**
* Transforms a document with XMLForm
1.9 +1 -4
xml-cocoon2/src/java/org/apache/cocoon/matching/AbstractRegexpMatcher.java
Index: AbstractRegexpMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/AbstractRegexpMatcher.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractRegexpMatcher.java 6 Jun 2002 14:43:40 -0000 1.8
+++ AbstractRegexpMatcher.java 5 Dec 2002 10:32:58 -0000 1.9
@@ -52,10 +52,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.sitemap.PatternException;
-
import org.apache.regexp.RE;
import org.apache.regexp.RECompiler;
import org.apache.regexp.REProgram;
1.7 +1 -2
xml-cocoon2/src/java/org/apache/cocoon/matching/WildcardURIMatcher.java
Index: WildcardURIMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/WildcardURIMatcher.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WildcardURIMatcher.java 31 Jul 2002 13:13:29 -0000 1.6
+++ WildcardURIMatcher.java 5 Dec 2002 10:32:58 -0000 1.7
@@ -51,7 +51,6 @@
package org.apache.cocoon.matching;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.environment.ObjectModelHelper;
import java.util.Map;
1.2 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/matching/WildcardParameterMatcher.java
Index: WildcardParameterMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/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 5 Mar 2002 01:09:20 -0000 1.1
+++ WildcardParameterMatcher.java 5 Dec 2002 10:32:58 -0000 1.2
@@ -55,8 +55,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.environment.ObjectModelHelper;
-
import java.util.Map;
/**
1.6 +1 -2
xml-cocoon2/src/java/org/apache/cocoon/matching/AbstractPreparableMatcher.java
Index: AbstractPreparableMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/AbstractPreparableMatcher.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractPreparableMatcher.java 31 Jul 2002 13:13:29 -0000 1.5
+++ AbstractPreparableMatcher.java 5 Dec 2002 10:32:58 -0000 1.6
@@ -52,7 +52,6 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.sitemap.PatternException;
import java.util.Map;
1.6 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/matching/PreparableMatcher.java
Index: PreparableMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/PreparableMatcher.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PreparableMatcher.java 22 Feb 2002 07:03:52 -0000 1.5
+++ PreparableMatcher.java 5 Dec 2002 10:32:58 -0000 1.6
@@ -50,9 +50,7 @@
*/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.sitemap.PatternException;
import java.util.Map;
1.4 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/matching/ParameterMatcher.java
Index: ParameterMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/ParameterMatcher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ParameterMatcher.java 3 Oct 2002 04:41:01 -0000 1.3
+++ ParameterMatcher.java 5 Dec 2002 10:32:58 -0000 1.4
@@ -52,8 +52,6 @@
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;
1.8 +1 -7
xml-cocoon2/src/java/org/apache/cocoon/matching/RegexpURIMatcher.java
Index: RegexpURIMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/RegexpURIMatcher.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RegexpURIMatcher.java 31 Jul 2002 13:13:29 -0000 1.7
+++ RegexpURIMatcher.java 5 Dec 2002 10:32:58 -0000 1.8
@@ -51,13 +51,7 @@
package org.apache.cocoon.matching;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.environment.ObjectModelHelper;
-
-import org.apache.regexp.RE;
-import org.apache.regexp.RECompiler;
-import org.apache.regexp.REProgram;
-import org.apache.regexp.RESyntaxException;
import java.util.Map;
1.2 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/matching/RegexpParameterMatcher.java
Index: RegexpParameterMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/RegexpParameterMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegexpParameterMatcher.java 5 Mar 2002 01:09:20 -0000 1.1
+++ RegexpParameterMatcher.java 5 Dec 2002 10:32:58 -0000 1.2
@@ -55,8 +55,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.environment.ObjectModelHelper;
-
import java.util.Map;
/**
1.6 +1 -4
xml-cocoon2/src/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java
Index: AbstractWildcardMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractWildcardMatcher.java 31 Jul 2002 13:13:29 -0000 1.5
+++ AbstractWildcardMatcher.java 5 Dec 2002 10:32:58 -0000 1.6
@@ -50,11 +50,8 @@
*/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.matching.helpers.WildcardHelper;
import java.util.HashMap;
1.2 +2 -4
xml-cocoon2/src/java/org/apache/cocoon/i18n/AbstractBunldeFactory.java
Index: AbstractBunldeFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/i18n/AbstractBunldeFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractBunldeFactory.java 13 Nov 2002 22:09:35 -0000 1.1
+++ AbstractBunldeFactory.java 5 Dec 2002 10:32:58 -0000 1.2
@@ -54,9 +54,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.Logger;
-
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceResolver;
+import org.apache.cocoon.i18n.BundleFactory.ConfigurationKeys;
/**
* Bundle factory implementation base class.
1.20 +4 -7
xml-cocoon2/src/java/org/apache/cocoon/reading/ResourceReader.java
Index: ResourceReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/reading/ResourceReader.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ResourceReader.java 10 Sep 2002 12:15:49 -0000 1.19
+++ ResourceReader.java 5 Dec 2002 10:32:58 -0000 1.20
@@ -51,12 +51,6 @@
package org.apache.cocoon.reading;
import org.apache.avalon.framework.parameters.Parameters;
-
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.source.SourceValidity;
-import org.apache.excalibur.source.impl.validity.FileTimeStampValidity;
-import org.apache.excalibur.source.impl.validity.TimeStampValidity;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.components.source.SourceUtil;
@@ -64,6 +58,9 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.source.SourceValidity;
import org.xml.sax.SAXException;
import java.io.IOException;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
