cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: xml-cocoon2/src/org/apache/cocoon/xml/xlink ExtendedXLinkPipe.java
Date Mon, 20 Aug 2001 13:55:19 GMT
dims        01/08/20 06:55:19

  Modified:    src/org/apache/cocoon Cocoon.java CodeFactory.java Main.java
                        Notification.java Notifier.java
                        ProcessingException.java
               src/org/apache/cocoon/acting AbstractAction.java
                        AbstractComplementaryConfigurableAction.java
                        AbstractConfigurableAction.java
                        AbstractDatabaseAction.java
                        AbstractValidatorAction.java Action.java
                        ComposerAction.java ConfigurableComposerAction.java
                        DatabaseAddAction.java
                        DatabaseAuthenticatorAction.java
                        DatabaseDeleteAction.java DatabaseSelectAction.java
                        DatabaseUpdateAction.java FormValidatorAction.java
                        HelloAction.java HttpHeaderAction.java
                        LangSelect.java LocaleAction.java OraAddAction.java
                        RequestParamAction.java ResourceExistsAction.java
                        ScriptAction.java SendmailAction.java
                        ServerPagesAction.java
                        SessionInvalidatorAction.java
                        SessionIsValidAction.java
                        SessionPropagatorAction.java
                        SessionStateAction.java SessionValidatorAction.java
                        ValidatorActionHelper.java
               src/org/apache/cocoon/caching AggregatedCacheValidity.java
                        CompositeCacheValidity.java
                        IncludeCacheValidity.java PipelineCacheKey.java
               src/org/apache/cocoon/components/browser Browser.java
               src/org/apache/cocoon/components/classloader
                        ClassLoaderManager.java ClassLoaderManagerImpl.java
                        RepositoryClassLoader.java
               src/org/apache/cocoon/components/jsp JSPEngine.java
                        JSPEngineImpl.java
                        JSPEngineImplNamedDispatcherInclude.java
                        JSPEngineImplWLS.java
               src/org/apache/cocoon/components/language/generator
                        GeneratorSelector.java ProgramGenerator.java
                        ProgramGeneratorImpl.java
               src/org/apache/cocoon/components/language/markup
                        AbstractMarkupLanguage.java Logicsheet.java
                        LogicsheetCodeGenerator.java
                        MarkupCodeGenerator.java MarkupLanguage.java
                        NamedLogicsheet.java
               src/org/apache/cocoon/components/language/markup/sitemap
                        SitemapMarkupLanguage.java
               src/org/apache/cocoon/components/language/markup/xsp
                        XSPCookieHelper.java XSPFormValidatorHelper.java
                        XSPGenerator.java XSPMarkupLanguage.java
                        XSPObjectHelper.java XSPRequestHelper.java
                        XSPResponseHelper.java XSPUtil.java
               src/org/apache/cocoon/components/language/programming
                        AbstractProgrammingLanguage.java
                        CompiledProgrammingLanguage.java
                        LanguageCompiler.java ProgrammingLanguage.java
               src/org/apache/cocoon/components/language/programming/java
                        AbstractJavaCompiler.java JavaLanguage.java
                        Javac.java Jikes.java JstyleFormatter.java
               src/org/apache/cocoon/components/language/programming/javascript
                        JavascriptLanguage.java
               src/org/apache/cocoon/components/parser JaxpParser.java
                        Parser.java XercesParser.java
               src/org/apache/cocoon/components/pipeline
                        AbstractEventPipeline.java
                        AbstractStreamPipeline.java
                        CacheableEventPipeline.java
                        CachingEventPipeline.java
                        CachingStreamPipeline.java EventPipeline.java
                        NonCachingEventPipeline.java
                        NonCachingStreamPipeline.java StreamPipeline.java
               src/org/apache/cocoon/components/profiler Profiler.java
                        ProfilerData.java ProfilerGenerator.java
                        ProfilerResult.java
                        ProfilingCachingEventPipeline.java
                        ProfilingNonCachingEventPipeline.java
                        ProfilingSAXConnector.java SimpleProfiler.java
               src/org/apache/cocoon/components/renderer
                        ExtendableRendererFactory.java
               src/org/apache/cocoon/components/sax
                        XMLByteStreamCompiler.java
                        XMLByteStreamFragment.java
                        XMLByteStreamInterpreter.java XMLTeePipe.java
               src/org/apache/cocoon/components/saxconnector
                        LoggingSAXConnector.java
               src/org/apache/cocoon/components/source
                        CocoonSourceFactory.java SitemapSource.java
                        SourceFactory.java SourceHandler.java
                        SourceHandlerImpl.java URLSource.java
               src/org/apache/cocoon/components/store FilesystemStore.java
                        MRUMemoryStore.java MemoryStore.java Store.java
               src/org/apache/cocoon/components/transcoder
                        ExtendableTranscoderFactory.java
               src/org/apache/cocoon/components/url ContextURLFactory.java
                        ResourceURLFactory.java URLFactory.java
                        URLFactoryImpl.java
               src/org/apache/cocoon/components/xslt XSLTProcessor.java
                        XSLTProcessorImpl.java
               src/org/apache/cocoon/environment AbstractEnvironment.java
                        Environment.java Request.java Response.java
                        Source.java SourceResolver.java
               src/org/apache/cocoon/environment/commandline
                        AbstractCommandLineEnvironment.java
                        CommandLineRequest.java CommandLineResponse.java
                        CommandlineContext.java FileSavingEnvironment.java
                        LinkSamplingEnvironment.java
               src/org/apache/cocoon/environment/http HttpContext.java
                        HttpEnvironment.java HttpRequest.java
                        HttpResponse.java HttpSession.java
                        RequestWrapper22.java RequestWrapper23.java
                        RequestWrapperMaybeUpload22.java
                        RequestWrapperMaybeUpload23.java
               src/org/apache/cocoon/environment/wrapper
                        EnvironmentWrapper.java RequestParameters.java
                        RequestWrapper.java
               src/org/apache/cocoon/generation AbstractGenerator.java
                        AbstractServerPage.java ComposerGenerator.java
                        DirectoryGenerator.java FileGenerator.java
                        FragmentExtractorGenerator.java Generator.java
                        HTMLGenerator.java ImageDirectoryGenerator.java
                        JspGenerator.java PhpGenerator.java
                        RequestGenerator.java ScriptGenerator.java
                        ServerPagesGenerator.java ServletGenerator.java
                        StatusGenerator.java StreamGenerator.java
                        VelocityGenerator.java
               src/org/apache/cocoon/i18n XMLResourceBundle.java
                        XMLResourceBundleFactory.java
               src/org/apache/cocoon/matching BrowserMatcherFactory.java
                        Matcher.java RequestParamMatcher.java
                        WildcardHeaderMatcherFactory.java
                        WildcardParameterValueMatcherFactory.java
                        WildcardSessionStateMatcherFactory.java
               src/org/apache/cocoon/reading AbstractReader.java
                        DatabaseReader.java Reader.java ResourceReader.java
               src/org/apache/cocoon/selection BrowserSelectorFactory.java
                        HeaderSelectorFactory.java HostSelectorFactory.java
                        ParameterSelectorFactory.java
                        RequestSelectorFactory.java Selector.java
                        SessionStateSelectorFactory.java
               src/org/apache/cocoon/selection/helpers
                        CodedSelectorHelper.java
               src/org/apache/cocoon/serialization AbstractSerializer.java
                        AbstractTextSerializer.java FOPSerializer.java
                        HTMLSerializer.java LinkSerializer.java
                        SVGSerializer.java TextSerializer.java
                        XMLSerializer.java
               src/org/apache/cocoon/servlet CocoonServlet.java
                        ParanoidClassLoader.java ParanoidCocoonServlet.java
               src/org/apache/cocoon/sitemap AbstractSitemap.java
                        ContentAggregator.java Handler.java
                        LinkTranslator.java Manager.java
                        SitemapComponentSelector.java
                        SitemapModelComponent.java
                        SitemapOutputComponent.java SitemapRedirector.java
                        XSLTFactoryLoader.java
               src/org/apache/cocoon/transformation
                        AbstractDOMTransformer.java
                        CIncludeTransformer.java
                        CachingCIncludeTransformer.java
                        FilterTransformer.java
                        FragmentExtractorTransformer.java
                        I18nTransformer.java LDAPTransformer.java
                        LogTransformer.java ReadDOMSessionTransformer.java
                        RoleFilterTransformer.java SQLTransformer.java
                        TraxTransformer.java
                        WriteDOMSessionTransformer.java
                        XIncludeTransformer.java XTTransformer.java
               src/org/apache/cocoon/util ClassUtils.java IOUtils.java
                        NetUtils.java PostInputStream.java StringUtils.java
                        TraxErrorHandler.java
               src/org/apache/cocoon/util/log CocoonLogFormatter.java
                        ExtensiblePatternFormatter.java
                        XMLCocoonLogFormatter.java
               src/org/apache/cocoon/xml AbstractDOMFragment.java
                        AbstractSAXFragment.java AbstractXMLConsumer.java
                        AbstractXMLPipe.java ContentHandlerWrapper.java
                        DocumentHandlerAdapter.java
                        DocumentHandlerWrapper.java
                        LoggingEntityResolver.java XMLProducer.java
               src/org/apache/cocoon/xml/dom DOMBuilder.java
                        DOMStreamer.java SVGBuilder.java
               src/org/apache/cocoon/xml/xlink ExtendedXLinkPipe.java
  Log:
  - Fixing Import's
  
  Revision  Changes    Path
  1.18      +14 -23    xml-cocoon2/src/org/apache/cocoon/Cocoon.java
  
  Index: Cocoon.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Cocoon.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Cocoon.java	2001/07/17 10:11:11	1.17
  +++ Cocoon.java	2001/08/20 13:55:09	1.18
  @@ -7,22 +7,11 @@
    *****************************************************************************/
   package org.apache.cocoon;
   
  -import java.io.File;
  -import java.io.FileNotFoundException;
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.io.FileInputStream;
  -import java.io.BufferedInputStream;
  -import java.net.URL;
  -import java.util.Enumeration;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Map;
  +import org.apache.avalon.excalibur.component.DefaultRoleManager;
  +import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
  @@ -31,36 +20,38 @@
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Modifiable;
   import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.components.language.generator.ProgramGenerator;
   import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.components.pipeline.EventPipeline;
   import org.apache.cocoon.components.pipeline.StreamPipeline;
  -import org.apache.cocoon.components.store.Store;
  -import org.apache.cocoon.components.store.FilesystemStore;
   import org.apache.cocoon.components.source.SourceHandler;
   import org.apache.cocoon.components.source.URLSource;
  +import org.apache.cocoon.components.store.FilesystemStore;
  +import org.apache.cocoon.components.store.Store;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
   import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.serialization.Serializer;
  -import org.apache.cocoon.sitemap.Manager;
   import org.apache.cocoon.sitemap.AbstractSitemap;
  +import org.apache.cocoon.sitemap.Manager;
   import org.apache.cocoon.util.ClassUtils;
  -import org.apache.cocoon.util.NetUtils;
  -import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
  -import org.apache.avalon.excalibur.component.DefaultRoleManager;
   import org.xml.sax.InputSource;
  -import org.xml.sax.SAXException;
  +
  +import java.io.BufferedInputStream;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.net.URL;
  +import java.util.Enumeration;
  +import java.util.Map;
   
   /**
    * The Cocoon Object is the main Kernel for the entire Cocoon system.
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a> (Apache Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.17 $ $Date: 2001/07/17 10:11:11 $
  + * @version CVS $Revision: 1.18 $ $Date: 2001/08/20 13:55:09 $
    */
   public class Cocoon extends AbstractLoggable implements ThreadSafe, Component, Initializable, Disposable, Modifiable, Processor, Contextualizable {
       /** The application context */
  
  
  
  1.2       +1 -2      xml-cocoon2/src/org/apache/cocoon/CodeFactory.java
  
  Index: CodeFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/CodeFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CodeFactory.java	2001/05/09 20:49:28	1.1
  +++ CodeFactory.java	2001/08/20 13:55:09	1.2
  @@ -9,7 +9,6 @@
   package org.apache.cocoon;
   
   import org.apache.avalon.framework.configuration.ConfigurationException;
  -
   import org.w3c.dom.NodeList;
   
   /**
  @@ -22,7 +21,7 @@
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:28 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:09 $
    */
   
   public interface CodeFactory {
  
  
  
  1.12      +23 -23    xml-cocoon2/src/org/apache/cocoon/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Main.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Main.java	2001/07/20 22:10:39	1.11
  +++ Main.java	2001/08/20 13:55:09	1.12
  @@ -8,49 +8,49 @@
   
   package org.apache.cocoon;
   
  +import org.apache.avalon.excalibur.cli.CLArgsParser;
  +import org.apache.avalon.excalibur.cli.CLOption;
  +import org.apache.avalon.excalibur.cli.CLOptionDescriptor;
  +import org.apache.avalon.excalibur.cli.CLUtil;
  +import org.apache.avalon.framework.context.DefaultContext;
  +import org.apache.cocoon.environment.Environment;
  +import org.apache.cocoon.environment.commandline.CommandlineContext;
  +import org.apache.cocoon.environment.commandline.FileSavingEnvironment;
  +import org.apache.cocoon.environment.commandline.LinkSamplingEnvironment;
  +import org.apache.cocoon.util.IOUtils;
  +import org.apache.cocoon.util.MIMEUtils;
  +import org.apache.cocoon.util.NetUtils;
  +import org.apache.log.Hierarchy;
  +import org.apache.log.LogTarget;
  +import org.apache.log.Logger;
  +import org.apache.log.Priority;
  +import org.apache.log.output.DefaultOutputLogTarget;
  +import org.apache.log.output.FileOutputLogTarget;
  +
   import java.io.BufferedOutputStream;
  +import java.io.BufferedReader;
   import java.io.File;
   import java.io.FileNotFoundException;
   import java.io.FileOutputStream;
  +import java.io.FileReader;
   import java.io.IOException;
   import java.io.OutputStream;
   import java.io.PrintStream;
  -import java.io.BufferedReader;
  -import java.io.FileReader;
   import java.net.MalformedURLException;
  -import java.util.HashSet;
   import java.util.ArrayList;
   import java.util.Arrays;
   import java.util.Collection;
   import java.util.HashMap;
  +import java.util.HashSet;
   import java.util.Iterator;
   import java.util.List;
   import java.util.Map;
  -import org.apache.avalon.framework.context.DefaultContext;
  -import org.apache.cocoon.environment.Environment;
  -import org.apache.cocoon.environment.commandline.FileSavingEnvironment;
  -import org.apache.cocoon.environment.commandline.LinkSamplingEnvironment;
  -import org.apache.cocoon.environment.commandline.CommandlineContext;
  -import org.apache.cocoon.util.IOUtils;
  -import org.apache.cocoon.util.JavaArchiveFilter;
  -import org.apache.cocoon.util.MIMEUtils;
  -import org.apache.cocoon.util.NetUtils;
  -import org.apache.avalon.excalibur.cli.CLArgsParser;
  -import org.apache.avalon.excalibur.cli.CLOption;
  -import org.apache.avalon.excalibur.cli.CLOptionDescriptor;
  -import org.apache.avalon.excalibur.cli.CLUtil;
  -import org.apache.log.Hierarchy;
  -import org.apache.log.LogTarget;
  -import org.apache.log.Logger;
  -import org.apache.log.Priority;
  -import org.apache.log.output.DefaultOutputLogTarget;
  -import org.apache.log.output.FileOutputLogTarget;
   
   /**
    * Command line entry point.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.11 $ $Date: 2001/07/20 22:10:39 $
  + * @version CVS $Revision: 1.12 $ $Date: 2001/08/20 13:55:09 $
    */
   
   public class Main {
  
  
  
  1.4       +3 -2      xml-cocoon2/src/org/apache/cocoon/Notification.java
  
  Index: Notification.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Notification.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Notification.java	2001/08/17 13:20:14	1.3
  +++ Notification.java	2001/08/20 13:55:09	1.4
  @@ -8,11 +8,12 @@
   
   package org.apache.cocoon;
   
  +import org.apache.avalon.framework.CascadingThrowable;
  +import org.xml.sax.SAXException;
  +
   import java.io.PrintWriter;
   import java.io.StringWriter;
   import java.util.HashMap;
  -import org.apache.avalon.framework.CascadingThrowable;
  -import org.xml.sax.SAXException;
   
   
   /**
  
  
  
  1.4       +5 -7      xml-cocoon2/src/org/apache/cocoon/Notifier.java
  
  Index: Notifier.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Notifier.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Notifier.java	2001/07/19 12:20:32	1.3
  +++ Notifier.java	2001/08/20 13:55:09	1.4
  @@ -8,23 +8,21 @@
   
   package org.apache.cocoon;
   
  +import org.xml.sax.ContentHandler;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.helpers.AttributesImpl;
  +
   import java.io.IOException;
   import java.io.OutputStream;
  -import java.text.DateFormat;
   import java.util.HashMap;
   import java.util.Iterator;
  -import java.util.Set;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.helpers.AttributesImpl;
   
   /**
    * Generates an XML representation of the current notification.
    *
    * @author <a href="mailto:nicolaken@supereva.it">Nicola Ken Barozzi</a> Aisa
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/07/19 12:20:32 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:09 $
    */
   
   public class Notifier {
  
  
  
  1.3       +3 -2      xml-cocoon2/src/org/apache/cocoon/ProcessingException.java
  
  Index: ProcessingException.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/ProcessingException.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProcessingException.java	2001/08/14 13:59:14	1.2
  +++ ProcessingException.java	2001/08/20 13:55:09	1.3
  @@ -7,9 +7,10 @@
    *****************************************************************************/
   package org.apache.cocoon;
   
  +import org.apache.avalon.framework.CascadingException;
  +
   import java.io.PrintStream;
   import java.io.PrintWriter;
  -import org.apache.avalon.framework.CascadingException;
   
   /**
    * This Exception is thrown every time there is a problem in processing
  @@ -17,7 +18,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.2 $ $Date: 2001/08/14 13:59:14 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:09 $
    */
   public class ProcessingException extends CascadingException {
   
  
  
  
  1.7       +5 -5      xml-cocoon2/src/org/apache/cocoon/acting/AbstractAction.java
  
  Index: AbstractAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractAction.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractAction.java	2001/07/27 18:04:33	1.6
  +++ AbstractAction.java	2001/08/20 13:55:09	1.7
  @@ -7,23 +7,23 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.util.Map;
  -import java.util.TreeMap;
  -import java.util.Collections;
  -
   import org.apache.avalon.framework.activity.Disposable;
   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.logger.AbstractLoggable;
   
  +import java.util.Collections;
  +import java.util.Map;
  +import java.util.TreeMap;
  +
   /**
    * AbstractAction gives you the infrastructure for easily deploying more
    * Actions.  In order to get at the Logger, use getLogger().
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2001/07/27 18:04:33 $
  + * @version CVS $Revision: 1.7 $ $Date: 2001/08/20 13:55:09 $
    */
   public abstract class AbstractAction extends AbstractLoggable
   implements Action, Configurable, Disposable {
  
  
  
  1.8       +5 -11     xml-cocoon2/src/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java
  
  Index: AbstractComplementaryConfigurableAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractComplementaryConfigurableAction.java	2001/07/23 15:50:10	1.7
  +++ AbstractComplementaryConfigurableAction.java	2001/08/20 13:55:09	1.8
  @@ -7,22 +7,16 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.net.URL;
  -import java.util.HashMap;
  -import java.util.Map;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
  -import org.apache.cocoon.components.source.SourceHandler;
  -import org.apache.cocoon.Roles;
   import org.apache.cocoon.Constants;
  -import org.apache.cocoon.acting.ConfigurationHelper;
  -import org.apache.cocoon.components.parser.Parser;
  -import org.apache.cocoon.components.url.URLFactory;
  +import org.apache.cocoon.components.source.SourceHandler;
   import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.components.source.URLSource;
  -import org.xml.sax.InputSource;
  +
  +import java.util.HashMap;
  +import java.util.Map;
   
   /**
    * Set up environment for configurable form handling data.  This group
  @@ -32,7 +26,7 @@
    * effective.  The name of the root configuration element is irrelevant.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.7 $ $Date: 2001/07/23 15:50:10 $
  + * @version CVS $Revision: 1.8 $ $Date: 2001/08/20 13:55:09 $
    */
   public abstract class AbstractComplementaryConfigurableAction extends ConfigurableComposerAction {
       private static Map configurations = new HashMap();
  
  
  
  1.3       +1 -2      xml-cocoon2/src/org/apache/cocoon/acting/AbstractConfigurableAction.java
  
  Index: AbstractConfigurableAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractConfigurableAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractConfigurableAction.java	2001/08/13 11:49:27	1.2
  +++ AbstractConfigurableAction.java	2001/08/20 13:55:09	1.3
  @@ -10,7 +10,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.util.HashMap;
   
   /**
  @@ -18,7 +17,7 @@
    * deploying more Actions that take default parameters.
    *
    * @author <a href="mailto:haul@apache.org">Christian Haul</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/08/13 11:49:27 $ */
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:09 $ */
   public abstract class AbstractConfigurableAction extends AbstractAction implements Configurable {
   
       /**
  
  
  
  1.10      +12 -12    xml-cocoon2/src/org/apache/cocoon/acting/AbstractDatabaseAction.java
  
  Index: AbstractDatabaseAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractDatabaseAction.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AbstractDatabaseAction.java	2001/07/23 15:50:10	1.9
  +++ AbstractDatabaseAction.java	2001/08/20 13:55:09	1.10
  @@ -7,6 +7,17 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  +import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  +import org.apache.avalon.framework.activity.Disposable;
  +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.Configurable;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.generation.ImageDirectoryGenerator;
  +
   import java.io.BufferedInputStream;
   import java.io.ByteArrayInputStream;
   import java.io.File;
  @@ -26,17 +37,6 @@
   import java.util.Collections;
   import java.util.HashMap;
   import java.util.Map;
  -import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  -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.parameters.Parameters;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.generation.ImageDirectoryGenerator;
  -import org.apache.avalon.excalibur.datasource.DataSourceComponent;
   
   /**
    * Set up environment for configurable form handling data.  It is
  @@ -158,7 +158,7 @@
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:balld@apache.org">Donald Ball</a>
  - * @version CVS $Revision: 1.9 $ $Date: 2001/07/23 15:50:10 $
  + * @version CVS $Revision: 1.10 $ $Date: 2001/08/20 13:55:09 $
    */
   public abstract class AbstractDatabaseAction extends AbstractComplementaryConfigurableAction implements Configurable, Disposable {
       protected Map files = new HashMap();
  
  
  
  1.7       +4 -10     xml-cocoon2/src/org/apache/cocoon/acting/AbstractValidatorAction.java
  
  Index: AbstractValidatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractValidatorAction.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractValidatorAction.java	2001/07/10 11:18:18	1.6
  +++ AbstractValidatorAction.java	2001/08/20 13:55:09	1.7
  @@ -1,20 +1,14 @@
  -// $Id: AbstractValidatorAction.java,v 1.6 2001/07/10 11:18:18 haul Exp $
  +// $Id: AbstractValidatorAction.java,v 1.7 2001/08/20 13:55:09 dims Exp $
   package org.apache.cocoon.acting;
   
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.log.Logger;
  -
  +import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.regexp.RE;
   import org.apache.regexp.RESyntaxException;
   
   import java.util.Map;
   
  -import org.apache.cocoon.acting.ValidatorActionResult;
  -import org.apache.cocoon.acting.ValidatorActionHelper;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -
   /**
    * Abstract implementation of action that needs to perform validation of
    * parameters (from session, from request, etc.). All `validator' actions
  @@ -103,7 +97,7 @@
    * </table>
    * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2001/07/10 11:18:18 $
  + * @version CVS $Revision: 1.7 $ $Date: 2001/08/20 13:55:09 $
    */
   public abstract class AbstractValidatorAction
   extends AbstractComplementaryConfigurableAction
  @@ -624,5 +618,5 @@
   
   }
   
  -// $Id: AbstractValidatorAction.java,v 1.6 2001/07/10 11:18:18 haul Exp $
  +// $Id: AbstractValidatorAction.java,v 1.7 2001/08/20 13:55:09 dims Exp $
   // vim: set et ts=4 sw=4:
  
  
  
  1.5       +3 -3      xml-cocoon2/src/org/apache/cocoon/acting/Action.java
  
  Index: Action.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/Action.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Action.java	2001/07/07 11:43:12	1.4
  +++ Action.java	2001/08/20 13:55:09	1.5
  @@ -7,18 +7,18 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.util.Map;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.thread.ThreadSafe;
   import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.xml.sax.SAXException;
  +
  +import java.util.Map;
   
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/07/07 11:43:12 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:09 $
    */
   public interface Action extends Component, ThreadSafe {
   
  
  
  
  1.2       +2 -3      xml-cocoon2/src/org/apache/cocoon/acting/ComposerAction.java
  
  Index: ComposerAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ComposerAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ComposerAction.java	2001/05/09 20:50:05	1.1
  +++ ComposerAction.java	2001/08/20 13:55:09	1.2
  @@ -7,17 +7,16 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -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.component.Composable;
  -import org.apache.cocoon.Cocoon;
   
   /**
    * The <code>ComposerAction</code> will allow any <code>Action</code>
    * that extends this to access SitemapComponents.
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:50:05 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:09 $
    */
   public abstract class ComposerAction extends AbstractAction implements Composable {
   
  
  
  
  1.3       +2 -3      xml-cocoon2/src/org/apache/cocoon/acting/ConfigurableComposerAction.java
  
  Index: ConfigurableComposerAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ConfigurableComposerAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConfigurableComposerAction.java	2001/07/28 16:05:59	1.2
  +++ ConfigurableComposerAction.java	2001/08/20 13:55:09	1.3
  @@ -7,10 +7,9 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -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.component.Composable;
  -import org.apache.cocoon.Cocoon;
   
   /**
    * The <code>ComposerAction</code> will allow any <code>Action</code>
  @@ -21,7 +20,7 @@
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:haul@apache.org">Christian Haul</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/28 16:05:59 $ */
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:09 $ */
   public abstract class ConfigurableComposerAction extends AbstractConfigurableAction implements Composable {
   
       /** The component manager instance */
  
  
  
  1.10      +13 -18    xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAddAction.java
  
  Index: DatabaseAddAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAddAction.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DatabaseAddAction.java	2001/07/13 13:21:10	1.9
  +++ DatabaseAddAction.java	2001/08/20 13:55:09	1.10
  @@ -7,32 +7,27 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  +import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  +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.Constants;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.SourceResolver;
  +
   import java.sql.Connection;
   import java.sql.PreparedStatement;
   import java.sql.ResultSet;
   import java.sql.SQLException;
  -import java.sql.Timestamp;
  -import java.util.ArrayList;
  +import java.util.Collections;
  +import java.util.Enumeration;
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.Map;
  -import java.util.Enumeration;
  -import java.util.Collections;
   import java.util.SortedSet;
   import java.util.TreeSet;
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentException;
  -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.Constants;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.generation.ImageDirectoryGenerator;
  -import org.apache.avalon.excalibur.datasource.DataSourceComponent;
   
   /**
    * Adds record in a database. The action can update one or more tables,
  @@ -43,7 +38,7 @@
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:balld@apache.org">Donald Ball</a>
  - * @version CVS $Revision: 1.9 $ $Date: 2001/07/13 13:21:10 $
  + * @version CVS $Revision: 1.10 $ $Date: 2001/08/20 13:55:09 $
    */
   public class DatabaseAddAction extends AbstractDatabaseAction {
       protected static final Map addStatements = new HashMap();
  
  
  
  1.9       +12 -13    xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java
  
  Index: DatabaseAuthenticatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DatabaseAuthenticatorAction.java	2001/08/09 21:12:31	1.8
  +++ DatabaseAuthenticatorAction.java	2001/08/20 13:55:09	1.9
  @@ -1,22 +1,21 @@
  -// $Id: DatabaseAuthenticatorAction.java,v 1.8 2001/08/09 21:12:31 bloritsch Exp $
  +// $Id: DatabaseAuthenticatorAction.java,v 1.9 2001/08/20 13:55:09 dims Exp $
   package org.apache.cocoon.acting;
   
  -import java.sql.Connection;
  -import java.sql.ResultSet;
  -import java.sql.Statement;
  -import java.util.Collections;
  -import java.util.HashMap;
  -import java.util.Map;
  +import org.apache.avalon.excalibur.datasource.DataSourceComponent;
   import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
  -import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  -import org.apache.log.Logger;
  +
  +import java.sql.Connection;
  +import java.sql.ResultSet;
  +import java.sql.Statement;
  +import java.util.Collections;
  +import java.util.HashMap;
  +import java.util.Map;
   
   /**
    * This action is used to authenticate user by comparing several request
  @@ -51,7 +50,7 @@
    * not verified.
    *
    * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
  - * @version CVS $Revision: 1.8 $ $Date: 2001/08/09 21:12:31 $
  + * @version CVS $Revision: 1.9 $ $Date: 2001/08/20 13:55:09 $
    */
   public class DatabaseAuthenticatorAction extends AbstractDatabaseAction
   {
  @@ -252,5 +251,5 @@
       }
   }
   
  -// $Id: DatabaseAuthenticatorAction.java,v 1.8 2001/08/09 21:12:31 bloritsch Exp $
  +// $Id: DatabaseAuthenticatorAction.java,v 1.9 2001/08/20 13:55:09 dims Exp $
   // vim: set et ts=4 sw=4:
  
  
  
  1.8       +9 -16     xml-cocoon2/src/org/apache/cocoon/acting/DatabaseDeleteAction.java
  
  Index: DatabaseDeleteAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseDeleteAction.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DatabaseDeleteAction.java	2001/07/27 18:04:33	1.7
  +++ DatabaseDeleteAction.java	2001/08/20 13:55:09	1.8
  @@ -7,28 +7,21 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.sql.Connection;
  -import java.sql.PreparedStatement;
  -import java.sql.ResultSet;
  -import java.sql.SQLException;
  -import java.sql.Timestamp;
  -import java.util.ArrayList;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Map;
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.configuration.Configurable;
  +import org.apache.avalon.excalibur.datasource.DataSourceComponent;
   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.Constants;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.generation.ImageDirectoryGenerator;
  -import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  +
  +import java.sql.Connection;
  +import java.sql.PreparedStatement;
  +import java.sql.SQLException;
  +import java.util.HashMap;
  +import java.util.Map;
   
   /**
    * Delete a record from a database.  This Action assumes that all
  @@ -38,7 +31,7 @@
    * the keys.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.7 $ $Date: 2001/07/27 18:04:33 $
  + * @version CVS $Revision: 1.8 $ $Date: 2001/08/20 13:55:09 $
    */
   public final class DatabaseDeleteAction extends AbstractDatabaseAction {
       private static final Map deleteStatements = new HashMap();
  
  
  
  1.2       +10 -16    xml-cocoon2/src/org/apache/cocoon/acting/DatabaseSelectAction.java
  
  Index: DatabaseSelectAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseSelectAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DatabaseSelectAction.java	2001/07/27 21:28:03	1.1
  +++ DatabaseSelectAction.java	2001/08/20 13:55:09	1.2
  @@ -7,28 +7,22 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.sql.Connection;
  -import java.sql.PreparedStatement;
  -import java.sql.ResultSet;
  -import java.sql.SQLException;
  -import java.sql.Timestamp;
  -import java.util.ArrayList;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Map;
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.configuration.Configurable;
  +import org.apache.avalon.excalibur.datasource.DataSourceComponent;
   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.Constants;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.generation.ImageDirectoryGenerator;
  -import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  +
  +import java.sql.Connection;
  +import java.sql.PreparedStatement;
  +import java.sql.ResultSet;
  +import java.sql.SQLException;
  +import java.util.HashMap;
  +import java.util.Map;
   
   /**
    * Select a record from a database. If request parameters are present,
  @@ -37,7 +31,7 @@
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/07/27 21:28:03 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:09 $
    */
   public class DatabaseSelectAction extends AbstractDatabaseAction {
   
  
  
  
  1.9       +9 -16     xml-cocoon2/src/org/apache/cocoon/acting/DatabaseUpdateAction.java
  
  Index: DatabaseUpdateAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseUpdateAction.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DatabaseUpdateAction.java	2001/07/27 21:28:03	1.8
  +++ DatabaseUpdateAction.java	2001/08/20 13:55:09	1.9
  @@ -7,35 +7,28 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.sql.Connection;
  -import java.sql.PreparedStatement;
  -import java.sql.ResultSet;
  -import java.sql.SQLException;
  -import java.sql.Timestamp;
  -import java.util.ArrayList;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Map;
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.configuration.Configurable;
  +import org.apache.avalon.excalibur.datasource.DataSourceComponent;
   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.Constants;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.generation.ImageDirectoryGenerator;
  -import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  +
  +import java.sql.Connection;
  +import java.sql.PreparedStatement;
  +import java.sql.SQLException;
  +import java.util.HashMap;
  +import java.util.Map;
   
   /**
    * Update a record in a database.  This Action assumes that there is
    * only one table at a time to update.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.8 $ $Date: 2001/07/27 21:28:03 $
  + * @version CVS $Revision: 1.9 $ $Date: 2001/08/20 13:55:09 $
    */
   public class DatabaseUpdateAction extends AbstractDatabaseAction {
       private static final Map updateStatements = new HashMap();
  
  
  
  1.9       +6 -10     xml-cocoon2/src/org/apache/cocoon/acting/FormValidatorAction.java
  
  Index: FormValidatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/FormValidatorAction.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FormValidatorAction.java	2001/07/23 15:50:10	1.8
  +++ FormValidatorAction.java	2001/08/20 13:55:09	1.9
  @@ -1,20 +1,16 @@
  -// $Id: FormValidatorAction.java,v 1.8 2001/07/23 15:50:10 haul Exp $
  +// $Id: FormValidatorAction.java,v 1.9 2001/08/20 13:55:09 dims Exp $
   package org.apache.cocoon.acting;
   
  -import java.util.Collections;
  -import java.util.HashMap;
  -import java.util.Map;
   import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.util.Tokenizer;
  -import org.apache.log.Logger;
   
  -import org.apache.cocoon.acting.ValidatorActionHelper;
  +import java.util.HashMap;
  +import java.util.Map;
   
   /**
    * This is the action used to validate Request parameters.
  @@ -58,7 +54,7 @@
    *
    * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Revision: 1.8 $ $Date: 2001/07/23 15:50:10 $
  + * @version CVS $Revision: 1.9 $ $Date: 2001/08/20 13:55:09 $
    */
   public class FormValidatorAction extends AbstractValidatorAction
   {
  @@ -208,5 +204,5 @@
       }
   }
   
  -// $Id: FormValidatorAction.java,v 1.8 2001/07/23 15:50:10 haul Exp $
  +// $Id: FormValidatorAction.java,v 1.9 2001/08/20 13:55:09 dims Exp $
   // vim: set et ts=4 sw=4:
  
  
  
  1.4       +4 -6      xml-cocoon2/src/org/apache/cocoon/acting/HelloAction.java
  
  Index: HelloAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/HelloAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HelloAction.java	2001/06/05 21:36:20	1.3
  +++ HelloAction.java	2001/08/20 13:55:09	1.4
  @@ -7,23 +7,21 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.util.Map;
  -import org.apache.avalon.framework.component.Component;
  -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.Constants;
  +import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
  -import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.SourceResolver;
   
  +import java.util.Map;
  +
   /**
    * A simple Action that tracks if a <code>Session</code> object
    * has been created or not.
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/06/05 21:36:20 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:09 $
    */
   public class HelloAction extends ComposerAction {
   
  
  
  
  1.3       +5 -4      xml-cocoon2/src/org/apache/cocoon/acting/HttpHeaderAction.java
  
  Index: HttpHeaderAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/HttpHeaderAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HttpHeaderAction.java	2001/07/23 15:50:10	1.2
  +++ HttpHeaderAction.java	2001/08/20 13:55:09	1.3
  @@ -7,16 +7,17 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.util.Collections;
  -import java.util.HashMap;
  -import java.util.Map;
  -import org.apache.avalon.framework.parameters.Parameters;
   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.Constants;
   import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.Response;
   import org.apache.cocoon.environment.SourceResolver;
  +
  +import java.util.Collections;
  +import java.util.HashMap;
  +import java.util.Map;
   
   /**
    * This action adds HTTP headers to the response.
  
  
  
  1.5       +9 -9      xml-cocoon2/src/org/apache/cocoon/acting/LangSelect.java
  
  Index: LangSelect.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/LangSelect.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LangSelect.java	2001/06/05 21:36:20	1.4
  +++ LangSelect.java	2001/08/20 13:55:09	1.5
  @@ -7,25 +7,25 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.util.ArrayList;
  -import java.util.Enumeration;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.List;
  -import java.util.Locale;
  -import java.util.Map;
  -import org.apache.avalon.framework.parameters.Parameters;
   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.Constants;
  -import org.apache.cocoon.acting.Action;
   import org.apache.cocoon.environment.Cookie;
   import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Response;
   import org.apache.cocoon.environment.Session;
   import org.apache.cocoon.environment.SourceResolver;
  +
  +import java.util.ArrayList;
  +import java.util.Enumeration;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.List;
  +import java.util.Locale;
  +import java.util.Map;
   
   /**
    * LangSelect Action returns two character language code to sitemap.
  
  
  
  1.3       +5 -10     xml-cocoon2/src/org/apache/cocoon/acting/LocaleAction.java
  
  Index: LocaleAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/LocaleAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LocaleAction.java	2001/07/06 21:35:00	1.2
  +++ LocaleAction.java	2001/08/20 13:55:09	1.3
  @@ -7,19 +7,10 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.util.ArrayList;
  -import java.util.Enumeration;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.List;
  -import java.util.Locale;
  -import java.util.Map;
  -import org.apache.avalon.framework.parameters.Parameters;
  -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.Constants;
  -import org.apache.cocoon.acting.Action;
   import org.apache.cocoon.environment.Cookie;
   import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.Request;
  @@ -27,6 +18,10 @@
   import org.apache.cocoon.environment.Session;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.regexp.RE;
  +
  +import java.util.HashMap;
  +import java.util.Locale;
  +import java.util.Map;
   
   /**
    * LocaleAction is a class which obtains the request's locale information
  
  
  
  1.5       +12 -14    xml-cocoon2/src/org/apache/cocoon/acting/OraAddAction.java
  
  Index: OraAddAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/OraAddAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- OraAddAction.java	2001/07/13 13:21:21	1.4
  +++ OraAddAction.java	2001/08/20 13:55:09	1.5
  @@ -7,6 +7,17 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  +import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  +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.Constants;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.SourceResolver;
  +import org.apache.cocoon.generation.ImageDirectoryGenerator;
  +
   import java.io.BufferedInputStream;
   import java.io.BufferedOutputStream;
   import java.io.ByteArrayInputStream;
  @@ -21,26 +32,13 @@
   import java.util.ArrayList;
   import java.util.HashMap;
   import java.util.Map;
  -import oracle.jdbc.OracleResultSet;
  -import oracle.sql.BLOB;
  -import oracle.sql.CLOB;
  -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.Constants;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.generation.ImageDirectoryGenerator;
  -import org.apache.avalon.excalibur.datasource.DataSourceComponent;
   
   /**
    * Add a record in a database.  This Action assumes that there is
    * only one table at a time to update.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/07/13 13:21:21 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:09 $
    */
   public class OraAddAction extends DatabaseAddAction {
       private static final Map selectLOBStatements = new HashMap();
  
  
  
  1.4       +8 -8      xml-cocoon2/src/org/apache/cocoon/acting/RequestParamAction.java
  
  Index: RequestParamAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/RequestParamAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RequestParamAction.java	2001/07/11 15:15:25	1.3
  +++ RequestParamAction.java	2001/08/20 13:55:09	1.4
  @@ -14,15 +14,15 @@
   /*
    * Standard imports
    */
  -import java.util.HashMap;
  -import java.util.Map;
  -import java.util.Enumeration;
  -import org.apache.cocoon.acting.ComposerAction;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.Constants;
  -import org.apache.avalon.framework.parameters.Parameters;
  +
  +import java.util.Enumeration;
  +import java.util.HashMap;
  +import java.util.Map;
   
   /**
    * This action makes some request details available to the sitemap via parameter
  @@ -73,7 +73,7 @@
    *
    * @author <a href="mailto:Marcus.Crafter@osa.de">Marcus Crafter</a>
    * @author <a href="mailto:tcurdt@dff.st">Torsten Curdt</a>
  - * @version CVS $Revision: 1.3 $
  + * @version CVS $Revision: 1.4 $
    */
   public class RequestParamAction extends ComposerAction {
   
  
  
  
  1.8       +5 -17     xml-cocoon2/src/org/apache/cocoon/acting/ResourceExistsAction.java
  
  Index: ResourceExistsAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ResourceExistsAction.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ResourceExistsAction.java	2001/07/07 11:43:12	1.7
  +++ ResourceExistsAction.java	2001/08/20 13:55:09	1.8
  @@ -7,25 +7,13 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.io.InputStream;
  -import java.io.IOException;
  -import java.util.Collections;
  -import java.util.HashMap;
  -import java.util.Map;
  -import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentException;
  -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.Constants;
  -import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.xml.sax.InputSource;
  +
  +import java.util.Collections;
  +import java.util.HashMap;
  +import java.util.Map;
   
   /**
    * This action simply checks to see if a given resource exists. It takes a
  @@ -33,7 +21,7 @@
    * null otherwise. It has only been tested with context urls.
    *
    * @author <a href="mailto:balld@apache.org">Donald Ball</a>
  - * @version CVS $Revision: 1.7 $ $Date: 2001/07/07 11:43:12 $
  + * @version CVS $Revision: 1.8 $ $Date: 2001/08/20 13:55:09 $
    */
   public class ResourceExistsAction extends ComposerAction {
   
  
  
  
  1.2       +10 -29    xml-cocoon2/src/org/apache/cocoon/acting/ScriptAction.java
  
  Index: ScriptAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ScriptAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ScriptAction.java	2001/07/16 10:54:36	1.1
  +++ ScriptAction.java	2001/08/20 13:55:09	1.2
  @@ -10,43 +10,24 @@
   
   // Cocoon imports
   
  +import com.ibm.bsf.BSFException;
  +import com.ibm.bsf.BSFManager;
  +import com.ibm.bsf.util.IOUtils;
  +import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Session;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.Roles;
  -
  -// Avalon imports
  -
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.avalon.framework.parameters.Parameters;
  -
  -// Java runtime imports
   
  -import java.io.Reader;
   import java.io.FileNotFoundException;
   import java.io.InputStreamReader;
  -import java.util.Map;
  -import java.util.Map;
  -import java.util.HashMap;
  +import java.io.Reader;
   import java.util.Collections;
  -
  -// BSF imports
  -
  -import com.ibm.bsf.BSFManager;
  -import com.ibm.bsf.util.IOUtils;
  -import com.ibm.bsf.BSFException;
  -
  -// SAX imports
  -
  -import org.xml.sax.InputSource;
  -import org.xml.sax.SAXException;
  +import java.util.HashMap;
  +import java.util.Map;
   
   /**
    * A simple action that executes any script that can be run by the BSF
  
  
  
  1.4       +6 -14     xml-cocoon2/src/org/apache/cocoon/acting/SendmailAction.java
  
  Index: SendmailAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SendmailAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SendmailAction.java	2001/06/05 21:36:21	1.3
  +++ SendmailAction.java	2001/08/20 13:55:09	1.4
  @@ -7,19 +7,6 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.util.Collections;
  -import java.util.Date;
  -import java.util.HashMap;
  -import java.util.Map;
  -import java.util.Properties;
  -import javax.mail.Message;
  -import javax.mail.Transport;
  -import javax.mail.Session;
  -import javax.mail.MessagingException;
  -import javax.mail.internet.InternetAddress;
  -import javax.mail.internet.MimeMessage;
  -import javax.mail.internet.AddressException;
  -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;
  @@ -27,7 +14,12 @@
   import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.log.Logger;
  +
  +import java.util.Collections;
  +import java.util.Date;
  +import java.util.HashMap;
  +import java.util.Map;
  +import java.util.Properties;
   
   /**
    * The SendmailAction class sends email. The action needs four parameters:
  
  
  
  1.3       +5 -7      xml-cocoon2/src/org/apache/cocoon/acting/ServerPagesAction.java
  
  Index: ServerPagesAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ServerPagesAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ServerPagesAction.java	2001/08/13 11:50:48	1.2
  +++ ServerPagesAction.java	2001/08/20 13:55:09	1.3
  @@ -7,16 +7,11 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.util.HashMap;
  -import java.util.Map;
  -
  +import org.apache.avalon.excalibur.component.ComponentHandler;
   import org.apache.avalon.framework.activity.Disposable;
  -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.excalibur.component.ComponentHandler;
  -
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.components.sax.XMLByteStreamCompiler;
   import org.apache.cocoon.components.sax.XMLByteStreamFragment;
  @@ -26,6 +21,9 @@
   import org.apache.cocoon.generation.ServerPagesGenerator;
   import org.apache.cocoon.xml.AbstractXMLConsumer;
   
  +import java.util.HashMap;
  +import java.util.Map;
  +
   /**
    * Allows actions to be written in XSP. This allows to use XSP to produce
    * XML fragments that are later reused in generators.<br/>
  @@ -60,7 +58,7 @@
    * </pre>
    *
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/08/13 11:50:48 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:09 $
    */
   public class ServerPagesAction extends ConfigurableComposerAction implements Disposable {
       
  
  
  
  1.4       +7 -8      xml-cocoon2/src/org/apache/cocoon/acting/SessionInvalidatorAction.java
  
  Index: SessionInvalidatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionInvalidatorAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SessionInvalidatorAction.java	2001/06/05 21:36:21	1.3
  +++ SessionInvalidatorAction.java	2001/08/20 13:55:09	1.4
  @@ -1,24 +1,23 @@
  -// $Id: SessionInvalidatorAction.java,v 1.3 2001/06/05 21:36:21 dims Exp $
  +// $Id: SessionInvalidatorAction.java,v 1.4 2001/08/20 13:55:09 dims Exp $
   package org.apache.cocoon.acting;
   
  -import java.util.Collections;
  -import java.util.HashMap;
  -import java.util.Map;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.log.Logger;
  +
  +import java.util.Collections;
  +import java.util.HashMap;
  +import java.util.Map;
   
   /**
    * This is the action used to invalidate an HTTP session. The action returns
    * empty map if everything is ok, null otherwise.
    *
    * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
  - * @version CVS $Revision: 1.3 $ $Date: 2001/06/05 21:36:21 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:09 $
    */
   public class SessionInvalidatorAction extends AbstractAction
   {
  @@ -50,5 +49,5 @@
       }
   }
   
  -// $Id: SessionInvalidatorAction.java,v 1.3 2001/06/05 21:36:21 dims Exp $
  +// $Id: SessionInvalidatorAction.java,v 1.4 2001/08/20 13:55:09 dims Exp $
   // vim: set et ts=4 sw=4:
  
  
  
  1.2       +4 -9      xml-cocoon2/src/org/apache/cocoon/acting/SessionIsValidAction.java
  
  Index: SessionIsValidAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionIsValidAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SessionIsValidAction.java	2001/07/11 09:50:02	1.1
  +++ SessionIsValidAction.java	2001/08/20 13:55:09	1.2
  @@ -7,20 +7,15 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.util.Collections;
  -import java.util.HashMap;
  -import java.util.Map;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.cocoon.acting.ValidatorActionHelper;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.util.Tokenizer;
  -import org.apache.log.Logger;
  +
  +import java.util.HashMap;
  +import java.util.Map;
   
   
   /**
  @@ -28,7 +23,7 @@
    * seesion is still valid.
    *
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/07/11 09:50:02 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:09 $
    */
   
   public class SessionIsValidAction extends AbstractValidatorAction
  
  
  
  1.5       +8 -10     xml-cocoon2/src/org/apache/cocoon/acting/SessionPropagatorAction.java
  
  Index: SessionPropagatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionPropagatorAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SessionPropagatorAction.java	2001/07/23 15:50:10	1.4
  +++ SessionPropagatorAction.java	2001/08/20 13:55:09	1.5
  @@ -1,20 +1,18 @@
  -// $Id: SessionPropagatorAction.java,v 1.4 2001/07/23 15:50:10 haul Exp $
  +// $Id: SessionPropagatorAction.java,v 1.5 2001/08/20 13:55:09 dims Exp $
   package org.apache.cocoon.acting;
   
  -import java.util.Collections;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Map;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.avalon.framework.parameters.Parameters;
   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.Constants;
   import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.log.Logger;
  +
  +import java.util.Collections;
  +import java.util.HashMap;
  +import java.util.Map;
   
   /**
    * This is the action used to propagate parameters into session. It
  @@ -30,7 +28,7 @@
    * </pre>
    *
    * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
  - * @version CVS $Revision: 1.4 $ $Date: 2001/07/23 15:50:10 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:09 $
    */
   public class SessionPropagatorAction extends AbstractConfigurableAction
   {
  @@ -116,6 +114,6 @@
       }
   }
   
  -// $Id: SessionPropagatorAction.java,v 1.4 2001/07/23 15:50:10 haul Exp $
  +// $Id: SessionPropagatorAction.java,v 1.5 2001/08/20 13:55:09 dims Exp $
   // vim: set et ts=4 sw=4:
   
  
  
  
  1.3       +6 -7      xml-cocoon2/src/org/apache/cocoon/acting/SessionStateAction.java
  
  Index: SessionStateAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionStateAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SessionStateAction.java	2001/07/23 15:50:10	1.2
  +++ SessionStateAction.java	2001/08/20 13:55:09	1.3
  @@ -7,19 +7,18 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.util.Map;
  -import java.util.HashMap;
  -
  -import org.apache.avalon.framework.parameters.Parameters;
   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.Constants;
  +import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
  -import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.SourceResolver;
   
  +import java.util.HashMap;
  +import java.util.Map;
  +
   /**
    * Store the session's current state in a session attribute.
    *
  @@ -69,7 +68,7 @@
    * @see org.apache.cocoon.selection.SessionStateSelectorFactory
    *
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Id: SessionStateAction.java,v 1.2 2001/07/23 15:50:10 haul Exp $ */
  + * @version CVS $Id: SessionStateAction.java,v 1.3 2001/08/20 13:55:09 dims Exp $ */
   public class SessionStateAction extends AbstractConfigurableAction {
   
       private static String componentName = "REZEPTE SessionStateAction";
  
  
  
  1.9       +7 -9      xml-cocoon2/src/org/apache/cocoon/acting/SessionValidatorAction.java
  
  Index: SessionValidatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionValidatorAction.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SessionValidatorAction.java	2001/08/15 12:30:37	1.8
  +++ SessionValidatorAction.java	2001/08/20 13:55:09	1.9
  @@ -1,20 +1,18 @@
  -// $Id: SessionValidatorAction.java,v 1.8 2001/08/15 12:30:37 dims Exp $
  +// $Id: SessionValidatorAction.java,v 1.9 2001/08/20 13:55:09 dims Exp $
   package org.apache.cocoon.acting;
   
  -import java.util.Collections;
  -import java.util.HashMap;
  -import java.util.Map;
   import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.cocoon.acting.ValidatorActionHelper;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.util.Tokenizer;
  -import org.apache.log.Logger;
  +
  +import java.util.Collections;
  +import java.util.HashMap;
  +import java.util.Map;
   
   
   /**
  @@ -53,7 +51,7 @@
    * all validated parameters to the sitemap via {name} expression.
    *
    * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
  - * @version CVS $Revision: 1.8 $ $Date: 2001/08/15 12:30:37 $
  + * @version CVS $Revision: 1.9 $ $Date: 2001/08/20 13:55:09 $
    */
   public class SessionValidatorAction extends AbstractValidatorAction
   {
  @@ -198,5 +196,5 @@
       }
   }
   
  -// $Id: SessionValidatorAction.java,v 1.8 2001/08/15 12:30:37 dims Exp $
  +// $Id: SessionValidatorAction.java,v 1.9 2001/08/20 13:55:09 dims Exp $
   // vim: set et ts=4 sw=4:
  
  
  
  1.3       +2 -2      xml-cocoon2/src/org/apache/cocoon/acting/ValidatorActionHelper.java
  
  Index: ValidatorActionHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ValidatorActionHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ValidatorActionHelper.java	2001/06/15 11:49:20	1.2
  +++ ValidatorActionHelper.java	2001/08/20 13:55:09	1.3
  @@ -1,13 +1,13 @@
   package org.apache.cocoon.acting;
   
  -import org.apache.cocoon.acting.ValidatorActionResult;
   
  +
   /**
    * Helper class to pass a the result of a validation back along with
    * the validated object itself.
    *
    * @author Christian Haul &lt;haul@informatik.tu-darmstadt.de&gt;
  - * @version CVS $Revision: 1.2 $ $Date: 2001/06/15 11:49:20 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:09 $
    */
   
   public class ValidatorActionHelper
  
  
  
  1.2       +2 -2      xml-cocoon2/src/org/apache/cocoon/caching/AggregatedCacheValidity.java
  
  Index: AggregatedCacheValidity.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/AggregatedCacheValidity.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AggregatedCacheValidity.java	2001/05/25 16:13:38	1.1
  +++ AggregatedCacheValidity.java	2001/08/20 13:55:10	1.2
  @@ -7,15 +7,15 @@
    *****************************************************************************/
   package org.apache.cocoon.caching;
   
  -import java.util.List;
   import java.util.ArrayList;
   import java.util.Iterator;
  +import java.util.List;
   
   /**
    * A validation object using a List.
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/25 16:13:38 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:10 $
    */
   public final class AggregatedCacheValidity
   implements CacheValidity {
  
  
  
  1.2       +2 -2      xml-cocoon2/src/org/apache/cocoon/caching/CompositeCacheValidity.java
  
  Index: CompositeCacheValidity.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/CompositeCacheValidity.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CompositeCacheValidity.java	2001/05/09 20:50:03	1.1
  +++ CompositeCacheValidity.java	2001/08/20 13:55:10	1.2
  @@ -7,13 +7,13 @@
    *****************************************************************************/
   package org.apache.cocoon.caching;
   
  -import java.util.HashMap;
   
  +
   /**
    * A validation object using a Hashmap.
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:50:03 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:10 $
    */
   public final class CompositeCacheValidity
   implements CacheValidity {
  
  
  
  1.2       +3 -2      xml-cocoon2/src/org/apache/cocoon/caching/IncludeCacheValidity.java
  
  Index: IncludeCacheValidity.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/IncludeCacheValidity.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IncludeCacheValidity.java	2001/07/09 12:42:17	1.1
  +++ IncludeCacheValidity.java	2001/08/20 13:55:10	1.2
  @@ -7,10 +7,11 @@
    *****************************************************************************/
   package org.apache.cocoon.caching;
   
  -import java.util.List;
  +import org.apache.cocoon.environment.SourceResolver;
  +
   import java.util.ArrayList;
   import java.util.Iterator;
  -import org.apache.cocoon.environment.SourceResolver;
  +import java.util.List;
   
   
   /**
  
  
  
  1.3       +2 -2      xml-cocoon2/src/org/apache/cocoon/caching/PipelineCacheKey.java
  
  Index: PipelineCacheKey.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/PipelineCacheKey.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PipelineCacheKey.java	2001/05/31 17:37:43	1.2
  +++ PipelineCacheKey.java	2001/08/20 13:55:10	1.3
  @@ -7,15 +7,15 @@
    *****************************************************************************/
   package org.apache.cocoon.caching;
   
  -import java.util.List;
   import java.util.ArrayList;
  +import java.util.List;
   
   /**
    * This is the cache key for one pipeline. It consists of one
    * or more <code>ComponentCacheKey</code> objects.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 17:37:43 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:10 $
    */
   public final class PipelineCacheKey {
   
  
  
  
  1.4       +3 -2      xml-cocoon2/src/org/apache/cocoon/components/browser/Browser.java
  
  Index: Browser.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/browser/Browser.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Browser.java	2001/07/07 11:43:13	1.3
  +++ Browser.java	2001/08/20 13:55:10	1.4
  @@ -8,13 +8,14 @@
   package org.apache.cocoon.components.browser;
   
   import org.apache.avalon.framework.component.Component;
  -import java.util.HashMap;
   import org.w3c.dom.Document;
   
  +import java.util.HashMap;
  +
   /**
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/07/07 11:43:13 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:10 $
    */
   public interface Browser extends Component {
   
  
  
  
  1.3       +3 -2      xml-cocoon2/src/org/apache/cocoon/components/classloader/ClassLoaderManager.java
  
  Index: ClassLoaderManager.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/classloader/ClassLoaderManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ClassLoaderManager.java	2001/07/07 11:43:13	1.2
  +++ ClassLoaderManager.java	2001/08/20 13:55:10	1.3
  @@ -7,9 +7,10 @@
    *****************************************************************************/
   package org.apache.cocoon.components.classloader;
   
  +import org.apache.avalon.framework.component.Component;
  +
   import java.io.File;
   import java.io.IOException;
  -import org.apache.avalon.framework.component.Component;
   
   /**
    * A class loader manager acting as a proxy for a <b>single</b>
  @@ -18,7 +19,7 @@
    * that it can be safely reinstantiated for dynamic class reloading
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:13 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:10 $
    */
   public interface ClassLoaderManager extends Component {
   
  
  
  
  1.4       +5 -7      xml-cocoon2/src/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java
  
  Index: ClassLoaderManagerImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ClassLoaderManagerImpl.java	2001/08/09 21:12:31	1.3
  +++ ClassLoaderManagerImpl.java	2001/08/20 13:55:10	1.4
  @@ -7,22 +7,20 @@
    *****************************************************************************/
   package org.apache.cocoon.components.classloader;
   
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +
   import java.io.File;
   import java.io.IOException;
  -import java.net.MalformedURLException;
  -import java.net.URL;
  -import java.util.Set;
  -import java.util.HashSet;
   import java.util.Collections;
  +import java.util.HashSet;
  +import java.util.Set;
   import java.util.Vector;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.util.ClassUtils;
   
   /**
    * A singleton-like implementation of <code>ClassLoaderManager</code>
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/08/09 21:12:31 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:10 $
    */
   public class ClassLoaderManagerImpl implements ClassLoaderManager, ThreadSafe {
     /**
  
  
  
  1.2       +5 -6      xml-cocoon2/src/org/apache/cocoon/components/classloader/RepositoryClassLoader.java
  
  Index: RepositoryClassLoader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/classloader/RepositoryClassLoader.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RepositoryClassLoader.java	2001/05/09 20:49:49	1.1
  +++ RepositoryClassLoader.java	2001/08/20 13:55:10	1.2
  @@ -7,6 +7,10 @@
    *****************************************************************************/
   package org.apache.cocoon.components.classloader;
   
  +import org.apache.avalon.framework.logger.Loggable;
  +import org.apache.cocoon.util.ClassUtils;
  +import org.apache.log.Logger;
  +
   import java.io.File;
   import java.io.IOException;
   import java.net.MalformedURLException;
  @@ -14,11 +18,6 @@
   import java.net.URLClassLoader;
   import java.util.Iterator;
   import java.util.Vector;
  -import org.apache.avalon.framework.logger.Loggable;
  -import org.apache.cocoon.util.ClassUtils;
  -import org.apache.cocoon.util.IOUtils;
  -import org.apache.cocoon.util.NetUtils;
  -import org.apache.log.Logger;
   
   /**
    * A class loader with a growable list of path search directories.
  @@ -28,7 +27,7 @@
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:49 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:10 $
    */
   public class RepositoryClassLoader extends URLClassLoader implements Loggable {
   
  
  
  
  1.3       +5 -4      xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngine.java
  
  Index: JSPEngine.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngine.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JSPEngine.java	2001/07/16 14:10:54	1.2
  +++ JSPEngine.java	2001/08/20 13:55:10	1.3
  @@ -7,19 +7,20 @@
    *****************************************************************************/
   package org.apache.cocoon.components.jsp;
   
  -import java.io.IOException;
  +import org.apache.avalon.framework.component.Component;
  +import org.xml.sax.SAXException;
  +
   import javax.servlet.ServletContext;
   import javax.servlet.ServletException;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  -import org.apache.avalon.framework.component.Component;
  -import org.xml.sax.SAXException;
  +import java.io.IOException;
   
   /**
    * A component for loading and running JSP.
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/16 14:10:54 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:10 $
    */
   public interface JSPEngine extends Component {
   
  
  
  
  1.3       +21 -30    xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngineImpl.java
  
  Index: JSPEngineImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngineImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JSPEngineImpl.java	2001/07/16 14:10:55	1.2
  +++ JSPEngineImpl.java	2001/08/20 13:55:10	1.3
  @@ -7,29 +7,7 @@
    *****************************************************************************/
   package org.apache.cocoon.components.jsp;
   
  -import java.io.BufferedReader;
  -import java.io.IOException;
  -import java.io.OutputStream;
  -import java.io.ByteArrayInputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.PrintWriter;
  -import java.security.Principal;
  -import java.util.Enumeration;
  -import java.util.Locale;
  -import java.util.Map;
  -import javax.servlet.RequestDispatcher;
  -import javax.servlet.ServletConfig;
  -import javax.servlet.ServletContext;
  -import javax.servlet.ServletException;
  -import javax.servlet.ServletInputStream;
  -import javax.servlet.ServletOutputStream;
  -import javax.servlet.http.Cookie;
  -import javax.servlet.http.HttpSession;
  -import javax.servlet.Servlet;
  -import javax.servlet.http.HttpServletRequest;
  -import javax.servlet.http.HttpServletResponse;
   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.Composable;
  @@ -42,22 +20,35 @@
   import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.parser.Parser;
  -import org.apache.cocoon.environment.http.HttpEnvironment;
  -import org.apache.cocoon.xml.AbstractXMLProducer;
  -import org.apache.cocoon.xml.XMLProducer;
  -import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.log.Logger;
  -import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  +import javax.servlet.RequestDispatcher;
  +import javax.servlet.Servlet;
  +import javax.servlet.ServletConfig;
  +import javax.servlet.ServletContext;
  +import javax.servlet.ServletException;
  +import javax.servlet.ServletInputStream;
  +import javax.servlet.ServletOutputStream;
  +import javax.servlet.http.Cookie;
  +import javax.servlet.http.HttpServletRequest;
  +import javax.servlet.http.HttpServletResponse;
  +import javax.servlet.http.HttpSession;
  +import java.io.BufferedReader;
  +import java.io.ByteArrayInputStream;
  +import java.io.ByteArrayOutputStream;
  +import java.io.IOException;
  +import java.io.PrintWriter;
  +import java.security.Principal;
  +import java.util.Enumeration;
  +import java.util.Locale;
  +
   /**
    * Allows JSP to be used as a generator.  Builds upon the JSP servlet
    * functionality - overrides the output method and returns the byte(s). 
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/16 14:10:55 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:10 $
    */
   public class JSPEngineImpl extends AbstractLoggable 
       implements JSPEngine, Contextualizable, Composable, Configurable, ThreadSafe, Disposable {
  
  
  
  1.2       +19 -30    xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngineImplNamedDispatcherInclude.java
  
  Index: JSPEngineImplNamedDispatcherInclude.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngineImplNamedDispatcherInclude.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JSPEngineImplNamedDispatcherInclude.java	2001/07/19 17:27:52	1.1
  +++ JSPEngineImplNamedDispatcherInclude.java	2001/08/20 13:55:10	1.2
  @@ -7,29 +7,7 @@
    *****************************************************************************/
   package org.apache.cocoon.components.jsp;
   
  -import java.io.BufferedReader;
  -import java.io.IOException;
  -import java.io.OutputStream;
  -import java.io.ByteArrayInputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.PrintWriter;
  -import java.security.Principal;
  -import java.util.Enumeration;
  -import java.util.Locale;
  -import java.util.Map;
  -import javax.servlet.RequestDispatcher;
  -import javax.servlet.ServletConfig;
  -import javax.servlet.ServletContext;
  -import javax.servlet.ServletException;
  -import javax.servlet.ServletInputStream;
  -import javax.servlet.ServletOutputStream;
  -import javax.servlet.http.Cookie;
  -import javax.servlet.http.HttpSession;
  -import javax.servlet.Servlet;
  -import javax.servlet.http.HttpServletRequest;
  -import javax.servlet.http.HttpServletResponse;
   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.Composable;
  @@ -42,16 +20,27 @@
   import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.parser.Parser;
  -import org.apache.cocoon.environment.http.HttpEnvironment;
  -import org.apache.cocoon.xml.AbstractXMLProducer;
  -import org.apache.cocoon.xml.XMLProducer;
  -import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.log.Logger;
  -import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  +import javax.servlet.RequestDispatcher;
  +import javax.servlet.ServletContext;
  +import javax.servlet.ServletException;
  +import javax.servlet.ServletInputStream;
  +import javax.servlet.ServletOutputStream;
  +import javax.servlet.http.Cookie;
  +import javax.servlet.http.HttpServletRequest;
  +import javax.servlet.http.HttpServletResponse;
  +import javax.servlet.http.HttpSession;
  +import java.io.BufferedReader;
  +import java.io.ByteArrayInputStream;
  +import java.io.ByteArrayOutputStream;
  +import java.io.IOException;
  +import java.io.PrintWriter;
  +import java.security.Principal;
  +import java.util.Enumeration;
  +import java.util.Locale;
  +
   /**
    * Allows JSP to be used as a generator.  Builds upon the JSP servlet
    * functionality - overrides the output method and returns the byte(s). 
  @@ -60,7 +49,7 @@
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @author <a href="mailto:bh22351@i-one.at">Bernhard Huber</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/07/19 17:27:52 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:10 $
    */
   public class JSPEngineImplNamedDispatcherInclude extends AbstractLoggable 
       implements JSPEngine, Contextualizable, Composable, Configurable, ThreadSafe, Disposable {
  
  
  
  1.2       +10 -30    xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngineImplWLS.java
  
  Index: JSPEngineImplWLS.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngineImplWLS.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JSPEngineImplWLS.java	2001/07/19 17:27:52	1.1
  +++ JSPEngineImplWLS.java	2001/08/20 13:55:10	1.2
  @@ -7,29 +7,7 @@
    *****************************************************************************/
   package org.apache.cocoon.components.jsp;
   
  -import java.io.BufferedReader;
  -import java.io.IOException;
  -import java.io.OutputStream;
  -import java.io.ByteArrayInputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.PrintWriter;
  -import java.security.Principal;
  -import java.util.Enumeration;
  -import java.util.Locale;
  -import java.util.Map;
  -import javax.servlet.RequestDispatcher;
  -import javax.servlet.ServletConfig;
  -import javax.servlet.ServletContext;
  -import javax.servlet.ServletException;
  -import javax.servlet.ServletInputStream;
  -import javax.servlet.ServletOutputStream;
  -import javax.servlet.http.Cookie;
  -import javax.servlet.http.HttpSession;
  -import javax.servlet.Servlet;
  -import javax.servlet.http.HttpServletRequest;
  -import javax.servlet.http.HttpServletResponse;
   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.Composable;
  @@ -42,16 +20,18 @@
   import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.parser.Parser;
  -import org.apache.cocoon.environment.http.HttpEnvironment;
  -import org.apache.cocoon.xml.AbstractXMLProducer;
  -import org.apache.cocoon.xml.XMLProducer;
  -import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.log.Logger;
  -import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  +import javax.servlet.ServletContext;
  +import javax.servlet.ServletException;
  +import javax.servlet.http.Cookie;
  +import javax.servlet.http.HttpServletRequest;
  +import javax.servlet.http.HttpServletResponse;
  +import java.io.ByteArrayOutputStream;
  +import java.io.IOException;
  +import java.util.Locale;
  +
   /**
    * Allows WLS JSP to be used as a generator.  Builds upon the JSP servlet
    * functionality - overrides the output method and returns the byte(s).
  @@ -61,7 +41,7 @@
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @author <a href="mailto:bh22351@i-one.at">Bernhard Huber</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/07/19 17:27:52 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:10 $
    */
   public class JSPEngineImplWLS extends AbstractLoggable 
       implements JSPEngine, Contextualizable, Composable, Configurable, ThreadSafe, Disposable {
  
  
  
  1.8       +9 -10     xml-cocoon2/src/org/apache/cocoon/components/language/generator/GeneratorSelector.java
  
  Index: GeneratorSelector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/GeneratorSelector.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- GeneratorSelector.java	2001/08/16 01:26:35	1.7
  +++ GeneratorSelector.java	2001/08/20 13:55:10	1.8
  @@ -7,32 +7,31 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.generator;
   
  -import java.io.File;
  +import org.apache.avalon.excalibur.component.ComponentHandler;
  +import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
  +import org.apache.avalon.excalibur.component.RoleManager;
   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.context.Context;
   import org.apache.avalon.framework.configuration.DefaultConfiguration;
  +import org.apache.avalon.framework.context.Context;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.components.classloader.ClassLoaderManager;
  -import org.apache.cocoon.util.ClassUtils;
  -import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
  -import org.apache.avalon.excalibur.component.ComponentHandler;
  -import org.apache.avalon.excalibur.component.RoleManager;
   
  -import java.util.Map;
  -import java.util.HashMap;
  -import java.util.List;
  +import java.io.File;
   import java.util.ArrayList;
  +import java.util.HashMap;
   import java.util.Iterator;
  +import java.util.List;
  +import java.util.Map;
   
   /**
    * This interface is the common base of all Compiled Components.  This
    * includes Sitemaps and XSP Pages
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.7 $ $Date: 2001/08/16 01:26:35 $
  + * @version CVS $Revision: 1.8 $ $Date: 2001/08/20 13:55:10 $
    */
   public class GeneratorSelector extends ExcaliburComponentSelector implements Disposable {
   
  
  
  
  1.6       +1 -2      xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGenerator.java
  
  Index: ProgramGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGenerator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ProgramGenerator.java	2001/07/07 11:43:13	1.5
  +++ ProgramGenerator.java	2001/08/20 13:55:10	1.6
  @@ -7,7 +7,6 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.generator;
   
  -import java.io.File;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.cocoon.environment.SourceResolver;
  @@ -17,7 +16,7 @@
    * documents writeen in a <code>MarkupLanguage</code>
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2001/07/07 11:43:13 $
  + * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:10 $
    */
   public interface ProgramGenerator extends Component {
   
  
  
  
  1.17      +5 -12     xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
  
  Index: ProgramGeneratorImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ProgramGeneratorImpl.java	2001/08/11 16:48:54	1.16
  +++ ProgramGeneratorImpl.java	2001/08/20 13:55:10	1.17
  @@ -8,11 +8,6 @@
   
   package org.apache.cocoon.components.language.generator;
   
  -import java.io.File;
  -import java.io.FileNotFoundException;
  -import java.io.FileReader;
  -import java.io.IOException;
  -import java.net.MalformedURLException;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
  @@ -37,20 +32,18 @@
   import org.apache.cocoon.components.language.programming.CodeFormatter;
   import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
   import org.apache.cocoon.components.store.Store;
  -import org.apache.cocoon.environment.Environment;
  -import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.environment.Source;
  +import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.util.IOUtils;
  -import org.apache.log.Logger;
  -import org.w3c.dom.Document;
  -import org.w3c.dom.Document;
   import org.xml.sax.InputSource;
  -import org.xml.sax.SAXException;
  +
  +import java.io.File;
  +import java.net.MalformedURLException;
   
   /**
    * The default implementation of <code>ProgramGenerator</code>
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.16 $ $Date: 2001/08/11 16:48:54 $
  + * @version CVS $Revision: 1.17 $ $Date: 2001/08/20 13:55:10 $
    */
   public class ProgramGeneratorImpl extends AbstractLoggable
       implements ProgramGenerator, Contextualizable, Composable, Configurable, ThreadSafe, Disposable {
  
  
  
  1.7       +16 -17    xml-cocoon2/src/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
  
  Index: AbstractMarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractMarkupLanguage.java	2001/07/23 13:50:29	1.6
  +++ AbstractMarkupLanguage.java	2001/08/20 13:55:11	1.7
  @@ -8,20 +8,6 @@
   
   package org.apache.cocoon.components.language.markup;
   
  -import java.io.File;
  -import java.io.IOException;
  -import java.net.MalformedURLException;
  -import java.net.URL;
  -import java.util.ArrayList;
  -import java.util.Date;
  -import java.util.Enumeration;
  -import java.util.Hashtable;
  -import java.util.Iterator;
  -import java.util.LinkedList;
  -import java.util.List;
  -import java.util.ListIterator;
  -import java.util.Map;
  -import java.util.Vector;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
  @@ -31,13 +17,13 @@
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
   import org.apache.cocoon.components.store.Store;
   import org.apache.cocoon.components.url.URLFactory;
  -import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.environment.Source;
  +import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.util.IOUtils;
  -import org.apache.cocoon.ProcessingException;
   import org.xml.sax.Attributes;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  @@ -46,12 +32,25 @@
   import org.xml.sax.helpers.XMLFilterImpl;
   import org.xml.sax.helpers.XMLReaderFactory;
   
  +import java.io.File;
  +import java.io.IOException;
  +import java.net.MalformedURLException;
  +import java.net.URL;
  +import java.util.ArrayList;
  +import java.util.Date;
  +import java.util.Hashtable;
  +import java.util.Iterator;
  +import java.util.LinkedList;
  +import java.util.List;
  +import java.util.ListIterator;
  +import java.util.Map;
  +
   /**
    * Base implementation of <code>MarkupLanguage</code>. This class uses
    * logicsheets as the only means of code generation. Code generation should be decoupled from this context!!!
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2001/07/23 13:50:29 $
  + * @version CVS $Revision: 1.7 $ $Date: 2001/08/20 13:55:11 $
    */
   public abstract class AbstractMarkupLanguage extends AbstractLoggable implements MarkupLanguage, Composable, Configurable {
       /** The supported language table */
  
  
  
  1.4       +10 -22    xml-cocoon2/src/org/apache/cocoon/components/language/markup/Logicsheet.java
  
  Index: Logicsheet.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/Logicsheet.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Logicsheet.java	2001/05/31 17:37:53	1.3
  +++ Logicsheet.java	2001/08/20 13:55:11	1.4
  @@ -8,35 +8,23 @@
   
   package org.apache.cocoon.components.language.markup;
   
  -import java.io.IOException;
  -import java.io.PrintWriter;
  -import java.io.StringWriter;
  -import java.util.HashMap;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Map;
  -import java.util.Set;
  -import javax.xml.transform.Templates;
  -import javax.xml.transform.TransformerConfigurationException;
  -import javax.xml.transform.TransformerFactory;
  -import javax.xml.transform.sax.SAXSource;
  -import javax.xml.transform.sax.SAXTransformerFactory;
  -import javax.xml.transform.sax.TransformerHandler;
   import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.cocoon.util.TraxErrorHandler;
   import org.xml.sax.Attributes;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.DTDHandler;
  -import org.xml.sax.ErrorHandler;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  -import org.xml.sax.SAXNotRecognizedException;
  -import org.xml.sax.SAXNotSupportedException;
   import org.xml.sax.XMLFilter;
   import org.xml.sax.XMLReader;
  -import org.xml.sax.helpers.AttributesImpl;
   import org.xml.sax.helpers.XMLFilterImpl;
  -import org.xml.sax.helpers.XMLReaderFactory;
  +
  +import javax.xml.transform.Templates;
  +import javax.xml.transform.TransformerConfigurationException;
  +import javax.xml.transform.TransformerFactory;
  +import javax.xml.transform.sax.SAXTransformerFactory;
  +import javax.xml.transform.sax.TransformerHandler;
  +import java.io.IOException;
  +import java.util.HashMap;
  +import java.util.Map;
   
   /**
    * A code-generation logicsheet. This class is actually a wrapper for
  @@ -46,7 +34,7 @@
    * transformed into an equivalent XSLT stylesheet anyway... This class should probably be based on an interface...
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/05/31 17:37:53 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:11 $
    */
   public class Logicsheet extends AbstractLoggable {
       /** The trax TransformerFactory */
  
  
  
  1.3       +9 -13     xml-cocoon2/src/org/apache/cocoon/components/language/markup/LogicsheetCodeGenerator.java
  
  Index: LogicsheetCodeGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/LogicsheetCodeGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LogicsheetCodeGenerator.java	2001/05/31 17:37:54	1.2
  +++ LogicsheetCodeGenerator.java	2001/08/20 13:55:11	1.3
  @@ -7,32 +7,28 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup;
   
  -import java.io.IOException;
  -import java.io.StringWriter;
  -import java.util.ArrayList;
  -import java.util.List;
  -import java.util.Properties;
  +import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.cocoon.util.TraxErrorHandler;
  +import org.xml.sax.ContentHandler;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.XMLReader;
  +
   import javax.xml.transform.OutputKeys;
   import javax.xml.transform.TransformerConfigurationException;
  -import javax.xml.transform.TransformerException;
   import javax.xml.transform.TransformerFactory;
   import javax.xml.transform.sax.SAXResult;
   import javax.xml.transform.sax.SAXTransformerFactory;
   import javax.xml.transform.sax.TransformerHandler;
   import javax.xml.transform.stream.StreamResult;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.cocoon.util.TraxErrorHandler;
  -import org.apache.log.Logger;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.InputSource;
  -import org.xml.sax.XMLReader;
  +import java.io.StringWriter;
  +import java.util.Properties;
   
   /**
    * A logicsheet-based implementation of <code>MarkupCodeGenerator</code>
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 17:37:54 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:11 $
    */
   public class LogicsheetCodeGenerator extends AbstractLoggable implements MarkupCodeGenerator {
   
  
  
  
  1.2       +2 -2      xml-cocoon2/src/org/apache/cocoon/components/language/markup/MarkupCodeGenerator.java
  
  Index: MarkupCodeGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/MarkupCodeGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MarkupCodeGenerator.java	2001/05/09 20:49:50	1.1
  +++ MarkupCodeGenerator.java	2001/08/20 13:55:11	1.2
  @@ -7,14 +7,14 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup;
   
  -import org.xml.sax.XMLReader;
   import org.xml.sax.InputSource;
  +import org.xml.sax.XMLReader;
   
   /**
    * This interfaces defines the functionality of a source code generator
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:50 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:11 $
    */
   public interface MarkupCodeGenerator {
       /**
  
  
  
  1.4       +1 -2      xml-cocoon2/src/org/apache/cocoon/components/language/markup/MarkupLanguage.java
  
  Index: MarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/MarkupLanguage.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MarkupLanguage.java	2001/07/07 11:43:14	1.3
  +++ MarkupLanguage.java	2001/08/20 13:55:11	1.4
  @@ -11,7 +11,6 @@
   import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
   import org.apache.cocoon.environment.SourceResolver;
   import org.xml.sax.InputSource;
  -import org.xml.sax.XMLReader;
   
   /**
    * This interface defines a markup language whose SAX producer's instance are to
  @@ -19,7 +18,7 @@
    * document augmenting it with dynamic content
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/07/07 11:43:14 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:11 $
    */
   public interface MarkupLanguage extends Component {
   
  
  
  
  1.2       +2 -4      xml-cocoon2/src/org/apache/cocoon/components/language/markup/NamedLogicsheet.java
  
  Index: NamedLogicsheet.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/NamedLogicsheet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NamedLogicsheet.java	2001/05/09 20:49:50	1.1
  +++ NamedLogicsheet.java	2001/08/20 13:55:11	1.2
  @@ -7,10 +7,8 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup;
   
  -import java.io.IOException;
  -import org.xml.sax.InputSource;
  -import org.xml.sax.SAXException;
   
  +
   /**
    * An extension to <code>Logicsheet</code> that is associated with a namespace.
    * Named logicsheets are implicitly declared (and automagically applied) when
  @@ -18,7 +16,7 @@
    * namespace
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:50 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:11 $
    */
   public class NamedLogicsheet extends Logicsheet {
       /**
  
  
  
  1.4       +11 -12    xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/SitemapMarkupLanguage.java
  
  Index: SitemapMarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/SitemapMarkupLanguage.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SitemapMarkupLanguage.java	2001/07/23 13:50:29	1.3
  +++ SitemapMarkupLanguage.java	2001/08/20 13:55:11	1.4
  @@ -7,22 +7,12 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.sitemap;
   
  -import java.io.File;
  -import java.io.IOException;
  -import java.net.MalformedURLException;
  -import java.util.ArrayList;
  -import java.util.Date;
  -import java.util.HashSet;
  -import java.util.Iterator;
  -import java.util.List;
  -import java.util.Set;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.logger.Loggable;
  +import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.language.markup.AbstractMarkupLanguage;
   import org.apache.cocoon.components.language.markup.LogicsheetCodeGenerator;
   import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.ProcessingException;
   import org.apache.log.Logger;
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
  @@ -31,12 +21,21 @@
   import org.xml.sax.helpers.AttributesImpl;
   import org.xml.sax.helpers.XMLFilterImpl;
   
  +import java.io.File;
  +import java.io.IOException;
  +import java.util.ArrayList;
  +import java.util.Date;
  +import java.util.HashSet;
  +import java.util.Iterator;
  +import java.util.List;
  +import java.util.Set;
  +
   /**
    * This class implements <code>MarkupLanguage</code> for Cocoon's
    * <a href="http://xml.apache.org/cocoon/sitemap.html">Sitemap</a>.
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/07/23 13:50:29 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:11 $
    */
   public class SitemapMarkupLanguage extends AbstractMarkupLanguage {
   
  
  
  
  1.7       +4 -4      xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java
  
  Index: XSPCookieHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XSPCookieHelper.java	2001/08/17 14:29:16	1.6
  +++ XSPCookieHelper.java	2001/08/20 13:55:11	1.7
  @@ -39,16 +39,16 @@
   
   package org.apache.cocoon.components.language.markup.xsp;
   
  -import java.util.Enumeration;
  -import java.util.Hashtable;
  -import java.util.Map;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Cookie;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Response;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.SAXException;
  -import org.xml.sax.helpers.AttributesImpl;
  +
  +import java.util.Enumeration;
  +import java.util.Hashtable;
  +import java.util.Map;
   
   public class XSPCookieHelper extends XSPObjectHelper {
     /**
  
  
  
  1.10      +10 -20    xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPFormValidatorHelper.java
  
  Index: XSPFormValidatorHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPFormValidatorHelper.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- XSPFormValidatorHelper.java	2001/07/18 11:45:53	1.9
  +++ XSPFormValidatorHelper.java	2001/08/20 13:55:11	1.10
  @@ -7,37 +7,27 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.xsp;
   
  -import java.util.Map;
  -import java.util.HashMap;
  -import java.net.URL;
  -
  +import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
   import org.apache.cocoon.Constants;
  -import org.apache.cocoon.acting.ValidatorActionResult;
   import org.apache.cocoon.acting.ConfigurationHelper;
  -import org.apache.cocoon.components.language.markup.xsp.XSPObjectHelper;
  +import org.apache.cocoon.acting.ValidatorActionResult;
   import org.apache.cocoon.components.source.SourceHandler;
  -import org.apache.cocoon.components.source.URLSource;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Source;
  -
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.InputSource;
  -import org.xml.sax.helpers.AttributesImpl;
  -
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
  -import org.apache.avalon.framework.component.ComponentManager;
  -
   import org.apache.log.Logger;
   
  +import java.util.HashMap;
  +import java.util.Map;
  +
   /**
    * The <code>ValidatorActionResult</code> object helper
    *
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Revision: 1.9 $ $Date: 2001/07/18 11:45:53 $
  + * @version CVS $Revision: 1.10 $ $Date: 2001/08/20 13:55:11 $
    */
   public class XSPFormValidatorHelper {
     /**
  
  
  
  1.7       +3 -3      xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java
  
  Index: XSPGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XSPGenerator.java	2001/07/07 11:43:18	1.6
  +++ XSPGenerator.java	2001/08/20 13:55:11	1.7
  @@ -7,20 +7,20 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.xsp;
   
  -import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.component.ComponentException;
  +import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.generation.AbstractServerPage;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   
   /**
    * Base class for XSP-generated <code>ServerPagesGenerator</code> classes
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2001/07/07 11:43:18 $
  + * @version CVS $Revision: 1.7 $ $Date: 2001/08/20 13:55:11 $
    */
   public abstract class XSPGenerator extends AbstractServerPage implements CompiledComponent, Contextualizable, Recyclable {
     protected Context avalonContext = null;
  
  
  
  1.4       +12 -12    xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java
  
  Index: XSPMarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XSPMarkupLanguage.java	2001/07/23 13:50:29	1.3
  +++ XSPMarkupLanguage.java	2001/08/20 13:55:11	1.4
  @@ -7,37 +7,37 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.xsp;
   
  -import java.io.File;
  -import java.io.IOException;
  -import java.util.ArrayList;
  -import java.util.Date;
  -import java.util.HashSet;
  -import java.util.Iterator;
  -import java.util.List;
  -import java.util.Set;
  -import java.util.Stack;
   import org.apache.avalon.framework.logger.Loggable;
   import org.apache.cocoon.Constants;
  +import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.language.markup.AbstractMarkupLanguage;
   import org.apache.cocoon.components.language.markup.LogicsheetCodeGenerator;
   import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.ProcessingException;
   import org.apache.log.Logger;
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   import org.xml.sax.XMLFilter;
  -import org.xml.sax.XMLReader;
   import org.xml.sax.helpers.AttributesImpl;
   import org.xml.sax.helpers.XMLFilterImpl;
   
  +import java.io.File;
  +import java.io.IOException;
  +import java.util.ArrayList;
  +import java.util.Date;
  +import java.util.HashSet;
  +import java.util.Iterator;
  +import java.util.List;
  +import java.util.Set;
  +import java.util.Stack;
  +
   /**
    * This class implements <code>MarkupLanguage</code> for Cocoon's
    * <a href="http://xml.apache.org/cocoon/xsp.html">XSP</a>.
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="mailto:ssahuc@apache.org">Sebastien Sahuc</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/07/23 13:50:29 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:11 $
    */
   public class XSPMarkupLanguage extends AbstractMarkupLanguage {
   
  
  
  
  1.3       +4 -3      xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java
  
  Index: XSPObjectHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XSPObjectHelper.java	2001/06/14 15:11:04	1.2
  +++ XSPObjectHelper.java	2001/08/20 13:55:11	1.3
  @@ -7,8 +7,6 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.xsp;
   
  -import java.util.Collection;
  -import java.util.Iterator;
   import org.apache.cocoon.xml.XMLFragment;
   import org.apache.cocoon.xml.dom.DOMStreamer;
   import org.w3c.dom.Node;
  @@ -16,13 +14,16 @@
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  +import java.util.Collection;
  +import java.util.Iterator;
  +
   /**
    * Base class for XSP's object model manipulation logicsheets
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="sylvain.wallez@anyware-tech.com">Sylvain Wallez</a>
    *         (Cocoon1 <code>xspExpr()</code> methods port)
  - * @version CVS $Revision: 1.2 $ $Date: 2001/06/14 15:11:04 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:11 $
    */
   public class XSPObjectHelper {
     /**
  
  
  
  1.8       +6 -5      xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java
  
  Index: XSPRequestHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XSPRequestHelper.java	2001/06/14 15:17:13	1.7
  +++ XSPRequestHelper.java	2001/08/20 13:55:11	1.8
  @@ -7,10 +7,6 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.xsp;
   
  -import java.util.Enumeration;
  -import java.util.Map;
  -import java.util.ArrayList;
  -import java.util.List;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
  @@ -18,11 +14,16 @@
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  +import java.util.ArrayList;
  +import java.util.Enumeration;
  +import java.util.List;
  +import java.util.Map;
  +
   /**
    * The <code>Request</code> object helper
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.7 $ $Date: 2001/06/14 15:17:13 $
  + * @version CVS $Revision: 1.8 $ $Date: 2001/08/20 13:55:11 $
    */
   public class XSPRequestHelper {
     /**
  
  
  
  1.3       +3 -7      xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java
  
  Index: XSPResponseHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XSPResponseHelper.java	2001/06/14 15:11:05	1.2
  +++ XSPResponseHelper.java	2001/08/20 13:55:11	1.3
  @@ -7,20 +7,16 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.xsp;
   
  -import java.io.IOException;
  -import java.util.Enumeration;
  -import java.util.Map;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Response;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.helpers.AttributesImpl;
  +
  +import java.util.Map;
   
   /**
    * The XSP <code>Response</code> object helper
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/06/14 15:11:05 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:11 $
    */
   public class XSPResponseHelper {
     /**
  
  
  
  1.5       +13 -18    xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java
  
  Index: XSPUtil.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XSPUtil.java	2001/07/18 17:34:37	1.4
  +++ XSPUtil.java	2001/08/20 13:55:11	1.5
  @@ -7,6 +7,18 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.xsp;
   
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.components.parser.Parser;
  +import org.apache.cocoon.components.url.URLFactory;
  +import org.apache.cocoon.environment.Context;
  +import org.apache.cocoon.environment.Session;
  +import org.apache.cocoon.util.NetUtils;
  +import org.apache.cocoon.util.Tokenizer;
  +import org.apache.cocoon.xml.IncludeXMLConsumer;
  +import org.xml.sax.ContentHandler;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.SAXException;
  +
   import java.io.BufferedInputStream;
   import java.io.BufferedReader;
   import java.io.File;
  @@ -16,32 +28,15 @@
   import java.io.InputStream;
   import java.io.InputStreamReader;
   import java.io.Reader;
  -import java.net.URL;
   import java.text.SimpleDateFormat;
   import java.util.Date;
   import java.util.Map;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.parser.Parser;
  -import org.apache.cocoon.components.url.URLFactory;
  -import org.apache.cocoon.environment.Context;
  -import org.apache.cocoon.environment.Session;
  -import org.apache.cocoon.util.IOUtils;
  -import org.apache.cocoon.util.NetUtils;
  -import org.apache.cocoon.util.Tokenizer;
  -import org.apache.cocoon.xml.AbstractXMLConsumer;
  -import org.apache.cocoon.xml.IncludeXMLConsumer;
  -import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.cocoon.xml.dom.DOMBuilder;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.InputSource;
  -import org.xml.sax.SAXException;
   
   /**
    * The XSP <code>Utility</code> object helper
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="mailto:bloritsch@apache.org>Berin Loritsch</a>
  - * @version $Revision: 1.4 $ $Date: 2001/07/18 17:34:37 $
  + * @version $Revision: 1.5 $ $Date: 2001/08/20 13:55:11 $
    */
   public class XSPUtil {
       public static String pathComponent(String filename) {
  
  
  
  1.2       +3 -2      xml-cocoon2/src/org/apache/cocoon/components/language/programming/AbstractProgrammingLanguage.java
  
  Index: AbstractProgrammingLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/AbstractProgrammingLanguage.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractProgrammingLanguage.java	2001/05/09 20:49:56	1.1
  +++ AbstractProgrammingLanguage.java	2001/08/20 13:55:11	1.2
  @@ -7,7 +7,6 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.programming;
   
  -import java.io.File;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -16,13 +15,15 @@
   import org.apache.cocoon.components.language.LanguageException;
   import org.apache.cocoon.util.ClassUtils;
   
  +import java.io.File;
  +
   /**
    * Base implementation of <code>ProgrammingLanguage</code>. This class sets the
    * <code>CodeFormatter</code> instance and deletes source program files after
    * unloading.
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:56 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:11 $
    */
   public abstract class AbstractProgrammingLanguage extends AbstractLoggable
     implements ProgrammingLanguage, Configurable
  
  
  
  1.5       +3 -3      xml-cocoon2/src/org/apache/cocoon/components/language/programming/CompiledProgrammingLanguage.java
  
  Index: CompiledProgrammingLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/CompiledProgrammingLanguage.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CompiledProgrammingLanguage.java	2001/07/16 08:21:19	1.4
  +++ CompiledProgrammingLanguage.java	2001/08/20 13:55:11	1.5
  @@ -7,8 +7,6 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.programming;
   
  -import java.io.File;
  -import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.context.Contextualizable;
  @@ -18,11 +16,13 @@
   import org.apache.cocoon.util.ClassUtils;
   import org.apache.cocoon.util.IOUtils;
   
  +import java.io.File;
  +
   /**
    * A compiled programming language. This class extends <code>AbstractProgrammingLanguage</code> adding support for compilation
    * and object program files
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/07/16 08:21:19 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:11 $
    */
   public abstract class CompiledProgrammingLanguage extends AbstractProgrammingLanguage implements Contextualizable {
       /** The compiler */
  
  
  
  1.2       +3 -2      xml-cocoon2/src/org/apache/cocoon/components/language/programming/LanguageCompiler.java
  
  Index: LanguageCompiler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/LanguageCompiler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LanguageCompiler.java	2001/05/09 20:49:56	1.1
  +++ LanguageCompiler.java	2001/08/20 13:55:11	1.2
  @@ -8,15 +8,16 @@
   
   package org.apache.cocoon.components.language.programming;
   
  +import org.apache.avalon.framework.component.Component;
  +
   import java.io.IOException;
   import java.util.List;
  -import org.apache.avalon.framework.component.Component;
   
   /**
    * This interface defines a compiler's functionality for all
    * (Java-based) compiled languages
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.1 $ $Date: 2001/05/09 20:49:56 $
  + * @version $Revision: 1.2 $ $Date: 2001/08/20 13:55:11 $
    * @since 2.0
    */
   public interface LanguageCompiler extends Component {
  
  
  
  1.3       +3 -2      xml-cocoon2/src/org/apache/cocoon/components/language/programming/ProgrammingLanguage.java
  
  Index: ProgrammingLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/ProgrammingLanguage.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProgrammingLanguage.java	2001/07/07 11:43:22	1.2
  +++ ProgrammingLanguage.java	2001/08/20 13:55:11	1.3
  @@ -7,16 +7,17 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.programming;
   
  -import java.io.File;
   import org.apache.avalon.framework.component.Component;
   import org.apache.cocoon.components.language.LanguageException;
   import org.apache.cocoon.components.language.generator.CompiledComponent;
   
  +import java.io.File;
  +
   /**
    * This interface states the functionality of a programming language processor
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:22 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:11 $
    */
   public interface ProgrammingLanguage extends Component {
   
  
  
  
  1.2       +5 -4      xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/AbstractJavaCompiler.java
  
  Index: AbstractJavaCompiler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/AbstractJavaCompiler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractJavaCompiler.java	2001/05/09 20:49:56	1.1
  +++ AbstractJavaCompiler.java	2001/08/20 13:55:11	1.2
  @@ -8,19 +8,20 @@
   
   package org.apache.cocoon.components.language.programming.java;
   
  +import org.apache.avalon.excalibur.pool.Recyclable;
  +import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.cocoon.components.language.programming.LanguageCompiler;
  +
   import java.io.BufferedReader;
   import java.io.IOException;
   import java.io.InputStream;
   import java.io.InputStreamReader;
   import java.util.List;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.cocoon.components.language.programming.LanguageCompiler;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   
   /**
    * This class implements the functionality common to all Java compilers.
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.1 $ $Date: 2001/05/09 20:49:56 $
  + * @version $Revision: 1.2 $ $Date: 2001/08/20 13:55:11 $
    * @since 2.0
    */
   public abstract class AbstractJavaCompiler extends AbstractLoggable implements LanguageCompiler, Recyclable {
  
  
  
  1.5       +5 -8      xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JavaLanguage.java
  
  Index: JavaLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JavaLanguage.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JavaLanguage.java	2001/07/07 11:43:22	1.4
  +++ JavaLanguage.java	2001/08/20 13:55:11	1.5
  @@ -8,15 +8,10 @@
   
   package org.apache.cocoon.components.language.programming.java;
   
  -import java.io.File;
  -import java.io.IOException;
  -import java.util.List;
   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.Composable;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.avalon.framework.logger.Loggable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.thread.ThreadSafe;
   import org.apache.cocoon.components.classloader.ClassLoaderManager;
  @@ -24,16 +19,18 @@
   import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.components.language.programming.CompiledProgrammingLanguage;
   import org.apache.cocoon.components.language.programming.CompilerError;
  -import org.apache.cocoon.components.language.programming.LanguageCompiler;
   import org.apache.cocoon.util.ClassUtils;
   import org.apache.cocoon.util.JavaArchiveFilter;
  -import org.apache.log.Logger;
  +
  +import java.io.File;
  +import java.io.IOException;
  +import java.util.List;
   
   /**
    * The Java programming language processor
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/07/07 11:43:22 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:11 $
    */
   public class JavaLanguage extends CompiledProgrammingLanguage implements ThreadSafe, Composable, Disposable {
   
  
  
  
  1.5       +5 -6      xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Javac.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Javac.java	2001/07/12 15:01:27	1.4
  +++ Javac.java	2001/08/20 13:55:11	1.5
  @@ -8,6 +8,10 @@
   
   package org.apache.cocoon.components.language.programming.java;
   
  +import org.apache.cocoon.components.language.programming.CompilerError;
  +import org.apache.cocoon.util.ClassUtils;
  +import org.apache.log.Hierarchy;
  +
   import java.io.BufferedReader;
   import java.io.ByteArrayInputStream;
   import java.io.ByteArrayOutputStream;
  @@ -16,17 +20,12 @@
   import java.util.ArrayList;
   import java.util.List;
   import java.util.StringTokenizer;
  -import org.apache.cocoon.components.language.programming.CompilerError;
  -import org.apache.cocoon.util.ClassUtils;
  -import org.apache.log.Hierarchy;
  -import org.apache.log.Logger;
  -import sun.tools.javac.Main;
   
   /**
    * This class wraps the Sun's Javac Compiler.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.4 $ $Date: 2001/07/12 15:01:27 $
  + * @version $Revision: 1.5 $ $Date: 2001/08/20 13:55:11 $
    * @since 2.0
    */
   
  
  
  
  1.6       +3 -4      xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Jikes.java
  
  Index: Jikes.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Jikes.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Jikes.java	2001/07/05 21:03:25	1.5
  +++ Jikes.java	2001/08/20 13:55:11	1.6
  @@ -8,6 +8,8 @@
   
   package org.apache.cocoon.components.language.programming.java;
   
  +import org.apache.cocoon.components.language.programming.CompilerError;
  +
   import java.io.BufferedInputStream;
   import java.io.BufferedReader;
   import java.io.ByteArrayInputStream;
  @@ -17,15 +19,12 @@
   import java.util.ArrayList;
   import java.util.List;
   import java.util.StringTokenizer;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.cocoon.components.language.programming.CompilerError;
  -import org.apache.log.Logger;
   
   /**
    * This class wraps IBM's <i>Jikes</i> Java compiler
    * NOTE: inspired by the Apache Jasper implementation.
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.5 $ $Date: 2001/07/05 21:03:25 $
  + * @version $Revision: 1.6 $ $Date: 2001/08/20 13:55:11 $
    * @since 2.0
    */
   
  
  
  
  1.2       +6 -6      xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JstyleFormatter.java
  
  Index: JstyleFormatter.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JstyleFormatter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JstyleFormatter.java	2001/05/09 20:49:57	1.1
  +++ JstyleFormatter.java	2001/08/20 13:55:11	1.2
  @@ -7,16 +7,16 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.programming.java;
   
  +import jstyle.JSBeautifier;
  +import jstyle.JSFormatter;
  +import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.cocoon.components.language.programming.CodeFormatter;
  +
   import java.io.BufferedReader;
   import java.io.ByteArrayOutputStream;
   import java.io.PrintWriter;
   import java.io.StringReader;
   import java.io.UnsupportedEncodingException;
  -import jstyle.JSBeautifier;
  -import jstyle.JSFormatter;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.cocoon.components.language.programming.CodeFormatter;
  -import org.apache.log.Logger;
   
   /**
    * This class implements <code>CodeFormatter</code> based on
  @@ -24,7 +24,7 @@
    * beautifier. This implementation is very improvised...
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:57 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:11 $
    */
   public class JstyleFormatter extends AbstractLoggable implements CodeFormatter {
     /**
  
  
  
  1.2       +3 -5      xml-cocoon2/src/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java
  
  Index: JavascriptLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JavascriptLanguage.java	2001/05/09 20:49:57	1.1
  +++ JavascriptLanguage.java	2001/08/20 13:55:12	1.2
  @@ -7,19 +7,17 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.programming.javascript;
   
  -import java.io.File;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.cocoon.components.language.LanguageException;
  -import org.apache.cocoon.components.language.programming.CompiledProgrammingLanguage;
   import org.apache.cocoon.components.language.programming.java.JavaLanguage;
  -import org.apache.log.Logger;
   import org.mozilla.javascript.tools.jsc.Main;
   
  +import java.io.File;
  +
   /**
    * The compiled Javascript (Rhino) programming language processor
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:57 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:12 $
    */
   public class JavascriptLanguage extends JavaLanguage
   {
  
  
  
  1.6       +13 -13    xml-cocoon2/src/org/apache/cocoon/components/parser/JaxpParser.java
  
  Index: JaxpParser.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/parser/JaxpParser.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JaxpParser.java	2001/08/20 12:36:59	1.5
  +++ JaxpParser.java	2001/08/20 13:55:12	1.6
  @@ -7,16 +7,13 @@
    *****************************************************************************/
   package org.apache.cocoon.components.parser;
   
  -import java.io.IOException;
  -import javax.xml.parsers.DocumentBuilder;
  -import javax.xml.parsers.DocumentBuilderFactory;
  -import javax.xml.parsers.ParserConfigurationException;
  -import javax.xml.parsers.SAXParser;
  -import javax.xml.parsers.SAXParserFactory;
  +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.thread.SingleThreaded;
  +import org.apache.cocoon.components.resolver.Resolver;
   import org.apache.cocoon.util.ClassUtils;
   import org.apache.cocoon.xml.AbstractXMLProducer;
  -import org.apache.cocoon.xml.dom.DOMFactory;
  -import org.apache.cocoon.components.resolver.Resolver;
   import org.w3c.dom.DOMImplementation;
   import org.w3c.dom.Document;
   import org.xml.sax.ErrorHandler;
  @@ -24,17 +21,20 @@
   import org.xml.sax.SAXException;
   import org.xml.sax.SAXParseException;
   import org.xml.sax.XMLReader;
  -import org.apache.avalon.framework.thread.SingleThreaded;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.component.ComponentException;
  +
  +import javax.xml.parsers.DocumentBuilder;
  +import javax.xml.parsers.DocumentBuilderFactory;
  +import javax.xml.parsers.ParserConfigurationException;
  +import javax.xml.parsers.SAXParser;
  +import javax.xml.parsers.SAXParserFactory;
  +import java.io.IOException;
   
   /**
    * An XMLParser that is only dependant on JAXP 1.1 compliant parsers.
    * If only we can get rid of the need for the Document...
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 12:36:59 $
  + * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:12 $
    */
   public class JaxpParser extends AbstractXMLProducer
   implements Parser, ErrorHandler, Composable, SingleThreaded {
  
  
  
  1.4       +4 -3      xml-cocoon2/src/org/apache/cocoon/components/parser/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/parser/Parser.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Parser.java	2001/07/07 11:43:23	1.3
  +++ Parser.java	2001/08/20 13:55:12	1.4
  @@ -7,21 +7,22 @@
    *****************************************************************************/
   package org.apache.cocoon.components.parser;
   
  -import java.io.IOException;
   import org.apache.avalon.framework.component.Component;
   import org.apache.cocoon.xml.XMLProducer;
   import org.apache.cocoon.xml.dom.DOMFactory;
   import org.w3c.dom.Document;
  +import org.xml.sax.ContentHandler;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  -import org.xml.sax.ContentHandler;
   import org.xml.sax.ext.LexicalHandler;
   
  +import java.io.IOException;
  +
   /**
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.3 $ $Date: 2001/07/07 11:43:23 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:12 $
    */
   public interface Parser extends Component, XMLProducer, DOMFactory {
   
  
  
  
  1.2       +4 -4      xml-cocoon2/src/org/apache/cocoon/components/parser/XercesParser.java
  
  Index: XercesParser.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/parser/XercesParser.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XercesParser.java	2001/05/11 13:45:09	1.1
  +++ XercesParser.java	2001/08/20 13:55:12	1.2
  @@ -7,25 +7,25 @@
    *****************************************************************************/
   package org.apache.cocoon.components.parser;
   
  -import java.io.IOException;
   import org.apache.avalon.framework.thread.SingleThreaded;
   import org.apache.cocoon.xml.AbstractXMLProducer;
   import org.apache.xerces.dom.DocumentImpl;
   import org.apache.xerces.dom.DocumentTypeImpl;
   import org.apache.xerces.parsers.DOMParser;
   import org.apache.xerces.parsers.SAXParser;
  +import org.w3c.dom.Document;
   import org.xml.sax.ErrorHandler;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   import org.xml.sax.SAXParseException;
  -import org.xml.sax.XMLReader;
  -import org.w3c.dom.Document;
  +
  +import java.io.IOException;
   
   /**
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/11 13:45:09 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:12 $
    */
   public class XercesParser extends AbstractXMLProducer
   implements Parser, ErrorHandler, SingleThreaded {
  
  
  
  1.14      +5 -5      xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java
  
  Index: AbstractEventPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- AbstractEventPipeline.java	2001/07/19 14:54:03	1.13
  +++ AbstractEventPipeline.java	2001/08/20 13:55:12	1.14
  @@ -7,15 +7,11 @@
    *****************************************************************************/
   package org.apache.cocoon.components.pipeline;
   
  -import java.io.IOException;
  -import java.util.ArrayList;
  -import java.util.Iterator;
   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.cocoon.ProcessingException;
   import org.apache.cocoon.components.saxconnector.SAXConnector;
  @@ -28,10 +24,14 @@
   import org.apache.cocoon.xml.XMLProducer;
   import org.xml.sax.SAXException;
   
  +import java.io.IOException;
  +import java.util.ArrayList;
  +import java.util.Iterator;
  +
   /**
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:cziegeler@Carsten Ziegeler">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.13 $ $Date: 2001/07/19 14:54:03 $
  + * @version CVS $Revision: 1.14 $ $Date: 2001/08/20 13:55:12 $
    */
   public abstract class AbstractEventPipeline
   extends AbstractXMLProducer
  
  
  
  1.9       +3 -8      xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractStreamPipeline.java
  
  Index: AbstractStreamPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractStreamPipeline.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AbstractStreamPipeline.java	2001/08/05 16:33:27	1.8
  +++ AbstractStreamPipeline.java	2001/08/20 13:55:12	1.9
  @@ -7,15 +7,9 @@
    *****************************************************************************/
   package org.apache.cocoon.components.pipeline;
   
  -import java.io.ByteArrayOutputStream;
  -import java.io.IOException;
  -import java.io.OutputStream;
   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.logger.AbstractLoggable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  @@ -23,9 +17,10 @@
   import org.apache.cocoon.reading.Reader;
   import org.apache.cocoon.serialization.Serializer;
   import org.apache.cocoon.sitemap.SitemapComponentSelector;
  -import org.apache.cocoon.xml.XMLConsumer;
   import org.apache.cocoon.xml.XMLProducer;
   
  +import java.io.ByteArrayOutputStream;
  +
   /** A <CODE>ResourcePipeline</CODE> either
    * <UL>
    *  <LI>collects a <CODE>Reader</CODE> and let it process</LI>
  @@ -35,7 +30,7 @@
    * </UL>
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.8 $ $Date: 2001/08/05 16:33:27 $
  + * @version CVS $Revision: 1.9 $ $Date: 2001/08/20 13:55:12 $
    */
   public abstract class AbstractStreamPipeline extends AbstractLoggable implements StreamPipeline, Disposable {
       protected EventPipeline eventPipeline;
  
  
  
  1.3       +3 -2      xml-cocoon2/src/org/apache/cocoon/components/pipeline/CacheableEventPipeline.java
  
  Index: CacheableEventPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CacheableEventPipeline.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CacheableEventPipeline.java	2001/05/15 07:51:23	1.2
  +++ CacheableEventPipeline.java	2001/08/20 13:55:12	1.3
  @@ -7,16 +7,17 @@
    *****************************************************************************/
   package org.apache.cocoon.components.pipeline;
   
  -import java.util.Map;
   import org.apache.cocoon.caching.PipelineCacheKey;
   import org.apache.cocoon.environment.Environment;
   
  +import java.util.Map;
  +
   /**
    * This marker interface declares an <code>EventPipeline</code> as cacheable.
    *
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/05/15 07:51:23 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:12 $
    */
   public interface CacheableEventPipeline {
   
  
  
  
  1.17      +8 -13     xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java
  
  Index: CachingEventPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- CachingEventPipeline.java	2001/08/05 16:33:27	1.16
  +++ CachingEventPipeline.java	2001/08/20 13:55:12	1.17
  @@ -7,18 +7,12 @@
    *****************************************************************************/
   package org.apache.cocoon.components.pipeline;
   
  -import java.io.IOException;
  -import java.util.ArrayList;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Map;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   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.Composable;
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.caching.CacheValidity;
   import org.apache.cocoon.caching.Cacheable;
  @@ -31,16 +25,17 @@
   import org.apache.cocoon.components.saxconnector.SAXConnector;
   import org.apache.cocoon.components.store.Store;
   import org.apache.cocoon.environment.Environment;
  -import org.apache.cocoon.generation.Generator;
  -import org.apache.cocoon.sitemap.ErrorNotifier;
   import org.apache.cocoon.transformation.Transformer;
  -import org.apache.cocoon.xml.AbstractXMLProducer;
   import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.cocoon.xml.XMLMulticaster;
  -import org.apache.cocoon.xml.XMLPipe;
   import org.apache.cocoon.xml.XMLProducer;
   import org.xml.sax.SAXException;
   
  +import java.io.IOException;
  +import java.util.ArrayList;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.Map;
  +
   /**
    * The CachingEventPipeline
    *
  @@ -50,7 +45,7 @@
    * does not cache! (If it would cache, the response would be cached twice!)
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.16 $ $Date: 2001/08/05 16:33:27 $
  + * @version CVS $Revision: 1.17 $ $Date: 2001/08/20 13:55:12 $
    */
   public class CachingEventPipeline
   extends AbstractEventPipeline
  
  
  
  1.11      +10 -9     xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingStreamPipeline.java
  
  Index: CachingStreamPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingStreamPipeline.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CachingStreamPipeline.java	2001/08/07 10:56:49	1.10
  +++ CachingStreamPipeline.java	2001/08/20 13:55:12	1.11
  @@ -7,19 +7,12 @@
    *****************************************************************************/
   package org.apache.cocoon.components.pipeline;
   
  -import java.io.ByteArrayOutputStream;
  -import java.io.IOException;
  -import java.io.OutputStream;
  -import java.net.SocketException;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Map;
   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.parameters.Parameters;
  -import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ConnectionResetException;
  +import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.caching.CacheValidity;
   import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.CachedStreamObject;
  @@ -30,6 +23,14 @@
   import org.apache.cocoon.environment.Environment;
   import org.xml.sax.SAXException;
   
  +import java.io.ByteArrayOutputStream;
  +import java.io.IOException;
  +import java.io.OutputStream;
  +import java.net.SocketException;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.Map;
  +
   /** A <CODE>StreamPipeline</CODE> either
    * <UL>
    *  <LI>collects a <CODE>Reader</CODE> and let it process</LI>
  @@ -45,7 +46,7 @@
    *  </ul>
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.10 $ $Date: 2001/08/07 10:56:49 $
  + * @version CVS $Revision: 1.11 $ $Date: 2001/08/20 13:55:12 $
    */
   public class CachingStreamPipeline extends AbstractStreamPipeline {
   
  
  
  
  1.7       +2 -3      xml-cocoon2/src/org/apache/cocoon/components/pipeline/EventPipeline.java
  
  Index: EventPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/EventPipeline.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- EventPipeline.java	2001/07/09 13:19:53	1.6
  +++ EventPipeline.java	2001/08/20 13:55:12	1.7
  @@ -7,17 +7,16 @@
    *****************************************************************************/
   package org.apache.cocoon.components.pipeline;
   
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.generation.Generator;
  -import org.apache.cocoon.sitemap.Sitemap;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   
   /**
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2001/07/09 13:19:53 $
  + * @version CVS $Revision: 1.7 $ $Date: 2001/08/20 13:55:12 $
    */
   public interface EventPipeline extends Component, Composable, Recyclable {
   
  
  
  
  1.7       +1 -18     xml-cocoon2/src/org/apache/cocoon/components/pipeline/NonCachingEventPipeline.java
  
  Index: NonCachingEventPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/NonCachingEventPipeline.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- NonCachingEventPipeline.java	2001/07/09 13:19:54	1.6
  +++ NonCachingEventPipeline.java	2001/08/20 13:55:12	1.7
  @@ -7,28 +7,11 @@
    *****************************************************************************/
   package org.apache.cocoon.components.pipeline;
   
  -import java.io.IOException;
  -import java.util.ArrayList;
  -import java.util.Iterator;
  -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.Composable;
  -import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.environment.Environment;
  -import org.apache.cocoon.generation.Generator;
  -import org.apache.cocoon.sitemap.ErrorNotifier;
  -import org.apache.cocoon.transformation.Transformer;
  -import org.apache.cocoon.xml.AbstractXMLProducer;
  -import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.cocoon.xml.XMLProducer;
  -import org.xml.sax.SAXException;
   
   /**
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2001/07/09 13:19:54 $
  + * @version CVS $Revision: 1.7 $ $Date: 2001/08/20 13:55:12 $
    */
   public class NonCachingEventPipeline extends AbstractEventPipeline implements Recyclable {
   
  
  
  
  1.2       +3 -2      xml-cocoon2/src/org/apache/cocoon/components/pipeline/NonCachingStreamPipeline.java
  
  Index: NonCachingStreamPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/NonCachingStreamPipeline.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NonCachingStreamPipeline.java	2001/05/09 20:49:48	1.1
  +++ NonCachingStreamPipeline.java	2001/08/20 13:55:12	1.2
  @@ -7,10 +7,11 @@
    *****************************************************************************/
   package org.apache.cocoon.components.pipeline;
   
  -import java.io.IOException;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.Environment;
   
  +import java.io.IOException;
  +
   /** A <CODE>ResourcePipeline</CODE> either
    * <UL>
    *  <LI>collects a <CODE>Reader</CODE> and let it process</LI>
  @@ -19,7 +20,7 @@
    * resource
    * </UL>
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:48 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:12 $
    */
   public final class NonCachingStreamPipeline extends AbstractStreamPipeline {
   
  
  
  
  1.6       +2 -2      xml-cocoon2/src/org/apache/cocoon/components/pipeline/StreamPipeline.java
  
  Index: StreamPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/StreamPipeline.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StreamPipeline.java	2001/07/09 13:19:55	1.5
  +++ StreamPipeline.java	2001/08/20 13:55:12	1.6
  @@ -7,10 +7,10 @@
    *****************************************************************************/
   package org.apache.cocoon.components.pipeline;
   
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.cocoon.environment.Environment;
   
   /** A <CODE>StreamPipeline</CODE> either
  @@ -20,7 +20,7 @@
    *  <CODE>Serializer</CODE> and let them produce the character stream
    * </UL>
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2001/07/09 13:19:55 $
  + * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:12 $
    */
   public interface StreamPipeline extends Component, Composable, Recyclable {
   
  
  
  
  1.3       +3 -6      xml-cocoon2/src/org/apache/cocoon/components/profiler/Profiler.java
  
  Index: Profiler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/profiler/Profiler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Profiler.java	2001/07/13 04:02:40	1.2
  +++ Profiler.java	2001/08/20 13:55:12	1.3
  @@ -7,18 +7,15 @@
    *****************************************************************************/
   package org.apache.cocoon.components.profiler;
   
  -import java.util.Collection;
  -
  -import org.xml.sax.ContentHandler;
  -
   import org.apache.avalon.framework.component.Component;
  -import org.apache.cocoon.environment.Request;
  +
  +import java.util.Collection;
   
   /**
    * Profiler component interface.
    *
    * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/13 04:02:40 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:12 $
    */
   public interface Profiler extends Component
   {
  
  
  
  1.2       +3 -7      xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilerData.java
  
  Index: ProfilerData.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilerData.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ProfilerData.java	2001/07/05 15:03:28	1.1
  +++ ProfilerData.java	2001/08/20 13:55:12	1.2
  @@ -7,19 +7,15 @@
    *****************************************************************************/
   package org.apache.cocoon.components.profiler;
   
  -import java.util.ArrayList;
  -import java.util.Collection;
  -import java.util.Iterator;
  -
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.util.HashUtil;
   
  +import java.util.ArrayList;
  +
   /**
    * Request-time profiler information.
    *
    * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/07/05 15:03:28 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:12 $
    */
   public class ProfilerData
   {
  
  
  
  1.3       +10 -17    xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilerGenerator.java
  
  Index: ProfilerGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilerGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProfilerGenerator.java	2001/07/13 04:02:42	1.2
  +++ ProfilerGenerator.java	2001/08/20 13:55:12	1.3
  @@ -7,33 +7,26 @@
   *****************************************************************************/
   package org.apache.cocoon.components.profiler;
   
  -import java.io.File;
  -import java.net.InetAddress;
  -import java.net.UnknownHostException;
  -import java.text.DateFormat;
  -import java.util.ArrayList;
  -import java.util.Calendar;
  -import java.util.Date;
  -import java.util.List;
  -import java.util.StringTokenizer;
  -import java.util.Collection;
  -import java.util.Iterator;
   import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.activity.Disposable;
  -import org.xml.sax.Attributes;
  +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.generation.ComposerGenerator;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
  -import org.apache.cocoon.generation.ComposerGenerator;
  +
  +import java.text.DateFormat;
  +import java.util.Collection;
  +import java.util.Date;
  +import java.util.Iterator;
   
   /**
    * Generates an XML representation of the current status of Profiler.
    *
    * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/13 04:02:42 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:12 $
    */
   public class ProfilerGenerator extends ComposerGenerator
   implements Recyclable, Composable, Disposable {
  
  
  
  1.2       +1 -7      xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilerResult.java
  
  Index: ProfilerResult.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilerResult.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ProfilerResult.java	2001/07/05 15:03:28	1.1
  +++ ProfilerResult.java	2001/08/20 13:55:12	1.2
  @@ -7,19 +7,13 @@
    *****************************************************************************/
   package org.apache.cocoon.components.profiler;
   
  -import java.util.ArrayList;
  -import java.util.Collection;
  -import java.util.Iterator;
   import java.util.Arrays;
   
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Environment;
  -
   /**
    * Represents data collected about one pipeline.
    *
    * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/07/05 15:03:28 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:12 $
    */
   public class ProfilerResult
   {
  
  
  
  1.3       +4 -15     xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilingCachingEventPipeline.java
  
  Index: ProfilingCachingEventPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilingCachingEventPipeline.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProfilingCachingEventPipeline.java	2001/07/13 04:02:44	1.2
  +++ ProfilingCachingEventPipeline.java	2001/08/20 13:55:12	1.3
  @@ -7,29 +7,18 @@
    *****************************************************************************/
   package org.apache.cocoon.components.profiler;
   
  -import java.io.IOException;
  -import java.util.ArrayList;
  -import java.util.Iterator;
  -import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.excalibur.pool.Recyclable;
  +import org.apache.avalon.framework.activity.Disposable;
   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.parameters.Parameters;
  -import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.cocoon.environment.Environment;
  -import org.apache.cocoon.generation.Generator;
  -import org.apache.cocoon.sitemap.ErrorNotifier;
  -import org.apache.cocoon.transformation.Transformer;
  -import org.apache.cocoon.xml.AbstractXMLProducer;
  -import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.cocoon.xml.XMLProducer;
   import org.apache.cocoon.components.pipeline.CachingEventPipeline;
  -import org.xml.sax.SAXException;
  +import org.apache.cocoon.environment.Environment;
   
   /**
    * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/13 04:02:44 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:12 $
    */
   public class ProfilingCachingEventPipeline extends CachingEventPipeline
   implements Recyclable, Composable, Disposable {
  
  
  
  1.3       +4 -15     xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilingNonCachingEventPipeline.java
  
  Index: ProfilingNonCachingEventPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilingNonCachingEventPipeline.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProfilingNonCachingEventPipeline.java	2001/07/13 04:02:45	1.2
  +++ ProfilingNonCachingEventPipeline.java	2001/08/20 13:55:12	1.3
  @@ -7,29 +7,18 @@
    *****************************************************************************/
   package org.apache.cocoon.components.profiler;
   
  -import java.io.IOException;
  -import java.util.ArrayList;
  -import java.util.Iterator;
  -import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.excalibur.pool.Recyclable;
  +import org.apache.avalon.framework.activity.Disposable;
   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.parameters.Parameters;
  -import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.cocoon.environment.Environment;
  -import org.apache.cocoon.generation.Generator;
  -import org.apache.cocoon.sitemap.ErrorNotifier;
  -import org.apache.cocoon.transformation.Transformer;
  -import org.apache.cocoon.xml.AbstractXMLProducer;
  -import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.cocoon.xml.XMLProducer;
   import org.apache.cocoon.components.pipeline.NonCachingEventPipeline;
  -import org.xml.sax.SAXException;
  +import org.apache.cocoon.environment.Environment;
   
   /**
    * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/13 04:02:45 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:12 $
    */
   public class ProfilingNonCachingEventPipeline extends NonCachingEventPipeline
   implements Recyclable, Composable, Disposable {
  
  
  
  1.2       +8 -14     xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilingSAXConnector.java
  
  Index: ProfilingSAXConnector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilingSAXConnector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ProfilingSAXConnector.java	2001/07/05 15:03:28	1.1
  +++ ProfilingSAXConnector.java	2001/08/20 13:55:12	1.2
  @@ -7,29 +7,23 @@
    *****************************************************************************/
   package org.apache.cocoon.components.profiler;
   
  -import java.io.IOException;
  -import java.util.Map;
  -
  -import org.xml.sax.Attributes;
  -import org.xml.sax.Locator;
  -import org.xml.sax.SAXException;
  -
  -import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.cocoon.Constants;
  +import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.components.saxconnector.SAXConnector;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.sitemap.Sitemap;
   import org.apache.cocoon.xml.AbstractXMLPipe;
   import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.cocoon.serialization.Serializer;
  -import org.apache.cocoon.components.saxconnector.SAXConnector;
  +import org.xml.sax.Attributes;
  +import org.xml.sax.SAXException;
  +
  +import java.io.IOException;
  +import java.util.Map;
   
   /**
    * This SAX connector measures time taken by the following SAX handler.
    * @author <a href="vgritsenko@apache.org">Vadim Gritsenko</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/07/05 15:03:28 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:12 $
    */
   public class ProfilingSAXConnector extends AbstractXMLPipe
   	implements Recyclable, SAXConnector
  
  
  
  1.2       +5 -15     xml-cocoon2/src/org/apache/cocoon/components/profiler/SimpleProfiler.java
  
  Index: SimpleProfiler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/profiler/SimpleProfiler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SimpleProfiler.java	2001/07/05 15:03:28	1.1
  +++ SimpleProfiler.java	2001/08/20 13:55:12	1.2
  @@ -7,29 +7,19 @@
    *****************************************************************************/
   package org.apache.cocoon.components.profiler;
   
  +import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +
   import java.util.Collection;
  -import java.util.Map;
   import java.util.HashMap;
  -
  -import org.xml.sax.ContentHandler;
  -
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -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.Composable;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.serialization.Serializer;
  +import java.util.Map;
   
   /**
    * Profiler component implementation. Stores profiler data for
    * all pipelines.
    *
    * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/07/05 15:03:28 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:12 $
    */
   public class SimpleProfiler extends AbstractLoggable
   	implements Profiler, ThreadSafe //, Composable, Configurable, Disposable
  
  
  
  1.2       +6 -5      xml-cocoon2/src/org/apache/cocoon/components/renderer/ExtendableRendererFactory.java
  
  Index: ExtendableRendererFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/renderer/ExtendableRendererFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ExtendableRendererFactory.java	2001/08/14 14:44:33	1.1
  +++ ExtendableRendererFactory.java	2001/08/20 13:55:12	1.2
  @@ -7,12 +7,13 @@
    *****************************************************************************/
   package org.apache.cocoon.components.renderer;
   
  -import java.util.HashMap;
  -import java.util.Map;
   import org.apache.fop.render.Renderer;
  -import org.apache.fop.render.ps.PSRenderer;
  -import org.apache.fop.render.pdf.PDFRenderer;
   import org.apache.fop.render.pcl.PCLRenderer;
  +import org.apache.fop.render.pdf.PDFRenderer;
  +import org.apache.fop.render.ps.PSRenderer;
  +
  +import java.util.HashMap;
  +import java.util.Map;
   
   /**
    * An extendable FOP Renderer factory.
  @@ -20,7 +21,7 @@
    * type. This factory is extendable as new <code>Renderer</code>s can
    * be added at runtime.
    * @author Davanum Srinivas
  - * @version $Revision: 1.1 $, $Date: 2001/08/14 14:44:33 $
  + * @version $Revision: 1.2 $, $Date: 2001/08/20 13:55:12 $
    */
   public class ExtendableRendererFactory implements RendererFactory {
   
  
  
  
  1.3       +4 -6      xml-cocoon2/src/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java
  
  Index: XMLByteStreamCompiler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLByteStreamCompiler.java	2001/07/02 14:23:36	1.2
  +++ XMLByteStreamCompiler.java	2001/08/20 13:55:12	1.3
  @@ -7,22 +7,20 @@
    *****************************************************************************/
   package org.apache.cocoon.components.sax;
   
  -import java.util.HashMap;
  -import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.excalibur.pool.Recyclable;
  +import org.apache.avalon.framework.component.Component;
   import org.xml.sax.Attributes;
  -import org.xml.sax.ContentHandler;
   import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
  -import org.xml.sax.SAXParseException;
  -import org.xml.sax.XMLReader;
  +
  +import java.util.HashMap;
   
   /**
    * This a simple xml compiler which outputs a byte array.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/02 14:23:36 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:12 $
    */
   
   public final class XMLByteStreamCompiler
  
  
  
  1.2       +1 -2      xml-cocoon2/src/org/apache/cocoon/components/sax/XMLByteStreamFragment.java
  
  Index: XMLByteStreamFragment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/sax/XMLByteStreamFragment.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLByteStreamFragment.java	2001/08/09 10:51:33	1.1
  +++ XMLByteStreamFragment.java	2001/08/20 13:55:12	1.2
  @@ -10,7 +10,6 @@
   import org.apache.cocoon.xml.AbstractSAXFragment;
   import org.apache.cocoon.xml.EmbeddedXMLPipe;
   import org.apache.cocoon.xml.XMLConsumer;
  -
   import org.xml.sax.ContentHandler;
   import org.xml.sax.SAXException;
   
  @@ -19,7 +18,7 @@
    * store SAX events and insert them in an XSP result using &lt;xsp:expr&gt;.
    *
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/08/09 10:51:33 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:12 $
    */
   
   public class XMLByteStreamFragment extends AbstractSAXFragment {
  
  
  
  1.5       +4 -4      xml-cocoon2/src/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java
  
  Index: XMLByteStreamInterpreter.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLByteStreamInterpreter.java	2001/05/31 15:06:56	1.4
  +++ XMLByteStreamInterpreter.java	2001/08/20 13:55:12	1.5
  @@ -7,20 +7,20 @@
    *****************************************************************************/
   package org.apache.cocoon.components.sax;
   
  -import java.util.ArrayList;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.cocoon.xml.AbstractXMLProducer;
  -import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.xml.sax.ContentHandler;
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  +import java.util.ArrayList;
  +
   /**
    * This a simple xml compiler which takes a byte array as input.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 15:06:56 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:12 $
    */
   
   public final class XMLByteStreamInterpreter
  
  
  
  1.3       +1 -4      xml-cocoon2/src/org/apache/cocoon/components/sax/XMLTeePipe.java
  
  Index: XMLTeePipe.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/sax/XMLTeePipe.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLTeePipe.java	2001/05/29 06:13:46	1.2
  +++ XMLTeePipe.java	2001/08/20 13:55:12	1.3
  @@ -10,12 +10,9 @@
   import org.apache.cocoon.xml.XMLConsumer;
   import org.apache.cocoon.xml.XMLPipe;
   import org.apache.cocoon.xml.XMLProducer;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.xml.sax.Attributes;
  -import org.xml.sax.ContentHandler;
   import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
  -import org.xml.sax.ext.LexicalHandler;
   
   
   /**
  @@ -23,7 +20,7 @@
    * The incoming events are forwarded to two other components.
    *
    * @author <a href="mailto:cziegeler@sundn.de">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/05/29 06:13:46 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:12 $
    */
   
   public final class XMLTeePipe
  
  
  
  1.4       +10 -12    xml-cocoon2/src/org/apache/cocoon/components/saxconnector/LoggingSAXConnector.java
  
  Index: LoggingSAXConnector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/saxconnector/LoggingSAXConnector.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LoggingSAXConnector.java	2001/06/21 06:53:09	1.3
  +++ LoggingSAXConnector.java	2001/08/20 13:55:13	1.4
  @@ -7,29 +7,27 @@
    *****************************************************************************/
   package org.apache.cocoon.components.saxconnector;
   
  -import java.io.IOException;
  -import java.io.StringWriter;
  -import java.io.Writer;
  -import java.util.Map;
  -import javax.xml.transform.TransformerConfigurationException;
  -import javax.xml.transform.stream.StreamResult;
  -import javax.xml.transform.sax.SAXTransformerFactory;
  -import javax.xml.transform.sax.TransformerHandler;
  -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.ProcessingException;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.xml.AbstractXMLPipe;
  -import org.apache.cocoon.xml.XMLConsumer;
   import org.xml.sax.Attributes;
   import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
   
  +import javax.xml.transform.TransformerConfigurationException;
  +import javax.xml.transform.sax.SAXTransformerFactory;
  +import javax.xml.transform.sax.TransformerHandler;
  +import javax.xml.transform.stream.StreamResult;
  +import java.io.IOException;
  +import java.io.StringWriter;
  +import java.io.Writer;
  +import java.util.Map;
  +
   /**
    * This SAX connector logs all intermediate sax streams to the log.
    * @author <a href="cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/06/21 06:53:09 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:13 $
    */
   public class LoggingSAXConnector
   extends AbstractXMLPipe
  
  
  
  1.5       +5 -4      xml-cocoon2/src/org/apache/cocoon/components/source/CocoonSourceFactory.java
  
  Index: CocoonSourceFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/CocoonSourceFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CocoonSourceFactory.java	2001/08/16 11:25:41	1.4
  +++ CocoonSourceFactory.java	2001/08/20 13:55:13	1.5
  @@ -8,9 +8,6 @@
   
   package org.apache.cocoon.components.source;
   
  -import java.io.IOException;
  -import java.net.URL;
  -import java.net.MalformedURLException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.cocoon.ProcessingException;
  @@ -18,13 +15,17 @@
   import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.sitemap.Sitemap;
   
  +import java.io.IOException;
  +import java.net.MalformedURLException;
  +import java.net.URL;
  +
   /**
    * This class implements the cocoon: protocol.
    * It cannot be configured like the other source factories
    * as it needs the current <code>Sitemap</code> as input.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/08/16 11:25:41 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:13 $
    */
   
   public final class CocoonSourceFactory
  
  
  
  1.15      +9 -15     xml-cocoon2/src/org/apache/cocoon/components/source/SitemapSource.java
  
  Index: SitemapSource.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/SitemapSource.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- SitemapSource.java	2001/08/16 11:25:41	1.14
  +++ SitemapSource.java	2001/08/20 13:55:13	1.15
  @@ -8,28 +8,15 @@
   
   package org.apache.cocoon.components.source;
   
  -import java.io.ByteArrayInputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.File;
  -import java.io.FileInputStream;
  -import java.io.FileReader;
  -import java.io.InputStream;
  -import java.io.InputStreamReader;
  -import java.io.IOException;
  -import java.io.Reader;
  -import java.net.URL;
  -import java.net.URLConnection;
  -import java.util.Map;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.cocoon.Constants;
  -import org.apache.cocoon.Processor;
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.Processor;
   import org.apache.cocoon.caching.PipelineCacheKey;
   import org.apache.cocoon.components.pipeline.CacheableEventPipeline;
   import org.apache.cocoon.components.pipeline.EventPipeline;
   import org.apache.cocoon.components.pipeline.StreamPipeline;
  -import org.apache.cocoon.components.source.SourceHandler;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Source;
  @@ -47,11 +34,18 @@
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  +import java.io.ByteArrayInputStream;
  +import java.io.ByteArrayOutputStream;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.util.Map;
  +
   /**
    * Description of a source which is defined by a pipeline.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.14 $ $Date: 2001/08/16 11:25:41 $
  + * @version CVS $Revision: 1.15 $ $Date: 2001/08/20 13:55:13 $
    */
   
   public final class SitemapSource
  
  
  
  1.4       +5 -4      xml-cocoon2/src/org/apache/cocoon/components/source/SourceFactory.java
  
  Index: SourceFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/SourceFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SourceFactory.java	2001/07/04 10:13:19	1.3
  +++ SourceFactory.java	2001/08/20 13:55:13	1.4
  @@ -7,17 +7,18 @@
    *****************************************************************************/
   package org.apache.cocoon.components.source;
   
  -import java.io.IOException;
  -import java.net.MalformedURLException;
  -import java.net.URL;
   import org.apache.avalon.framework.thread.ThreadSafe;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.Source;
   
  +import java.io.IOException;
  +import java.net.MalformedURLException;
  +import java.net.URL;
  +
   /**
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version $Id: SourceFactory.java,v 1.3 2001/07/04 10:13:19 cziegeler Exp $
  + * @version $Id: SourceFactory.java,v 1.4 2001/08/20 13:55:13 dims Exp $
    */
   public interface SourceFactory extends ThreadSafe {
   
  
  
  
  1.5       +5 -4      xml-cocoon2/src/org/apache/cocoon/components/source/SourceHandler.java
  
  Index: SourceHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/SourceHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SourceHandler.java	2001/07/07 11:43:27	1.4
  +++ SourceHandler.java	2001/08/20 13:55:13	1.5
  @@ -7,17 +7,18 @@
    *****************************************************************************/
   package org.apache.cocoon.components.source;
   
  -import java.io.IOException;
  -import java.net.MalformedURLException;
  -import java.net.URL;
   import org.apache.avalon.framework.component.Component;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.Source;
   
  +import java.io.IOException;
  +import java.net.MalformedURLException;
  +import java.net.URL;
  +
   /**
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version $Id: SourceHandler.java,v 1.4 2001/07/07 11:43:27 giacomo Exp $
  + * @version $Id: SourceHandler.java,v 1.5 2001/08/20 13:55:13 dims Exp $
    */
   public interface SourceHandler extends Component {
   
  
  
  
  1.4       +8 -9      xml-cocoon2/src/org/apache/cocoon/components/source/SourceHandlerImpl.java
  
  Index: SourceHandlerImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/SourceHandlerImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SourceHandlerImpl.java	2001/07/07 11:43:27	1.3
  +++ SourceHandlerImpl.java	2001/08/20 13:55:13	1.4
  @@ -7,12 +7,6 @@
    *****************************************************************************/
   package org.apache.cocoon.components.source;
   
  -import java.io.IOException;
  -import java.net.MalformedURLException;
  -import java.net.URL;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Map;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
  @@ -26,17 +20,22 @@
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.logger.Loggable;
  -import org.apache.avalon.framework.thread.ThreadSafe;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.source.URLSource;
   import org.apache.cocoon.components.url.URLFactory;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.util.ClassUtils;
   
  +import java.io.IOException;
  +import java.net.MalformedURLException;
  +import java.net.URL;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.Map;
  +
   /**
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version $Id: SourceHandlerImpl.java,v 1.3 2001/07/07 11:43:27 giacomo Exp $
  + * @version $Id: SourceHandlerImpl.java,v 1.4 2001/08/20 13:55:13 dims Exp $
    */
   public final class SourceHandlerImpl
   extends AbstractLoggable
  
  
  
  1.8       +9 -11     xml-cocoon2/src/org/apache/cocoon/components/source/URLSource.java
  
  Index: URLSource.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/URLSource.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- URLSource.java	2001/07/16 07:43:20	1.7
  +++ URLSource.java	2001/08/20 13:55:13	1.8
  @@ -8,16 +8,6 @@
   
   package org.apache.cocoon.components.source;
   
  -import java.io.File;
  -import java.io.FileInputStream;
  -import java.io.FileReader;
  -import java.io.InputStream;
  -import java.io.InputStreamReader;
  -import java.io.IOException;
  -import java.io.Reader;
  -import java.lang.reflect.Method;
  -import java.net.URL;
  -import java.net.URLConnection;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.cocoon.ProcessingException;
  @@ -28,11 +18,19 @@
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.lang.reflect.Method;
  +import java.net.URL;
  +import java.net.URLConnection;
  +
   /**
    * Description of a source which is described by an URL.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.7 $ $Date: 2001/07/16 07:43:20 $
  + * @version CVS $Revision: 1.8 $ $Date: 2001/08/20 13:55:13 $
    */
   
   public final class URLSource
  
  
  
  1.4       +4 -3      xml-cocoon2/src/org/apache/cocoon/components/store/FilesystemStore.java
  
  Index: FilesystemStore.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/store/FilesystemStore.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FilesystemStore.java	2001/07/13 20:47:43	1.3
  +++ FilesystemStore.java	2001/08/20 13:55:13	1.4
  @@ -7,9 +7,6 @@
    *****************************************************************************/
   package org.apache.cocoon.components.store;
   
  -import java.io.File;
  -import java.io.IOException;
  -import java.util.Enumeration;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.context.Contextualizable;
  @@ -17,6 +14,10 @@
   import org.apache.avalon.framework.thread.ThreadSafe;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.util.IOUtils;
  +
  +import java.io.File;
  +import java.io.IOException;
  +import java.util.Enumeration;
   
   public class FilesystemStore extends AbstractLoggable implements Contextualizable, Store, ThreadSafe {
     /** The directory repository */
  
  
  
  1.10      +10 -15    xml-cocoon2/src/org/apache/cocoon/components/store/MRUMemoryStore.java
  
  Index: MRUMemoryStore.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/store/MRUMemoryStore.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MRUMemoryStore.java	2001/08/18 17:54:47	1.9
  +++ MRUMemoryStore.java	2001/08/20 13:55:13	1.10
  @@ -7,21 +7,6 @@
    *****************************************************************************/
   package org.apache.cocoon.components.store;
   
  -import java.net.URLDecoder;
  -import java.net.URLEncoder;
  -import java.io.File;
  -import java.util.Enumeration;
  -import java.util.HashMap;
  -import java.util.LinkedList;
  -import java.util.Stack;
  -import java.util.StringTokenizer;
  -import java.util.Vector;
  -
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.util.ClassUtils;
  -import org.apache.cocoon.util.IOUtils;
  -
  -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.Composable;
  @@ -34,6 +19,16 @@
   import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.util.ClassUtils;
  +import org.apache.cocoon.util.IOUtils;
  +
  +import java.io.File;
  +import java.net.URLEncoder;
  +import java.util.Enumeration;
  +import java.util.HashMap;
  +import java.util.LinkedList;
  +import java.util.Stack;
   
   /**
    * This class provides a cache algorithm for the requested documents.
  
  
  
  1.2       +3 -3      xml-cocoon2/src/org/apache/cocoon/components/store/MemoryStore.java
  
  Index: MemoryStore.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/store/MemoryStore.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MemoryStore.java	2001/05/09 20:50:01	1.1
  +++ MemoryStore.java	2001/08/20 13:55:13	1.2
  @@ -7,10 +7,10 @@
    *****************************************************************************/
   package org.apache.cocoon.components.store;
   
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +
   import java.util.Enumeration;
   import java.util.Hashtable;
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.thread.ThreadSafe;
   
   /**
    *
  @@ -20,7 +20,7 @@
    *         (Apache Software Foundation)
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:50:01 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:13 $
    */
   public class MemoryStore implements Store, ThreadSafe {
       /* WARNING: Hashtable is threadsafe, whereas HashMap is not.
  
  
  
  1.3       +3 -2      xml-cocoon2/src/org/apache/cocoon/components/store/Store.java
  
  Index: Store.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/store/Store.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Store.java	2001/07/07 11:43:29	1.2
  +++ Store.java	2001/08/20 13:55:13	1.3
  @@ -7,9 +7,10 @@
    *****************************************************************************/
   package org.apache.cocoon.components.store;
   
  +import org.apache.avalon.framework.component.Component;
  +
   import java.io.IOException;
   import java.util.Enumeration;
  -import org.apache.avalon.framework.component.Component;
   
   /**
    *
  @@ -19,7 +20,7 @@
    *         (Apache Software Foundation)
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:29 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:13 $
    */
   public interface Store extends Component {
   
  
  
  
  1.2       +4 -3      xml-cocoon2/src/org/apache/cocoon/components/transcoder/ExtendableTranscoderFactory.java
  
  Index: ExtendableTranscoderFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/transcoder/ExtendableTranscoderFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ExtendableTranscoderFactory.java	2001/05/09 20:50:01	1.1
  +++ ExtendableTranscoderFactory.java	2001/08/20 13:55:13	1.2
  @@ -7,19 +7,20 @@
    *****************************************************************************/
   package org.apache.cocoon.components.transcoder;
   
  -import java.util.HashMap;
  -import java.util.Map;
   import org.apache.batik.transcoder.Transcoder;
   import org.apache.batik.transcoder.image.JPEGTranscoder;
   import org.apache.batik.transcoder.image.PNGTranscoder;
   
  +import java.util.HashMap;
  +import java.util.Map;
  +
   /**
    * An extendable Batik Transcoder factory.
    * When given a MIME type, find a Transcoder which supports that MIME
    * type. This factory is extendable as new <code>Transcoder</code>s can
    * be added at runtime.
    * @author Ross Burton
  - * @version $Revision: 1.1 $, $Date: 2001/05/09 20:50:01 $
  + * @version $Revision: 1.2 $, $Date: 2001/08/20 13:55:13 $
    */
   public class ExtendableTranscoderFactory implements TranscoderFactory {
   
  
  
  
  1.3       +4 -3      xml-cocoon2/src/org/apache/cocoon/components/url/ContextURLFactory.java
  
  Index: ContextURLFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/url/ContextURLFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ContextURLFactory.java	2001/06/21 19:28:56	1.2
  +++ ContextURLFactory.java	2001/08/20 13:55:13	1.3
  @@ -7,17 +7,18 @@
    *****************************************************************************/
   package org.apache.cocoon.components.url;
   
  -import java.net.MalformedURLException;
  -import java.net.URL;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Context;
   
  +import java.net.MalformedURLException;
  +import java.net.URL;
  +
   /**
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
  - * @version $Id: ContextURLFactory.java,v 1.2 2001/06/21 19:28:56 giacomo Exp $
  + * @version $Id: ContextURLFactory.java,v 1.3 2001/08/20 13:55:13 dims Exp $
    */
   public class ContextURLFactory extends AbstractLoggable implements URLFactory, Contextualizable {
   
  
  
  
  1.2       +4 -3      xml-cocoon2/src/org/apache/cocoon/components/url/ResourceURLFactory.java
  
  Index: ResourceURLFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/url/ResourceURLFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ResourceURLFactory.java	2001/05/09 20:50:02	1.1
  +++ ResourceURLFactory.java	2001/08/20 13:55:13	1.2
  @@ -7,17 +7,18 @@
    *****************************************************************************/
   package org.apache.cocoon.components.url;
   
  -import java.net.MalformedURLException;
  -import java.net.URL;
   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.AbstractLoggable;
   import org.apache.cocoon.util.ClassUtils;
   
  +import java.net.MalformedURLException;
  +import java.net.URL;
  +
   /**
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
  - * @version $Id: ResourceURLFactory.java,v 1.1 2001/05/09 20:50:02 giacomo Exp $
  + * @version $Id: ResourceURLFactory.java,v 1.2 2001/08/20 13:55:13 dims Exp $
    */
   public class ResourceURLFactory extends AbstractLoggable implements URLFactory, Contextualizable {
   
  
  
  
  1.3       +3 -2      xml-cocoon2/src/org/apache/cocoon/components/url/URLFactory.java
  
  Index: URLFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/url/URLFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- URLFactory.java	2001/07/07 11:43:29	1.2
  +++ URLFactory.java	2001/08/20 13:55:13	1.3
  @@ -7,13 +7,14 @@
    *****************************************************************************/
   package org.apache.cocoon.components.url;
   
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +
   import java.net.MalformedURLException;
   import java.net.URL;
  -import org.apache.avalon.framework.thread.ThreadSafe;
   
   /**
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
  - * @version $Id: URLFactory.java,v 1.2 2001/07/07 11:43:29 giacomo Exp $
  + * @version $Id: URLFactory.java,v 1.3 2001/08/20 13:55:13 dims Exp $
    */
   public interface URLFactory extends ThreadSafe {
   
  
  
  
  1.7       +8 -7      xml-cocoon2/src/org/apache/cocoon/components/url/URLFactoryImpl.java
  
  Index: URLFactoryImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/url/URLFactoryImpl.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- URLFactoryImpl.java	2001/08/05 16:55:37	1.6
  +++ URLFactoryImpl.java	2001/08/20 13:55:13	1.7
  @@ -7,12 +7,6 @@
    *****************************************************************************/
   package org.apache.cocoon.components.url;
   
  -import java.io.File;
  -import java.net.MalformedURLException;
  -import java.net.URL;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Map;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -26,10 +20,17 @@
   import org.apache.cocoon.environment.http.HttpContext;
   import org.apache.cocoon.util.ClassUtils;
   
  +import java.io.File;
  +import java.net.MalformedURLException;
  +import java.net.URL;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.Map;
  +
   
   /**
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
  - * @version $Id: URLFactoryImpl.java,v 1.6 2001/08/05 16:55:37 vgritsenko Exp $
  + * @version $Id: URLFactoryImpl.java,v 1.7 2001/08/20 13:55:13 dims Exp $
    */
   public class URLFactoryImpl extends AbstractLoggable implements URLFactory, Component, Configurable, Contextualizable {
   
  
  
  
  1.2       +6 -9      xml-cocoon2/src/org/apache/cocoon/components/xslt/XSLTProcessor.java
  
  Index: XSLTProcessor.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/xslt/XSLTProcessor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XSLTProcessor.java	2001/08/14 11:19:54	1.1
  +++ XSLTProcessor.java	2001/08/20 13:55:13	1.2
  @@ -7,16 +7,13 @@
    *****************************************************************************/
   package org.apache.cocoon.components.xslt;
   
  -import javax.xml.transform.sax.TransformerHandler;
  -import javax.xml.transform.TransformerConfigurationException;
  -import javax.xml.transform.Result;
  -import java.io.IOException;
  -
  -import org.xml.sax.SAXException;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.ProcessingException;
   import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.environment.Source;
  +import org.apache.cocoon.environment.SourceResolver;
  +
  +import javax.xml.transform.Result;
  +import javax.xml.transform.sax.TransformerHandler;
   
   /**
    * This is the interface of the XSLT processor in Cocoon.
  
  
  
  1.2       +33 -39    xml-cocoon2/src/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java
  
  Index: XSLTProcessorImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XSLTProcessorImpl.java	2001/08/14 11:19:54	1.1
  +++ XSLTProcessorImpl.java	2001/08/20 13:55:13	1.2
  @@ -7,47 +7,41 @@
    *****************************************************************************/
   package org.apache.cocoon.components.xslt;
   
  -import javax.xml.transform.stream.StreamSource;
  -import javax.xml.transform.stream.StreamResult;
  -import javax.xml.transform.sax.TransformerHandler;
  -import javax.xml.transform.sax.TemplatesHandler;
  -import javax.xml.transform.sax.SAXTransformerFactory;
  -import javax.xml.transform.sax.SAXSource;
  -import javax.xml.transform.URIResolver;
  -import javax.xml.transform.TransformerFactory;
  -import javax.xml.transform.TransformerException;
  -import javax.xml.transform.TransformerConfigurationException;
  -import javax.xml.transform.Transformer;
  -import javax.xml.transform.Templates;
  +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.Composable;
  +import org.apache.avalon.framework.configuration.Configurable;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.components.store.Store;
  +import org.apache.cocoon.environment.Source;
  +import org.apache.cocoon.environment.SourceResolver;
  +import org.apache.cocoon.util.TraxErrorHandler;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.XMLReader;
  +import org.xml.sax.helpers.XMLReaderFactory;
  +
   import javax.xml.transform.Result;
  -import java.util.Map;
  -import java.util.Iterator;
  -import java.util.HashMap;
  -import java.io.Writer;
  -import java.io.StringWriter;
  -import java.io.IOException;
  +import javax.xml.transform.Templates;
  +import javax.xml.transform.Transformer;
  +import javax.xml.transform.TransformerException;
  +import javax.xml.transform.TransformerFactory;
  +import javax.xml.transform.URIResolver;
  +import javax.xml.transform.sax.SAXSource;
  +import javax.xml.transform.sax.SAXTransformerFactory;
  +import javax.xml.transform.sax.TemplatesHandler;
  +import javax.xml.transform.sax.TransformerHandler;
  +import javax.xml.transform.stream.StreamResult;
  +import javax.xml.transform.stream.StreamSource;
   import java.io.File;
  -
  -import org.xml.sax.helpers.XMLReaderFactory;
  -import org.xml.sax.XMLReader;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.InputSource;
  -import org.apache.cocoon.util.TraxErrorHandler;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.components.store.Store;
  -import org.apache.cocoon.Roles;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.Configurable;
  -import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.activity.Disposable;
  +import java.io.IOException;
  +import java.io.StringWriter;
  +import java.io.Writer;
   
   /**
    * This class defines the implementation of the {@link XSLTProcessor}
  
  
  
  1.16      +6 -7      xml-cocoon2/src/org/apache/cocoon/environment/AbstractEnvironment.java
  
  Index: AbstractEnvironment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/AbstractEnvironment.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- AbstractEnvironment.java	2001/08/17 14:09:15	1.15
  +++ AbstractEnvironment.java	2001/08/20 13:55:13	1.16
  @@ -7,25 +7,24 @@
    *****************************************************************************/
   package org.apache.cocoon.environment;
   
  +import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.components.source.SourceHandler;
  +import org.xml.sax.SAXException;
  +
   import java.io.File;
   import java.io.IOException;
   import java.net.MalformedURLException;
   import java.net.URL;
  -import java.util.ArrayList;
   import java.util.HashMap;
   import java.util.Map;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.source.SourceHandler;
  -import org.xml.sax.InputSource;
  -import org.xml.sax.SAXException;
   
   /**
    * Base class for any environment
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.15 $ $Date: 2001/08/17 14:09:15 $
  + * @version CVS $Revision: 1.16 $ $Date: 2001/08/20 13:55:13 $
    */
   public abstract class AbstractEnvironment extends AbstractLoggable implements Environment {
   
  
  
  
  1.9       +3 -4      xml-cocoon2/src/org/apache/cocoon/environment/Environment.java
  
  Index: Environment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/Environment.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Environment.java	2001/08/17 14:09:15	1.8
  +++ Environment.java	2001/08/20 13:55:13	1.9
  @@ -8,20 +8,19 @@
   
   package org.apache.cocoon.environment;
   
  +import org.apache.cocoon.components.source.SourceHandler;
  +
   import java.io.IOException;
   import java.io.OutputStream;
  -import java.net.MalformedURLException;
   import java.net.URL;
   import java.util.Map;
  -import org.apache.cocoon.components.source.SourceHandler;
  -import org.xml.sax.SAXException;
   
   /**
    * Base interface for an environment abstraction
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.8 $ $Date: 2001/08/17 14:09:15 $
  + * @version CVS $Revision: 1.9 $ $Date: 2001/08/20 13:55:13 $
    */
   
   public interface Environment extends SourceResolver {
  
  
  
  1.5       +2 -5      xml-cocoon2/src/org/apache/cocoon/environment/Request.java
  
  Index: Request.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/Request.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Request.java	2001/07/12 19:23:26	1.4
  +++ Request.java	2001/08/20 13:55:13	1.5
  @@ -7,13 +7,10 @@
    *****************************************************************************/
   package org.apache.cocoon.environment;
   
  -import java.io.BufferedReader;
  -import java.io.IOException;
  -import java.io.UnsupportedEncodingException;
  +import java.security.Principal;
   import java.util.Enumeration;
   import java.util.Locale;
   import java.util.Map;
  -import java.security.Principal;
   
   /**
    * Defines an interface to provide client request information .
  @@ -21,7 +18,7 @@
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/07/12 19:23:26 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:13 $
    *
    */
   
  
  
  
  1.2       +1 -2      xml-cocoon2/src/org/apache/cocoon/environment/Response.java
  
  Index: Response.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/Response.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Response.java	2001/05/09 20:49:43	1.1
  +++ Response.java	2001/08/20 13:55:13	1.2
  @@ -7,7 +7,6 @@
    *****************************************************************************/
   package org.apache.cocoon.environment;
   
  -import java.io.IOException;
   import java.util.Locale;
   
   /**
  @@ -15,7 +14,7 @@
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:43 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:13 $
    *
    */
   
  
  
  
  1.9       +5 -10     xml-cocoon2/src/org/apache/cocoon/environment/Source.java
  
  Index: Source.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/Source.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Source.java	2001/07/06 09:59:45	1.8
  +++ Source.java	2001/08/20 13:55:13	1.9
  @@ -8,27 +8,22 @@
   
   package org.apache.cocoon.environment;
   
  -import java.io.File;
  -import java.io.FileInputStream;
  -import java.io.FileReader;
  -import java.io.InputStream;
  -import java.io.InputStreamReader;
  -import java.io.IOException;
  -import java.io.Reader;
  -import java.net.URL;
  -import java.net.URLConnection;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.xml.XMLConsumer;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.InputStream;
  +
   /**
    * Description of a source. This interface provides a simple interface
    * for accessing any resource (URL, local file etc).
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.8 $ $Date: 2001/07/06 09:59:45 $
  + * @version CVS $Revision: 1.9 $ $Date: 2001/08/20 13:55:13 $
    */
   
   public interface Source {
  
  
  
  1.4       +3 -2      xml-cocoon2/src/org/apache/cocoon/environment/SourceResolver.java
  
  Index: SourceResolver.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/SourceResolver.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SourceResolver.java	2001/06/28 09:56:36	1.3
  +++ SourceResolver.java	2001/08/20 13:55:13	1.4
  @@ -8,15 +8,16 @@
   
   package org.apache.cocoon.environment;
   
  -import java.io.IOException;
   import org.apache.cocoon.ProcessingException;
   import org.xml.sax.SAXException;
   
  +import java.io.IOException;
  +
   /**
    * Base interface for resolving a source by system identifiers.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/06/28 09:56:36 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:13 $
    */
   
   public interface SourceResolver {
  
  
  
  1.6       +5 -4      xml-cocoon2/src/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
  
  Index: AbstractCommandLineEnvironment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractCommandLineEnvironment.java	2001/08/14 15:51:31	1.5
  +++ AbstractCommandLineEnvironment.java	2001/08/20 13:55:14	1.6
  @@ -8,19 +8,20 @@
   
   package org.apache.cocoon.environment.commandline;
   
  +import org.apache.cocoon.environment.AbstractEnvironment;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.log.Logger;
  +
   import java.io.File;
   import java.io.IOException;
   import java.io.OutputStream;
   import java.net.MalformedURLException;
  -import org.apache.cocoon.environment.AbstractEnvironment;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.log.Logger;
   
   /**
    * This environment is used to save the requested file to disk.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2001/08/14 15:51:31 $
  + * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:14 $
    */
   
   public abstract class AbstractCommandLineEnvironment
  
  
  
  1.5       +8 -10     xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandLineRequest.java
  
  Index: CommandLineRequest.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandLineRequest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CommandLineRequest.java	2001/07/12 19:23:34	1.4
  +++ CommandLineRequest.java	2001/08/20 13:55:14	1.5
  @@ -8,26 +8,24 @@
   
   package org.apache.cocoon.environment.commandline;
   
  -import java.io.BufferedReader;
  -import java.io.IOException;
  -import java.io.UnsupportedEncodingException;
  -import java.util.Enumeration;
  -import java.util.Iterator;
  -import java.util.Locale;
  -import java.util.Map;
  -import java.util.HashMap;
  -import java.util.Collections;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Cookie;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
   
  +import java.util.Collections;
  +import java.util.Enumeration;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.Locale;
  +import java.util.Map;
  +
   /**
    * Creates a specific servlet request simulation from command line usage.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/07/12 19:23:34 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:14 $
    */
   
   /*
  
  
  
  1.2       +3 -5      xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandLineResponse.java
  
  Index: CommandLineResponse.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandLineResponse.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CommandLineResponse.java	2001/05/09 20:49:44	1.1
  +++ CommandLineResponse.java	2001/08/20 13:55:14	1.2
  @@ -8,18 +8,16 @@
   
   package org.apache.cocoon.environment.commandline;
   
  -import java.io.IOException;
  -import java.io.PrintWriter;
  -import java.io.UnsupportedEncodingException;
  -import java.util.Locale;
   import org.apache.cocoon.environment.Cookie;
   import org.apache.cocoon.environment.Response;
   
  +import java.util.Locale;
  +
   /**
    * Creates a specific servlet response simulation from command line usage.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:44 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:14 $
    */
   
   public class CommandLineResponse implements Response {
  
  
  
  1.3       +1 -3      xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandlineContext.java
  
  Index: CommandlineContext.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandlineContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CommandlineContext.java	2001/06/22 14:11:04	1.2
  +++ CommandlineContext.java	2001/08/20 13:55:14	1.3
  @@ -8,12 +8,10 @@
   package org.apache.cocoon.environment.commandline;
   
   import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.cocoon.environment.Context;
   
  -import java.lang.String;
   import java.net.MalformedURLException;
   import java.net.URL;
  -//import javax.servlet.ServletContext;
  -import org.apache.cocoon.environment.Context;
   
   /**
    *
  
  
  
  1.4       +4 -6      xml-cocoon2/src/org/apache/cocoon/environment/commandline/FileSavingEnvironment.java
  
  Index: FileSavingEnvironment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/FileSavingEnvironment.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FileSavingEnvironment.java	2001/07/04 07:57:25	1.3
  +++ FileSavingEnvironment.java	2001/08/20 13:55:14	1.4
  @@ -8,21 +8,19 @@
   
   package org.apache.cocoon.environment.commandline;
   
  +import org.apache.cocoon.Constants;
  +import org.apache.log.Logger;
  +
   import java.io.File;
  -import java.io.FileOutputStream;
  -import java.io.IOException;
   import java.io.OutputStream;
   import java.net.MalformedURLException;
   import java.util.Map;
  -import org.apache.log.Logger;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.AbstractEnvironment;
   
   /**
    * This environment is used to save the requested file to disk.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/07/04 07:57:25 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:14 $
    */
   
   public class FileSavingEnvironment extends AbstractCommandLineEnvironment {
  
  
  
  1.4       +4 -9      xml-cocoon2/src/org/apache/cocoon/environment/commandline/LinkSamplingEnvironment.java
  
  Index: LinkSamplingEnvironment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/LinkSamplingEnvironment.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LinkSamplingEnvironment.java	2001/07/04 07:57:26	1.3
  +++ LinkSamplingEnvironment.java	2001/08/20 13:55:14	1.4
  @@ -7,30 +7,25 @@
    *****************************************************************************/
   package org.apache.cocoon.environment.commandline;
   
  +import org.apache.cocoon.Constants;
  +import org.apache.log.Logger;
  +
   import java.io.BufferedReader;
   import java.io.ByteArrayInputStream;
   import java.io.ByteArrayOutputStream;
   import java.io.File;
   import java.io.IOException;
   import java.io.InputStreamReader;
  -import java.io.OutputStream;
   import java.net.MalformedURLException;
   import java.util.ArrayList;
   import java.util.Collection;
  -import java.util.Collections;
  -import java.util.Iterator;
  -import java.util.List;
   import java.util.Map;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.Main;
  -import org.apache.cocoon.environment.AbstractEnvironment;
  -import org.apache.log.Logger;
   
   /**
    * This environment is sample the links of the resource.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/07/04 07:57:26 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:14 $
    */
   
   public class LinkSamplingEnvironment extends AbstractCommandLineEnvironment {
  
  
  
  1.4       +3 -3      xml-cocoon2/src/org/apache/cocoon/environment/http/HttpContext.java
  
  Index: HttpContext.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/HttpContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HttpContext.java	2001/07/04 10:13:31	1.3
  +++ HttpContext.java	2001/08/20 13:55:14	1.4
  @@ -7,11 +7,11 @@
    *****************************************************************************/
   package org.apache.cocoon.environment.http;
   
  -import java.lang.String;
  +import org.apache.cocoon.environment.Context;
  +
  +import javax.servlet.ServletContext;
   import java.net.MalformedURLException;
   import java.net.URL;
  -import javax.servlet.ServletContext;
  -import org.apache.cocoon.environment.Context;
   
   /**
    *
  
  
  
  1.7       +8 -11     xml-cocoon2/src/org/apache/cocoon/environment/http/HttpEnvironment.java
  
  Index: HttpEnvironment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/HttpEnvironment.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- HttpEnvironment.java	2001/08/14 15:51:31	1.6
  +++ HttpEnvironment.java	2001/08/20 13:55:14	1.7
  @@ -8,21 +8,18 @@
   
   package org.apache.cocoon.environment.http;
   
  -import java.io.File;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.AbstractEnvironment;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Session;
  +
  +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.Map;
  -import javax.servlet.ServletContext;
  -import javax.servlet.http.HttpServletRequest;
  -import javax.servlet.http.HttpServletResponse;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.AbstractEnvironment;
  -import org.apache.cocoon.environment.Session;
  -import org.apache.cocoon.environment.Redirector;
  -import org.xml.sax.InputSource;
  -import org.xml.sax.SAXException;
   
   public class HttpEnvironment extends AbstractEnvironment implements Redirector {
   
  
  
  
  1.7       +10 -11    xml-cocoon2/src/org/apache/cocoon/environment/http/HttpRequest.java
  
  Index: HttpRequest.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/HttpRequest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- HttpRequest.java	2001/08/06 20:02:45	1.6
  +++ HttpRequest.java	2001/08/20 13:55:14	1.7
  @@ -7,28 +7,27 @@
    *****************************************************************************/
   package org.apache.cocoon.environment.http;
   
  +import org.apache.cocoon.environment.Cookie;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.Session;
  +
  +import javax.servlet.RequestDispatcher;
  +import javax.servlet.ServletInputStream;
  +import javax.servlet.http.HttpServletRequest;
   import java.io.BufferedReader;
   import java.io.IOException;
  -import java.io.UnsupportedEncodingException;
  +import java.util.Collections;
   import java.util.Enumeration;
  +import java.util.HashMap;
   import java.util.Locale;
  -import java.util.Vector;
   import java.util.Map;
  -import java.util.HashMap;
  -import java.util.Collections;
  -import javax.servlet.RequestDispatcher;
  -import javax.servlet.ServletInputStream;
  -import javax.servlet.http.HttpServletRequest;
  -import org.apache.cocoon.environment.Cookie;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Session;
   
   /**
    * Implements the {@link javax.servlet.http.HttpServletRequest} interface
    * to provide request information for HTTP servlets.
    *
    * @author <a href="mailto:giacomo@apache,org">Giacomo Pati</a>
  - * @version CVS $Id: HttpRequest.java,v 1.6 2001/08/06 20:02:45 balld Exp $
  + * @version CVS $Id: HttpRequest.java,v 1.7 2001/08/20 13:55:14 dims Exp $
    */
   
   public class HttpRequest implements Request {
  
  
  
  1.3       +5 -6      xml-cocoon2/src/org/apache/cocoon/environment/http/HttpResponse.java
  
  Index: HttpResponse.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/HttpResponse.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HttpResponse.java	2001/07/04 09:08:27	1.2
  +++ HttpResponse.java	2001/08/20 13:55:14	1.3
  @@ -7,15 +7,14 @@
    *****************************************************************************/
   package org.apache.cocoon.environment.http;
   
  +import org.apache.cocoon.environment.Cookie;
  +import org.apache.cocoon.environment.Response;
  +
  +import javax.servlet.ServletOutputStream;
  +import javax.servlet.http.HttpServletResponse;
   import java.io.IOException;
   import java.io.PrintWriter;
  -import java.io.UnsupportedEncodingException;
   import java.util.Locale;
  -import javax.servlet.ServletException;
  -import javax.servlet.ServletOutputStream;
  -import javax.servlet.http.HttpServletResponse;
  -import org.apache.cocoon.environment.Cookie;
  -import org.apache.cocoon.environment.Response;
   
   /**
    *
  
  
  
  1.2       +3 -2      xml-cocoon2/src/org/apache/cocoon/environment/http/HttpSession.java
  
  Index: HttpSession.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/HttpSession.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HttpSession.java	2001/05/09 20:49:45	1.1
  +++ HttpSession.java	2001/08/20 13:55:14	1.2
  @@ -8,9 +8,10 @@
   
   package org.apache.cocoon.environment.http;
   
  -import java.util.Enumeration;
   import org.apache.cocoon.environment.Session;
   
  +import java.util.Enumeration;
  +
   /**
    *
    * Provides a way to identify a user across more than one page
  @@ -36,7 +37,7 @@
    * will not be directly visible in another.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:45 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:14 $
    *
    */
   
  
  
  
  1.6       +2 -2      xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper22.java
  
  Index: RequestWrapper22.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper22.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RequestWrapper22.java	2001/07/20 09:03:29	1.5
  +++ RequestWrapper22.java	2001/08/20 13:55:14	1.6
  @@ -7,9 +7,9 @@
    *****************************************************************************/
   package org.apache.cocoon.environment.http;
   
  +import javax.servlet.http.HttpServletRequest;
   import java.io.File;
   import java.util.Vector;
  -import javax.servlet.http.HttpServletRequest;
   
   /**
    *
  @@ -17,7 +17,7 @@
    * to provide request information for HTTP servlets.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2001/07/20 09:03:29 $
  + * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:14 $
    */
   
   public final class RequestWrapper {
  
  
  
  1.6       +2 -2      xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper23.java
  
  Index: RequestWrapper23.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper23.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RequestWrapper23.java	2001/07/20 09:03:29	1.5
  +++ RequestWrapper23.java	2001/08/20 13:55:14	1.6
  @@ -7,9 +7,9 @@
    *****************************************************************************/
   package org.apache.cocoon.environment.http;
   
  +import javax.servlet.http.HttpServletRequest;
   import java.io.File;
   import java.util.Vector;
  -import javax.servlet.http.HttpServletRequest;
   
   /**
    *
  @@ -17,7 +17,7 @@
    * to provide request information for HTTP servlets.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2001/07/20 09:03:29 $
  + * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:14 $
    */
   
   public final class RequestWrapper {
  
  
  
  1.3       +4 -3      xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapperMaybeUpload22.java
  
  Index: RequestWrapperMaybeUpload22.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapperMaybeUpload22.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RequestWrapperMaybeUpload22.java	2001/07/20 09:03:29	1.2
  +++ RequestWrapperMaybeUpload22.java	2001/08/20 13:55:14	1.3
  @@ -7,10 +7,11 @@
    *****************************************************************************/
   package org.apache.cocoon.environment.http;
   
  +import uk.co.weft.maybeupload.MaybeUploadRequestWrapper;
  +
  +import javax.servlet.http.HttpServletRequest;
   import java.io.File;
   import java.util.Vector;
  -import javax.servlet.http.HttpServletRequest;
  -import uk.co.weft.maybeupload.MaybeUploadRequestWrapper;
   
   /**
    *
  @@ -18,7 +19,7 @@
    * to provide request information for HTTP servlets.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/20 09:03:29 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:14 $
    */
   
   public final class RequestWrapper extends MaybeUploadRequestWrapper {
  
  
  
  1.3       +4 -3      xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapperMaybeUpload23.java
  
  Index: RequestWrapperMaybeUpload23.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapperMaybeUpload23.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RequestWrapperMaybeUpload23.java	2001/07/20 09:03:29	1.2
  +++ RequestWrapperMaybeUpload23.java	2001/08/20 13:55:14	1.3
  @@ -7,11 +7,12 @@
    *****************************************************************************/
   package org.apache.cocoon.environment.http;
   
  +import uk.co.weft.maybeupload.MaybeUploadRequestWrapper;
  +
  +import javax.servlet.http.HttpServletRequest;
   import java.io.File;
   import java.util.Map;
   import java.util.Vector;
  -import javax.servlet.http.HttpServletRequest;
  -import uk.co.weft.maybeupload.MaybeUploadRequestWrapper;
   
   /**
    *
  @@ -19,7 +20,7 @@
    * to provide request information for HTTP servlets.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/20 09:03:29 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:14 $
    */
   
   public final class RequestWrapper extends MaybeUploadRequestWrapper implements HttpServletRequest {
  
  
  
  1.7       +8 -17     xml-cocoon2/src/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
  
  Index: EnvironmentWrapper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- EnvironmentWrapper.java	2001/08/17 14:09:15	1.6
  +++ EnvironmentWrapper.java	2001/08/20 13:55:14	1.7
  @@ -8,29 +8,20 @@
   
   package org.apache.cocoon.environment.wrapper;
   
  -import java.io.IOException;
  -import java.io.OutputStream;
  -import java.net.MalformedURLException;
  -import java.net.URL;
  -import java.util.Enumeration;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Map;
  -import java.util.Locale;
  -
  -import org.xml.sax.SAXException;
  -
   import org.apache.cocoon.Constants;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.source.SourceHandler;
   import org.apache.cocoon.environment.AbstractEnvironment;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Response;
   import org.apache.cocoon.environment.Session;
  -import org.apache.cocoon.environment.Source;
   import org.apache.log.Logger;
   
  +import java.io.IOException;
  +import java.io.OutputStream;
  +import java.net.MalformedURLException;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.Map;
  +
   
   /**
    * This is a wrapper class for the <code>Environment</code> object.
  @@ -38,7 +29,7 @@
    * contains a <code>RequestWrapper</code> object.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version $Id: EnvironmentWrapper.java,v 1.6 2001/08/17 14:09:15 vgritsenko Exp $
  + * @version $Id: EnvironmentWrapper.java,v 1.7 2001/08/20 13:55:14 dims Exp $
    */
   public final class EnvironmentWrapper
   extends AbstractEnvironment
  
  
  
  1.4       +1 -2      xml-cocoon2/src/org/apache/cocoon/environment/wrapper/RequestParameters.java
  
  Index: RequestParameters.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/wrapper/RequestParameters.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RequestParameters.java	2001/08/14 14:43:37	1.3
  +++ RequestParameters.java	2001/08/20 13:55:14	1.4
  @@ -8,7 +8,6 @@
   package org.apache.cocoon.environment.wrapper;
   
   import java.io.Serializable;
  -
   import java.util.ArrayList;
   import java.util.Enumeration;
   import java.util.HashMap;
  @@ -22,7 +21,7 @@
    * for the <code>Request</code> object.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version $Id: RequestParameters.java,v 1.3 2001/08/14 14:43:37 cziegeler Exp $
  + * @version $Id: RequestParameters.java,v 1.4 2001/08/20 13:55:14 dims Exp $
    */
   public final class RequestParameters
   implements Serializable {
  
  
  
  1.8       +9 -5      xml-cocoon2/src/org/apache/cocoon/environment/wrapper/RequestWrapper.java
  
  Index: RequestWrapper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/wrapper/RequestWrapper.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- RequestWrapper.java	2001/08/16 11:25:41	1.7
  +++ RequestWrapper.java	2001/08/20 13:55:14	1.8
  @@ -8,15 +8,19 @@
   
   package org.apache.cocoon.environment.wrapper;
   
  -import java.io.IOException;
  -import java.security.Principal;
  -import java.util.*;
  -
   import org.apache.cocoon.environment.Cookie;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
   
  +import java.security.Principal;
  +import java.util.Enumeration;
  +import java.util.HashSet;
  +import java.util.Iterator;
  +import java.util.Locale;
  +import java.util.Map;
  +import java.util.Set;
  +
   
   /**
    * This is a wrapper class for the <code>Request</code> object.
  @@ -24,7 +28,7 @@
    * are different.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version $Id: RequestWrapper.java,v 1.7 2001/08/16 11:25:41 cziegeler Exp $
  + * @version $Id: RequestWrapper.java,v 1.8 2001/08/20 13:55:14 dims Exp $
    */
   public final class RequestWrapper implements Request {
   
  
  
  
  1.3       +4 -3      xml-cocoon2/src/org/apache/cocoon/generation/AbstractGenerator.java
  
  Index: AbstractGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/AbstractGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractGenerator.java	2001/05/22 14:40:23	1.2
  +++ AbstractGenerator.java	2001/08/20 13:55:14	1.3
  @@ -7,19 +7,20 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.io.IOException;
  -import java.util.Map;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.xml.AbstractXMLProducer;
   import org.xml.sax.SAXException;
   
  +import java.io.IOException;
  +import java.util.Map;
  +
   /**
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.2 $ $Date: 2001/05/22 14:40:23 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:14 $
    */
   public abstract class AbstractGenerator extends AbstractXMLProducer implements Generator {
   
  
  
  
  1.2       +4 -3      xml-cocoon2/src/org/apache/cocoon/generation/AbstractServerPage.java
  
  Index: AbstractServerPage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/AbstractServerPage.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractServerPage.java	2001/05/09 20:49:40	1.1
  +++ AbstractServerPage.java	2001/08/20 13:55:15	1.2
  @@ -7,21 +7,22 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.io.File;
  -import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.CacheValidity;
  +import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.NOPCacheValidity;
   import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.environment.Request;
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  +import java.io.File;
  +
   /**
    * Base implementation of <code>ServerPagesGenerator</code>. This class
    * declares variables that must be explicitly initialized by code generators.
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:40 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:15 $
    */
   public abstract class AbstractServerPage
     extends ServletGenerator implements CompiledComponent, Cacheable
  
  
  
  1.3       +2 -4      xml-cocoon2/src/org/apache/cocoon/generation/ComposerGenerator.java
  
  Index: ComposerGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ComposerGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ComposerGenerator.java	2001/06/12 20:02:47	1.2
  +++ ComposerGenerator.java	2001/08/20 13:55:15	1.3
  @@ -7,17 +7,15 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
  -
  -import org.apache.cocoon.Cocoon;
  +import org.apache.avalon.framework.component.Composable;
   
   /**
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.2 $ $Date: 2001/06/12 20:02:47 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:15 $
    */
   public abstract class ComposerGenerator extends AbstractGenerator
   implements Composable {
  
  
  
  1.10      +9 -10     xml-cocoon2/src/org/apache/cocoon/generation/DirectoryGenerator.java
  
  Index: DirectoryGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/DirectoryGenerator.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DirectoryGenerator.java	2001/08/15 03:19:36	1.9
  +++ DirectoryGenerator.java	2001/08/20 13:55:15	1.10
  @@ -8,25 +8,24 @@
   
   package org.apache.cocoon.generation;
   
  -import java.io.File;
  -import java.io.IOException;
  -import java.net.URL;
  -import java.text.SimpleDateFormat;
  -import java.util.Date;
  -import java.util.Map;
  -import java.util.Stack;
  -import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
   import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.regexp.RE;
   import org.apache.regexp.RESyntaxException;
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  +import java.io.File;
  +import java.io.IOException;
  +import java.text.SimpleDateFormat;
  +import java.util.Date;
  +import java.util.Map;
  +import java.util.Stack;
  +
   /**
    * Generates an XML directory listing.
    * <p>
  @@ -62,7 +61,7 @@
    *         (Apache Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:conny@smb-tec.com">Conny Krappatsch</a>
    *         (SMB GmbH) for Virbus AG
  - * @version CVS $Revision: 1.9 $ $Date: 2001/08/15 03:19:36 $ */
  + * @version CVS $Revision: 1.10 $ $Date: 2001/08/20 13:55:15 $ */
   
   public class DirectoryGenerator extends ComposerGenerator implements Recyclable {
   
  
  
  
  1.18      +6 -8      xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java
  
  Index: FileGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- FileGenerator.java	2001/08/15 03:19:36	1.17
  +++ FileGenerator.java	2001/08/20 13:55:15	1.18
  @@ -7,15 +7,10 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.io.File;
  -import java.io.IOException;
  -import java.io.FileNotFoundException;
  -import java.util.Map;
  -import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   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.excalibur.pool.Poolable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
   import org.apache.cocoon.caching.CacheValidity;
  @@ -24,9 +19,12 @@
   import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.util.HashUtil;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.xml.sax.SAXException;
   
  +import java.io.FileNotFoundException;
  +import java.io.IOException;
  +import java.util.Map;
  +
   /**
    *
    *
  @@ -37,7 +35,7 @@
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.17 $ $Date: 2001/08/15 03:19:36 $
  + * @version CVS $Revision: 1.18 $ $Date: 2001/08/20 13:55:15 $
    */
   public class FileGenerator extends ComposerGenerator
   implements Cacheable, Recyclable {
  
  
  
  1.5       +7 -8      xml-cocoon2/src/org/apache/cocoon/generation/FragmentExtractorGenerator.java
  
  Index: FragmentExtractorGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/FragmentExtractorGenerator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FragmentExtractorGenerator.java	2001/07/13 04:16:56	1.4
  +++ FragmentExtractorGenerator.java	2001/08/20 13:55:15	1.5
  @@ -7,11 +7,7 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.io.IOException;
  -import java.rmi.server.UID;
  -import java.util.Collections;
  -import java.util.HashMap;
  -import java.util.Map;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
  @@ -20,13 +16,16 @@
   import org.apache.cocoon.caching.NOPCacheValidity;
   import org.apache.cocoon.environment.AbstractEnvironment;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.generation.AbstractGenerator;
   import org.apache.cocoon.util.HashUtil;
   import org.apache.cocoon.xml.dom.DOMStreamer;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.w3c.dom.Document;
   import org.xml.sax.SAXException;
   
  +import java.io.IOException;
  +import java.rmi.server.UID;
  +import java.util.HashMap;
  +import java.util.Map;
  +
   /** The generation half of FragmentExtractor.
    * FragmentExtractor is a transformer-generator pair which is designed to allow
    * sitemap managers to extract certain nodes from a SAX stream and move them
  @@ -37,7 +36,7 @@
    * This is by no means complete yet, but it should prove useful, particularly
    * for offline generation.
    * @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/07/13 04:16:56 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:15 $
    */
   public class FragmentExtractorGenerator extends AbstractGenerator
           implements Recyclable, Cacheable {
  
  
  
  1.3       +3 -2      xml-cocoon2/src/org/apache/cocoon/generation/Generator.java
  
  Index: Generator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/Generator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Generator.java	2001/07/07 11:43:30	1.2
  +++ Generator.java	2001/08/20 13:55:15	1.3
  @@ -7,17 +7,18 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.io.IOException;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.sitemap.SitemapModelComponent;
   import org.apache.cocoon.xml.XMLProducer;
   import org.xml.sax.SAXException;
   
  +import java.io.IOException;
  +
   /**
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:30 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:15 $
    */
   public interface Generator extends XMLProducer, SitemapModelComponent {
   
  
  
  
  1.10      +12 -19    xml-cocoon2/src/org/apache/cocoon/generation/HTMLGenerator.java
  
  Index: HTMLGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/HTMLGenerator.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- HTMLGenerator.java	2001/08/11 19:01:07	1.9
  +++ HTMLGenerator.java	2001/08/20 13:55:15	1.10
  @@ -7,45 +7,38 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.io.BufferedInputStream;
  -import java.io.BufferedOutputStream;
  -import java.io.ByteArrayInputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.File;
  -import java.io.IOException;
  -import java.net.URL;
  -import java.util.Map;
   import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.CacheValidity;
  +import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.TimeStampCacheValidity;
  +import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.util.HashUtil;
   import org.apache.cocoon.xml.dom.DOMStreamer;
  +import org.apache.xpath.XPathAPI;
  +import org.w3c.dom.Node;
  +import org.w3c.dom.traversal.NodeIterator;
   import org.w3c.tidy.Tidy;
   import org.xml.sax.SAXException;
  +
  +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 org.apache.xpath.XPathAPI;
  -import org.w3c.dom.Node;
  -import org.w3c.dom.traversal.NodeIterator;
  -import org.xml.sax.InputSource;
  -import javax.xml.transform.OutputKeys;
  +import java.io.BufferedInputStream;
  +import java.io.IOException;
  +import java.util.Map;
   
   /**
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.9 $ $Date: 2001/08/11 19:01:07 $
  + * @version CVS $Revision: 1.10 $ $Date: 2001/08/20 13:55:15 $
    */
   public class HTMLGenerator extends ComposerGenerator implements Cacheable, Recyclable {
   
  
  
  
  1.8       +5 -10     xml-cocoon2/src/org/apache/cocoon/generation/ImageDirectoryGenerator.java
  
  Index: ImageDirectoryGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ImageDirectoryGenerator.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ImageDirectoryGenerator.java	2001/08/11 19:01:07	1.7
  +++ ImageDirectoryGenerator.java	2001/08/20 13:55:15	1.8
  @@ -7,26 +7,21 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  +import org.apache.log.Hierarchy;
  +import org.xml.sax.SAXException;
  +
   import java.io.BufferedInputStream;
  -import java.io.BufferedReader;
   import java.io.File;
  -import java.io.FileNotFoundException;
  -import java.io.FileReader;
   import java.io.FileInputStream;
  -import java.io.InputStreamReader;
  +import java.io.FileNotFoundException;
   import java.io.IOException;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.log.Hierarchy;
  -import org.apache.log.Logger;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.helpers.AttributesImpl;
   
   /**
    * An extension of DirectoryGenerators that adds extra attributes for image
    * files.
    *
    * @author <a href="mailto:balld@webslingerZ.com">Donald A. Ball Jr.</a>
  - * @version $Revision: 1.7 $ $Date: 2001/08/11 19:01:07 $
  + * @version $Revision: 1.8 $ $Date: 2001/08/20 13:55:15 $
    */
   public class ImageDirectoryGenerator extends DirectoryGenerator {
   
  
  
  
  1.15      +8 -13     xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java
  
  Index: JspGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- JspGenerator.java	2001/08/05 16:40:31	1.14
  +++ JspGenerator.java	2001/08/20 13:55:15	1.15
  @@ -7,36 +7,31 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.io.ByteArrayInputStream;
  -import java.io.IOException;
  -import java.util.Map;
  -import javax.servlet.ServletContext;
  -import javax.servlet.ServletException;
  -import javax.servlet.http.HttpServletRequest;
  -import javax.servlet.http.HttpServletResponse;
   import org.apache.avalon.excalibur.pool.Recyclable;
  -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.logger.AbstractLoggable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.jsp.JSPEngine;
   import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.environment.http.HttpEnvironment;
  -import org.apache.cocoon.xml.AbstractXMLProducer;
  -import org.apache.cocoon.xml.XMLProducer;
  -import org.apache.log.Logger;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  +import javax.servlet.ServletContext;
  +import javax.servlet.ServletException;
  +import javax.servlet.http.HttpServletRequest;
  +import javax.servlet.http.HttpServletResponse;
  +import java.io.ByteArrayInputStream;
  +import java.io.IOException;
  +
   /**
    * Allows JSP to be used as a generator.  Builds upon the JSP servlet
    * functionality - overrides the output method in order to pipe the
    * results into SAX events.
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.14 $ $Date: 2001/08/05 16:40:31 $
  + * @version CVS $Revision: 1.15 $ $Date: 2001/08/20 13:55:15 $
    */
   public class JspGenerator extends ServletGenerator implements Recyclable, Configurable {
   
  
  
  
  1.8       +14 -21    xml-cocoon2/src/org/apache/cocoon/generation/PhpGenerator.java
  
  Index: PhpGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/PhpGenerator.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- PhpGenerator.java	2001/07/07 11:43:30	1.7
  +++ PhpGenerator.java	2001/08/20 13:55:15	1.8
  @@ -7,39 +7,32 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.io.IOException;
  -import java.io.OutputStream;
  -import java.io.PipedInputStream;
  -import java.io.PipedOutputStream;
  -import java.util.Enumeration;
  -import java.util.Map;
  -import javax.servlet.ServletConfig;
  -import javax.servlet.ServletContext;
  -import javax.servlet.ServletException;
  -import javax.servlet.http.HttpServletRequest;
  -import javax.servlet.http.HttpServletResponse;
  -import net.php.servlet;
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.parser.Parser;
  -import org.apache.cocoon.environment.http.HttpEnvironment;
   import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.xml.AbstractXMLProducer;
  -import org.apache.cocoon.xml.XMLProducer;
  -import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.log.Logger;
  +import org.apache.cocoon.environment.http.HttpEnvironment;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  +import javax.servlet.ServletConfig;
  +import javax.servlet.ServletContext;
  +import javax.servlet.ServletException;
  +import javax.servlet.http.HttpServletRequest;
  +import javax.servlet.http.HttpServletResponse;
  +import java.io.IOException;
  +import java.io.OutputStream;
  +import java.io.PipedInputStream;
  +import java.io.PipedOutputStream;
  +import java.util.Enumeration;
  +
   /**
    * Allows PHP to be used as a generator.  Builds upon the PHP servlet
    * functionallity - overrides the output method in order to pipe the
    * results into SAX events.
    *
    * @author <a href="mailto:rubys@us.ibm.com">Sam Ruby</a>
  - * @version CVS $Revision: 1.7 $ $Date: 2001/07/07 11:43:30 $
  + * @version CVS $Revision: 1.8 $ $Date: 2001/08/20 13:55:15 $
    */
   public class PhpGenerator extends ServletGenerator implements Recyclable {
   
  
  
  
  1.5       +5 -4      xml-cocoon2/src/org/apache/cocoon/generation/RequestGenerator.java
  
  Index: RequestGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/RequestGenerator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- RequestGenerator.java	2001/07/16 13:14:01	1.4
  +++ RequestGenerator.java	2001/08/20 13:55:15	1.5
  @@ -7,20 +7,21 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.util.Enumeration;
  -import java.util.Iterator;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Request;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  +import java.util.Enumeration;
  +import java.util.Iterator;
  +
   /**
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/07/16 13:14:01 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:15 $
    */
   public class RequestGenerator extends ServletGenerator implements Recyclable {
   
  
  
  
  1.10      +6 -9      xml-cocoon2/src/org/apache/cocoon/generation/ScriptGenerator.java
  
  Index: ScriptGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ScriptGenerator.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ScriptGenerator.java	2001/08/11 19:01:07	1.9
  +++ ScriptGenerator.java	2001/08/20 13:55:15	1.10
  @@ -11,22 +11,19 @@
   import com.ibm.bsf.BSFException;
   import com.ibm.bsf.BSFManager;
   import com.ibm.bsf.util.IOUtils;
  -import java.io.FileNotFoundException;
  -import java.io.FileReader;
  -import java.io.Reader;
  -import java.io.StringReader;
  -import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   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.pool.Recyclable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
   import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.environment.SourceResolver;
   import org.xml.sax.InputSource;
  -import org.xml.sax.SAXException;
  +
  +import java.io.FileNotFoundException;
  +import java.io.Reader;
  +import java.io.StringReader;
   
   /**
    * The Scriptgenerator executes arbitraty scripts using the BSF framework
  @@ -48,7 +45,7 @@
    * </pre>
    *
    * @author <a href="mailto:jafoster@engmail.uwaterloo.ca">Jason Foster</a>
  - * @version CVS $Revision: 1.9 $ $Date: 2001/08/11 19:01:07 $
  + * @version CVS $Revision: 1.10 $ $Date: 2001/08/20 13:55:15 $
    */
   public class ScriptGenerator extends ComposerGenerator implements Configurable,
   Recyclable {
  
  
  
  1.14      +11 -19    xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java
  
  Index: ServerPagesGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ServerPagesGenerator.java	2001/08/11 19:01:07	1.13
  +++ ServerPagesGenerator.java	2001/08/20 13:55:15	1.14
  @@ -7,47 +7,39 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.io.File;
  -import java.io.IOException;
  -import java.net.MalformedURLException;
  -import java.net.URL;
  -import java.util.LinkedList;
  -import java.util.HashMap;
  -import java.util.Map;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   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.Composable;
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
  -import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.CacheValidity;
  -import org.apache.cocoon.caching.ParametersCacheValidity;
  +import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.CompositeCacheValidity;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.components.language.generator.CompiledComponent;
  +import org.apache.cocoon.caching.ParametersCacheValidity;
   import org.apache.cocoon.components.language.generator.ProgramGenerator;
   import org.apache.cocoon.components.language.markup.xsp.XSPGenerator;
  +import org.apache.cocoon.environment.Source;
  +import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.util.HashUtil;
   import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.xml.sax.Attributes;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.InputSource;
   import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
  -import org.xml.sax.ext.LexicalHandler;
  +
  +import java.io.IOException;
  +import java.util.HashMap;
  +import java.util.LinkedList;
  +import java.util.Map;
   
   /**
    * This class acts as a proxy to a dynamically loaded<code>Generator</code>
    * delegating actual SAX event generation.
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.13 $ $Date: 2001/08/11 19:01:07 $
  + * @version CVS $Revision: 1.14 $ $Date: 2001/08/20 13:55:15 $
    */
   public class ServerPagesGenerator
     extends ServletGenerator
  
  
  
  1.4       +4 -3      xml-cocoon2/src/org/apache/cocoon/generation/ServletGenerator.java
  
  Index: ServletGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ServletGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ServletGenerator.java	2001/08/16 01:14:22	1.3
  +++ ServletGenerator.java	2001/08/20 13:55:15	1.4
  @@ -7,8 +7,6 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.io.IOException;
  -import java.util.Map;
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.Constants;
  @@ -19,10 +17,13 @@
   import org.apache.cocoon.environment.SourceResolver;
   import org.xml.sax.SAXException;
   
  +import java.io.IOException;
  +import java.util.Map;
  +
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/08/16 01:14:22 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:15 $
    */
   public abstract class ServletGenerator extends ComposerGenerator
   implements Composable {
  
  
  
  1.5       +7 -8      xml-cocoon2/src/org/apache/cocoon/generation/StatusGenerator.java
  
  Index: StatusGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/StatusGenerator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StatusGenerator.java	2001/05/31 17:38:23	1.4
  +++ StatusGenerator.java	2001/08/20 13:55:15	1.5
  @@ -7,20 +7,19 @@
   *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.io.File;
  +import org.apache.avalon.excalibur.pool.Recyclable;
  +import org.xml.sax.Attributes;
  +import org.xml.sax.ContentHandler;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.helpers.AttributesImpl;
  +
   import java.net.InetAddress;
   import java.net.UnknownHostException;
   import java.text.DateFormat;
   import java.util.ArrayList;
  -import java.util.Calendar;
   import java.util.Date;
   import java.util.List;
   import java.util.StringTokenizer;
  -import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.helpers.AttributesImpl;
   
   /** Generates an XML representation of the current status of Cocoon.
    * Potted DTD:
  @@ -48,7 +47,7 @@
    *
    * @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a> (Luminas Limited)
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 17:38:23 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:15 $
    */
   public class StatusGenerator extends ComposerGenerator implements Recyclable {
   
  
  
  
  1.4       +5 -11     xml-cocoon2/src/org/apache/cocoon/generation/StreamGenerator.java
  
  Index: StreamGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/StreamGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StreamGenerator.java	2001/07/07 11:43:30	1.3
  +++ StreamGenerator.java	2001/08/20 13:55:15	1.4
  @@ -8,25 +8,19 @@
   
   package org.apache.cocoon.generation;
   
  -import java.io.StringReader;
  -import java.io.IOException;
  -import java.util.Map;
  +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.components.parser.Parser;
   import org.apache.cocoon.environment.http.HttpRequest;
  -import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.util.PostInputStream;
  -import org.apache.avalon.excalibur.pool.Poolable;
  -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.parameters.Parameters;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  +import java.io.IOException;
  +import java.io.StringReader;
  +
   /**
    *
    * The <code>StreamGenerator</code> is a class that reads XML from a
  @@ -48,7 +42,7 @@
    * number of bytes read is equal to the getContentLength() value.
    *
    * @author <a href="mailto:Kinga_Dziembowski@hp.com">Kinga Dziembowski</a>
  - * @version $Revision: 1.3 $ $Date: 2001/07/07 11:43:30 $
  + * @version $Revision: 1.4 $ $Date: 2001/08/20 13:55:15 $
    */
   public class StreamGenerator extends ComposerGenerator {
       public static final String CLASS = StreamGenerator.class.getName();
  
  
  
  1.7       +6 -8      xml-cocoon2/src/org/apache/cocoon/generation/VelocityGenerator.java
  
  Index: VelocityGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/VelocityGenerator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- VelocityGenerator.java	2001/08/05 16:40:31	1.6
  +++ VelocityGenerator.java	2001/08/20 13:55:15	1.7
  @@ -7,25 +7,23 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.io.IOException;
  -import java.io.StringReader;
  -import java.io.StringWriter;
  -import java.net.URL;
  -import java.util.Properties;
  -import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
   import org.apache.cocoon.components.parser.Parser;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.velocity.VelocityContext;
   import org.apache.velocity.app.Velocity;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  +import java.io.IOException;
  +import java.io.StringReader;
  +import java.io.StringWriter;
  +
   /**
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2001/08/05 16:40:31 $
  + * @version CVS $Revision: 1.7 $ $Date: 2001/08/20 13:55:15 $
    */
   public class VelocityGenerator extends ServletGenerator implements Recyclable {
   
  
  
  
  1.2       +14 -26    xml-cocoon2/src/org/apache/cocoon/i18n/XMLResourceBundle.java
  
  Index: XMLResourceBundle.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/i18n/XMLResourceBundle.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLResourceBundle.java	2001/07/19 11:22:21	1.1
  +++ XMLResourceBundle.java	2001/08/20 13:55:16	1.2
  @@ -9,45 +9,33 @@
   package org.apache.cocoon.i18n;
   
   /** JDK classes **/
  -import java.io.IOException;
  -import java.util.Map;
  -import java.util.HashMap;
  -import java.util.Hashtable;
  -import java.util.Locale;
  -import java.util.Enumeration;
  -import java.util.ResourceBundle;
  -import java.util.MissingResourceException;
  -
  -/** W3C DOM classes **/
  +import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.framework.logger.Loggable;
  +import org.apache.log.Logger;
  +import org.apache.xpath.XPathAPI;
   import org.w3c.dom.Document;
  +import org.w3c.dom.NamedNodeMap;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
  -import org.w3c.dom.NamedNodeMap;
  -
  -/** SAX classes **/
   import org.xml.sax.SAXException;
   
  -/** Parser classes **/
   import javax.xml.parsers.DocumentBuilder;
   import javax.xml.parsers.DocumentBuilderFactory;
   import javax.xml.parsers.ParserConfigurationException;
  -
  -/** XPath classes **/
  -import org.apache.xpath.XPathAPI;
  -
  -/** TRaX classes **/
  -import javax.xml.transform.TransformerException;
  -
  -/** Avalon classes **/
  -import org.apache.avalon.framework.logger.Loggable;
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.log.Logger;
  +import java.io.IOException;
  +import java.util.Enumeration;
  +import java.util.HashMap;
  +import java.util.Hashtable;
  +import java.util.Locale;
  +import java.util.Map;
  +import java.util.MissingResourceException;
  +import java.util.ResourceBundle;
   
   /**
    * @author <a href="mailto:mengelhart@earthtrip.com">Mike Engelhart</a>
    * @author <a href="mailto:neeme@one.lv">Neeme Praks</a>
    * @author <a href="mailto:oleg@one.lv">Oleg Podolsky</a>
  - * @version $Id: XMLResourceBundle.java,v 1.1 2001/07/19 11:22:21 dims Exp $
  + * @version $Id: XMLResourceBundle.java,v 1.2 2001/08/20 13:55:16 dims Exp $
    */
   public class XMLResourceBundle
       extends ResourceBundle
  
  
  
  1.2       +9 -12     xml-cocoon2/src/org/apache/cocoon/i18n/XMLResourceBundleFactory.java
  
  Index: XMLResourceBundleFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/i18n/XMLResourceBundleFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLResourceBundleFactory.java	2001/07/19 11:22:21	1.1
  +++ XMLResourceBundleFactory.java	2001/08/20 13:55:16	1.2
  @@ -8,23 +8,20 @@
   //package org.apache.avalon.excalibur.i18n;
   package org.apache.cocoon.i18n;
   
  -import java.util.Map;
  -import java.util.HashMap;
  -import java.util.Locale;
  -
  -import org.xml.sax.SAXParseException;
  -
  +import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.framework.component.ComponentException;
  +import org.apache.avalon.framework.component.DefaultComponentSelector;
   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.logger.Loggable;
  +import org.apache.avalon.framework.thread.ThreadSafe;
   import org.apache.log.Logger;
  +import org.xml.sax.SAXParseException;
   
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.DefaultComponentSelector;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  +import java.util.HashMap;
  +import java.util.Locale;
  +import java.util.Map;
   
   /**
    * This is the XMLResourceBundleFactory, the method for getting and
  @@ -33,7 +30,7 @@
    * @author <a href="mailto:mengelhart@earthtrip.com">Mike Engelhart</a>
    * @author <a href="mailto:neeme@one.lv">Neeme Praks</a>
    * @author <a href="mailto:oleg@one.lv">Oleg Podolsky</a>
  - * @version $Id: XMLResourceBundleFactory.java,v 1.1 2001/07/19 11:22:21 dims Exp $
  + * @version $Id: XMLResourceBundleFactory.java,v 1.2 2001/08/20 13:55:16 dims Exp $
    */
   
   public class XMLResourceBundleFactory
  
  
  
  1.3       +2 -4      xml-cocoon2/src/org/apache/cocoon/matching/BrowserMatcherFactory.java
  
  Index: BrowserMatcherFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/BrowserMatcherFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BrowserMatcherFactory.java	2001/07/28 01:56:30	1.2
  +++ BrowserMatcherFactory.java	2001/08/20 13:55:16	1.3
  @@ -7,13 +7,11 @@
    *****************************************************************************/
   package org.apache.cocoon.matching;
   
  -import java.util.Stack;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.xerces.dom.TreeWalkerImpl;
  +import org.apache.cocoon.CodeFactory;
   import org.w3c.dom.NamedNodeMap;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
  -import org.apache.cocoon.CodeFactory;
   
   /**
    * This class generates source code which matches a specific browser pattern
  @@ -21,7 +19,7 @@
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/28 01:56:30 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:16 $
    */
   
   public class BrowserMatcherFactory implements CodeFactory {
  
  
  
  1.4       +3 -2      xml-cocoon2/src/org/apache/cocoon/matching/Matcher.java
  
  Index: Matcher.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/Matcher.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Matcher.java	2001/07/07 11:43:32	1.3
  +++ Matcher.java	2001/08/20 13:55:16	1.4
  @@ -7,14 +7,15 @@
    *****************************************************************************/
   package org.apache.cocoon.matching;
   
  -import java.util.Map;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.parameters.Parameters;
   
  +import java.util.Map;
  +
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/07/07 11:43:32 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:16 $
    */
   public interface Matcher extends Component {
   
  
  
  
  1.5       +5 -5      xml-cocoon2/src/org/apache/cocoon/matching/RequestParamMatcher.java
  
  Index: RequestParamMatcher.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/RequestParamMatcher.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- RequestParamMatcher.java	2001/07/11 09:30:41	1.4
  +++ RequestParamMatcher.java	2001/08/20 13:55:16	1.5
  @@ -14,12 +14,12 @@
   /*
    * Standard imports
    */
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Request;
  +
   import java.util.HashMap;
   import java.util.Map;
  -import org.apache.cocoon.matching.Matcher;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.Constants;
  -import org.apache.avalon.framework.parameters.Parameters;
   
   /**
    * This class allows for matching based on a request parameter.
  @@ -34,7 +34,7 @@
    * </pre>
    *
    * @author <a href="mailto:Marcus.Crafter@osa.de">Marcus Crafter</a>
  - * @version CVS $Revision: 1.4 $
  + * @version CVS $Revision: 1.5 $
    */
   public class RequestParamMatcher implements Matcher {
       /**
  
  
  
  1.3       +2 -5      xml-cocoon2/src/org/apache/cocoon/matching/WildcardHeaderMatcherFactory.java
  
  Index: WildcardHeaderMatcherFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/WildcardHeaderMatcherFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WildcardHeaderMatcherFactory.java	2001/07/20 08:40:44	1.2
  +++ WildcardHeaderMatcherFactory.java	2001/08/20 13:55:16	1.3
  @@ -8,11 +8,8 @@
   package org.apache.cocoon.matching;
   
   import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.cocoon.CodeFactory;
  -import org.w3c.dom.NamedNodeMap;
  -import org.w3c.dom.NodeList;
   import org.w3c.dom.Node;
  +import org.w3c.dom.NodeList;
   
   /**
    * This class generates source code which represents a specific pattern matcher
  @@ -25,7 +22,7 @@
    * </table>
    *
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/20 08:40:44 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:16 $
    */
   
   public class WildcardHeaderMatcherFactory extends WildcardURIMatcherFactory {
  
  
  
  1.3       +2 -5      xml-cocoon2/src/org/apache/cocoon/matching/WildcardParameterValueMatcherFactory.java
  
  Index: WildcardParameterValueMatcherFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/WildcardParameterValueMatcherFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WildcardParameterValueMatcherFactory.java	2001/07/20 08:40:44	1.2
  +++ WildcardParameterValueMatcherFactory.java	2001/08/20 13:55:16	1.3
  @@ -8,11 +8,8 @@
   package org.apache.cocoon.matching;
   
   import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.cocoon.CodeFactory;
  -import org.w3c.dom.NamedNodeMap;
  -import org.w3c.dom.NodeList;
   import org.w3c.dom.Node;
  +import org.w3c.dom.NodeList;
   
   /**
    * This class generates source code which represents a specific pattern matcher
  @@ -29,7 +26,7 @@
    * </table>
    *
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/20 08:40:44 $ */
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:16 $ */
   
   public class WildcardParameterValueMatcherFactory extends WildcardURIMatcherFactory {
   
  
  
  
  1.3       +2 -5      xml-cocoon2/src/org/apache/cocoon/matching/WildcardSessionStateMatcherFactory.java
  
  Index: WildcardSessionStateMatcherFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/WildcardSessionStateMatcherFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WildcardSessionStateMatcherFactory.java	2001/07/20 08:40:44	1.2
  +++ WildcardSessionStateMatcherFactory.java	2001/08/20 13:55:16	1.3
  @@ -8,12 +8,9 @@
   package org.apache.cocoon.matching;
   
   import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.cocoon.CodeFactory;
   import org.apache.cocoon.Constants;
  -import org.w3c.dom.NamedNodeMap;
  -import org.w3c.dom.NodeList;
   import org.w3c.dom.Node;
  +import org.w3c.dom.NodeList;
   
   /**
    * This class generates source code which represents a specific pattern matcher
  @@ -26,7 +23,7 @@
    * </table>
    *
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/20 08:40:44 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:16 $
    */
   
   public class WildcardSessionStateMatcherFactory extends WildcardURIMatcherFactory {
  
  
  
  1.4       +6 -5      xml-cocoon2/src/org/apache/cocoon/reading/AbstractReader.java
  
  Index: AbstractReader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/reading/AbstractReader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractReader.java	2001/07/12 10:23:13	1.3
  +++ AbstractReader.java	2001/08/20 13:55:16	1.4
  @@ -7,10 +7,6 @@
    *****************************************************************************/
   package org.apache.cocoon.reading;
   
  -import java.io.BufferedOutputStream;
  -import java.io.IOException;
  -import java.io.OutputStream;
  -import java.util.Map;
   import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.parameters.Parameters;
  @@ -18,10 +14,15 @@
   import org.apache.cocoon.environment.SourceResolver;
   import org.xml.sax.SAXException;
   
  +import java.io.BufferedOutputStream;
  +import java.io.IOException;
  +import java.io.OutputStream;
  +import java.util.Map;
  +
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/07/12 10:23:13 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:16 $
    */
   public abstract class AbstractReader extends AbstractLoggable implements Reader, Recyclable {
       /** The current <code>SourceResolver</code>. */
  
  
  
  1.6       +18 -17    xml-cocoon2/src/org/apache/cocoon/reading/DatabaseReader.java
  
  Index: DatabaseReader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/reading/DatabaseReader.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DatabaseReader.java	2001/08/09 21:12:31	1.5
  +++ DatabaseReader.java	2001/08/20 13:55:16	1.6
  @@ -7,17 +7,8 @@
    *****************************************************************************/
   package org.apache.cocoon.reading;
   
  -import java.io.BufferedInputStream;
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.sql.Blob;
  -import java.sql.Connection;
  -import java.sql.PreparedStatement;
  -import java.sql.ResultSet;
  -import java.sql.SQLException;
  -import java.sql.Timestamp;
  -import java.util.Date;
  -import java.util.Map;
  +import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  +import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
  @@ -28,20 +19,30 @@
   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.excalibur.datasource.DataSourceComponent;
  -import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Response;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.CacheValidity;
  +import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.NOPCacheValidity;
   import org.apache.cocoon.caching.TimeStampCacheValidity;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.Response;
  +import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.util.HashUtil;
   import org.xml.sax.SAXException;
  +
  +import java.io.BufferedInputStream;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.sql.Blob;
  +import java.sql.Connection;
  +import java.sql.PreparedStatement;
  +import java.sql.ResultSet;
  +import java.sql.SQLException;
  +import java.sql.Timestamp;
  +import java.util.Date;
  +import java.util.Map;
   
   /**
    * This Reader pulls a resource from a database.  It is configured with
  
  
  
  1.4       +3 -2      xml-cocoon2/src/org/apache/cocoon/reading/Reader.java
  
  Index: Reader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/reading/Reader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Reader.java	2001/07/12 10:23:16	1.3
  +++ Reader.java	2001/08/20 13:55:16	1.4
  @@ -7,16 +7,17 @@
    *****************************************************************************/
   package org.apache.cocoon.reading;
   
  -import java.io.IOException;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.sitemap.SitemapModelComponent;
   import org.apache.cocoon.sitemap.SitemapOutputComponent;
   import org.xml.sax.SAXException;
   
  +import java.io.IOException;
  +
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/07/12 10:23:16 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:16 $
    */
   public interface Reader extends SitemapModelComponent, SitemapOutputComponent {
   
  
  
  
  1.7       +7 -17     xml-cocoon2/src/org/apache/cocoon/reading/ResourceReader.java
  
  Index: ResourceReader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/reading/ResourceReader.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ResourceReader.java	2001/07/13 04:16:48	1.6
  +++ ResourceReader.java	2001/08/20 13:55:16	1.7
  @@ -7,41 +7,31 @@
    *****************************************************************************/
   package org.apache.cocoon.reading;
   
  -import java.io.BufferedInputStream;
  -import java.io.File;
  -import java.io.FileInputStream;
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.net.MalformedURLException;
  -import java.net.URL;
  -import java.net.URLConnection;
  -import java.util.Date;
  -import java.util.Enumeration;
  -import java.util.Hashtable;
  -import java.util.Map;
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentException;
  +import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.caching.CacheValidity;
   import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.TimeStampCacheValidity;
   import org.apache.cocoon.environment.Context;
  -import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Response;
   import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.util.HashUtil;
   import org.xml.sax.SAXException;
   
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.util.Date;
  +import java.util.Map;
  +
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2001/07/13 04:16:48 $
  + * @version CVS $Revision: 1.7 $ $Date: 2001/08/20 13:55:16 $
    *
    * The <code>ResourceReader</code> component is used to serve binary data
    * in a sitemap pipeline. It makes use of HTTP Headers to determine if
  
  
  
  1.2       +1 -4      xml-cocoon2/src/org/apache/cocoon/selection/BrowserSelectorFactory.java
  
  Index: BrowserSelectorFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/BrowserSelectorFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BrowserSelectorFactory.java	2001/05/09 20:49:29	1.1
  +++ BrowserSelectorFactory.java	2001/08/20 13:55:16	1.2
  @@ -9,12 +9,9 @@
   
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.cocoon.CodeFactory;
  -import org.apache.xerces.dom.TreeWalkerImpl;
   import org.w3c.dom.NamedNodeMap;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
  -import org.w3c.dom.traversal.NodeFilter;
  -import org.w3c.dom.traversal.TreeWalker;
   
   /**
    * This class generates source code which tests a specific browser pattern
  @@ -23,7 +20,7 @@
    * @author <a href="mailto:cziegeler@sundn.de">Carsten Ziegeler</a>
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:29 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:16 $
   */
   
   
  
  
  
  1.3       +1 -6      xml-cocoon2/src/org/apache/cocoon/selection/HeaderSelectorFactory.java
  
  Index: HeaderSelectorFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/HeaderSelectorFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HeaderSelectorFactory.java	2001/07/20 08:40:44	1.2
  +++ HeaderSelectorFactory.java	2001/08/20 13:55:16	1.3
  @@ -8,13 +8,8 @@
   package org.apache.cocoon.selection;
   
   import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.cocoon.CodeFactory;
  -import org.apache.xerces.dom.TreeWalkerImpl;
  -import org.w3c.dom.NamedNodeMap;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
  -import org.w3c.dom.traversal.NodeFilter;
  -import org.w3c.dom.traversal.TreeWalker;
   
   /**
    * This class generates source code to implement a selector that
  @@ -27,7 +22,7 @@
    * </table>
    *
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/20 08:40:44 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:16 $
    */
   public class HeaderSelectorFactory extends ParameterSelectorFactory {
   
  
  
  
  1.3       +1 -4      xml-cocoon2/src/org/apache/cocoon/selection/HostSelectorFactory.java
  
  Index: HostSelectorFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/HostSelectorFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HostSelectorFactory.java	2001/06/21 11:26:16	1.2
  +++ HostSelectorFactory.java	2001/08/20 13:55:16	1.3
  @@ -9,12 +9,9 @@
   
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.cocoon.CodeFactory;
  -import org.apache.xerces.dom.TreeWalkerImpl;
   import org.w3c.dom.NamedNodeMap;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
  -import org.w3c.dom.traversal.NodeFilter;
  -import org.w3c.dom.traversal.TreeWalker;
   
   /**
    * This class generates source code to implement a selector that
  @@ -35,7 +32,7 @@
    *   </map:select>
    *
    * @author <a href="mailto:cbritton@centervilletech.com">Colin Britton</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/06/21 11:26:16 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:16 $
   */
   
   
  
  
  
  1.3       +1 -6      xml-cocoon2/src/org/apache/cocoon/selection/ParameterSelectorFactory.java
  
  Index: ParameterSelectorFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/ParameterSelectorFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ParameterSelectorFactory.java	2001/07/11 09:30:39	1.2
  +++ ParameterSelectorFactory.java	2001/08/20 13:55:16	1.3
  @@ -9,12 +9,7 @@
   
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.cocoon.CodeFactory;
  -import org.apache.xerces.dom.TreeWalkerImpl;
  -import org.w3c.dom.NamedNodeMap;
  -import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
  -import org.w3c.dom.traversal.NodeFilter;
  -import org.w3c.dom.traversal.TreeWalker;
   
   /**
    * This class generates source code to implement a selector that
  @@ -40,7 +35,7 @@
    * depending on those parameters.
    *
    * @author <a href="mailto:leo.sutic@inspireinfrastructure.com">Leo Sutic</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/11 09:30:39 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:16 $
    */
   public class ParameterSelectorFactory implements CodeFactory {
   
  
  
  
  1.3       +1 -6      xml-cocoon2/src/org/apache/cocoon/selection/RequestSelectorFactory.java
  
  Index: RequestSelectorFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/RequestSelectorFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RequestSelectorFactory.java	2001/07/20 08:40:44	1.2
  +++ RequestSelectorFactory.java	2001/08/20 13:55:16	1.3
  @@ -8,13 +8,8 @@
   package org.apache.cocoon.selection;
   
   import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.cocoon.CodeFactory;
  -import org.apache.xerces.dom.TreeWalkerImpl;
  -import org.w3c.dom.NamedNodeMap;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
  -import org.w3c.dom.traversal.NodeFilter;
  -import org.w3c.dom.traversal.TreeWalker;
   
   /**
    * This class generates source code to implement a selector that
  @@ -27,7 +22,7 @@
    * </table>
    *
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/20 08:40:44 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:16 $
    */
   public class RequestSelectorFactory extends ParameterSelectorFactory {
   
  
  
  
  1.3       +3 -2      xml-cocoon2/src/org/apache/cocoon/selection/Selector.java
  
  Index: Selector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/Selector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Selector.java	2001/07/07 11:43:33	1.2
  +++ Selector.java	2001/08/20 13:55:16	1.3
  @@ -7,15 +7,16 @@
    *****************************************************************************/
   package org.apache.cocoon.selection;
   
  -import java.util.Map;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.parameters.Parameters;
   
  +import java.util.Map;
  +
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:leo.sutic">Leo Sutic</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:33 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:16 $
    */
   public interface Selector extends Component {
   
  
  
  
  1.3       +1 -6      xml-cocoon2/src/org/apache/cocoon/selection/SessionStateSelectorFactory.java
  
  Index: SessionStateSelectorFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/SessionStateSelectorFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SessionStateSelectorFactory.java	2001/07/20 08:40:44	1.2
  +++ SessionStateSelectorFactory.java	2001/08/20 13:55:16	1.3
  @@ -8,14 +8,9 @@
   package org.apache.cocoon.selection;
   
   import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.cocoon.CodeFactory;
   import org.apache.cocoon.Constants;
  -import org.apache.xerces.dom.TreeWalkerImpl;
  -import org.w3c.dom.NamedNodeMap;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
  -import org.w3c.dom.traversal.NodeFilter;
  -import org.w3c.dom.traversal.TreeWalker;
   
   /**
    * This class generates source code to implement a selector that
  @@ -28,7 +23,7 @@
    * </table>
    *
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/20 08:40:44 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:16 $
    */
   public class SessionStateSelectorFactory extends ParameterSelectorFactory {
   
  
  
  
  1.2       +3 -2      xml-cocoon2/src/org/apache/cocoon/selection/helpers/CodedSelectorHelper.java
  
  Index: CodedSelectorHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/helpers/CodedSelectorHelper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CodedSelectorHelper.java	2001/05/09 20:49:29	1.1
  +++ CodedSelectorHelper.java	2001/08/20 13:55:16	1.2
  @@ -7,13 +7,14 @@
    *****************************************************************************/
   package org.apache.cocoon.selection.helpers;
   
  -import java.util.Map;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Context;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Response;
   import org.apache.cocoon.environment.Session;
   
  +import java.util.Map;
  +
   /**
    * This abstract class provides the basis for testing the environment with
    * developer specified java code via the CodedSelectorFactory. This class also
  @@ -21,7 +22,7 @@
    * variables for developer ease.
    *
    * @author <a href="mailto:Marcus.Crafter@osa.de">Marcus Crafter</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:29 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:16 $
    */
   public abstract class CodedSelectorHelper
   {
  
  
  
  1.4       +4 -8      xml-cocoon2/src/org/apache/cocoon/serialization/AbstractSerializer.java
  
  Index: AbstractSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/AbstractSerializer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractSerializer.java	2001/07/12 10:23:26	1.3
  +++ AbstractSerializer.java	2001/08/20 13:55:16	1.4
  @@ -8,21 +8,17 @@
   
   package org.apache.cocoon.serialization;
   
  -import java.io.BufferedOutputStream;
  -import java.io.IOException;
  -import java.io.OutputStream;
  -import java.util.Map;
   import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.xml.AbstractXMLPipe;
  -import org.apache.cocoon.ProcessingException;
  -import org.xml.sax.SAXException;
  +
  +import java.io.BufferedOutputStream;
  +import java.io.OutputStream;
   
   /**
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/07/12 10:23:26 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:16 $
    */
   
   public abstract class AbstractSerializer extends AbstractXMLPipe implements Serializer, Recyclable {
  
  
  
  1.3       +10 -9     xml-cocoon2/src/org/apache/cocoon/serialization/AbstractTextSerializer.java
  
  Index: AbstractTextSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/AbstractTextSerializer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractTextSerializer.java	2001/05/31 17:38:41	1.2
  +++ AbstractTextSerializer.java	2001/08/20 13:55:16	1.3
  @@ -8,31 +8,32 @@
   
   package org.apache.cocoon.serialization;
   
  -import java.util.ArrayList;
  -import java.util.List;
  -import java.util.Properties;
  -import javax.xml.transform.OutputKeys;
  -import javax.xml.transform.TransformerFactory;
  -import javax.xml.transform.sax.SAXTransformerFactory;
  +import org.apache.avalon.excalibur.pool.Poolable;
   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.pool.Poolable;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.caching.CacheValidity;
   import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.NOPCacheValidity;
   import org.apache.cocoon.util.TraxErrorHandler;
   import org.xml.sax.Attributes;
  -import org.xml.sax.helpers.AttributesImpl;
   import org.xml.sax.SAXException;
  +import org.xml.sax.helpers.AttributesImpl;
  +
  +import javax.xml.transform.OutputKeys;
  +import javax.xml.transform.TransformerFactory;
  +import javax.xml.transform.sax.SAXTransformerFactory;
  +import java.util.ArrayList;
  +import java.util.List;
  +import java.util.Properties;
   
   /**
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @author <a href="mailto:sylvain.wallez@anyware-tech.com">Sylvain Wallez</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 17:38:41 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:16 $
    */
   public abstract class AbstractTextSerializer extends AbstractSerializer implements Configurable, Cacheable, Poolable {
   
  
  
  
  1.5       +9 -8      xml-cocoon2/src/org/apache/cocoon/serialization/FOPSerializer.java
  
  Index: FOPSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/FOPSerializer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FOPSerializer.java	2001/08/14 14:44:33	1.4
  +++ FOPSerializer.java	2001/08/20 13:55:16	1.5
  @@ -8,26 +8,27 @@
   
   package org.apache.cocoon.serialization;
   
  -import java.io.OutputStream;
  -import java.io.IOException;
  -import org.apache.cocoon.caching.Cacheable;
  +import org.apache.avalon.excalibur.pool.Recyclable;
  +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.caching.CacheValidity;
  +import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.NOPCacheValidity;
   import org.apache.cocoon.components.renderer.ExtendableRendererFactory;
   import org.apache.cocoon.components.renderer.RendererFactory;
   import org.apache.cocoon.util.ClassUtils;
  -import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.avalon.framework.configuration.Configurable;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.fop.apps.Driver;
  -import org.apache.fop.apps.Options;
   import org.apache.fop.apps.FOPException;
  +import org.apache.fop.apps.Options;
   import org.apache.fop.messaging.MessageEvent;
   import org.apache.fop.messaging.MessageHandler;
   import org.apache.fop.messaging.MessageListener;
   import org.apache.fop.render.Renderer;
   import org.xml.sax.SAXException;
  +
  +import java.io.IOException;
  +import java.io.OutputStream;
   
   public class FOPSerializer extends AbstractSerializer
       implements MessageListener, Recyclable, Configurable, Cacheable {
  
  
  
  1.2       +4 -5      xml-cocoon2/src/org/apache/cocoon/serialization/HTMLSerializer.java
  
  Index: HTMLSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/HTMLSerializer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HTMLSerializer.java	2001/05/09 20:49:38	1.1
  +++ HTMLSerializer.java	2001/08/20 13:55:16	1.2
  @@ -8,17 +8,16 @@
   
   package org.apache.cocoon.serialization;
   
  -import java.io.OutputStream;
  +import org.apache.avalon.excalibur.pool.Poolable;
  +
   import javax.xml.transform.OutputKeys;
   import javax.xml.transform.sax.TransformerHandler;
   import javax.xml.transform.stream.StreamResult;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import java.io.OutputStream;
   
   /**
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:38 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:16 $
    */
   
   public class HTMLSerializer extends AbstractTextSerializer implements Poolable {
  
  
  
  1.3       +6 -9      xml-cocoon2/src/org/apache/cocoon/serialization/LinkSerializer.java
  
  Index: LinkSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/LinkSerializer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LinkSerializer.java	2001/07/12 10:23:30	1.2
  +++ LinkSerializer.java	2001/08/20 13:55:16	1.3
  @@ -8,22 +8,19 @@
   
   package org.apache.cocoon.serialization;
   
  -import java.io.IOException;
  -import java.io.OutputStream;
  -import java.io.PrintStream;
  -import java.util.Map;
  +import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.cocoon.Constants;
  -import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.xml.xlink.ExtendedXLinkPipe;
  -import org.apache.avalon.excalibur.pool.Poolable;
  -import org.apache.avalon.framework.parameters.Parameters;
   import org.xml.sax.Attributes;
  -import org.xml.sax.EntityResolver;
   import org.xml.sax.SAXException;
   
  +import java.io.IOException;
  +import java.io.OutputStream;
  +import java.io.PrintStream;
  +
   /**
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/12 10:23:30 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:16 $
    */
   
   public class LinkSerializer extends ExtendedXLinkPipe implements Serializer, Poolable {
  
  
  
  1.3       +6 -7      xml-cocoon2/src/org/apache/cocoon/serialization/SVGSerializer.java
  
  Index: SVGSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/SVGSerializer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SVGSerializer.java	2001/07/12 10:23:31	1.2
  +++ SVGSerializer.java	2001/08/20 13:55:16	1.3
  @@ -8,10 +8,7 @@
   
   package org.apache.cocoon.serialization;
   
  -import java.awt.Color;
  -import java.io.BufferedOutputStream;
  -import java.io.OutputStream;
  -import java.lang.reflect.Field;
  +import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.configuration.Configurable;
  @@ -30,19 +27,21 @@
   import org.apache.cocoon.util.ClassUtils;
   import org.apache.cocoon.xml.XMLConsumer;
   import org.apache.cocoon.xml.dom.SVGBuilder;
  -import org.apache.avalon.excalibur.pool.Poolable;
  -import org.apache.log.Logger;
   import org.w3c.dom.Document;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.SAXException;
   import org.xml.sax.ext.LexicalHandler;
   
  +import java.awt.*;
  +import java.io.BufferedOutputStream;
  +import java.io.OutputStream;
  +
   /**
    * A Batik based Serializer for generating PNG/JPEG images
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @author <a href="mailto:rossb@apache.org">Ross Burton</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/12 10:23:31 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:16 $
    */
   public class SVGSerializer extends SVGBuilder
           implements Composable, Serializer, Configurable, Poolable, Cacheable {
  
  
  
  1.2       +4 -5      xml-cocoon2/src/org/apache/cocoon/serialization/TextSerializer.java
  
  Index: TextSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/TextSerializer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TextSerializer.java	2001/05/09 20:49:38	1.1
  +++ TextSerializer.java	2001/08/20 13:55:16	1.2
  @@ -8,17 +8,16 @@
   
   package org.apache.cocoon.serialization;
   
  -import java.io.OutputStream;
  +import org.apache.avalon.excalibur.pool.Poolable;
  +
   import javax.xml.transform.OutputKeys;
   import javax.xml.transform.sax.TransformerHandler;
   import javax.xml.transform.stream.StreamResult;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import java.io.OutputStream;
   
   /**
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:38 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:16 $
    */
   
   public class TextSerializer extends AbstractTextSerializer implements Poolable {
  
  
  
  1.2       +4 -5      xml-cocoon2/src/org/apache/cocoon/serialization/XMLSerializer.java
  
  Index: XMLSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/XMLSerializer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLSerializer.java	2001/05/09 20:49:38	1.1
  +++ XMLSerializer.java	2001/08/20 13:55:16	1.2
  @@ -8,17 +8,16 @@
   
   package org.apache.cocoon.serialization;
   
  -import java.io.OutputStream;
  +import org.apache.avalon.excalibur.pool.Poolable;
  +
   import javax.xml.transform.OutputKeys;
   import javax.xml.transform.sax.TransformerHandler;
   import javax.xml.transform.stream.StreamResult;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import java.io.OutputStream;
   
   /**
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:38 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:16 $
    */
   
   public class XMLSerializer extends AbstractTextSerializer implements Poolable {
  
  
  
  1.32      +18 -25    xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- CocoonServlet.java	2001/08/18 18:15:36	1.31
  +++ CocoonServlet.java	2001/08/20 13:55:17	1.32
  @@ -7,25 +7,6 @@
    *****************************************************************************/
   package org.apache.cocoon.servlet;
   
  -import java.io.File;
  -import java.io.IOException;
  -import java.io.OutputStream;
  -import java.io.PrintWriter;
  -import java.net.MalformedURLException;
  -import java.net.URL;
  -import java.util.Arrays;
  -import java.util.Date;
  -import java.util.Enumeration;
  -import java.util.StringTokenizer;
  -import javax.servlet.ServletConfig;
  -import javax.servlet.ServletContext;
  -import javax.servlet.ServletException;
  -import javax.servlet.ServletOutputStream;
  -import javax.servlet.http.HttpServlet;
  -import javax.servlet.http.HttpServletRequest;
  -import javax.servlet.http.HttpServletResponse;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.DefaultContext;
   import org.apache.cocoon.Cocoon;
   import org.apache.cocoon.ConnectionResetException;
  @@ -34,26 +15,38 @@
   import org.apache.cocoon.Notifier;
   import org.apache.cocoon.ResourceNotFoundException;
   import org.apache.cocoon.components.classloader.RepositoryClassLoader;
  -import org.apache.cocoon.environment.Context;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.http.HttpContext;
   import org.apache.cocoon.environment.http.HttpEnvironment;
   import org.apache.cocoon.environment.http.RequestWrapper;
   import org.apache.cocoon.util.ClassUtils;
   import org.apache.cocoon.util.IOUtils;
  -import org.apache.cocoon.util.NetUtils;
   import org.apache.cocoon.util.log.CocoonLogFormatter;
   import org.apache.cocoon.util.log.XMLCocoonLogFormatter;
   import org.apache.log.ContextMap;
  -import org.apache.log.format.Formatter;
   import org.apache.log.Hierarchy;
   import org.apache.log.LogTarget;
   import org.apache.log.Logger;
   import org.apache.log.Priority;
   import org.apache.log.filter.PriorityFilter;
  -import org.apache.log.output.io.FileTarget;
  +import org.apache.log.format.Formatter;
   import org.apache.log.output.ServletOutputLogTarget;
  -import org.xml.sax.SAXException;
  +import org.apache.log.output.io.FileTarget;
  +
  +import javax.servlet.ServletConfig;
  +import javax.servlet.ServletContext;
  +import javax.servlet.ServletException;
  +import javax.servlet.ServletOutputStream;
  +import javax.servlet.http.HttpServlet;
  +import javax.servlet.http.HttpServletRequest;
  +import javax.servlet.http.HttpServletResponse;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.OutputStream;
  +import java.net.URL;
  +import java.util.Arrays;
  +import java.util.Date;
  +import java.util.StringTokenizer;
   
   /**
    * This is the entry point for Cocoon execution as an HTTP Servlet.
  @@ -64,7 +57,7 @@
    * @author <a href="mailto:nicolaken@supereva.it">Nicola Ken Barozzi</a> Aisa
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.31 $ $Date: 2001/08/18 18:15:36 $
  + * @version CVS $Revision: 1.32 $ $Date: 2001/08/20 13:55:17 $
    */
   
   public class CocoonServlet extends HttpServlet {
  
  
  
  1.3       +2 -3      xml-cocoon2/src/org/apache/cocoon/servlet/ParanoidClassLoader.java
  
  Index: ParanoidClassLoader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/ParanoidClassLoader.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ParanoidClassLoader.java	2001/05/23 16:29:08	1.2
  +++ ParanoidClassLoader.java	2001/08/20 13:55:17	1.3
  @@ -7,9 +7,8 @@
    *****************************************************************************/
   package org.apache.cocoon.servlet;
   
  -import java.io.IOException;
   import java.io.File;
  -
  +import java.io.IOException;
   import java.net.MalformedURLException;
   import java.net.URL;
   import java.net.URLClassLoader;
  @@ -20,7 +19,7 @@
    * classes.  It checks this classloader before it checks its parent.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/05/23 16:29:08 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:17 $
    */
   
   public class ParanoidClassLoader extends URLClassLoader {
  
  
  
  1.4       +4 -10     xml-cocoon2/src/org/apache/cocoon/servlet/ParanoidCocoonServlet.java
  
  Index: ParanoidCocoonServlet.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/ParanoidCocoonServlet.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ParanoidCocoonServlet.java	2001/07/12 13:47:40	1.3
  +++ ParanoidCocoonServlet.java	2001/08/20 13:55:17	1.4
  @@ -8,17 +8,11 @@
   
   package org.apache.cocoon.servlet;
   
  -import java.io.File;
  -import java.io.IOException;
  -import java.net.MalformedURLException;
  -import java.net.URL;
  -import java.util.Date;
  -import javax.servlet.ServletContext;
  -import javax.servlet.ServletException;
  -import org.apache.avalon.framework.context.ContextException;
  -import org.apache.cocoon.Constants;
   import org.apache.cocoon.util.IOUtils;
   
  +import javax.servlet.ServletException;
  +import java.io.File;
  +
   /**
    * This is the entry point for Cocoon execution as an HTTP Servlet.
    * It also creates a buffer by loading the whole servlet inside a ClassLoader.
  @@ -28,7 +22,7 @@
    * of it.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/07/12 13:47:40 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:17 $
    */
   
   public class ParanoidCocoonServlet extends CocoonServlet {
  
  
  
  1.16      +10 -15    xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java
  
  Index: AbstractSitemap.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- AbstractSitemap.java	2001/07/18 12:22:19	1.15
  +++ AbstractSitemap.java	2001/08/20 13:55:17	1.16
  @@ -8,24 +8,15 @@
   
   package org.apache.cocoon.sitemap;
   
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.net.URL;
  -import java.util.ArrayList;
  -import java.util.List;
  -import java.util.Map;
  +import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
  +import org.apache.avalon.excalibur.component.RoleManager;
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.activity.Initializable;
   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.Composable;
  -import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
   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.AbstractLoggable;
   import org.apache.avalon.framework.thread.ThreadSafe;
   import org.apache.cocoon.Constants;
  @@ -43,15 +34,19 @@
   import org.apache.cocoon.serialization.Serializer;
   import org.apache.cocoon.transformation.Transformer;
   import org.apache.cocoon.util.ClassUtils;
  -import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
  -import org.apache.avalon.excalibur.component.RoleManager;
  -import org.apache.avalon.excalibur.component.DefaultRoleManager;
  +
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.net.URL;
  +import java.util.ArrayList;
  +import java.util.List;
  +import java.util.Map;
   
   /**
    * Base class for generated <code>Sitemap</code> classes
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.15 $ $Date: 2001/07/18 12:22:19 $
  + * @version CVS $Revision: 1.16 $ $Date: 2001/08/20 13:55:17 $
    */
   public abstract class AbstractSitemap extends AbstractLoggable implements Sitemap, Disposable, ThreadSafe {
       private Context context;
  
  
  
  1.14      +7 -10     xml-cocoon2/src/org/apache/cocoon/sitemap/ContentAggregator.java
  
  Index: ContentAggregator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/ContentAggregator.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ContentAggregator.java	2001/07/12 06:22:42	1.13
  +++ ContentAggregator.java	2001/08/20 13:55:17	1.14
  @@ -8,38 +8,35 @@
   
   package org.apache.cocoon.sitemap;
   
  -import java.io.IOException;
  -import java.util.ArrayList;
  -import java.util.Map;
  -import java.util.Iterator;
  -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.Composable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.caching.CacheValidity;
   import org.apache.cocoon.caching.AggregatedCacheValidity;
  +import org.apache.cocoon.caching.CacheValidity;
   import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.TimeStampCacheValidity;
  -import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.generation.Generator;
  +import org.apache.cocoon.util.HashUtil;
   import org.apache.cocoon.xml.ContentHandlerWrapper;
   import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.cocoon.xml.XMLProducer;
  -import org.apache.cocoon.util.HashUtil;
   import org.xml.sax.Attributes;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.SAXException;
   import org.xml.sax.ext.LexicalHandler;
   import org.xml.sax.helpers.AttributesImpl;
   
  +import java.io.IOException;
  +import java.util.ArrayList;
  +import java.util.Map;
  +
   /**
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Id: ContentAggregator.java,v 1.13 2001/07/12 06:22:42 cziegeler Exp $
  + * @version CVS $Id: ContentAggregator.java,v 1.14 2001/08/20 13:55:17 dims Exp $
    */
   public class ContentAggregator extends ContentHandlerWrapper implements Generator, Cacheable, Composable {
   
  
  
  
  1.17      +5 -5      xml-cocoon2/src/org/apache/cocoon/sitemap/Handler.java
  
  Index: Handler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/Handler.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Handler.java	2001/08/14 16:02:05	1.16
  +++ Handler.java	2001/08/20 13:55:17	1.17
  @@ -8,9 +8,6 @@
   
   package org.apache.cocoon.sitemap;
   
  -import java.io.FileNotFoundException;
  -import java.io.IOException;
  -import java.net.URL;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
  @@ -20,7 +17,6 @@
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.avalon.excalibur.component.RoleManager;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.Processor;
   import org.apache.cocoon.components.language.generator.CompiledComponent;
  @@ -34,13 +30,17 @@
   import org.apache.cocoon.environment.SourceResolver;
   import org.xml.sax.SAXException;
   
  +import java.io.FileNotFoundException;
  +import java.io.IOException;
  +import java.net.URL;
  +
   /**
    * Handles the manageing and stating of one <code>Sitemap</code>
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.16 $ $Date: 2001/08/14 16:02:05 $
  + * @version CVS $Revision: 1.17 $ $Date: 2001/08/20 13:55:17 $
    */
   public class Handler extends AbstractLoggable
   implements Runnable, Contextualizable, Composable, Processor, Disposable, SourceResolver {
  
  
  
  1.4       +4 -3      xml-cocoon2/src/org/apache/cocoon/sitemap/LinkTranslator.java
  
  Index: LinkTranslator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/LinkTranslator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LinkTranslator.java	2001/06/08 20:28:25	1.3
  +++ LinkTranslator.java	2001/08/20 13:55:17	1.4
  @@ -8,8 +8,6 @@
   
   package org.apache.cocoon.sitemap;
   
  -import java.io.IOException;
  -import java.util.Map;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
  @@ -19,9 +17,12 @@
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   
  +import java.io.IOException;
  +import java.util.Map;
  +
   /**
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/06/08 20:28:25 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:17 $
    */
   public class LinkTranslator extends ExtendedXLinkPipe implements Transformer {
       private Map links;
  
  
  
  1.10      +5 -6      xml-cocoon2/src/org/apache/cocoon/sitemap/Manager.java
  
  Index: Manager.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/Manager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Manager.java	2001/08/20 13:02:05	1.9
  +++ Manager.java	2001/08/20 13:55:17	1.10
  @@ -8,9 +8,7 @@
   
   package org.apache.cocoon.sitemap;
   
  -import java.io.File;
  -import java.util.HashMap;
  -import java.util.Iterator;
  +import org.apache.avalon.excalibur.component.RoleManager;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  @@ -21,12 +19,13 @@
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.avalon.excalibur.component.RoleManager;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.pipeline.EventPipeline;
   import org.apache.cocoon.components.pipeline.StreamPipeline;
   import org.apache.cocoon.environment.Environment;
  -import org.apache.cocoon.sitemap.Handler;
  +
  +import java.util.HashMap;
  +import java.util.Iterator;
   
   /**
    * This class manages all sub <code>Sitemap</code>s of a <code>Sitemap</code>
  @@ -34,7 +33,7 @@
    * checking regeneration of the sub <code>Sitemap</code>
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.9 $ $Date: 2001/08/20 13:02:05 $
  + * @version CVS $Revision: 1.10 $ $Date: 2001/08/20 13:55:17 $
    */
   public class Manager extends AbstractLoggable implements Component, Configurable, Composable, Contextualizable, ThreadSafe {
       private Context context;
  
  
  
  1.8       +6 -8      xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapComponentSelector.java
  
  Index: SitemapComponentSelector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapComponentSelector.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SitemapComponentSelector.java	2001/08/16 01:35:26	1.7
  +++ SitemapComponentSelector.java	2001/08/20 13:55:17	1.8
  @@ -8,22 +8,20 @@
   
   package org.apache.cocoon.sitemap;
   
  -import java.util.Collections;
  -import java.util.HashMap;
  -import java.util.Map;
  +import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
   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.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
  +
  +import java.util.Collections;
  +import java.util.HashMap;
  +import java.util.Map;
   
   /** Default component manager for Cocoon's sitemap components.
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
  - * @version CVS $Id: SitemapComponentSelector.java,v 1.7 2001/08/16 01:35:26 vgritsenko Exp $
  + * @version CVS $Id: SitemapComponentSelector.java,v 1.8 2001/08/20 13:55:17 dims Exp $
    */
   public class SitemapComponentSelector extends ExcaliburComponentSelector {
       private Map mime_types;
  
  
  
  1.4       +4 -3      xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapModelComponent.java
  
  Index: SitemapModelComponent.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapModelComponent.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SitemapModelComponent.java	2001/06/08 20:28:27	1.3
  +++ SitemapModelComponent.java	2001/08/20 13:55:17	1.4
  @@ -8,19 +8,20 @@
   
   package org.apache.cocoon.sitemap;
   
  -import java.io.IOException;
  -import java.util.Map;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.SourceResolver;
   import org.xml.sax.SAXException;
   
  +import java.io.IOException;
  +import java.util.Map;
  +
   /**
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.3 $ $Date: 2001/06/08 20:28:27 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:17 $
    */
   public interface SitemapModelComponent extends Component {
       /**
  
  
  
  1.4       +3 -2      xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapOutputComponent.java
  
  Index: SitemapOutputComponent.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapOutputComponent.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SitemapOutputComponent.java	2001/07/12 10:23:40	1.3
  +++ SitemapOutputComponent.java	2001/08/20 13:55:17	1.4
  @@ -8,15 +8,16 @@
   
   package org.apache.cocoon.sitemap;
   
  +import org.apache.avalon.framework.component.Component;
  +
   import java.io.IOException;
   import java.io.OutputStream;
  -import org.apache.avalon.framework.component.Component;
   
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/07/12 10:23:40 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:17 $
    */
   public interface SitemapOutputComponent extends Component {
       /**
  
  
  
  1.3       +2 -1      xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapRedirector.java
  
  Index: SitemapRedirector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapRedirector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SitemapRedirector.java	2001/06/08 20:28:28	1.2
  +++ SitemapRedirector.java	2001/08/20 13:55:17	1.3
  @@ -10,13 +10,14 @@
   
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.Redirector;
  +
   import java.io.IOException;
   
   /**
    * Wrapper for sitemap redirection
    *
    * @author <a href="mailto:cziegeler@sundn.de">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/06/08 20:28:28 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:17 $
    */
   public class SitemapRedirector implements Redirector {
       private boolean hasRedirected = false;
  
  
  
  1.4       +3 -2      xml-cocoon2/src/org/apache/cocoon/sitemap/XSLTFactoryLoader.java
  
  Index: XSLTFactoryLoader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/XSLTFactoryLoader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XSLTFactoryLoader.java	2001/06/08 20:28:28	1.3
  +++ XSLTFactoryLoader.java	2001/08/20 13:55:17	1.4
  @@ -8,13 +8,14 @@
   
   package org.apache.cocoon.sitemap;
   
  -import java.util.HashMap;
   import org.apache.avalon.framework.logger.Loggable;
   import org.apache.cocoon.CodeFactory;
   import org.apache.cocoon.util.ClassUtils;
   import org.apache.log.Logger;
   import org.w3c.dom.NodeList;
   
  +import java.util.HashMap;
  +
   /**
    * This class is used as a XSLT extension class. It is used by the sitemap
    * generation stylesheet to load <code>MatcherFactory</code>s or
  @@ -25,7 +26,7 @@
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/06/08 20:28:28 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:17 $
    */
   public class XSLTFactoryLoader {
       protected static Logger log;
  
  
  
  1.5       +4 -5      xml-cocoon2/src/org/apache/cocoon/transformation/AbstractDOMTransformer.java
  
  Index: AbstractDOMTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/AbstractDOMTransformer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractDOMTransformer.java	2001/07/07 11:43:35	1.4
  +++ AbstractDOMTransformer.java	2001/08/20 13:55:17	1.5
  @@ -7,26 +7,25 @@
    *****************************************************************************/
   package org.apache.cocoon.transformation;
   
  -import java.io.IOException;
  -import java.util.Map;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   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.Composable;
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.transformation.Transformer;
   import org.apache.cocoon.xml.XMLConsumer;
   import org.apache.cocoon.xml.dom.DOMBuilder;
  -import org.apache.cocoon.xml.dom.DOMFactory;
   import org.apache.cocoon.xml.dom.DOMStreamer;
   import org.w3c.dom.Document;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.SAXException;
   import org.xml.sax.ext.LexicalHandler;
  +
  +import java.io.IOException;
  +import java.util.Map;
   
   /**
    * An Abstract DOM Transformer, for use when a transformer needs a DOM-based
  
  
  
  1.5       +4 -3      xml-cocoon2/src/org/apache/cocoon/transformation/CIncludeTransformer.java
  
  Index: CIncludeTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/CIncludeTransformer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CIncludeTransformer.java	2001/07/07 11:43:35	1.4
  +++ CIncludeTransformer.java	2001/08/20 13:55:17	1.5
  @@ -7,8 +7,6 @@
    *****************************************************************************/
   package org.apache.cocoon.transformation;
   
  -import java.io.IOException;
  -import java.util.Map;
   import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  @@ -20,6 +18,9 @@
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  +import java.io.IOException;
  +import java.util.Map;
  +
   /**
    * This transformer triggers for the element <code>include</code> in the
    * namespace "http://apache.org/cocoon/include/1.0".
  @@ -30,7 +31,7 @@
    * which surrounds the included content.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/07/07 11:43:35 $ $Author: giacomo $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:17 $ $Author: dims $
    */
   public class CIncludeTransformer extends AbstractTransformer
   implements Recyclable, Composable {
  
  
  
  1.6       +5 -9      xml-cocoon2/src/org/apache/cocoon/transformation/CachingCIncludeTransformer.java
  
  Index: CachingCIncludeTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/CachingCIncludeTransformer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CachingCIncludeTransformer.java	2001/07/17 10:59:22	1.5
  +++ CachingCIncludeTransformer.java	2001/08/20 13:55:17	1.6
  @@ -7,27 +7,23 @@
    *****************************************************************************/
   package org.apache.cocoon.transformation;
   
  -import java.io.IOException;
  -import java.util.Map;
   import org.apache.avalon.excalibur.pool.Recyclable;
   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.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.CacheValidity;
  +import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.IncludeCacheValidity;
  -import org.apache.cocoon.caching.TimeStampCacheValidity;
  -import org.apache.cocoon.components.store.Store;
  -import org.apache.cocoon.components.parser.Parser;
  -import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.xml.IncludeXMLConsumer;
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
  -import org.apache.cocoon.util.HashUtil;
  +
  +import java.io.IOException;
  +import java.util.Map;
   
   /**
    * <p>This transformer triggers for the element <code>include</code> in the
  @@ -49,7 +45,7 @@
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
    * @author <a href="mailto:maciejka@tiger.com.pl">Maciek Kaminski</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2001/07/17 10:59:22 $ $Author: cziegeler $
  + * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:17 $ $Author: dims $
    */
   public class CachingCIncludeTransformer extends AbstractTransformer
   implements Recyclable, Composable, Cacheable {
  
  
  
  1.3       +6 -6      xml-cocoon2/src/org/apache/cocoon/transformation/FilterTransformer.java
  
  Index: FilterTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/FilterTransformer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FilterTransformer.java	2001/07/10 19:49:02	1.2
  +++ FilterTransformer.java	2001/08/20 13:55:17	1.3
  @@ -1,16 +1,16 @@
   package org.apache.cocoon.transformation;
   
  -import java.util.Map;
  -import java.io.IOException;
  +import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.transformation.AbstractTransformer;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.excalibur.pool.Poolable;
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  +import java.io.IOException;
  +import java.util.Map;
  +
   /**
    * The filter transformer can be used to let only an amount of elements through in
    * a given block.
  @@ -25,7 +25,7 @@
    * Only the 3th block will be shown, containing only 5 row elements.
    *
    * @author <a href="mailto:sven.beauprez@the-ecorp.com">Sven Beauprez</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/10 19:49:02 $ $Author: bloritsch $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:17 $ $Author: dims $
    */
   
   public class FilterTransformer extends AbstractTransformer implements Poolable {
  
  
  
  1.5       +8 -9      xml-cocoon2/src/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
  
  Index: FragmentExtractorTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/FragmentExtractorTransformer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FragmentExtractorTransformer.java	2001/07/07 11:43:35	1.4
  +++ FragmentExtractorTransformer.java	2001/08/20 13:55:17	1.5
  @@ -7,26 +7,20 @@
    *****************************************************************************/
   package org.apache.cocoon.transformation;
   
  -import java.io.IOException;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Map;
  +import org.apache.avalon.excalibur.pool.Poolable;
   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.Composable;
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.caching.CacheValidity;
   import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.NOPCacheValidity;
  +import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.generation.FragmentExtractorGenerator;
  -import org.apache.cocoon.transformation.AbstractTransformer;
  -import org.apache.cocoon.util.HashUtil;
   import org.apache.cocoon.xml.dom.DOMBuilder;
   import org.apache.cocoon.xml.dom.DOMFactory;
   import org.w3c.dom.Document;
  @@ -34,6 +28,11 @@
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  +import java.io.IOException;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.Map;
  +
   
   /** The transformation half of the FragmentExtractor.
    * This transformer sieves an incoming stream of xml with embedded SVG images
  @@ -43,7 +42,7 @@
    * <a href="http://c2.com/cgi/wiki?YouArentGonnaNeedIt">you aren't gonna need it</a>,
    * so I've just used very simple extraction based on a URI and local name.
    * @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/07/07 11:43:35 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:17 $
    */
   public class FragmentExtractorTransformer extends AbstractTransformer
       implements Composable, Disposable, Cacheable, Poolable {
  
  
  
  1.16      +16 -34    xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer.java
  
  Index: I18nTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- I18nTransformer.java	2001/08/14 11:46:08	1.15
  +++ I18nTransformer.java	2001/08/20 13:55:17	1.16
  @@ -9,56 +9,38 @@
    */
   package org.apache.cocoon.transformation;
   
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.acting.LocaleAction;
  -import org.apache.cocoon.components.parser.Parser;
  -import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.environment.SourceResolver;
  -
  -import org.apache.cocoon.i18n.XMLResourceBundle;
  -import org.apache.cocoon.i18n.XMLResourceBundleFactory;
  -
   import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.logger.Loggable;
  -
   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.configuration.DefaultConfiguration;
  -
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.acting.LocaleAction;
  +import org.apache.cocoon.environment.SourceResolver;
  +import org.apache.cocoon.i18n.XMLResourceBundle;
  +import org.apache.cocoon.i18n.XMLResourceBundleFactory;
   import org.apache.regexp.RE;
  -
   import org.xml.sax.Attributes;
  -import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
  -import org.xml.sax.helpers.DefaultHandler;
   
   import java.io.IOException;
  -
  -import java.util.Map;
  -import java.util.HashMap;
  -import java.util.StringTokenizer;
  -import java.util.ArrayList;
  -import java.util.Locale;
  -import java.util.Date;
  -import java.util.MissingResourceException;
  -
  -import java.text.Format;
  -import java.text.MessageFormat;
   import java.text.DateFormat;
  -import java.text.SimpleDateFormat;
  -import java.text.NumberFormat;
   import java.text.DecimalFormat;
  +import java.text.MessageFormat;
  +import java.text.NumberFormat;
   import java.text.ParseException;
  -
  -import java.net.URL;
  -import java.net.MalformedURLException;
  +import java.text.SimpleDateFormat;
  +import java.util.ArrayList;
  +import java.util.Date;
  +import java.util.HashMap;
  +import java.util.Locale;
  +import java.util.Map;
  +import java.util.MissingResourceException;
  +import java.util.StringTokenizer;
   
   /**
    * Internationalisation transformer. Used to transform i18n markup into text
  
  
  
  1.5       +15 -21    xml-cocoon2/src/org/apache/cocoon/transformation/LDAPTransformer.java
  
  Index: LDAPTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/LDAPTransformer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LDAPTransformer.java	2001/07/07 11:43:35	1.4
  +++ LDAPTransformer.java	2001/08/20 13:55:17	1.5
  @@ -7,7 +7,21 @@
    *****************************************************************************/
   package org.apache.cocoon.transformation;
   
  +import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.environment.SourceResolver;
  +import org.apache.cocoon.xml.XMLConsumer;
  +import org.apache.log.Logger;
  +import org.xml.sax.Attributes;
  +import org.xml.sax.Locator;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.ext.LexicalHandler;
  +import org.xml.sax.helpers.AttributesImpl;
  +
   import javax.naming.Context;
  +import javax.naming.NamingEnumeration;
  +import javax.naming.NamingException;
   import javax.naming.directory.Attribute;
   import javax.naming.directory.BasicAttribute;
   import javax.naming.directory.DirContext;
  @@ -15,33 +29,13 @@
   import javax.naming.directory.ModificationItem;
   import javax.naming.directory.SearchControls;
   import javax.naming.directory.SearchResult;
  -import javax.naming.NamingEnumeration;
  -import javax.naming.NamingException;
  -
   import java.io.IOException;
  -import java.lang.Integer;
  -import java.lang.Long;
   import java.util.Enumeration;
  +import java.util.LinkedList;
   import java.util.List;
  -import java.util.LinkedList ;
   import java.util.Map;
   import java.util.Properties;
   import java.util.Vector;
  -import org.apache.avalon.excalibur.pool.Poolable;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.util.ClassUtils;
  -import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.cocoon.xml.XMLProducer;
  -import org.apache.log.Logger;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.Locator;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.ext.LexicalHandler;
  -import org.xml.sax.helpers.AttributesImpl;
   
   
   /*****************************************************************************
  
  
  
  1.4       +7 -6      xml-cocoon2/src/org/apache/cocoon/transformation/LogTransformer.java
  
  Index: LogTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/LogTransformer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LogTransformer.java	2001/08/07 10:44:40	1.3
  +++ LogTransformer.java	2001/08/20 13:55:17	1.4
  @@ -7,18 +7,19 @@
    *****************************************************************************/
   package org.apache.cocoon.transformation;
   
  -import java.io.FileWriter;
  -import java.io.IOException;
  -import java.util.Date;
  -import java.util.Map;
  +import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.avalon.excalibur.pool.Poolable;
   import org.xml.sax.Attributes;
   import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
   
  +import java.io.FileWriter;
  +import java.io.IOException;
  +import java.util.Date;
  +import java.util.Map;
  +
   /**
    *
    * The <code>LogTransformer</code> is a class that can be plugged into a pipeline
  @@ -43,7 +44,7 @@
    *
    * @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
    *         (PWR Organisation &amp; Entwicklung)
  - * @version CVS $Revision: 1.3 $ $Date: 2001/08/07 10:44:40 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:17 $
    *
    */
   public class LogTransformer extends AbstractTransformer implements Poolable {
  
  
  
  1.3       +9 -9      xml-cocoon2/src/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java
  
  Index: ReadDOMSessionTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ReadDOMSessionTransformer.java	2001/08/10 11:59:04	1.2
  +++ ReadDOMSessionTransformer.java	2001/08/20 13:55:17	1.3
  @@ -1,21 +1,21 @@
   package org.apache.cocoon.transformation;
   
  -import java.util.Map;
  -import java.io.IOException;
  +import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Session;
  +import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.Session;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.transformation.AbstractTransformer;
  -import org.apache.cocoon.xml.dom.DOMStreamer;
   import org.apache.cocoon.xml.EmbeddedXMLPipe;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.cocoon.xml.dom.DOMStreamer;
   import org.w3c.dom.Node;
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   
  +import java.io.IOException;
  +import java.util.Map;
  +
   
   /**
    * With this transformer, a DOM-object that is stored in the session, can be inserted
  @@ -35,7 +35,7 @@
    *  the trigger-element
    *
    * @author <a href="mailto:sven.beauprez@the-ecorp.com">Sven Beauprez</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/08/10 11:59:04 $ $Author: dims $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:17 $ $Author: dims $
    */
   
   public class ReadDOMSessionTransformer extends AbstractTransformer implements Poolable {
  
  
  
  1.3       +6 -10     xml-cocoon2/src/org/apache/cocoon/transformation/RoleFilterTransformer.java
  
  Index: RoleFilterTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/RoleFilterTransformer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RoleFilterTransformer.java	2001/07/10 20:18:24	1.2
  +++ RoleFilterTransformer.java	2001/08/20 13:55:17	1.3
  @@ -8,22 +8,18 @@
   package org.apache.cocoon.transformation;
   
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.excalibur.pool.Recyclable;
  -
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.transformation.FilterTransformer;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.SourceResolver;
  +import org.xml.sax.Attributes;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.helpers.AttributesImpl;
   
   import java.io.IOException;
   import java.util.Map;
   import java.util.StringTokenizer;
   
  -import org.xml.sax.helpers.AttributesImpl;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.SAXException;
  -
   /**
    * Filter XML fragments based on a user's role.  This will help in
    * the development of smart forms that must only show information to
  @@ -47,7 +43,7 @@
    * will work as expected.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/10 20:18:24 $ $Author: bloritsch $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:17 $ $Author: dims $
    */
   public class RoleFilterTransformer extends FilterTransformer {
       private final static String URI = "http://apache.org/cocoon/role-filter/1.0";
  
  
  
  1.16      +21 -27    xml-cocoon2/src/org/apache/cocoon/transformation/SQLTransformer.java
  
  Index: SQLTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/SQLTransformer.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- SQLTransformer.java	2001/08/14 16:42:28	1.15
  +++ SQLTransformer.java	2001/08/20 13:55:17	1.16
  @@ -7,49 +7,43 @@
    *****************************************************************************/
   package org.apache.cocoon.transformation;
   
  -import java.io.IOException;
  -import java.sql.Connection;
  -import java.sql.DriverManager;
  -import java.sql.ResultSet;
  -import java.sql.ResultSetMetaData;
  -import java.sql.SQLException;
  -import java.sql.PreparedStatement;
  -import java.sql.CallableStatement;
  -import java.util.Enumeration;
  -import java.util.Map;
  -import java.util.HashMap;
  -import java.util.TreeMap;
  -import java.util.Iterator;
  -import java.util.Properties;
  -import java.util.Vector;
  -import java.lang.reflect.Field;
  +import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   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.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  -import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.cocoon.environment.SourceResolver;
  +import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.util.ClassUtils;
  -import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.cocoon.xml.XMLProducer;
  +import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.util.Tokenizer;
   import org.apache.log.Logger;
   import org.xml.sax.Attributes;
  -import org.xml.sax.ContentHandler;
   import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
  -import org.xml.sax.ext.LexicalHandler;
   import org.xml.sax.helpers.AttributesImpl;
   
  -import org.apache.cocoon.transformation.AbstractTransformer;
  +import java.io.IOException;
  +import java.lang.reflect.Field;
  +import java.sql.CallableStatement;
  +import java.sql.Connection;
  +import java.sql.DriverManager;
  +import java.sql.PreparedStatement;
  +import java.sql.ResultSet;
  +import java.sql.ResultSetMetaData;
  +import java.sql.SQLException;
  +import java.util.Enumeration;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.Map;
  +import java.util.Properties;
  +import java.util.TreeMap;
  +import java.util.Vector;
   
   /**
    *
  @@ -57,7 +51,7 @@
    * @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
    *         (PWR Organisation & Entwicklung)
    * @author <a href="mailto:sven.beauprez@the-ecorp.com">Sven Beauprez</a>
  - * @version CVS $Revision: 1.15 $ $Date: 2001/08/14 16:42:28 $ $Author: dims $
  + * @version CVS $Revision: 1.16 $ $Date: 2001/08/20 13:55:17 $ $Author: dims $
    */
   
   public class SQLTransformer extends AbstractTransformer implements Composable, Recyclable, Disposable, Configurable {
  
  
  
  1.29      +11 -29    xml-cocoon2/src/org/apache/cocoon/transformation/TraxTransformer.java
  
  Index: TraxTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/TraxTransformer.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- TraxTransformer.java	2001/08/16 08:00:03	1.28
  +++ TraxTransformer.java	2001/08/20 13:55:17	1.29
  @@ -7,27 +7,7 @@
    *****************************************************************************/
   package org.apache.cocoon.transformation;
   
  -import java.io.File;
  -import java.io.IOException;
  -import java.lang.reflect.Method;
  -import java.text.StringCharacterIterator;
  -import java.util.Enumeration;
  -import java.util.HashMap;
  -import java.util.Hashtable;
  -import java.util.Iterator;
  -import java.util.Iterator;
  -import java.util.Map;
  -import javax.xml.transform.Templates;
  -import javax.xml.transform.TransformerConfigurationException;
  -import javax.xml.transform.TransformerFactory;
  -import javax.xml.transform.URIResolver;
  -import javax.xml.transform.sax.SAXResult;
  -import javax.xml.transform.sax.SAXSource;
  -import javax.xml.transform.sax.TransformerHandler;
  -import org.apache.avalon.excalibur.pool.Poolable;
  -import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentManager;
  @@ -41,23 +21,25 @@
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.caching.CacheValidity;
   import org.apache.cocoon.caching.Cacheable;
  -import org.apache.cocoon.caching.CompositeCacheValidity;
  -import org.apache.cocoon.caching.ParametersCacheValidity;
   import org.apache.cocoon.caching.TimeStampCacheValidity;
   import org.apache.cocoon.components.browser.Browser;
   import org.apache.cocoon.components.xslt.XSLTProcessor;
  +import org.apache.cocoon.environment.Cookie;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.environment.Cookie;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.util.HashUtil;
  -import org.apache.cocoon.util.TraxErrorHandler;
  -import org.apache.cocoon.xml.ContentHandlerWrapper;
   import org.apache.cocoon.xml.XMLConsumer;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  -import org.xml.sax.ext.LexicalHandler;
  +
  +import javax.xml.transform.sax.SAXResult;
  +import javax.xml.transform.sax.TransformerHandler;
  +import java.io.IOException;
  +import java.text.StringCharacterIterator;
  +import java.util.Enumeration;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.Map;
   import java.util.Set;
   
   /**
  @@ -98,7 +80,7 @@
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
    * @author <a href="mailto:ovidiu@cup.hp.com">Ovidiu Predescu</a>
  - * @version CVS $Id: TraxTransformer.java,v 1.28 2001/08/16 08:00:03 cziegeler Exp $
  + * @version CVS $Id: TraxTransformer.java,v 1.29 2001/08/20 13:55:17 dims Exp $
    */
   public class TraxTransformer extends AbstractTransformer
   implements Transformer, Composable, Recyclable, Configurable, Cacheable, Disposable {
  
  
  
  1.3       +13 -14    xml-cocoon2/src/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java
  
  Index: WriteDOMSessionTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WriteDOMSessionTransformer.java	2001/07/07 11:43:36	1.2
  +++ WriteDOMSessionTransformer.java	2001/08/20 13:55:17	1.3
  @@ -8,26 +8,25 @@
   
   package org.apache.cocoon.transformation;
   
  -import java.util.Map;
  -import java.io.IOException;
  -import javax.xml.parsers.ParserConfigurationException;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Session;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.transformation.AbstractTransformer;
  -import org.apache.cocoon.xml.dom.DOMBuilder;
  -import org.apache.cocoon.components.parser.Parser;
  +import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.components.parser.Parser;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.Session;
  +import org.apache.cocoon.environment.SourceResolver;
  +import org.apache.cocoon.xml.dom.DOMBuilder;
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   
  +import java.io.IOException;
  +import java.util.Map;
  +
   
   /**
    * Make a DOM object from SAX events and write it to the session.
  @@ -43,7 +42,7 @@
    *   dom-root-element is the trigger that will be the root element of the DOM
    *
    * @author <a href="mailto:sven.beauprez@the-ecorp.com">Sven Beauprez</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:36 $ $Author: giacomo $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:17 $ $Author: dims $
    */
   
   public class WriteDOMSessionTransformer extends AbstractTransformer implements 
  
  
  
  1.12      +14 -18    xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java
  
  Index: XIncludeTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- XIncludeTransformer.java	2001/07/11 18:07:24	1.11
  +++ XIncludeTransformer.java	2001/08/20 13:55:17	1.12
  @@ -7,23 +7,12 @@
    *****************************************************************************/
   package org.apache.cocoon.transformation;
   
  -import java.io.BufferedInputStream;
  -import java.io.BufferedReader;
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.io.InputStreamReader;
  -import java.io.Reader;
  -import java.net.MalformedURLException;
  -import java.net.URL;
  -import java.util.Map;
  -import java.util.Stack;
  -import javax.xml.transform.TransformerException;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   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.Composable;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.logger.Loggable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  @@ -31,19 +20,26 @@
   import org.apache.cocoon.components.url.URLFactory;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.xml.IncludeXMLConsumer;
  -import org.apache.cocoon.xml.dom.DOMBuilder;
   import org.apache.cocoon.xml.dom.DOMStreamer;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.xpath.XPathAPI;
   import org.w3c.dom.Document;
  -import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
   import org.xml.sax.Attributes;
  -import org.xml.sax.ContentHandler;
   import org.xml.sax.InputSource;
   import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
  -import org.xml.sax.ext.LexicalHandler;
  +
  +import javax.xml.transform.TransformerException;
  +import java.io.BufferedInputStream;
  +import java.io.BufferedReader;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.InputStreamReader;
  +import java.io.Reader;
  +import java.net.MalformedURLException;
  +import java.net.URL;
  +import java.util.Map;
  +import java.util.Stack;
   
   /**
    * My first pass at an XInclude transformation. Currently it should set the base URI
  @@ -53,7 +49,7 @@
    * by the SAX event FSM yet.
    *
    * @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a>
  - * @version CVS $Revision: 1.11 $ $Date: 2001/07/11 18:07:24 $ $Author: bloritsch $
  + * @version CVS $Revision: 1.12 $ $Date: 2001/08/20 13:55:17 $ $Author: dims $
    */
   public class XIncludeTransformer extends AbstractTransformer implements Composable, Recyclable, Disposable {
   
  
  
  
  1.6       +11 -13    xml-cocoon2/src/org/apache/cocoon/transformation/XTTransformer.java
  
  Index: XTTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/XTTransformer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XTTransformer.java	2001/07/07 11:43:36	1.5
  +++ XTTransformer.java	2001/08/20 13:55:17	1.6
  @@ -21,38 +21,27 @@
   import com.jclark.xsl.tr.EngineImpl;
   import com.jclark.xsl.tr.ParameterSet;
   import com.jclark.xsl.tr.Sheet;
  -import java.io.File;
  -import java.io.IOException;
  -import java.net.URL;
  -import java.util.HashMap;
  -import java.util.Map;
  -import javax.xml.parsers.ParserConfigurationException;
  -import javax.xml.parsers.SAXParser;
  -import javax.xml.parsers.SAXParserFactory;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   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.Composable;
   import org.apache.avalon.framework.logger.Loggable;
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.cocoon.Constants;
   import org.apache.cocoon.Modifiable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.store.Store;
   import org.apache.cocoon.components.url.URLFactory;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.transformation.Transformer;
   import org.apache.cocoon.xml.DocumentHandlerAdapter;
   import org.apache.cocoon.xml.DocumentHandlerWrapper;
   import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.log.Logger;
   import org.xml.sax.AttributeList;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.DTDHandler;
   import org.xml.sax.DocumentHandler;
   import org.xml.sax.ErrorHandler;
  -import org.xml.sax.HandlerBase;
   import org.xml.sax.InputSource;
   import org.xml.sax.Locator;
   import org.xml.sax.Parser;
  @@ -60,11 +49,20 @@
   import org.xml.sax.SAXParseException;
   import org.xml.sax.ext.LexicalHandler;
   
  +import javax.xml.parsers.ParserConfigurationException;
  +import javax.xml.parsers.SAXParser;
  +import javax.xml.parsers.SAXParserFactory;
  +import java.io.File;
  +import java.io.IOException;
  +import java.net.URL;
  +import java.util.HashMap;
  +import java.util.Map;
  +
   /**
    * This Transformer use the XT processor.
    *
    * @author <a href="mailto:ssahuc@imediation.com">Sahuc Sebastien</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2001/07/07 11:43:36 $
  + * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:17 $
    */
   public class XTTransformer extends DocumentHandlerWrapper
   implements Transformer, Composable, Loggable, Recyclable, Disposable {
  
  
  
  1.11      +2 -2      xml-cocoon2/src/org/apache/cocoon/util/ClassUtils.java
  
  Index: ClassUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/ClassUtils.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ClassUtils.java	2001/07/30 10:50:44	1.10
  +++ ClassUtils.java	2001/08/20 13:55:18	1.11
  @@ -10,15 +10,15 @@
   
   import java.io.File;
   import java.io.IOException;
  -import java.net.URL;
   import java.net.MalformedURLException;
  +import java.net.URL;
   
   /**
    * A collection of class management utility methods.
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.10 $ $Date: 2001/07/30 10:50:44 $
  + * @version CVS $Revision: 1.11 $ $Date: 2001/08/20 13:55:18 $
    */
   public class ClassUtils {
   
  
  
  
  1.8       +3 -2      xml-cocoon2/src/org/apache/cocoon/util/IOUtils.java
  
  Index: IOUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/IOUtils.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- IOUtils.java	2001/08/08 19:55:29	1.7
  +++ IOUtils.java	2001/08/20 13:55:18	1.8
  @@ -7,6 +7,8 @@
    *****************************************************************************/
   package org.apache.cocoon.util;
   
  +import org.apache.log.Hierarchy;
  +
   import java.io.BufferedInputStream;
   import java.io.BufferedOutputStream;
   import java.io.File;
  @@ -20,7 +22,6 @@
   import java.text.Collator;
   import java.util.Arrays;
   import java.util.Locale;
  -import org.apache.log.Hierarchy;
   
   /**
    * A collection of <code>File</code>, <code>URL</code> and filename
  @@ -28,7 +29,7 @@
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.7 $ $Date: 2001/08/08 19:55:29 $
  + * @version CVS $Revision: 1.8 $ $Date: 2001/08/20 13:55:18 $
    */
   public class IOUtils {
   
  
  
  
  1.4       +1 -4      xml-cocoon2/src/org/apache/cocoon/util/NetUtils.java
  
  Index: NetUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/NetUtils.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NetUtils.java	2001/07/18 17:34:37	1.3
  +++ NetUtils.java	2001/08/20 13:55:18	1.4
  @@ -8,9 +8,6 @@
   
   package org.apache.cocoon.util;
   
  -import java.io.File;
  -import java.net.MalformedURLException;
  -import java.net.URL;
   import java.util.Map;
   
   /**
  @@ -18,7 +15,7 @@
    * utility methods
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/07/18 17:34:37 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:18 $
    */
   
   public class NetUtils {
  
  
  
  1.3       +2 -2      xml-cocoon2/src/org/apache/cocoon/util/PostInputStream.java
  
  Index: PostInputStream.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/PostInputStream.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PostInputStream.java	2001/06/15 11:49:26	1.2
  +++ PostInputStream.java	2001/08/20 13:55:18	1.3
  @@ -7,14 +7,14 @@
    *****************************************************************************/
   package org.apache.cocoon.util;
   
  -import java.io.InputStream;
   import java.io.IOException;
  +import java.io.InputStream;
   /**
    * The class PostInputStream is a wrapper for InputStream associated with POST message.
    * It allows to control read operation, restricting the number of bytes read to the value returned by getContentLen() method.
    *
    * @author <a href="mailto:Kinga_Dziembowski@hp.com">Kinga Dziembowski</a>
  - * @version $Id: PostInputStream.java,v 1.2 2001/06/15 11:49:26 dims Exp $
  + * @version $Id: PostInputStream.java,v 1.3 2001/08/20 13:55:18 dims Exp $
    */
   
   public class PostInputStream extends InputStream {
  
  
  
  1.2       +2 -2      xml-cocoon2/src/org/apache/cocoon/util/StringUtils.java
  
  Index: StringUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/StringUtils.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StringUtils.java	2001/05/09 20:49:33	1.1
  +++ StringUtils.java	2001/08/20 13:55:18	1.2
  @@ -7,14 +7,14 @@
    *****************************************************************************/
   package org.apache.cocoon.util;
   
  -import java.util.StringTokenizer;
   
  +
   /**
    * A collection of <code>String</code> handling utility methods.
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:33 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:18 $
    */
   public class StringUtils {
     
  
  
  
  1.2       +2 -1      xml-cocoon2/src/org/apache/cocoon/util/TraxErrorHandler.java
  
  Index: TraxErrorHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/TraxErrorHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TraxErrorHandler.java	2001/05/09 20:49:34	1.1
  +++ TraxErrorHandler.java	2001/08/20 13:55:18	1.2
  @@ -8,10 +8,11 @@
   
   package org.apache.cocoon.util;
   
  +import org.apache.log.Logger;
  +
   import javax.xml.transform.ErrorListener;
   import javax.xml.transform.SourceLocator;
   import javax.xml.transform.TransformerException;
  -import org.apache.log.Logger;
   
   public class TraxErrorHandler implements ErrorListener {
   
  
  
  
  1.6       +5 -7      xml-cocoon2/src/org/apache/cocoon/util/log/CocoonLogFormatter.java
  
  Index: CocoonLogFormatter.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/log/CocoonLogFormatter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CocoonLogFormatter.java	2001/08/13 08:40:38	1.5
  +++ CocoonLogFormatter.java	2001/08/20 13:55:18	1.6
  @@ -8,18 +8,16 @@
   
   package org.apache.cocoon.util.log;
   
  -import java.text.SimpleDateFormat;
  -import java.util.Date;
  -import java.util.Map;
  -
   import org.apache.avalon.framework.CascadingThrowable;
  -
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Request;
  -
   import org.apache.log.ContextMap;
   import org.apache.log.LogEvent;
   
  +import java.text.SimpleDateFormat;
  +import java.util.Date;
  +import java.util.Map;
  +
   /**
    * An extended pattern formatter. New patterns are defined by this class are :
    * <ul>
  @@ -34,7 +32,7 @@
    * </ul>
    *
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2001/08/13 08:40:38 $
  + * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:18 $
    */
   
   public class CocoonLogFormatter extends ExtensiblePatternFormatter
  
  
  
  1.6       +4 -3      xml-cocoon2/src/org/apache/cocoon/util/log/ExtensiblePatternFormatter.java
  
  Index: ExtensiblePatternFormatter.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/log/ExtensiblePatternFormatter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ExtensiblePatternFormatter.java	2001/08/16 14:01:53	1.5
  +++ ExtensiblePatternFormatter.java	2001/08/20 13:55:18	1.6
  @@ -8,13 +8,14 @@
   
   package org.apache.cocoon.util.log;
   
  -import java.io.StringWriter;
  -import java.util.Stack;
   import org.apache.log.Hierarchy;
   import org.apache.log.LogEvent;
   import org.apache.log.Priority;
   import org.apache.log.format.Formatter;
   
  +import java.io.StringWriter;
  +import java.util.Stack;
  +
   /**
    * A refactoring of <code>org.apache.log.format.PatternFormatter</code> that
    * can be extended.
  @@ -31,7 +32,7 @@
    *
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2001/08/16 14:01:53 $
  + * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:18 $
    */
   public class ExtensiblePatternFormatter
       implements Formatter
  
  
  
  1.7       +8 -9      xml-cocoon2/src/org/apache/cocoon/util/log/XMLCocoonLogFormatter.java
  
  Index: XMLCocoonLogFormatter.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/log/XMLCocoonLogFormatter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XMLCocoonLogFormatter.java	2001/08/16 14:01:53	1.6
  +++ XMLCocoonLogFormatter.java	2001/08/20 13:55:18	1.7
  @@ -7,19 +7,18 @@
    *****************************************************************************/
   package org.apache.cocoon.util.log;
   
  +import org.apache.avalon.framework.CascadingThrowable;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.log.ContextMap;
  +import org.apache.log.LogEvent;
  +import org.apache.log.format.Formatter;
  +
   import java.io.StringWriter;
   import java.text.SimpleDateFormat;
   import java.util.Date;
   import java.util.Map;
  -import java.util.Stack;
   import java.util.StringTokenizer;
  -import org.apache.log.ContextMap;
  -import org.apache.log.LogEvent;
  -import org.apache.log.Priority;
  -import org.apache.log.format.Formatter;
  -import org.apache.avalon.framework.CascadingThrowable;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Request;
   
   /**
    * A refactoring of <code>org.apache.log.format.PatternFormatter</code>
  @@ -51,7 +50,7 @@
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2001/08/16 14:01:53 $
  + * @version CVS $Revision: 1.7 $ $Date: 2001/08/20 13:55:18 $
    */
   public class XMLCocoonLogFormatter
   implements Formatter {
  
  
  
  1.2       +6 -8      xml-cocoon2/src/org/apache/cocoon/xml/AbstractDOMFragment.java
  
  Index: AbstractDOMFragment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/AbstractDOMFragment.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractDOMFragment.java	2001/05/09 20:49:29	1.1
  +++ AbstractDOMFragment.java	2001/08/20 13:55:18	1.2
  @@ -8,17 +8,15 @@
   
   package org.apache.cocoon.xml;
   
  -import javax.xml.parsers.DocumentBuilder;
  -import javax.xml.parsers.DocumentBuilderFactory;
  -import javax.xml.parsers.ParserConfigurationException;
  -
   import org.apache.cocoon.xml.dom.DOMStreamer;
  -
  +import org.w3c.dom.Document;
  +import org.w3c.dom.Node;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.SAXException;
   
  -import org.w3c.dom.Document;
  -import org.w3c.dom.Node;
  +import javax.xml.parsers.DocumentBuilder;
  +import javax.xml.parsers.DocumentBuilderFactory;
  +import javax.xml.parsers.ParserConfigurationException;
   
   /**
    * Abstract implementation of {@link XMLFragment} for objects that are more easily represented
  @@ -28,7 +26,7 @@
    * the results of <code>toDOM()</code> that must be implemented by concrete subclasses.
    * 
    * @author <a href="mailto:sylvain.wallez@anyware-tech.com">Sylvain Wallez</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:29 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:18 $
    */
   
   public abstract class AbstractDOMFragment implements XMLFragment {
  
  
  
  1.2       +1 -2      xml-cocoon2/src/org/apache/cocoon/xml/AbstractSAXFragment.java
  
  Index: AbstractSAXFragment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/AbstractSAXFragment.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractSAXFragment.java	2001/05/09 20:49:31	1.1
  +++ AbstractSAXFragment.java	2001/08/20 13:55:18	1.2
  @@ -9,7 +9,6 @@
   package org.apache.cocoon.xml;
   
   import org.apache.cocoon.xml.dom.DOMBuilder;
  -
   import org.w3c.dom.Node;
   
   /**
  @@ -20,7 +19,7 @@
    * of <code>toSAX()</code> that must be implemented by concrete subclasses.
    * 
    * @author <a href="mailto:sylvain.wallez@anyware-tech.com">Sylvain Wallez</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:31 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:18 $
    */
   
   public abstract class AbstractSAXFragment implements XMLFragment {
  
  
  
  1.2       +1 -4      xml-cocoon2/src/org/apache/cocoon/xml/AbstractXMLConsumer.java
  
  Index: AbstractXMLConsumer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/AbstractXMLConsumer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractXMLConsumer.java	2001/05/09 20:49:31	1.1
  +++ AbstractXMLConsumer.java	2001/08/20 13:55:18	1.2
  @@ -8,12 +8,9 @@
   package org.apache.cocoon.xml;
   
   import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.log.Logger;
   import org.xml.sax.Attributes;
  -import org.xml.sax.ContentHandler;
   import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
  -import org.xml.sax.ext.LexicalHandler;
   
   /**
    * This abstract class provides default implementation of the methods specified
  @@ -21,7 +18,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:31 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:18 $
    */
   public abstract class AbstractXMLConsumer extends AbstractLoggable implements XMLConsumer {
   
  
  
  
  1.4       +1 -4      xml-cocoon2/src/org/apache/cocoon/xml/AbstractXMLPipe.java
  
  Index: AbstractXMLPipe.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/AbstractXMLPipe.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractXMLPipe.java	2001/05/30 13:32:29	1.3
  +++ AbstractXMLPipe.java	2001/08/20 13:55:18	1.4
  @@ -9,19 +9,16 @@
   package org.apache.cocoon.xml;
   
   import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.cocoon.xml.AbstractXMLProducer;
   import org.xml.sax.Attributes;
  -import org.xml.sax.ContentHandler;
   import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
  -import org.xml.sax.ext.LexicalHandler;
   
   /**
    * This class provides a bridge class to connect to existing content
    * handlers and lexical handlers.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/05/30 13:32:29 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:18 $
    */
   public class AbstractXMLPipe extends AbstractXMLProducer implements XMLPipe, Recyclable {
   
  
  
  
  1.2       +1 -4      xml-cocoon2/src/org/apache/cocoon/xml/ContentHandlerWrapper.java
  
  Index: ContentHandlerWrapper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/ContentHandlerWrapper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContentHandlerWrapper.java	2001/05/09 20:49:30	1.1
  +++ ContentHandlerWrapper.java	2001/08/20 13:55:18	1.2
  @@ -8,14 +8,11 @@
   
   package org.apache.cocoon.xml;
   
  -import java.util.Vector;
  -import org.apache.cocoon.xml.AbstractXMLConsumer;
   import org.apache.avalon.excalibur.pool.Recyclable;
   import org.xml.sax.Attributes;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
  -import org.xml.sax.helpers.AttributeListImpl;
   
   /**
    * This class is an utility class &quot;wrapping&quot; around a SAX version 2.0
  @@ -25,7 +22,7 @@
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    *         (Apache Software Foundation, Computer Associates)
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:30 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:18 $
    */
   public class ContentHandlerWrapper extends AbstractXMLConsumer implements Recyclable {
   
  
  
  
  1.2       +5 -7      xml-cocoon2/src/org/apache/cocoon/xml/DocumentHandlerAdapter.java
  
  Index: DocumentHandlerAdapter.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/DocumentHandlerAdapter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DocumentHandlerAdapter.java	2001/05/09 20:49:30	1.1
  +++ DocumentHandlerAdapter.java	2001/08/20 13:55:18	1.2
  @@ -8,12 +8,6 @@
   
   package org.apache.cocoon.xml;
   
  -import java.util.Enumeration;
  -import java.util.Hashtable;
  -import java.util.Vector;
  -import org.apache.cocoon.xml.AbstractXMLProducer;
  -import org.apache.cocoon.xml.NamespacesTable;
  -import org.apache.cocoon.xml.XMLConsumer;
   import org.xml.sax.AttributeList;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.DocumentHandler;
  @@ -21,6 +15,10 @@
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  +import java.util.Enumeration;
  +import java.util.Hashtable;
  +import java.util.Vector;
  +
   /**
    * This class is an utility class &quot;adapting&quot; a SAX version 1.0
    * <code>DocumentHandler</code>, to SAX version 2 <code>ContentHandler</code>.
  @@ -32,7 +30,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:30 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:18 $
    */
   public class DocumentHandlerAdapter extends AbstractXMLProducer
   implements DocumentHandler {
  
  
  
  1.2       +3 -5      xml-cocoon2/src/org/apache/cocoon/xml/DocumentHandlerWrapper.java
  
  Index: DocumentHandlerWrapper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/DocumentHandlerWrapper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DocumentHandlerWrapper.java	2001/05/09 20:49:30	1.1
  +++ DocumentHandlerWrapper.java	2001/08/20 13:55:18	1.2
  @@ -8,11 +8,7 @@
   
   package org.apache.cocoon.xml;
   
  -import java.util.Vector;
   import org.apache.avalon.framework.logger.Loggable;
  -import org.apache.cocoon.xml.AbstractXMLConsumer;
  -import org.apache.cocoon.xml.NamespacesTable;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.log.Logger;
   import org.xml.sax.Attributes;
   import org.xml.sax.DocumentHandler;
  @@ -20,6 +16,8 @@
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributeListImpl;
   
  +import java.util.Vector;
  +
   /**
    * This class is an utility class &quot;wrapping&quot; around a SAX version 1.0
    * <code>DocumentHandler</code> and forwarding it those events received throug
  @@ -32,7 +30,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:30 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:18 $
    */
   public class DocumentHandlerWrapper extends AbstractXMLConsumer implements Loggable /*, Recyclable*/ {
   
  
  
  
  1.2       +5 -5      xml-cocoon2/src/org/apache/cocoon/xml/LoggingEntityResolver.java
  
  Index: LoggingEntityResolver.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/LoggingEntityResolver.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LoggingEntityResolver.java	2001/05/09 20:49:30	1.1
  +++ LoggingEntityResolver.java	2001/08/20 13:55:18	1.2
  @@ -1,14 +1,14 @@
   package org.apache.cocoon.xml;
   
  -import java.io.IOException;
  -import java.util.Collections;
  -import java.util.HashSet;
  -import java.util.Set;
   import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.log.Logger;
   import org.xml.sax.EntityResolver;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  +
  +import java.io.IOException;
  +import java.util.Collections;
  +import java.util.HashSet;
  +import java.util.Set;
   
   /**
    * Logging entity resolver to assist in caching.
  
  
  
  1.3       +2 -3      xml-cocoon2/src/org/apache/cocoon/xml/XMLProducer.java
  
  Index: XMLProducer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/XMLProducer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLProducer.java	2001/05/29 06:13:48	1.2
  +++ XMLProducer.java	2001/08/20 13:55:18	1.3
  @@ -7,9 +7,8 @@
    *****************************************************************************/
   package org.apache.cocoon.xml;
   
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.ext.LexicalHandler;
   
  +
   /**
    * This interfaces identifies classes that produce XML data, sending SAX
    * events to the configured <code>XMLConsumer</code>.
  @@ -19,7 +18,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.2 $ $Date: 2001/05/29 06:13:48 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:18 $
    */
   public interface XMLProducer {
   
  
  
  
  1.3       +3 -6      xml-cocoon2/src/org/apache/cocoon/xml/dom/DOMBuilder.java
  
  Index: DOMBuilder.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/dom/DOMBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DOMBuilder.java	2001/07/12 08:24:11	1.2
  +++ DOMBuilder.java	2001/08/20 13:55:19	1.3
  @@ -8,35 +8,32 @@
   
   package org.apache.cocoon.xml.dom;
   
  -import java.util.Vector;
   import org.apache.avalon.framework.logger.Loggable;
   import org.apache.cocoon.xml.NamespacesTable;
   import org.apache.cocoon.xml.XMLConsumer;
   import org.apache.log.Logger;
  -import org.w3c.dom.Attr;
   import org.w3c.dom.CDATASection;
   import org.w3c.dom.Comment;
   import org.w3c.dom.Document;
  -import org.w3c.dom.DocumentType;
   import org.w3c.dom.Element;
   import org.w3c.dom.EntityReference;
  -import org.w3c.dom.NamedNodeMap;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
   import org.w3c.dom.ProcessingInstruction;
   import org.w3c.dom.Text;
   import org.xml.sax.Attributes;
  -import org.xml.sax.InputSource;
   import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
   
  +import java.util.Vector;
  +
   /**
    * The <code>DOMBuilder</code> is a utility class that will generate a W3C
    * DOM Document from SAX events.
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.2 $ $Date: 2001/07/12 08:24:11 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:19 $
    */
   public class DOMBuilder implements XMLConsumer, Loggable {
       protected Logger log;
  
  
  
  1.5       +9 -9      xml-cocoon2/src/org/apache/cocoon/xml/dom/DOMStreamer.java
  
  Index: DOMStreamer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/dom/DOMStreamer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DOMStreamer.java	2001/07/24 12:10:04	1.4
  +++ DOMStreamer.java	2001/08/20 13:55:19	1.5
  @@ -8,20 +8,20 @@
   
   package org.apache.cocoon.xml.dom;
   
  -import javax.xml.transform.Transformer;
  -import javax.xml.transform.TransformerConfigurationException;
  -import javax.xml.transform.TransformerException;
  -import javax.xml.transform.TransformerFactory;
  -import javax.xml.transform.dom.DOMSource;
  -import javax.xml.transform.sax.SAXResult;
  -
   import org.apache.cocoon.xml.AbstractXMLProducer;
   import org.apache.cocoon.xml.EmbeddedXMLPipe;
   import org.apache.cocoon.xml.XMLConsumer;
  +import org.w3c.dom.Node;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.SAXException;
   import org.xml.sax.ext.LexicalHandler;
  -import org.w3c.dom.Node;
  +
  +import javax.xml.transform.Transformer;
  +import javax.xml.transform.TransformerConfigurationException;
  +import javax.xml.transform.TransformerException;
  +import javax.xml.transform.TransformerFactory;
  +import javax.xml.transform.dom.DOMSource;
  +import javax.xml.transform.sax.SAXResult;
   
   /**
    * The <code>DOMStreamer</code> is a utility class that will generate SAX
  @@ -30,7 +30,7 @@
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.4 $ $Date: 2001/07/24 12:10:04 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:19 $
    */
   public class DOMStreamer extends AbstractXMLProducer {
   
  
  
  
  1.3       +1 -16     xml-cocoon2/src/org/apache/cocoon/xml/dom/SVGBuilder.java
  
  Index: SVGBuilder.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/dom/SVGBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SVGBuilder.java	2001/05/23 21:27:40	1.2
  +++ SVGBuilder.java	2001/08/20 13:55:19	1.3
  @@ -8,28 +8,13 @@
   
   package org.apache.cocoon.xml.dom;
   
  -import java.util.Vector;
   import org.apache.avalon.framework.logger.Loggable;
   import org.apache.batik.css.CSSDocumentHandler;
   import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
   import org.apache.batik.dom.svg.SVGDOMImplementation;
   import org.apache.cocoon.xml.XMLConsumer;
   import org.apache.log.Logger;
  -import org.w3c.dom.Attr;
  -import org.w3c.dom.CDATASection;
  -import org.w3c.dom.Comment;
   import org.w3c.dom.Document;
  -import org.w3c.dom.DocumentType;
  -import org.w3c.dom.Element;
  -import org.w3c.dom.EntityReference;
  -import org.w3c.dom.NamedNodeMap;
  -import org.w3c.dom.Node;
  -import org.w3c.dom.NodeList;
  -import org.w3c.dom.ProcessingInstruction;
  -import org.w3c.dom.Text;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.InputSource;
  -import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
   
   /**
  @@ -37,7 +22,7 @@
    * SVG-DOM Document from SAX events using Batik's SVGDocumentFactory.
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/05/23 21:27:40 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:19 $
    */
   public class SVGBuilder extends SAXSVGDocumentFactory implements XMLConsumer, Loggable {
       protected Logger log;
  
  
  
  1.2       +1 -2      xml-cocoon2/src/org/apache/cocoon/xml/xlink/ExtendedXLinkPipe.java
  
  Index: ExtendedXLinkPipe.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/xlink/ExtendedXLinkPipe.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ExtendedXLinkPipe.java	2001/05/09 20:49:32	1.1
  +++ ExtendedXLinkPipe.java	2001/08/20 13:55:19	1.2
  @@ -8,7 +8,6 @@
   
   package org.apache.cocoon.xml.xlink;
   
  -import org.apache.cocoon.xml.AbstractXMLPipe;
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
  @@ -27,7 +26,7 @@
    * be a way to remove this, that will be a happy day for XML and for Cocoon too.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:32 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:19 $
    */
   
   public abstract class ExtendedXLinkPipe extends XLinkPipe {
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message