cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon/xml/xlink ExtendedXLinkPipe.java XLinkPipe.java
Date Wed, 25 Apr 2001 17:10:08 GMT
donaldp     01/04/25 10:10:07

  Modified:    lib      Tag: xml-cocoon2 avalonapi.jar
               src/org/apache/cocoon Tag: xml-cocoon2 Cocoon.java Main.java
                        Notification.java Notifier.java
                        ProcessingException.java
               src/org/apache/cocoon/acting Tag: xml-cocoon2
                        AbstractAction.java
                        AbstractComplementaryConfigurableAction.java
                        AbstractDatabaseAction.java
                        AbstractValidatorAction.java Action.java
                        DatabaseAddAction.java
                        DatabaseAuthenticatorAction.java
                        DatabaseDeleteAction.java DatabaseUpdateAction.java
                        FormValidatorAction.java HelloAction.java
                        LangSelect.java OraAddAction.java
                        ResourceExistsAction.java
                        SessionInvalidatorAction.java
                        SessionPropagatorAction.java
                        SessionValidatorAction.java
               src/org/apache/cocoon/components/browser Tag: xml-cocoon2
                        BrowserImpl.xsl
               src/org/apache/cocoon/components/classloader Tag:
                        xml-cocoon2 ClassLoaderManager.java
                        ClassLoaderManagerImpl.java
                        RepositoryClassLoader.java
               src/org/apache/cocoon/components/language/generator Tag:
                        xml-cocoon2 CompiledComponent.java
                        GeneratorSelector.java ProgramGenerator.java
                        ProgramGeneratorImpl.java
               src/org/apache/cocoon/components/language/markup Tag:
                        xml-cocoon2 AbstractMarkupLanguage.java
                        Logicsheet.java LogicsheetCodeGenerator.java
                        MarkupLanguage.java NamedLogicsheet.java
               src/org/apache/cocoon/components/language/markup/sitemap
                        Tag: xml-cocoon2 SitemapMarkupLanguage.java
               src/org/apache/cocoon/components/language/markup/xsp Tag:
                        xml-cocoon2 XSPCookieHelper.java XSPGenerator.java
                        XSPMarkupLanguage.java XSPObjectHelper.java
                        XSPRequestHelper.java XSPResponseHelper.java
                        XSPUtil.java
               src/org/apache/cocoon/components/language/programming Tag:
                        xml-cocoon2 AbstractProgrammingLanguage.java
                        CompiledProgrammingLanguage.java
                        LanguageCompiler.java ProgrammingLanguage.java
               src/org/apache/cocoon/components/language/programming/java
                        Tag: xml-cocoon2 AbstractJavaCompiler.java
                        JavaLanguage.java JstyleFormatter.java
               src/org/apache/cocoon/components/language/programming/javascript
                        Tag: xml-cocoon2 JavascriptLanguage.java
               src/org/apache/cocoon/components/parser Tag: xml-cocoon2
                        JaxpParser.java Parser.java
               src/org/apache/cocoon/components/pipeline Tag: xml-cocoon2
                        AbstractEventPipeline.java
                        AbstractStreamPipeline.java
                        CacheableEventPipeline.java
                        CachingEventPipeline.java
                        CachingStreamPipeline.java EventPipeline.java
                        NonCachingEventPipeline.java
                        NonCachingStreamPipeline.java StreamPipeline.java
               src/org/apache/cocoon/components/sax Tag: xml-cocoon2
                        XMLByteStreamCompiler.java
                        XMLByteStreamInterpreter.java XMLDeserializer.java
                        XMLTeePipe.java
               src/org/apache/cocoon/components/saxconnector Tag:
                        xml-cocoon2 NullSAXConnector.java SAXConnector.java
                        XIncludeSAXConnector.java
               src/org/apache/cocoon/components/store Tag: xml-cocoon2
                        FilesystemStore.java MRUMemoryStore.java Store.java
               src/org/apache/cocoon/components/transcoder Tag: xml-cocoon2
                        ExtendableTranscoderFactory.java
               src/org/apache/cocoon/components/url Tag: xml-cocoon2
                        ContextURLFactory.java ResourceURLFactory.java
                        URLFactory.java URLFactoryImpl.java
               src/org/apache/cocoon/environment Tag: xml-cocoon2
                        AbstractEnvironment.java Context.java Cookie.java
                        Environment.java Request.java Response.java
                        Session.java
               src/org/apache/cocoon/environment/commandline Tag:
                        xml-cocoon2 AbstractCommandLineEnvironment.java
                        CommandLineRequest.java CommandLineResponse.java
                        FileSavingEnvironment.java
                        LinkSamplingEnvironment.java
               src/org/apache/cocoon/environment/http Tag: xml-cocoon2
                        HttpContext.java HttpCookie.java
                        HttpEnvironment.java HttpRequest.java
                        HttpResponse.java HttpSession.java
                        RequestWrapper22.java RequestWrapper23.java
               src/org/apache/cocoon/generation Tag: xml-cocoon2
                        AbstractGenerator.java AbstractServerPage.java
                        DirectoryGenerator.java FileGenerator.java
                        FragmentExtractorGenerator.java Generator.java
                        HTMLGenerator.java ImageDirectoryGenerator.java
                        PhpGenerator.java RequestGenerator.java
                        ScriptGenerator.java ServerPagesGenerator.java
                        ServletGenerator.java StatusGenerator.java
                        VelocityGenerator.java
               src/org/apache/cocoon/matching Tag: xml-cocoon2
                        BrowserMatcherFactory.java Matcher.java
                        RegexpTargetHostMatcherFactory.java
                        RegexpURIMatcherFactory.java
                        WildcardURIMatcherFactory.java
               src/org/apache/cocoon/matching/helpers Tag: xml-cocoon2
                        WildcardURIMatcher.java
               src/org/apache/cocoon/reading Tag: xml-cocoon2
                        AbstractReader.java DatabaseReader.java Reader.java
                        ResourceReader.java
               src/org/apache/cocoon/selection Tag: xml-cocoon2
                        BrowserSelectorFactory.java
                        CodedSelectorFactory.java HostSelectorFactory.java
                        Selector.java
               src/org/apache/cocoon/selection/helpers Tag: xml-cocoon2
                        CodedSelectorHelper.java
               src/org/apache/cocoon/serialization Tag: xml-cocoon2
                        AbstractSerializer.java AbstractTextSerializer.java
                        FOPSerializer.java HTMLSerializer.java
                        LinkSerializer.java SVGSerializer.java
                        TextSerializer.java XMLSerializer.java
               src/org/apache/cocoon/servlet Tag: xml-cocoon2
                        CocoonServlet.java ParanoidCocoonServlet.java
               src/org/apache/cocoon/sitemap Tag: xml-cocoon2
                        AbstractSitemap.java ContentAggregator.java
                        ErrorNotifier.java Handler.java LinkTranslator.java
                        Manager.java Sitemap.java
                        SitemapComponentSelector.java
                        SitemapModelComponent.java
                        SitemapOutputComponent.java XSLTFactoryLoader.java
               src/org/apache/cocoon/transformation Tag: xml-cocoon2
                        AbstractDOMTransformer.java
                        FragmentExtractorTransformer.java
                        I18nTransformer.java LogTransformer.java
                        SQLTransformer.java TraxTransformer.java
                        XIncludeTransformer.java XTTransformer.java
               src/org/apache/cocoon/util Tag: xml-cocoon2 ClassUtils.java
                        IOUtils.java JavaArchiveFilter.java NetUtils.java
                        Tokenizer.java TraxErrorHandler.java
               src/org/apache/cocoon/util/url Tag: xml-cocoon2
                        CocoonURLStreamHandlerFactory.java
               src/org/apache/cocoon/util/url/context Tag: xml-cocoon2
                        Handler.java
               src/org/apache/cocoon/util/url/resource Tag: xml-cocoon2
                        Handler.java
               src/org/apache/cocoon/xml Tag: xml-cocoon2
                        AbstractXMLConsumer.java AbstractXMLPipe.java
                        AbstractXMLProducer.java ContentHandlerWrapper.java
                        DocumentHandlerAdapter.java
                        DocumentHandlerWrapper.java IncludeXMLConsumer.java
                        LoggingEntityResolver.java
                        XIncludeContentHandler.java XMLConsumer.java
                        XMLMulticaster.java
               src/org/apache/cocoon/xml/dom Tag: xml-cocoon2
                        DOMBuilder.java DOMStreamer.java SVGBuilder.java
               src/org/apache/cocoon/xml/xlink Tag: xml-cocoon2
                        ExtendedXLinkPipe.java XLinkPipe.java
  Log:
  Update to latest AValonAPI
  
  Sort imports
  
  Add some license banners.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.51  +477 -424  xml-cocoon/lib/Attic/avalonapi.jar
  
  	<<Binary file>>
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.78  +15 -17    xml-cocoon/src/org/apache/cocoon/Cocoon.java
  
  Index: Cocoon.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Cocoon.java,v
  retrieving revision 1.4.2.77
  retrieving revision 1.4.2.78
  diff -u -r1.4.2.77 -r1.4.2.78
  --- Cocoon.java	2001/04/24 15:27:39	1.4.2.77
  +++ Cocoon.java	2001/04/25 17:04:53	1.4.2.78
  @@ -5,7 +5,6 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  -
   package org.apache.cocoon;
   
   import java.io.File;
  @@ -13,26 +12,30 @@
   import java.io.IOException;
   import java.io.InputStream;
   import java.net.URL;
  -import java.util.HashMap;
   import java.util.Enumeration;
  +import java.util.HashMap;
   import java.util.Iterator;
  +import org.apache.avalon.activity.Disposable;
  +import org.apache.avalon.activity.Initializable;
   import org.apache.avalon.component.Component;
   import org.apache.avalon.component.Composable;
  -import org.apache.avalon.context.Context;
  -import org.apache.avalon.context.Contextualizable;
  -import org.apache.avalon.Disposable;
  -import org.apache.avalon.context.ContextException;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
  -import org.apache.avalon.configuration.SAXConfigurationHandler;
   import org.apache.avalon.configuration.ConfigurationException;
  -import org.apache.avalon.Initializable;
  +import org.apache.avalon.configuration.SAXConfigurationHandler;
  +import org.apache.avalon.context.Context;
  +import org.apache.avalon.context.ContextException;
  +import org.apache.avalon.context.Contextualizable;
  +import org.apache.avalon.logger.AbstractLoggable;
   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.StreamPipeline;
   import org.apache.cocoon.components.pipeline.EventPipeline;
  +import org.apache.cocoon.components.pipeline.StreamPipeline;
   import org.apache.cocoon.components.store.FilesystemStore;
   import org.apache.cocoon.components.url.URLFactory;
  +import org.apache.cocoon.components.url.URLFactory;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.serialization.Serializer;
   import org.apache.cocoon.sitemap.Manager;
  @@ -40,20 +43,15 @@
   import org.apache.cocoon.util.NetUtils;
   import org.apache.excalibur.component.DefaultComponentManager;
   import org.apache.excalibur.component.DefaultRoleManager;
  -import org.apache.avalon.logger.AbstractLoggable;
  -import org.xml.sax.SAXException;
   import org.xml.sax.InputSource;
  -
  -import org.apache.cocoon.components.language.generator.ProgramGenerator;
  -import org.apache.cocoon.components.language.generator.CompiledComponent;
  -import org.apache.cocoon.components.url.URLFactory;
  +import org.xml.sax.SAXException;
   
   /**
    * 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.4.2.77 $ $Date: 2001/04/24 15:27:39 $
  + * @version CVS $Revision: 1.4.2.78 $ $Date: 2001/04/25 17:04:53 $
    */
   public class Cocoon extends AbstractLoggable implements Component, Initializable, Disposable, Modifiable, Processor, Contextualizable {
       /** The application context */
  @@ -104,7 +102,7 @@
           }
       }
   
  -    public void init() throws Exception {
  +    public void initialize() throws Exception {
           this.componentManager = new DefaultComponentManager();
           this.componentManager.setLogger(getLogger());
           this.componentManager.contextualize(this.context);
  
  
  
  1.1.4.31  +19 -24    xml-cocoon/src/org/apache/cocoon/Attic/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Main.java,v
  retrieving revision 1.1.4.30
  retrieving revision 1.1.4.31
  diff -u -r1.1.4.30 -r1.1.4.31
  --- Main.java	2001/04/20 20:49:42	1.1.4.30
  +++ Main.java	2001/04/25 17:04:54	1.1.4.31
  @@ -8,50 +8,45 @@
   
   package org.apache.cocoon;
   
  +import java.io.BufferedOutputStream;
   import java.io.File;
  -import java.io.IOException;
   import java.io.FileNotFoundException;
   import java.io.FileOutputStream;
  -import java.io.BufferedOutputStream;
  -import java.io.PrintStream;
  +import java.io.IOException;
   import java.io.OutputStream;
  -
  +import java.io.PrintStream;
   import java.net.MalformedURLException;
  -
  +import java.util.ArrayList;
   import java.util.Collection;
  +import java.util.HashMap;
   import java.util.Iterator;
   import java.util.List;
  -import java.util.ArrayList;
   import java.util.Map;
  -import java.util.HashMap;
  -
  +import org.apache.avalon.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.util.IOUtils;
  +import org.apache.cocoon.util.JavaArchiveFilter;
  +import org.apache.cocoon.util.MIMEUtils;
  +import org.apache.cocoon.util.NetUtils;
   import org.apache.excalibur.cli.CLArgsParser;
   import org.apache.excalibur.cli.CLOption;
   import org.apache.excalibur.cli.CLOptionDescriptor;
   import org.apache.excalibur.cli.CLUtil;
  -import org.apache.avalon.context.DefaultContext;
  -
  -import org.apache.cocoon.util.IOUtils;
  -import org.apache.cocoon.util.NetUtils;
  -import org.apache.cocoon.util.MIMEUtils;
  -import org.apache.cocoon.util.JavaArchiveFilter;
  -import org.apache.cocoon.environment.Environment;
  -import org.apache.cocoon.environment.commandline.LinkSamplingEnvironment;
  -import org.apache.cocoon.environment.commandline.FileSavingEnvironment;
  -
  -import org.apache.log.Logger;
  +import org.apache.log.Category;
   import org.apache.log.LogKit;
  +import org.apache.log.LogTarget;
  +import org.apache.log.Logger;
   import org.apache.log.Priority;
  -import org.apache.log.Category;
  -import org.apache.log.output.FileOutputLogTarget;
   import org.apache.log.output.DefaultOutputLogTarget;
  -import org.apache.log.LogTarget;
  +import org.apache.log.output.FileOutputLogTarget;
   
   /**
    * Command line entry point.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1.4.30 $ $Date: 2001/04/20 20:49:42 $
  + * @version CVS $Revision: 1.1.4.31 $ $Date: 2001/04/25 17:04:54 $
    */
   
   public class Main {
  @@ -217,7 +212,7 @@
               Cocoon c = new Cocoon();
               c.setLogger(log);
               c.contextualize(appContext);
  -            c.init();
  +            c.initialize();
               Main main = new Main(c, context, dest);
               main.warmup();
               if(main.process(targets, xspOnly)==0)
  
  
  
  1.1.2.4   +5 -8      xml-cocoon/src/org/apache/cocoon/Attic/Notification.java
  
  Index: Notification.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Notification.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- Notification.java	2001/04/19 19:05:23	1.1.2.3
  +++ Notification.java	2001/04/25 17:04:54	1.1.2.4
  @@ -8,14 +8,11 @@
   
   package org.apache.cocoon;
   
  -import java.util.HashMap;
  -
  -import java.io.StringWriter;
   import java.io.PrintWriter;
  -
  -import org.xml.sax.SAXException;
  -
  +import java.io.StringWriter;
  +import java.util.HashMap;
   import org.apache.avalon.CascadingException;
  +import org.xml.sax.SAXException;
   
   
   /**
  @@ -24,7 +21,7 @@
    * @author <a href="mailto:nicolaken@supereva.it">Nicola Ken Barozzi</a> Aisa
    * @created 24 August 2000
    */
  - 
  +
   public class Notification implements Notificable {
   
       /**
  @@ -81,7 +78,7 @@
           setSource(o.getClass().getName());
           setMessage(o.toString());
       }
  -    
  +
       /**
        * Constructor for the Notification object
        *
  
  
  
  1.1.2.11  +7 -10     xml-cocoon/src/org/apache/cocoon/Attic/Notifier.java
  
  Index: Notifier.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Notifier.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- Notifier.java	2001/04/20 07:16:09	1.1.2.10
  +++ Notifier.java	2001/04/25 17:04:55	1.1.2.11
  @@ -8,26 +8,23 @@
   
   package org.apache.cocoon;
   
  -import java.util.HashMap;
  -import java.util.Set;
  -import java.util.Iterator;
  -
  -import java.text.DateFormat;
  -
   import java.io.IOException;
   import java.io.OutputStream;
  -
  -import org.xml.sax.SAXException;
  -import org.xml.sax.helpers.AttributesImpl;
  +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.1.2.10 $ $Date: 2001/04/20 07:16:09 $
  + * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/25 17:04:55 $
    */
   
   public class Notifier {
  
  
  
  1.1.2.10  +2 -3      xml-cocoon/src/org/apache/cocoon/Attic/ProcessingException.java
  
  Index: ProcessingException.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/ProcessingException.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- ProcessingException.java	2001/02/23 14:47:32	1.1.2.9
  +++ ProcessingException.java	2001/04/25 17:04:55	1.1.2.10
  @@ -9,7 +9,6 @@
   
   import java.io.PrintStream;
   import java.io.PrintWriter;
  -
   import org.apache.avalon.CascadingException;
   
   /**
  @@ -18,7 +17,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/23 14:47:32 $
  + * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/25 17:04:55 $
    */
   public class ProcessingException extends CascadingException {
   
  @@ -64,4 +63,4 @@
           if(getCause()!=null)
               getCause().printStackTrace(s);
       }
  -}
  \ No newline at end of file
  +}
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.8   +2 -3      xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractAction.java
  
  Index: AbstractAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractAction.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- AbstractAction.java	2001/04/20 20:49:43	1.1.2.7
  +++ AbstractAction.java	2001/04/25 17:05:02	1.1.2.8
  @@ -7,12 +7,11 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.Disposable;
  +import org.apache.avalon.activity.Disposable;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.logger.AbstractLoggable;
  -
   import org.apache.log.Logger;
   
   /**
  @@ -20,7 +19,7 @@
    * Actions.  In order to get at the Logger, use getLogger().
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/20 20:49:43 $
  + * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/25 17:05:02 $
    */
   public abstract class AbstractAction extends AbstractLoggable
   implements Action, Configurable, Disposable {
  
  
  
  1.1.2.2   +4 -7      xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractComplementaryConfigurableAction.java
  
  Index: AbstractComplementaryConfigurableAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractComplementaryConfigurableAction.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- AbstractComplementaryConfigurableAction.java	2001/04/20 20:49:43	1.1.2.1
  +++ AbstractComplementaryConfigurableAction.java	2001/04/25 17:05:03	1.1.2.2
  @@ -7,20 +7,17 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.util.Map;
  -import java.util.HashMap;
   import java.net.URL;
  -
  +import java.util.HashMap;
  +import java.util.Map;
   import org.apache.avalon.component.Component;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationBuilder;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.configuration.SAXConfigurationHandler;
  -
  -import org.apache.cocoon.components.url.URLFactory;
   import org.apache.cocoon.Roles;
   import org.apache.cocoon.components.parser.Parser;
  -
  +import org.apache.cocoon.components.url.URLFactory;
   import org.xml.sax.InputSource;
   
   /**
  @@ -31,7 +28,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.1.2.1 $ $Date: 2001/04/20 20:49:43 $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/25 17:05:03 $
    */
   public abstract class AbstractComplementaryConfigurableAction extends ComposerAction {
       private static Map configurations = new HashMap();
  
  
  
  1.1.2.29  +25 -28    xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractDatabaseAction.java
  
  Index: AbstractDatabaseAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractDatabaseAction.java,v
  retrieving revision 1.1.2.28
  retrieving revision 1.1.2.29
  diff -u -r1.1.2.28 -r1.1.2.29
  --- AbstractDatabaseAction.java	2001/04/20 20:49:44	1.1.2.28
  +++ AbstractDatabaseAction.java	2001/04/25 17:05:03	1.1.2.29
  @@ -7,54 +7,51 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import java.sql.PreparedStatement;
  -import java.sql.ResultSet;
  -import java.sql.Timestamp;
  -import java.sql.Time;
  +import java.io.BufferedInputStream;
  +import java.io.ByteArrayInputStream;
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.InputStream;
  +import java.math.BigDecimal;
  +import java.net.URL;
   import java.sql.Array;
  +import java.sql.Blob;
  +import java.sql.Clob;
   import java.sql.Date;
  +import java.sql.PreparedStatement;
   import java.sql.Ref;
  +import java.sql.ResultSet;
   import java.sql.SQLException;
  +import java.sql.Time;
  +import java.sql.Timestamp;
   import java.sql.Types;
  -import java.sql.Blob;
  -import java.sql.Clob;
  -import java.net.URL;
  -import java.io.File;
  -import java.io.InputStream;
  -import java.io.FileInputStream;
  -import java.io.ByteArrayInputStream;
  -import java.io.BufferedInputStream;
  -import java.math.BigDecimal;
  +import java.text.DateFormat;
  +import java.text.SimpleDateFormat;
   import java.util.ArrayList;
   import java.util.Collections;
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.Map;
  -import java.text.DateFormat;
  -import java.text.SimpleDateFormat;
  -
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.InputSource;
  -
  +import org.apache.avalon.activity.Disposable;
   import org.apache.avalon.component.Component;
  +import org.apache.avalon.component.ComponentException;
   import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.ComponentSelector;
  -import org.apache.avalon.component.ComponentException;
  -import org.apache.avalon.Disposable;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
  -import org.apache.avalon.parameters.Parameters;
   import org.apache.avalon.configuration.SAXConfigurationHandler;
  -import org.apache.excalibur.datasource.DataSourceComponent;
  -
  -import org.apache.cocoon.Roles;
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.Roles;
  +import org.apache.cocoon.components.parser.Parser;
  +import org.apache.cocoon.components.url.URLFactory;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.generation.ImageDirectoryGenerator;
  -import org.apache.cocoon.components.url.URLFactory;
  -import org.apache.cocoon.components.parser.Parser;
  +import org.apache.excalibur.datasource.DataSourceComponent;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.InputSource;
   
   /**
    * Set up environment for configurable form handling data.  It is
  @@ -175,7 +172,7 @@
    * </table>
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.2.28 $ $Date: 2001/04/20 20:49:44 $
  + * @version CVS $Revision: 1.1.2.29 $ $Date: 2001/04/25 17:05:03 $
    */
   public abstract class AbstractDatabaseAction extends AbstractComplementaryConfigurableAction implements Configurable, Disposable {
       protected Map files = new HashMap();
  
  
  
  1.1.2.4   +21 -24    xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractValidatorAction.java
  
  Index: AbstractValidatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractValidatorAction.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- AbstractValidatorAction.java	2001/04/20 20:49:44	1.1.2.3
  +++ AbstractValidatorAction.java	2001/04/25 17:05:04	1.1.2.4
  @@ -1,20 +1,17 @@
  -// $Id: AbstractValidatorAction.java,v 1.1.2.3 2001/04/20 20:49:44 bloritsch Exp $
  +// $Id: AbstractValidatorAction.java,v 1.1.2.4 2001/04/25 17:05:04 donaldp Exp $
   package org.apache.cocoon.acting;
   
  -import java.util.Map;
  -import java.util.HashMap;
   import java.util.Collections;
  -
  -import org.apache.avalon.parameters.Parameters;
  +import java.util.HashMap;
  +import java.util.Map;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
  -
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.InputSource;
  -
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.*;
   import org.apache.cocoon.util.Tokenizer;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.InputSource;
   
   /**
    * Abstract implementation of action that needs to perform validation of
  @@ -27,31 +24,31 @@
    *
    * <pre>
    * &lt;root&gt;
  - * 	&lt;parameter name="username" type="string" nullable="no"/&gt;
  - * 	&lt;parameter name="id" type="long" nullable="no"/&gt;
  - * 	&lt;parameter name="sallary" type="double" nullable="no"/&gt;
  - * 	&lt;parameter name="theme" type="string" nullable="yes" default="dflt"/&gt;
  + *         &lt;parameter name="username" type="string" nullable="no"/&gt;
  + *         &lt;parameter name="id" type="long" nullable="no"/&gt;
  + *         &lt;parameter name="sallary" type="double" nullable="no"/&gt;
  + *         &lt;parameter name="theme" type="string" nullable="yes" default="dflt"/&gt;
    * &lt;/root&gt;
    * </pre>
    *
    * The types recognized by validator and its possible validation parameters
    * <table border="1">
  - * 	<tr>
  - * 		<td><b>string</b></td><td>nullable="yes|no" default="str"</td>
  - * 	</tr>
  - * 	<tr>
  - * 		<td><b>long</b></td><td>nullable="yes|no" default="123123"</td>
  - * 	</tr>
  - * 	<tr>
  - * 		<td><b>double</b></td><td>nullable="yes|no" default="0.5"</td>
  - * 	</tr>
  + *         <tr>
  + *                 <td><b>string</b></td><td>nullable="yes|no" default="str"</td>
  + *         </tr>
  + *         <tr>
  + *                 <td><b>long</b></td><td>nullable="yes|no" default="123123"</td>
  + *         </tr>
  + *         <tr>
  + *                 <td><b>double</b></td><td>nullable="yes|no" default="0.5"</td>
  + *         </tr>
    * </table>
    * Default value takes place only when specified parameter is nullable and
    * really is null or empty. Long numbers may be specified in decimal, hex or
    * octal values as accepted by java.Lang.decode (String s).
    *
    * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
  - * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/20 20:49:44 $
  + * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/25 17:05:04 $
    */
   public abstract class AbstractValidatorAction
   extends AbstractComplementaryConfigurableAction
  @@ -290,5 +287,5 @@
       }
   }
   
  -// $Id: AbstractValidatorAction.java,v 1.1.2.3 2001/04/20 20:49:44 bloritsch Exp $
  +// $Id: AbstractValidatorAction.java,v 1.1.2.4 2001/04/25 17:05:04 donaldp Exp $
   // vim: set et ts=4 sw=4:
  
  
  
  1.1.2.10  +3 -5      xml-cocoon/src/org/apache/cocoon/acting/Attic/Action.java
  
  Index: Action.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/Action.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- Action.java	2001/04/20 20:49:44	1.1.2.9
  +++ Action.java	2001/04/25 17:05:05	1.1.2.10
  @@ -8,18 +8,16 @@
   package org.apache.cocoon.acting;
   
   import java.util.Map;
  -
   import org.apache.avalon.component.Component;
  -import org.apache.avalon.thread.ThreadSafe;
   import org.apache.avalon.parameters.Parameters;
  -
  -import org.xml.sax.SAXException;
  +import org.apache.avalon.thread.ThreadSafe;
   import org.xml.sax.EntityResolver;
  +import org.xml.sax.SAXException;
   
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/20 20:49:44 $
  + * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/25 17:05:05 $
    */
   public interface Action extends Component, ThreadSafe {
       /**
  
  
  
  1.1.2.25  +4 -8      xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAddAction.java
  
  Index: DatabaseAddAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAddAction.java,v
  retrieving revision 1.1.2.24
  retrieving revision 1.1.2.25
  diff -u -r1.1.2.24 -r1.1.2.25
  --- DatabaseAddAction.java	2001/04/20 20:49:44	1.1.2.24
  +++ DatabaseAddAction.java	2001/04/25 17:05:06	1.1.2.25
  @@ -10,36 +10,32 @@
   import java.sql.Connection;
   import java.sql.PreparedStatement;
   import java.sql.ResultSet;
  -import java.sql.Timestamp;
   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.xml.sax.EntityResolver;
  -
   import org.apache.avalon.component.Component;
   import org.apache.avalon.component.ComponentException;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.parameters.Parameters;
  -
  -import org.apache.cocoon.Roles;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.generation.ImageDirectoryGenerator;
   import org.apache.excalibur.datasource.DataSourceComponent;
  +import org.xml.sax.EntityResolver;
   
   /**
    * 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.1.2.24 $ $Date: 2001/04/20 20:49:44 $
  + * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/04/25 17:05:06 $
    */
   public class DatabaseAddAction extends AbstractDatabaseAction {
       protected static final Map addStatements = new HashMap();
  
  
  
  1.1.2.7   +26 -31    xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAuthenticatorAction.java
  
  Index: DatabaseAuthenticatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAuthenticatorAction.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- DatabaseAuthenticatorAction.java	2001/04/24 17:32:55	1.1.2.6
  +++ DatabaseAuthenticatorAction.java	2001/04/25 17:05:06	1.1.2.7
  @@ -1,29 +1,24 @@
  -// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.6 2001/04/24 17:32:55 dims Exp $
  +// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.7 2001/04/25 17:05:06 donaldp Exp $
   package org.apache.cocoon.acting;
   
  -import java.util.Map;
  -import java.util.HashMap;
  +import java.sql.Connection;
  +import java.sql.ResultSet;
  +import java.sql.SQLException;
  +import java.sql.Statement;
  +import java.sql.Timestamp;
   import java.util.Collections;
  -
  -import org.apache.avalon.parameters.Parameters;
  +import java.util.HashMap;
  +import java.util.Map;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
  -import org.apache.excalibur.datasource.DataSourceComponent;
  -
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.InputSource;
  -
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.*;
  -import org.apache.cocoon.util.Tokenizer;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
  -
  -import java.sql.Connection;
  -import java.sql.Statement;
  -import java.sql.ResultSet;
  -import java.sql.Timestamp;
  -import java.sql.SQLException;
  -
  +import org.apache.cocoon.util.Tokenizer;
  +import org.apache.excalibur.datasource.DataSourceComponent;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.InputSource;
   
   /**
    * This action is used to authenticate user by comparing several request
  @@ -32,14 +27,14 @@
    * used for all actions derived from AbstractDatabaseAction.
    * <pre>
    * &lt;root&gt;
  - * 	&lt;connection&gt;personnel&lt;/connection&gt;
  - * 	&lt;table name="users_table&gt;
  - * 		&lt;select dbcol="username" request-param="username"
  - * 		to-session="username"/&gt;
  - * 		&lt;select dbcol="password" request-param="password"/&gt;
  - * 		&lt;select dbcol="role" to-session="role" type="string"/&gt;
  - * 		&lt;select dbcol="skin" to-session="skin" type="string"/&gt;
  - * 	&lt;/table&gt;
  + *         &lt;connection&gt;personnel&lt;/connection&gt;
  + *         &lt;table name="users_table&gt;
  + *                 &lt;select dbcol="username" request-param="username"
  + *                 to-session="username"/&gt;
  + *                 &lt;select dbcol="password" request-param="password"/&gt;
  + *                 &lt;select dbcol="role" to-session="role" type="string"/&gt;
  + *                 &lt;select dbcol="skin" to-session="skin" type="string"/&gt;
  + *         &lt;/table&gt;
    * &lt;/root&gt;
    * </pre>
    * The values specified via "request-param" describe the name of HTTP request
  @@ -51,14 +46,14 @@
    * Additionally all parameters that are
    * propagated to the session are made available to the sitemap via {name}
    * expression.
  - * 
  + *
    * If there is no need to touch the session object, providing just one-time
    * verification, you can specify action parameter "create-session" to "no" or
    * "false". No values are then propagated to the sesion and session object is
    * not verified.
    *
    * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/24 17:32:55 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/25 17:05:06 $
    */
   public class DatabaseAuthenticatorAction extends AbstractDatabaseAction
   {
  @@ -75,7 +70,7 @@
                       parameters.getParameter ("descriptor", null));
               boolean cs = true;
               String create_session = parameters.getParameter ("create-session", null);
  -            if (create_session != null && 
  +            if (create_session != null &&
                       ("no".equals (create_session.trim ()) || "false".equals (create_session.trim ()))) {
                   cs = false;
               }
  @@ -160,7 +155,7 @@
                   request_value = req.getParameter (
                           request_param);
                   if (request_value == null || request_value.trim().equals ("")) {
  -                    getLogger ().debug ("DBAUTH: request-param " 
  +                    getLogger ().debug ("DBAUTH: request-param "
                               + request_param + " does not exist");
                       return null;
                   }
  @@ -231,5 +226,5 @@
       }
   }
   
  -// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.6 2001/04/24 17:32:55 dims Exp $
  +// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.7 2001/04/25 17:05:06 donaldp Exp $
   // vim: set et ts=4 sw=4:
  
  
  
  1.1.2.15  +4 -8      xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseDeleteAction.java
  
  Index: DatabaseDeleteAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseDeleteAction.java,v
  retrieving revision 1.1.2.14
  retrieving revision 1.1.2.15
  diff -u -r1.1.2.14 -r1.1.2.15
  --- DatabaseDeleteAction.java	2001/04/20 20:49:44	1.1.2.14
  +++ DatabaseDeleteAction.java	2001/04/25 17:05:07	1.1.2.15
  @@ -10,29 +10,25 @@
   import java.sql.Connection;
   import java.sql.PreparedStatement;
   import java.sql.ResultSet;
  -import java.sql.Timestamp;
   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.xml.sax.EntityResolver;
  -
   import org.apache.avalon.component.Component;
   import org.apache.avalon.component.ComponentException;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.parameters.Parameters;
  -
  -import org.apache.cocoon.Roles;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.generation.ImageDirectoryGenerator;
   import org.apache.excalibur.datasource.DataSourceComponent;
  +import org.xml.sax.EntityResolver;
   
   /**
    * Delete a record from a database.  This Action assumes that all
  @@ -42,7 +38,7 @@
    * the keys.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/20 20:49:44 $
  + * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/25 17:05:07 $
    */
   public final class DatabaseDeleteAction extends AbstractDatabaseAction {
       private static final Map deleteStatements = new HashMap();
  
  
  
  1.1.2.20  +4 -8      xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseUpdateAction.java
  
  Index: DatabaseUpdateAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseUpdateAction.java,v
  retrieving revision 1.1.2.19
  retrieving revision 1.1.2.20
  diff -u -r1.1.2.19 -r1.1.2.20
  --- DatabaseUpdateAction.java	2001/04/20 20:49:44	1.1.2.19
  +++ DatabaseUpdateAction.java	2001/04/25 17:05:07	1.1.2.20
  @@ -10,36 +10,32 @@
   import java.sql.Connection;
   import java.sql.PreparedStatement;
   import java.sql.ResultSet;
  -import java.sql.Timestamp;
   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.xml.sax.EntityResolver;
  -
   import org.apache.avalon.component.Component;
   import org.apache.avalon.component.ComponentException;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.parameters.Parameters;
  -
  -import org.apache.cocoon.Roles;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.generation.ImageDirectoryGenerator;
   import org.apache.excalibur.datasource.DataSourceComponent;
  +import org.xml.sax.EntityResolver;
   
   /**
    * 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.1.2.19 $ $Date: 2001/04/20 20:49:44 $
  + * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/04/25 17:05:07 $
    */
   public class DatabaseUpdateAction extends AbstractDatabaseAction {
       private static final Map updateStatements = new HashMap();
  
  
  
  1.1.2.5   +11 -14    xml-cocoon/src/org/apache/cocoon/acting/Attic/FormValidatorAction.java
  
  Index: FormValidatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/FormValidatorAction.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- FormValidatorAction.java	2001/04/24 17:32:57	1.1.2.4
  +++ FormValidatorAction.java	2001/04/25 17:05:08	1.1.2.5
  @@ -1,20 +1,17 @@
  -// $Id: FormValidatorAction.java,v 1.1.2.4 2001/04/24 17:32:57 dims Exp $
  +// $Id: FormValidatorAction.java,v 1.1.2.5 2001/04/25 17:05:08 donaldp Exp $
   package org.apache.cocoon.acting;
   
  -import java.util.Map;
  -import java.util.HashMap;
   import java.util.Collections;
  -
  -import org.apache.avalon.parameters.Parameters;
  +import java.util.HashMap;
  +import java.util.Map;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
  -
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.InputSource;
  -
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.*;
  -import org.apache.cocoon.util.Tokenizer;
   import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.util.Tokenizer;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.InputSource;
   
   /**
    * This is the action used to validate HTTP form parameters supplied via
  @@ -22,8 +19,8 @@
    * file (its format is defined in AbstractValidatorAction).
    * <pre>
    * &lt;map:act type="form-validator"&gt;
  - * 	&lt;parameter name="descriptor" value="context://descriptor.xml"&gt;
  - * 	&lt;parameter name="validate" value="username,password"&gt;
  + *         &lt;parameter name="descriptor" value="context://descriptor.xml"&gt;
  + *         &lt;parameter name="validate" value="username,password"&gt;
    * &lt;/map:act&gt;
    * </pre>
    *
  @@ -35,7 +32,7 @@
    * all validated parameters to the sitemap via {name} expression.
    *
    * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/24 17:32:57 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 17:05:08 $
    */
   public class FormValidatorAction extends AbstractValidatorAction
   {
  @@ -85,5 +82,5 @@
       }
   }
   
  -// $Id: FormValidatorAction.java,v 1.1.2.4 2001/04/24 17:32:57 dims Exp $
  +// $Id: FormValidatorAction.java,v 1.1.2.5 2001/04/25 17:05:08 donaldp Exp $
   // vim: set et ts=4 sw=4:
  
  
  
  1.1.2.16  +3 -7      xml-cocoon/src/org/apache/cocoon/acting/Attic/HelloAction.java
  
  Index: HelloAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/HelloAction.java,v
  retrieving revision 1.1.2.15
  retrieving revision 1.1.2.16
  diff -u -r1.1.2.15 -r1.1.2.16
  --- HelloAction.java	2001/04/20 20:49:44	1.1.2.15
  +++ HelloAction.java	2001/04/25 17:05:09	1.1.2.16
  @@ -8,26 +8,22 @@
   package org.apache.cocoon.acting;
   
   import java.util.Map;
  -
  -
   import org.apache.avalon.component.Component;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.parameters.Parameters;
  -
  -import org.xml.sax.SAXException;
  -import org.xml.sax.EntityResolver;
  -
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.SAXException;
   
   /**
    * 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.1.2.15 $ $Date: 2001/04/20 20:49:44 $
  + * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/25 17:05:09 $
    */
   public class HelloAction extends ComposerAction {
   
  
  
  
  1.1.2.11  +4 -7      xml-cocoon/src/org/apache/cocoon/acting/Attic/LangSelect.java
  
  Index: LangSelect.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/LangSelect.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- LangSelect.java	2001/04/20 20:49:45	1.1.2.10
  +++ LangSelect.java	2001/04/25 17:05:10	1.1.2.11
  @@ -16,15 +16,12 @@
   import java.util.List;
   import java.util.Locale;
   import java.util.Map;
  -
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.acting.Action;
  -import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Cookie;
  +import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
  -
  -import org.apache.avalon.parameters.Parameters;
  -
   import org.xml.sax.EntityResolver;
   
   /**
  @@ -33,7 +30,7 @@
    * Definition in sitemap:
    * <pre>
    * &lt;map:actions&gt;
  - *		&lt;map:action name="lang_select" src="org.apache.cocoon.acting.LangSelect"/&gt;
  + *                &lt;map:action name="lang_select" src="org.apache.cocoon.acting.LangSelect"/&gt;
    * </pre>
    *
    * And you use it in following way:
  @@ -41,7 +38,7 @@
    * <pre>
    * &lt;map:match pattern="file"&gt;
    * &lt;map:act type="lang_select"&gt;
  - *		&lt;map:generate src="file_{lang}.xml"/&gt;
  + *                &lt;map:generate src="file_{lang}.xml"/&gt;
    * &lt;/map:act&gt;
    * </pre>
    *
  
  
  
  1.1.2.16  +16 -20    xml-cocoon/src/org/apache/cocoon/acting/Attic/OraAddAction.java
  
  Index: OraAddAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/OraAddAction.java,v
  retrieving revision 1.1.2.15
  retrieving revision 1.1.2.16
  diff -u -r1.1.2.15 -r1.1.2.16
  --- OraAddAction.java	2001/04/20 20:49:45	1.1.2.15
  +++ OraAddAction.java	2001/04/25 17:05:11	1.1.2.16
  @@ -7,35 +7,31 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.excalibur.datasource.DataSourceComponent;
  -import org.apache.avalon.configuration.ConfigurationException;
  -import org.apache.avalon.configuration.Configuration;
  -import org.apache.avalon.parameters.Parameters;
  -
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.generation.ImageDirectoryGenerator;
  -
  -import java.util.Map;
  -import java.util.HashMap;
  -import java.util.ArrayList;
  -import java.io.File;
   import java.io.BufferedInputStream;
   import java.io.BufferedOutputStream;
  -import java.io.FileInputStream;
   import java.io.ByteArrayInputStream;
  +import java.io.File;
  +import java.io.FileInputStream;
   import java.io.InputStream;
   import java.io.OutputStream;
   import java.sql.Connection;
   import java.sql.PreparedStatement;
   import java.sql.ResultSet;
   import java.sql.SQLException;
  -
  +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 oracle.jdbc.OracleResultSet;
  -
  +import org.apache.avalon.configuration.Configuration;
  +import org.apache.avalon.configuration.ConfigurationException;
  +import org.apache.avalon.parameters.Parameters;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.generation.ImageDirectoryGenerator;
  +import org.apache.excalibur.datasource.DataSourceComponent;
   import org.xml.sax.EntityResolver;
   
   /**
  @@ -43,7 +39,7 @@
    * only one table at a time to update.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/20 20:49:45 $
  + * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/25 17:05:11 $
    */
   public class OraAddAction extends DatabaseAddAction {
       private static final Map selectLOBStatements = new HashMap();
  @@ -394,4 +390,4 @@
   
           return query;
       }
  -}
  \ No newline at end of file
  +}
  
  
  
  1.1.2.3   +9 -13     xml-cocoon/src/org/apache/cocoon/acting/Attic/ResourceExistsAction.java
  
  Index: ResourceExistsAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/ResourceExistsAction.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- ResourceExistsAction.java	2001/04/20 20:49:45	1.1.2.2
  +++ ResourceExistsAction.java	2001/04/25 17:05:11	1.1.2.3
  @@ -7,30 +7,26 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  +import java.io.IOException;
  +import java.net.URL;
   import java.util.Collections;
   import java.util.HashMap;
   import java.util.Map;
  -
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.InputSource;
  -
  +import org.apache.avalon.activity.Disposable;
   import org.apache.avalon.component.Component;
  -import org.apache.avalon.component.ComponentManager;
  -import org.apache.avalon.Disposable;
   import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.parameters.Parameters;
  -
  -import org.apache.cocoon.Roles;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.components.url.URLFactory;
  -
  -import java.net.URL;
  -import java.io.IOException;
  +import org.apache.cocoon.environment.Request;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.InputSource;
   
   /**
    * This action simply checks to see if a given resource exists. It takes a
  @@ -38,7 +34,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.1.2.2 $ $Date: 2001/04/20 20:49:45 $
  + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/25 17:05:11 $
    */
   public class ResourceExistsAction extends ComposerAction {
   
  
  
  
  1.1.2.6   +9 -13     xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionInvalidatorAction.java
  
  Index: SessionInvalidatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionInvalidatorAction.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- SessionInvalidatorAction.java	2001/04/24 17:32:59	1.1.2.5
  +++ SessionInvalidatorAction.java	2001/04/25 17:05:12	1.1.2.6
  @@ -1,29 +1,25 @@
  -// $Id: SessionInvalidatorAction.java,v 1.1.2.5 2001/04/24 17:32:59 dims Exp $
  +// $Id: SessionInvalidatorAction.java,v 1.1.2.6 2001/04/25 17:05:12 donaldp Exp $
   package org.apache.cocoon.acting;
   
  -import java.util.Map;
  -import java.util.HashMap;
   import java.util.Collections;
  -
  -import org.apache.avalon.parameters.Parameters;
  +import java.util.HashMap;
  +import java.util.Map;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
  -
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.InputSource;
  -
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.*;
  -import org.apache.cocoon.util.Tokenizer;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
  -
  +import org.apache.cocoon.util.Tokenizer;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.InputSource;
   
   /**
    * 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.1.2.5 $ $Date: 2001/04/24 17:32:59 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:05:12 $
    */
   public class SessionInvalidatorAction extends AbstractAction
   {
  @@ -55,5 +51,5 @@
       }
   }
   
  -// $Id: SessionInvalidatorAction.java,v 1.1.2.5 2001/04/24 17:32:59 dims Exp $
  +// $Id: SessionInvalidatorAction.java,v 1.1.2.6 2001/04/25 17:05:12 donaldp Exp $
   // vim: set et ts=4 sw=4:
  
  
  
  1.1.2.2   +13 -17    xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionPropagatorAction.java
  
  Index: SessionPropagatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionPropagatorAction.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- SessionPropagatorAction.java	2001/04/24 17:33:01	1.1.2.1
  +++ SessionPropagatorAction.java	2001/04/25 17:05:12	1.1.2.2
  @@ -1,30 +1,26 @@
  -// $Id: SessionPropagatorAction.java,v 1.1.2.1 2001/04/24 17:33:01 dims Exp $
  +// $Id: SessionPropagatorAction.java,v 1.1.2.2 2001/04/25 17:05:12 donaldp Exp $
   package org.apache.cocoon.acting;
   
  -import java.util.Map;
  -import java.util.HashMap;
   import java.util.Collections;
  +import java.util.HashMap;
   import java.util.Iterator;
  -
  -import org.apache.avalon.parameters.Parameters;
  +import java.util.Map;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
  -
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.InputSource;
  -
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.*;
  -import org.apache.cocoon.util.Tokenizer;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
  -
  +import org.apache.cocoon.util.Tokenizer;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.InputSource;
   
   /**
    * This is the action used to propagate parameters into session. It
    * simply propagates given expression to the session. If session does not
    * exist, action fails. Additionaly it will make all propagated values
    * available via returned Map.
  - * 
  + *
    * <pre>
    * &lt;map:act type="session-propagator"&gt;
    *      &lt;paramater name="example" value="{example}"&gt;
  @@ -33,7 +29,7 @@
    * </pre>
    *
    * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
  - * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/04/24 17:33:01 $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/25 17:05:12 $
    */
   public class SessionPropagatorAction extends ComposerAction
   {
  @@ -62,13 +58,13 @@
               Iterator keys = parameters.getParameterNames ();
               while (keys.hasNext ()) {
                   String sessionParamName = (String) keys.next ();
  -                if (sessionParamName == null || 
  +                if (sessionParamName == null ||
                           "".equals (sessionParamName.trim ()))
                       return null;
                   String value = parameters.getParameter (sessionParamName, null);
  -                getLogger().debug ("SESSIONPROPAGATOR: propagating value " 
  +                getLogger().debug ("SESSIONPROPAGATOR: propagating value "
                           + value
  -                        + " to session attribute " 
  +                        + " to session attribute "
                           + sessionParamName);
                   session.setAttribute (sessionParamName, value);
                   actionMap.put (sessionParamName, value);
  @@ -83,6 +79,6 @@
       }
   }
   
  -// $Id: SessionPropagatorAction.java,v 1.1.2.1 2001/04/24 17:33:01 dims Exp $
  +// $Id: SessionPropagatorAction.java,v 1.1.2.2 2001/04/25 17:05:12 donaldp Exp $
   // vim: set et ts=4 sw=4:
   
  
  
  
  1.1.2.5   +11 -14    xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionValidatorAction.java
  
  Index: SessionValidatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionValidatorAction.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- SessionValidatorAction.java	2001/04/20 20:49:46	1.1.2.4
  +++ SessionValidatorAction.java	2001/04/25 17:05:13	1.1.2.5
  @@ -1,22 +1,19 @@
  -// $Id: SessionValidatorAction.java,v 1.1.2.4 2001/04/20 20:49:46 bloritsch Exp $
  +// $Id: SessionValidatorAction.java,v 1.1.2.5 2001/04/25 17:05:13 donaldp Exp $
   package org.apache.cocoon.acting;
   
  -import java.util.Map;
  -import java.util.HashMap;
   import java.util.Collections;
  +import java.util.HashMap;
   import java.util.Iterator;
  -
  -import org.apache.avalon.parameters.Parameters;
  +import java.util.Map;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
  -
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.InputSource;
  -
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.*;
  -import org.apache.cocoon.util.Tokenizer;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
  +import org.apache.cocoon.util.Tokenizer;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.InputSource;
   
   
   /**
  @@ -25,8 +22,8 @@
    * file (its format is defined in AbstractValidatorAction).
    * <pre>
    * &lt;map:act type="session-validator"&gt;
  - * 	&lt;parameter name="descriptor" value="context://descriptor.xml"&gt;
  - * 	&lt;parameter name="validate" value="username,password"&gt;
  + *         &lt;parameter name="descriptor" value="context://descriptor.xml"&gt;
  + *         &lt;parameter name="validate" value="username,password"&gt;
    * &lt;/map:act&gt;
    * </pre>
    *
  @@ -38,7 +35,7 @@
    * all validated parameters to the sitemap via {name} expression.
    *
    * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/20 20:49:46 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 17:05:13 $
    */
   public class SessionValidatorAction extends AbstractValidatorAction
   {
  @@ -89,5 +86,5 @@
       }
   }
   
  -// $Id: SessionValidatorAction.java,v 1.1.2.4 2001/04/20 20:49:46 bloritsch Exp $
  +// $Id: SessionValidatorAction.java,v 1.1.2.5 2001/04/25 17:05:13 donaldp Exp $
   // vim: set et ts=4 sw=4:
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +1 -1      xml-cocoon/src/org/apache/cocoon/components/browser/Attic/BrowserImpl.xsl
  
  Index: BrowserImpl.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/browser/Attic/BrowserImpl.xsl,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- BrowserImpl.xsl	2001/04/20 20:49:48	1.1.2.2
  +++ BrowserImpl.xsl	2001/04/25 17:05:23	1.1.2.3
  @@ -27,7 +27,7 @@
   
   import org.apache.avalon.component.Component;
   import org.apache.avalon.component.Composable;
  -import org.apache.avalon.Disposable;
  +import org.apache.avalon.activity.Disposable;
   import org.apache.avalon.component.ComponentException;
   import org.apache.avalon.component.ComponentManager;
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.8   +3 -4      xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/ClassLoaderManager.java
  
  Index: ClassLoaderManager.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/ClassLoaderManager.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- ClassLoaderManager.java	2001/04/20 20:49:49	1.1.2.7
  +++ ClassLoaderManager.java	2001/04/25 17:05:26	1.1.2.8
  @@ -7,10 +7,9 @@
    *****************************************************************************/
   package org.apache.cocoon.components.classloader;
   
  -import org.apache.avalon.component.Component;
  -
  -import java.io.IOException;
   import java.io.File;
  +import java.io.IOException;
  +import org.apache.avalon.component.Component;
   
   /**
    * A class loader manager acting as a proxy for a <b>single</b>
  @@ -19,7 +18,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.1.2.7 $ $Date: 2001/04/20 20:49:49 $
  + * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/25 17:05:26 $
    */
   public interface ClassLoaderManager extends Component {
       /**
  
  
  
  1.1.2.9   +4 -5      xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/ClassLoaderManagerImpl.java
  
  Index: ClassLoaderManagerImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/ClassLoaderManagerImpl.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- ClassLoaderManagerImpl.java	2001/04/20 20:49:49	1.1.2.8
  +++ ClassLoaderManagerImpl.java	2001/04/25 17:05:27	1.1.2.9
  @@ -7,19 +7,18 @@
    *****************************************************************************/
   package org.apache.cocoon.components.classloader;
   
  -import java.io.IOException;
   import java.io.File;
  -import java.net.URL;
  +import java.io.IOException;
   import java.net.MalformedURLException;
  -import org.apache.cocoon.util.ClassUtils;
  -
  +import java.net.URL;
   import org.apache.avalon.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.1.2.8 $ $Date: 2001/04/20 20:49:49 $
  + * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/25 17:05:27 $
    */
   public class ClassLoaderManagerImpl implements ClassLoaderManager, ThreadSafe {
     /**
  
  
  
  1.1.2.24  +7 -12     xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/RepositoryClassLoader.java
  
  Index: RepositoryClassLoader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/RepositoryClassLoader.java,v
  retrieving revision 1.1.2.23
  retrieving revision 1.1.2.24
  diff -u -r1.1.2.23 -r1.1.2.24
  --- RepositoryClassLoader.java	2001/04/20 20:49:49	1.1.2.23
  +++ RepositoryClassLoader.java	2001/04/25 17:05:28	1.1.2.24
  @@ -7,22 +7,17 @@
    *****************************************************************************/
   package org.apache.cocoon.components.classloader;
   
  -import java.util.Vector;
  -import java.util.Iterator;
  -
   import java.io.File;
  -
   import java.io.IOException;
  -
  +import java.net.MalformedURLException;
   import java.net.URL;
   import java.net.URLClassLoader;
  -import java.net.MalformedURLException;
  -
  -import org.apache.cocoon.util.NetUtils;
  -import org.apache.cocoon.util.IOUtils;
  -import org.apache.cocoon.util.ClassUtils;
  -
  +import java.util.Iterator;
  +import java.util.Vector;
   import org.apache.avalon.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;
   
   /**
  @@ -33,7 +28,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.2.23 $ $Date: 2001/04/20 20:49:49 $
  + * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/04/25 17:05:28 $
    */
   public class RepositoryClassLoader extends URLClassLoader implements Loggable {
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.8   +2 -2      xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/CompiledComponent.java
  
  Index: CompiledComponent.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/CompiledComponent.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- CompiledComponent.java	2001/04/24 15:27:44	1.1.2.7
  +++ CompiledComponent.java	2001/04/25 17:05:31	1.1.2.8
  @@ -16,7 +16,7 @@
    * includes Sitemaps and XSP Pages
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/24 15:27:44 $
  + * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/25 17:05:31 $
    */
   public interface CompiledComponent extends Component, Composable, Modifiable {
  -}
  \ No newline at end of file
  +}
  
  
  
  1.1.2.16  +6 -8      xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/GeneratorSelector.java
  
  Index: GeneratorSelector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/GeneratorSelector.java,v
  retrieving revision 1.1.2.15
  retrieving revision 1.1.2.16
  diff -u -r1.1.2.15 -r1.1.2.16
  --- GeneratorSelector.java	2001/04/20 20:49:50	1.1.2.15
  +++ GeneratorSelector.java	2001/04/25 17:05:32	1.1.2.16
  @@ -8,25 +8,23 @@
   package org.apache.cocoon.components.language.generator;
   
   import java.io.File;
  -
  +import org.apache.avalon.activity.Disposable;
   import org.apache.avalon.component.Component;
  -import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.ComponentException;
  -import org.apache.avalon.Disposable;
  +import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.configuration.DefaultConfiguration;
  -
  -import org.apache.cocoon.components.classloader.ClassLoaderManager;
  -import org.apache.cocoon.Roles;
   import org.apache.cocoon.Constants;
  -import org.apache.excalibur.component.DefaultComponentSelector;
  +import org.apache.cocoon.Roles;
  +import org.apache.cocoon.components.classloader.ClassLoaderManager;
   import org.apache.cocoon.util.ClassUtils;
  +import org.apache.excalibur.component.DefaultComponentSelector;
   
   /**
    * 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.1.2.15 $ $Date: 2001/04/20 20:49:50 $
  + * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/25 17:05:32 $
    */
   public class GeneratorSelector extends DefaultComponentSelector implements Disposable {
       private ClassLoaderManager classManager;
  
  
  
  1.1.2.11  +1 -2      xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGenerator.java
  
  Index: ProgramGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGenerator.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- ProgramGenerator.java	2001/04/20 20:49:50	1.1.2.10
  +++ ProgramGenerator.java	2001/04/25 17:05:33	1.1.2.11
  @@ -9,7 +9,6 @@
   
   import java.io.File;
   import org.apache.avalon.component.Component;
  -
   import org.xml.sax.EntityResolver;
   
   /**
  @@ -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.1.2.10 $ $Date: 2001/04/20 20:49:50 $
  + * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/25 17:05:33 $
    */
   public interface ProgramGenerator extends Component {
     /**
  
  
  
  1.1.2.51  +9 -9      xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java
  
  Index: ProgramGeneratorImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java,v
  retrieving revision 1.1.2.50
  retrieving revision 1.1.2.51
  diff -u -r1.1.2.50 -r1.1.2.51
  --- ProgramGeneratorImpl.java	2001/04/24 12:14:36	1.1.2.50
  +++ ProgramGeneratorImpl.java	2001/04/25 17:05:33	1.1.2.51
  @@ -12,24 +12,24 @@
   import java.io.FileNotFoundException;
   import java.io.FileReader;
   import java.io.IOException;
  -import org.apache.avalon.logger.AbstractLoggable;
  +import org.apache.avalon.activity.Disposable;
   import org.apache.avalon.component.Component;
  +import org.apache.avalon.component.ComponentException;
   import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.ComponentSelector;
   import org.apache.avalon.component.Composable;
  -import org.apache.avalon.context.Context;
  -import org.apache.avalon.context.Contextualizable;
  -import org.apache.avalon.Disposable;
  -import org.apache.avalon.thread.ThreadSafe;
  -import org.apache.avalon.component.ComponentException;
  -import org.apache.avalon.context.ContextException;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
  +import org.apache.avalon.context.Context;
  +import org.apache.avalon.context.ContextException;
  +import org.apache.avalon.context.Contextualizable;
  +import org.apache.avalon.logger.AbstractLoggable;
   import org.apache.avalon.parameters.Parameters;
  +import org.apache.avalon.thread.ThreadSafe;
   import org.apache.cocoon.Constants;
  -import org.apache.cocoon.Roles;
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.components.language.LanguageException;
   import org.apache.cocoon.components.language.markup.MarkupLanguage;
   import org.apache.cocoon.components.language.markup.sitemap.SitemapMarkupLanguage;
  @@ -47,7 +47,7 @@
   /**
    * The default implementation of <code>ProgramGenerator</code>
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.50 $ $Date: 2001/04/24 12:14:36 $
  + * @version CVS $Revision: 1.1.2.51 $ $Date: 2001/04/25 17:05:33 $
    */
   public class ProgramGeneratorImpl extends AbstractLoggable
       implements ProgramGenerator, Contextualizable, Composable, Configurable, ThreadSafe, Disposable {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.36  +20 -23    xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java
  
  Index: AbstractMarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java,v
  retrieving revision 1.1.2.35
  retrieving revision 1.1.2.36
  diff -u -r1.1.2.35 -r1.1.2.36
  --- AbstractMarkupLanguage.java	2001/04/23 17:11:35	1.1.2.35
  +++ AbstractMarkupLanguage.java	2001/04/25 17:05:36	1.1.2.36
  @@ -10,50 +10,47 @@
   
   import java.io.File;
   import java.io.IOException;
  -import java.net.URL;
   import java.net.MalformedURLException;
  +import java.net.URL;
  +import java.util.ArrayList;
   import java.util.Date;
  -import java.util.Map;
  +import java.util.Enumeration;
  +import java.util.Hashtable;
   import java.util.Iterator;
  -import java.util.ListIterator;
   import java.util.LinkedList;
  -import java.util.Vector;
   import java.util.List;
  -import java.util.ArrayList;
  -import java.util.Hashtable;
  -import java.util.Enumeration;
  -
  -import org.xml.sax.InputSource;
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.XMLReader;
  -import org.xml.sax.XMLFilter;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.helpers.XMLFilterImpl;
  -import org.xml.sax.helpers.XMLReaderFactory;
  -
  -import org.apache.avalon.component.Composable;
  +import java.util.ListIterator;
  +import java.util.Map;
  +import java.util.Vector;
   import org.apache.avalon.component.Component;
  -import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
  +import org.apache.avalon.component.Composable;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
  -import org.apache.avalon.parameters.Parameters;
   import org.apache.avalon.logger.AbstractLoggable;
  -
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.Roles;
   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.util.IOUtils;
  +import org.xml.sax.Attributes;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.XMLFilter;
  +import org.xml.sax.XMLReader;
  +import org.xml.sax.helpers.XMLFilterImpl;
  +import org.xml.sax.helpers.XMLReaderFactory;
   
   /**
    * 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.1.2.35 $ $Date: 2001/04/23 17:11:35 $
  + * @version CVS $Revision: 1.1.2.36 $ $Date: 2001/04/25 17:05:36 $
    */
   public abstract class AbstractMarkupLanguage extends AbstractLoggable implements MarkupLanguage, Composable, Configurable {
       /** The supported language table */
  @@ -265,7 +262,7 @@
               // Create code generator
               LogicsheetCodeGenerator codeGenerator = new LogicsheetCodeGenerator();
               codeGenerator.setLogger(getLogger());
  -            codeGenerator.init();
  +            codeGenerator.initialize();
               // set the transformer chain builder filter
               TransformerChainBuilderFilter tranBuilder = getTranformerChainBuilder(codeGenerator, resolver);
               tranBuilder.setLanguageDescriptor(language);
  
  
  
  1.1.2.18  +19 -20    xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/Logicsheet.java
  
  Index: Logicsheet.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/Logicsheet.java,v
  retrieving revision 1.1.2.17
  retrieving revision 1.1.2.18
  diff -u -r1.1.2.17 -r1.1.2.18
  --- Logicsheet.java	2001/04/23 17:11:37	1.1.2.17
  +++ Logicsheet.java	2001/04/25 17:05:37	1.1.2.18
  @@ -9,36 +9,35 @@
   package org.apache.cocoon.components.language.markup;
   
   import java.io.IOException;
  -import java.io.StringWriter;
   import java.io.PrintWriter;
  -import java.util.Map;
  +import java.io.StringWriter;
   import java.util.HashMap;
  -import java.util.Set;
   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.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.EntityResolver;
  +import org.xml.sax.ErrorHandler;
   import org.xml.sax.InputSource;
  -import org.xml.sax.helpers.XMLFilterImpl;
   import org.xml.sax.SAXException;
  -import org.xml.sax.SAXNotSupportedException;
   import org.xml.sax.SAXNotRecognizedException;
  +import org.xml.sax.SAXNotSupportedException;
   import org.xml.sax.XMLFilter;
   import org.xml.sax.XMLReader;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.DTDHandler;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.ErrorHandler;
   import org.xml.sax.helpers.AttributesImpl;
  +import org.xml.sax.helpers.XMLFilterImpl;
   import org.xml.sax.helpers.XMLReaderFactory;
  -import javax.xml.transform.TransformerFactory;
  -import javax.xml.transform.Templates;
  -import javax.xml.transform.TransformerConfigurationException;
  -import javax.xml.transform.sax.SAXSource;
  -import javax.xml.transform.sax.TransformerHandler;
  -import javax.xml.transform.sax.SAXTransformerFactory;
  -import org.apache.avalon.logger.AbstractLoggable;
  -
  -import org.apache.cocoon.util.TraxErrorHandler;
   
   /**
    * A code-generation logicsheet. This class is actually a wrapper for
  @@ -48,7 +47,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.1.2.17 $ $Date: 2001/04/23 17:11:37 $
  + * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/25 17:05:37 $
    */
   public class Logicsheet extends AbstractLoggable {
       /** The trax TransformerFactory */
  
  
  
  1.1.2.16  +11 -16    xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/LogicsheetCodeGenerator.java
  
  Index: LogicsheetCodeGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/LogicsheetCodeGenerator.java,v
  retrieving revision 1.1.2.15
  retrieving revision 1.1.2.16
  diff -u -r1.1.2.15 -r1.1.2.16
  --- LogicsheetCodeGenerator.java	2001/04/23 17:11:38	1.1.2.15
  +++ LogicsheetCodeGenerator.java	2001/04/25 17:05:38	1.1.2.16
  @@ -7,37 +7,32 @@
    *****************************************************************************/
   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.xml.sax.InputSource;
  -import org.xml.sax.XMLReader;
  -import org.xml.sax.ContentHandler;
  -
  -import java.io.IOException;
  -
  -import javax.xml.transform.TransformerFactory;
  +import javax.xml.transform.OutputKeys;
   import javax.xml.transform.TransformerConfigurationException;
  -import javax.xml.transform.sax.TransformerHandler;
  +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 javax.xml.transform.OutputKeys;
  -import javax.xml.transform.TransformerException;
  -
  -import org.apache.log.Logger;
   import org.apache.avalon.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;
   
   /**
    * 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.1.2.15 $ $Date: 2001/04/23 17:11:38 $
  + * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/25 17:05:38 $
    */
   public class LogicsheetCodeGenerator extends AbstractLoggable implements MarkupCodeGenerator {
   
  @@ -57,7 +52,7 @@
       /**
       * Initialize the LogicsheetCodeGenerator.
       */
  -    public void init() {
  +    public void initialize() {
   
           Properties format = new Properties();
   
  
  
  
  1.1.2.10  +3 -6      xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/MarkupLanguage.java
  
  Index: MarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/MarkupLanguage.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- MarkupLanguage.java	2001/04/20 20:49:52	1.1.2.9
  +++ MarkupLanguage.java	2001/04/25 17:05:39	1.1.2.10
  @@ -7,14 +7,11 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup;
   
  -import org.xml.sax.XMLReader;
  -import org.xml.sax.InputSource;
  -
   import org.apache.avalon.component.Component;
  -
   import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
  -
   import org.xml.sax.EntityResolver;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.XMLReader;
   
   /**
    * This interface defines a markup language whose SAX producer's instance are to
  @@ -22,7 +19,7 @@
    * document augmenting it with dynamic content
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/20 20:49:52 $
  + * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/25 17:05:39 $
    */
   public interface MarkupLanguage extends Component {
       /**
  
  
  
  1.1.2.5   +2 -3      xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/NamedLogicsheet.java
  
  Index: NamedLogicsheet.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/NamedLogicsheet.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- NamedLogicsheet.java	2000/10/12 16:43:18	1.1.2.4
  +++ NamedLogicsheet.java	2001/04/25 17:05:40	1.1.2.5
  @@ -7,9 +7,8 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup;
   
  -import org.xml.sax.InputSource;
  -
   import java.io.IOException;
  +import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
   /**
  @@ -19,7 +18,7 @@
    * namespace
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/10/12 16:43:18 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 17:05:40 $
    */
   public class NamedLogicsheet extends Logicsheet {
       /**
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.17  +12 -18    xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/Attic/SitemapMarkupLanguage.java
  
  Index: SitemapMarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/Attic/SitemapMarkupLanguage.java,v
  retrieving revision 1.1.2.16
  retrieving revision 1.1.2.17
  diff -u -r1.1.2.16 -r1.1.2.17
  --- SitemapMarkupLanguage.java	2001/04/20 20:49:53	1.1.2.16
  +++ SitemapMarkupLanguage.java	2001/04/25 17:05:42	1.1.2.17
  @@ -8,38 +8,32 @@
   package org.apache.cocoon.components.language.markup.sitemap;
   
   import java.io.File;
  -import java.util.Date;
  -import java.util.List;
  +import java.io.IOException;
   import java.util.ArrayList;
  -import java.util.Set;
  +import java.util.Date;
   import java.util.HashSet;
   import java.util.Iterator;
  -
  -import org.xml.sax.XMLReader;
  -import org.xml.sax.XMLFilter;
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.helpers.XMLFilterImpl;
  -import org.xml.sax.helpers.AttributesImpl;
  -
  +import java.util.List;
  +import java.util.Set;
  +import org.apache.avalon.logger.Loggable;
   import org.apache.cocoon.components.language.markup.*;
   import org.apache.cocoon.components.language.markup.sitemap.*;
  -
  -
   import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
  -
   import org.apache.log.Logger;
  -import org.apache.avalon.logger.Loggable;
  -
  -import java.io.IOException;
  +import org.xml.sax.Attributes;
  +import org.xml.sax.EntityResolver;
   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;
   
   /**
    * 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.1.2.16 $ $Date: 2001/04/20 20:49:53 $
  + * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/25 17:05:42 $
    */
   public class SitemapMarkupLanguage extends AbstractMarkupLanguage {
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +16 -19    xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPCookieHelper.java
  
  Index: XSPCookieHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPCookieHelper.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- XSPCookieHelper.java	2001/04/18 12:05:49	1.1.2.2
  +++ XSPCookieHelper.java	2001/04/25 17:05:44	1.1.2.3
  @@ -42,16 +42,13 @@
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Map;
  -
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.helpers.AttributesImpl;
  -import org.xml.sax.SAXException;
  -
  +import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Cookie;
  -import org.apache.cocoon.environment.Response;
   import org.apache.cocoon.environment.Request;
  -
  -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;
   
   public class XSPCookieHelper extends XSPObjectHelper {
     /**
  @@ -70,19 +67,19 @@
   
           @param name     name to be set for the cookie
   
  -        @param value	value to be set for the cookie
  +        @param value        value to be set for the cookie
   
  -        @param comment	comment to be set for the cookie
  +        @param comment        comment to be set for the cookie
   
  -        @param domain	domain to be set for the cookie
  +        @param domain        domain to be set for the cookie
   
  -        @param maxage	maxage to be set for the cookie
  +        @param maxage        maxage to be set for the cookie
   
  -        @param path		path to be set for the cookie
  +        @param path                path to be set for the cookie
   
  -        @param secure	secure property to be set for the cookie
  +        @param secure        secure property to be set for the cookie
   
  -        @param version	version to be set for the cookie
  +        @param version        version to be set for the cookie
     */
       public static void addCookie(Map objectModel, String name, String value,
                                       String comment, String domain, int maxage, String path,
  @@ -611,10 +608,10 @@
                          If both name and index are specified, name will take
                          preference.
   
  -    @param valueOf	   Specifies the property whose value if to be retrieved.
  +    @param valueOf           Specifies the property whose value if to be retrieved.
                          Properties have been specifed above
   
  -    @return 	If the name or index that is passed is improper then a null value
  +    @return         If the name or index that is passed is improper then a null value
                   will be returned, otherwise whatever will be the extracted value of
                   the property will be returned.
   */
  @@ -632,7 +629,7 @@
   
           Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
   
  -        int count 			 = 0;
  +        int count                          = 0;
   
           String returnValue = null;
   
  @@ -693,4 +690,4 @@
           return returnValue;
       }
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.1.2.20  +6 -9      xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPGenerator.java
  
  Index: XSPGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPGenerator.java,v
  retrieving revision 1.1.2.19
  retrieving revision 1.1.2.20
  diff -u -r1.1.2.19 -r1.1.2.20
  --- XSPGenerator.java	2001/04/24 12:14:37	1.1.2.19
  +++ XSPGenerator.java	2001/04/25 17:05:45	1.1.2.20
  @@ -7,24 +7,21 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.xsp;
   
  -import org.apache.cocoon.Roles;
   import org.apache.avalon.component.ComponentManager;
  -import org.apache.cocoon.components.parser.Parser;
  -
  -import org.apache.cocoon.components.language.generator.CompiledComponent;
  -
  -import org.apache.excalibur.pool.Poolable;
  +import org.apache.avalon.context.Context;
   import org.apache.avalon.context.ContextException;
   import org.apache.avalon.context.Contextualizable;
  -import org.apache.avalon.context.Context;
  -
  +import org.apache.cocoon.Roles;
  +import org.apache.cocoon.components.language.generator.CompiledComponent;
  +import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.generation.AbstractServerPage;
  +import org.apache.excalibur.pool.Poolable;
   
   /**
    * Base class for XSP-generated <code>ServerPagesGenerator</code> classes
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/04/24 12:14:37 $
  + * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/04/25 17:05:45 $
    */
   public abstract class XSPGenerator extends AbstractServerPage implements CompiledComponent, Contextualizable, Poolable {
   
  
  
  
  1.1.2.14  +13 -18    xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPMarkupLanguage.java
  
  Index: XSPMarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPMarkupLanguage.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- XSPMarkupLanguage.java	2001/04/20 20:49:54	1.1.2.13
  +++ XSPMarkupLanguage.java	2001/04/25 17:05:46	1.1.2.14
  @@ -8,32 +8,27 @@
   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.Set;
  -import java.util.ArrayList;
  -import java.util.List;
   import java.util.Iterator;
  +import java.util.List;
  +import java.util.Set;
   import java.util.Stack;
  -
  -import org.xml.sax.XMLReader;
  -import org.xml.sax.XMLFilter;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.helpers.AttributesImpl;
  -import org.xml.sax.helpers.XMLFilterImpl;
  -
  +import org.apache.avalon.logger.Loggable;
  +import org.apache.cocoon.Constants;
   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.Constants;
  -
   import org.apache.log.Logger;
  -import org.apache.avalon.logger.Loggable;
  -
  -import java.io.IOException;
  +import org.xml.sax.Attributes;
  +import org.xml.sax.EntityResolver;
   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;
   
   /**
    * This class implements <code>MarkupLanguage</code> for Cocoon's
  @@ -41,7 +36,7 @@
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="mailto:ssahuc@apache.org">Sebastien Sahuc</a>
  - * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/20 20:49:54 $
  + * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/25 17:05:46 $
    */
   public class XSPMarkupLanguage extends AbstractMarkupLanguage {
   
  
  
  
  1.1.2.9   +5 -8      xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPObjectHelper.java
  
  Index: XSPObjectHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPObjectHelper.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- XSPObjectHelper.java	2001/01/22 21:56:36	1.1.2.8
  +++ XSPObjectHelper.java	2001/04/25 17:05:46	1.1.2.9
  @@ -9,15 +9,12 @@
   
   import java.util.Collection;
   import java.util.Iterator;
  -
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.helpers.AttributesImpl;
  -import org.xml.sax.SAXException;
  -
  -import org.w3c.dom.Node;
  -
   import org.apache.cocoon.xml.XMLFragment;
   import org.apache.cocoon.xml.dom.DOMStreamer;
  +import org.w3c.dom.Node;
  +import org.xml.sax.ContentHandler;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.helpers.AttributesImpl;
   
   /**
    * Base class for XSP's object model manipulation logicsheets
  @@ -25,7 +22,7 @@
    * @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.1.2.8 $ $Date: 2001/01/22 21:56:36 $
  + * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/25 17:05:46 $
    */
   public class XSPObjectHelper {
     /**
  
  
  
  1.1.2.16  +5 -8      xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPRequestHelper.java
  
  Index: XSPRequestHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPRequestHelper.java,v
  retrieving revision 1.1.2.15
  retrieving revision 1.1.2.16
  diff -u -r1.1.2.15 -r1.1.2.16
  --- XSPRequestHelper.java	2001/04/18 12:05:49	1.1.2.15
  +++ XSPRequestHelper.java	2001/04/25 17:05:47	1.1.2.16
  @@ -8,23 +8,20 @@
   package org.apache.cocoon.components.language.markup.xsp;
   
   import java.util.Enumeration;
  -
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Session;
   import java.util.Map;
   import java.util.Vector;
  -
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.Session;
   import org.xml.sax.ContentHandler;
  -import org.xml.sax.helpers.AttributesImpl;
   import org.xml.sax.SAXException;
  -
  -import org.apache.cocoon.Constants;
  +import org.xml.sax.helpers.AttributesImpl;
   
   /**
    * The <code>Request</code> object helper
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/18 12:05:49 $
  + * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/25 17:05:47 $
    */
   public class XSPRequestHelper extends XSPObjectHelper {
     /**
  
  
  
  1.1.2.14  +4 -8      xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPResponseHelper.java
  
  Index: XSPResponseHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPResponseHelper.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- XSPResponseHelper.java	2001/04/19 13:11:41	1.1.2.13
  +++ XSPResponseHelper.java	2001/04/25 17:05:47	1.1.2.14
  @@ -10,22 +10,18 @@
   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.apache.log.LogKit;
   import org.xml.sax.ContentHandler;
  -import org.xml.sax.helpers.AttributesImpl;
   import org.xml.sax.SAXException;
  -
  -import org.apache.cocoon.Constants;
  -
  -import org.apache.log.LogKit;
  +import org.xml.sax.helpers.AttributesImpl;
   
   /**
    * The XSP <code>Response</code> object helper
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/19 13:11:41 $
  + * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/25 17:05:47 $
    */
   public class XSPResponseHelper extends XSPObjectHelper {
     /**
  
  
  
  1.1.2.12  +9 -12     xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPUtil.java
  
  Index: XSPUtil.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPUtil.java,v
  retrieving revision 1.1.2.11
  retrieving revision 1.1.2.12
  diff -u -r1.1.2.11 -r1.1.2.12
  --- XSPUtil.java	2001/04/18 12:05:49	1.1.2.11
  +++ XSPUtil.java	2001/04/25 17:05:47	1.1.2.12
  @@ -6,32 +6,26 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    */
  -
   package org.apache.cocoon.components.language.markup.xsp;
   
  +import java.io.BufferedInputStream;
  +import java.io.BufferedReader;
   import java.io.File;
   import java.io.FileInputStream;
   import java.io.FileReader;
  +import java.io.IOException;
   import java.io.InputStream;
   import java.io.InputStreamReader;
  -import java.io.BufferedInputStream;
  -import java.io.BufferedReader;
  -import java.io.IOException;
   import java.io.Reader;
   import java.net.URL;
   import java.text.SimpleDateFormat;
   import java.util.Date;
   import java.util.Map;
  -
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.InputSource;
  -import org.xml.sax.SAXException;
  -
  +import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.Roles;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.components.url.URLFactory;
   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;
  @@ -41,12 +35,15 @@
   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.1.2.11 $ $Date: 2001/04/18 12:05:49 $
  + * @version $Revision: 1.1.2.12 $ $Date: 2001/04/25 17:05:47 $
    */
   public class XSPUtil {
       public static String pathComponent(String filename) {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.15  +3 -7      xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/AbstractProgrammingLanguage.java
  
  Index: AbstractProgrammingLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/AbstractProgrammingLanguage.java,v
  retrieving revision 1.1.2.14
  retrieving revision 1.1.2.15
  diff -u -r1.1.2.14 -r1.1.2.15
  --- AbstractProgrammingLanguage.java	2001/04/23 17:52:19	1.1.2.14
  +++ AbstractProgrammingLanguage.java	2001/04/25 17:05:52	1.1.2.15
  @@ -8,17 +8,13 @@
   package org.apache.cocoon.components.language.programming;
   
   import java.io.File;
  -
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
  -
  +import org.apache.avalon.logger.AbstractLoggable;
   import org.apache.avalon.parameters.Parameters;
  -
  -import org.apache.cocoon.util.ClassUtils;
   import org.apache.cocoon.components.language.LanguageException;
  -
  -import org.apache.avalon.logger.AbstractLoggable;
  +import org.apache.cocoon.util.ClassUtils;
   
   /**
    * Base implementation of <code>ProgrammingLanguage</code>. This class sets the
  @@ -26,7 +22,7 @@
    * unloading.
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/23 17:52:19 $
  + * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/25 17:05:52 $
    */
   public abstract class AbstractProgrammingLanguage extends AbstractLoggable
     implements ProgrammingLanguage, Configurable
  
  
  
  1.1.2.19  +4 -5      xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/CompiledProgrammingLanguage.java
  
  Index: CompiledProgrammingLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/CompiledProgrammingLanguage.java,v
  retrieving revision 1.1.2.18
  retrieving revision 1.1.2.19
  diff -u -r1.1.2.18 -r1.1.2.19
  --- CompiledProgrammingLanguage.java	2001/04/24 12:14:39	1.1.2.18
  +++ CompiledProgrammingLanguage.java	2001/04/25 17:05:53	1.1.2.19
  @@ -6,26 +6,25 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    */
  -
   package org.apache.cocoon.components.language.programming;
   
   import java.io.File;
  -import org.apache.avalon.parameters.Parameters;
   import org.apache.avalon.component.Composable;
  -import org.apache.avalon.context.ContextException;
   import org.apache.avalon.context.Context;
  +import org.apache.avalon.context.ContextException;
   import org.apache.avalon.context.Contextualizable;
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.Roles;
  +import org.apache.cocoon.components.language.LanguageException;
   import org.apache.cocoon.util.ClassUtils;
   import org.apache.cocoon.util.IOUtils;
  -import org.apache.cocoon.components.language.LanguageException;
   
   /**
    * 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.1.2.18 $ $Date: 2001/04/24 12:14:39 $
  + * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/04/25 17:05:53 $
    */
   public abstract class CompiledProgrammingLanguage extends AbstractProgrammingLanguage implements Contextualizable {
       /** The compiler */
  
  
  
  1.1.2.7   +2 -3      xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/LanguageCompiler.java
  
  Index: LanguageCompiler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/LanguageCompiler.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- LanguageCompiler.java	2001/04/20 20:49:57	1.1.2.6
  +++ LanguageCompiler.java	2001/04/25 17:05:54	1.1.2.7
  @@ -8,16 +8,15 @@
   
   package org.apache.cocoon.components.language.programming;
   
  +import java.io.IOException;
   import java.util.List;
   import org.apache.avalon.component.Component;
   
  -import java.io.IOException;
  -
   /**
    * 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.2.6 $ $Date: 2001/04/20 20:49:57 $
  + * @version $Revision: 1.1.2.7 $ $Date: 2001/04/25 17:05:54 $
    * @since 2.0
    */
   public interface LanguageCompiler extends Component {
  
  
  
  1.1.2.10  +2 -4      xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/ProgrammingLanguage.java
  
  Index: ProgrammingLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/ProgrammingLanguage.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- ProgrammingLanguage.java	2001/04/20 20:49:57	1.1.2.9
  +++ ProgrammingLanguage.java	2001/04/25 17:05:54	1.1.2.10
  @@ -8,17 +8,15 @@
   package org.apache.cocoon.components.language.programming;
   
   import java.io.File;
  -
   import org.apache.avalon.component.Component;
  -
  -import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.components.language.LanguageException;
  +import org.apache.cocoon.components.language.generator.CompiledComponent;
   
   /**
    * This interface states the functionality of a programming language processor
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/20 20:49:57 $
  + * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/25 17:05:54 $
    */
   public interface ProgrammingLanguage extends Component {
     /**
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.13  +5 -8      xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/AbstractJavaCompiler.java
  
  Index: AbstractJavaCompiler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/AbstractJavaCompiler.java,v
  retrieving revision 1.1.2.12
  retrieving revision 1.1.2.13
  diff -u -r1.1.2.12 -r1.1.2.13
  --- AbstractJavaCompiler.java	2001/04/23 17:52:24	1.1.2.12
  +++ AbstractJavaCompiler.java	2001/04/25 17:06:03	1.1.2.13
  @@ -8,22 +8,19 @@
   
   package org.apache.cocoon.components.language.programming.java;
   
  -import java.util.List;
   import java.io.BufferedReader;
  +import java.io.IOException;
   import java.io.InputStream;
   import java.io.InputStreamReader;
  -import java.io.IOException;
  -
  -import org.apache.excalibur.pool.Recyclable;
  -
  -import org.apache.cocoon.components.language.programming.*;
  -
  +import java.util.List;
   import org.apache.avalon.logger.AbstractLoggable;
  +import org.apache.cocoon.components.language.programming.*;
  +import org.apache.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.2.12 $ $Date: 2001/04/23 17:52:24 $
  + * @version $Revision: 1.1.2.13 $ $Date: 2001/04/25 17:06:03 $
    * @since 2.0
    */
   public abstract class AbstractJavaCompiler extends AbstractLoggable implements LanguageCompiler, Recyclable {
  
  
  
  1.1.2.28  +8 -11     xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JavaLanguage.java
  
  Index: JavaLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JavaLanguage.java,v
  retrieving revision 1.1.2.27
  retrieving revision 1.1.2.28
  diff -u -r1.1.2.27 -r1.1.2.28
  --- JavaLanguage.java	2001/04/23 17:52:27	1.1.2.27
  +++ JavaLanguage.java	2001/04/25 17:06:04	1.1.2.28
  @@ -12,29 +12,26 @@
   import java.io.FileFilter;
   import java.io.IOException;
   import java.util.List;
  -
  -import org.apache.avalon.parameters.Parameters;
  -
  -import org.apache.avalon.component.Composable;
  +import org.apache.avalon.activity.Disposable;
   import org.apache.avalon.component.Component;
   import org.apache.avalon.component.ComponentManager;
  -import org.apache.avalon.Disposable;
  -import org.apache.avalon.thread.ThreadSafe;
  +import org.apache.avalon.component.Composable;
   import org.apache.avalon.logger.Loggable;
  -
  +import org.apache.avalon.parameters.Parameters;
  +import org.apache.avalon.thread.ThreadSafe;
   import org.apache.cocoon.Roles;
  -import org.apache.cocoon.util.ClassUtils;
  -import org.apache.cocoon.util.JavaArchiveFilter;
   import org.apache.cocoon.components.classloader.ClassLoaderManager;
  +import org.apache.cocoon.components.language.LanguageException;
   import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.components.language.programming.*;
  -import org.apache.cocoon.components.language.LanguageException;
  +import org.apache.cocoon.util.ClassUtils;
  +import org.apache.cocoon.util.JavaArchiveFilter;
   
   /**
    * The Java programming language processor
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.27 $ $Date: 2001/04/23 17:52:27 $
  + * @version CVS $Revision: 1.1.2.28 $ $Date: 2001/04/25 17:06:04 $
    */
   public class JavaLanguage extends CompiledProgrammingLanguage implements ThreadSafe, Composable, Disposable {
   
  
  
  
  1.1.2.8   +5 -8      xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JstyleFormatter.java
  
  Index: JstyleFormatter.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JstyleFormatter.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- JstyleFormatter.java	2001/04/23 17:52:31	1.1.2.7
  +++ JstyleFormatter.java	2001/04/25 17:06:05	1.1.2.8
  @@ -7,18 +7,15 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.programming.java;
   
  -import java.io.PrintWriter;
  -import java.io.StringReader;
   import java.io.BufferedReader;
   import java.io.ByteArrayOutputStream;
  +import java.io.PrintWriter;
  +import java.io.StringReader;
   import java.io.UnsupportedEncodingException;
  -
  -import jstyle.JSFormatter;
   import jstyle.JSBeautifier;
  -
  -import org.apache.cocoon.components.language.programming.*;
  -
  +import jstyle.JSFormatter;
   import org.apache.avalon.logger.AbstractLoggable;
  +import org.apache.cocoon.components.language.programming.*;
   
   /**
    * This class implements <code>CodeFormatter</code> based on
  @@ -26,7 +23,7 @@
    * beautifier. This implementation is very improvised...
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/23 17:52:31 $
  + * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/25 17:06:05 $
    */
   public class JstyleFormatter extends AbstractLoggable implements CodeFormatter {
     /**
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +3 -6      xml-cocoon/src/org/apache/cocoon/components/language/programming/javascript/Attic/JavascriptLanguage.java
  
  Index: JavascriptLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/javascript/Attic/JavascriptLanguage.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- JavascriptLanguage.java	2001/04/23 17:52:39	1.1.2.6
  +++ JavascriptLanguage.java	2001/04/25 17:06:08	1.1.2.7
  @@ -8,19 +8,16 @@
   package org.apache.cocoon.components.language.programming.javascript;
   
   import java.io.File;
  -
  +import org.apache.cocoon.components.language.LanguageException;
  +import org.apache.cocoon.components.language.programming.java.*;
   import org.mozilla.javascript.*;
   import org.mozilla.javascript.tools.jsc.Main;
   
  -import org.apache.cocoon.components.language.programming.java.*;
  -
  -import org.apache.cocoon.components.language.LanguageException;
  -
   /**
    * The compiled Javascript (Rhino) programming language processor
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/23 17:52:39 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/25 17:06:08 $
    */
   public class JavascriptLanguage extends JavaLanguage
   {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +8 -8      xml-cocoon/src/org/apache/cocoon/components/parser/Attic/JaxpParser.java
  
  Index: JaxpParser.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/parser/Attic/JaxpParser.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- JaxpParser.java	2001/04/23 02:06:16	1.1.2.6
  +++ JaxpParser.java	2001/04/25 17:06:11	1.1.2.7
  @@ -8,27 +8,27 @@
   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.cocoon.xml.AbstractXMLProducer;
   import org.apache.cocoon.xml.dom.DOMFactory;
  +import org.w3c.dom.DOMImplementation;
  +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 org.w3c.dom.DOMImplementation;
  -import javax.xml.parsers.SAXParserFactory;
  -import javax.xml.parsers.SAXParser;
  -import javax.xml.parsers.ParserConfigurationException;
  -import javax.xml.parsers.DocumentBuilderFactory;
  -import javax.xml.parsers.DocumentBuilder;
   
   /**
    * 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.1.2.6 $ $Date: 2001/04/23 02:06:16 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/25 17:06:11 $
    */
   public class JaxpParser extends AbstractXMLProducer
   implements Parser, ErrorHandler {
  
  
  
  1.1.2.14  +2 -2      xml-cocoon/src/org/apache/cocoon/components/parser/Attic/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/parser/Attic/Parser.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- Parser.java	2001/04/23 02:06:16	1.1.2.13
  +++ Parser.java	2001/04/25 17:06:12	1.1.2.14
  @@ -11,15 +11,15 @@
   import org.apache.avalon.component.Component;
   import org.apache.cocoon.xml.XMLProducer;
   import org.apache.cocoon.xml.dom.DOMFactory;
  +import org.w3c.dom.Document;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  -import org.w3c.dom.Document;
   
   /**
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/23 02:06:16 $
  + * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/25 17:06:12 $
    */
   public interface Parser extends Component, XMLProducer, DOMFactory {
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.9   +13 -17    xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/AbstractEventPipeline.java
  
  Index: AbstractEventPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/AbstractEventPipeline.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- AbstractEventPipeline.java	2001/04/24 22:05:57	1.1.2.8
  +++ AbstractEventPipeline.java	2001/04/25 17:06:16	1.1.2.9
  @@ -7,39 +7,35 @@
    *****************************************************************************/
   package org.apache.cocoon.components.pipeline;
   
  +import java.io.IOException;
   import java.util.ArrayList;
   import java.util.Iterator;
  -import java.io.IOException;
  -
  -import org.apache.avalon.component.ComponentManager;
  +import org.apache.avalon.activity.Disposable;
  +import org.apache.avalon.component.Component;
   import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.ComponentSelector;
  -import org.apache.avalon.component.Component;
   import org.apache.avalon.component.Composable;
  -import org.apache.avalon.Disposable;
   import org.apache.avalon.parameters.Parameters;
  -
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.Processor;
  +import org.apache.cocoon.Roles;
  +import org.apache.cocoon.components.saxconnector.SAXConnector;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.generation.Generator;
  +import org.apache.cocoon.sitemap.ErrorNotifier;
  +import org.apache.cocoon.sitemap.Sitemap;
   import org.apache.cocoon.transformation.Transformer;
   import org.apache.cocoon.xml.AbstractXMLProducer;
  -import org.apache.cocoon.xml.XMLProducer;
   import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.cocoon.Processor;
  -import org.apache.cocoon.Roles;
  -import org.apache.cocoon.components.saxconnector.SAXConnector;
  -
  -import org.apache.cocoon.sitemap.Sitemap;
  -import org.apache.cocoon.sitemap.ErrorNotifier;
  -
  -import org.xml.sax.SAXException;
  +import org.apache.cocoon.xml.XMLProducer;
   import org.xml.sax.EntityResolver;
  +import org.xml.sax.SAXException;
   
   /**
    * @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.1.2.8 $ $Date: 2001/04/24 22:05:57 $
  + * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/25 17:06:16 $
    */
   public abstract class AbstractEventPipeline
   extends AbstractXMLProducer
  @@ -136,7 +132,7 @@
           }
   
           if (super.xmlConsumer == null &&
  -            super.contentHandler == null && 
  +            super.contentHandler == null &&
               super.lexicalHandler == null) {
               return false;
           }
  
  
  
  1.1.2.6   +7 -10     xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/AbstractStreamPipeline.java
  
  Index: AbstractStreamPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/AbstractStreamPipeline.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- AbstractStreamPipeline.java	2001/04/20 20:50:00	1.1.2.5
  +++ AbstractStreamPipeline.java	2001/04/25 17:06:17	1.1.2.6
  @@ -9,25 +9,22 @@
   
   import java.io.IOException;
   import java.io.OutputStream;
  -
  +import org.apache.avalon.activity.Disposable;
   import org.apache.avalon.component.Component;
  -import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.ComponentSelector;
   import org.apache.avalon.component.Composable;
  -import org.apache.avalon.Disposable;
  -import org.apache.avalon.parameters.Parameters;
   import org.apache.avalon.logger.AbstractLoggable;
  -
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.reading.Reader;
   import org.apache.cocoon.serialization.Serializer;
   import org.apache.cocoon.sitemap.SitemapComponentSelector;
  -import org.apache.cocoon.xml.XMLProducer;
   import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.cocoon.Roles;
  -
  +import org.apache.cocoon.xml.XMLProducer;
   import org.xml.sax.EntityResolver;
   
   /** A <CODE>ResourcePipeline</CODE> either
  @@ -38,7 +35,7 @@
    * resource
    * </UL>
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/20 20:50:00 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:06:17 $
    */
   public abstract class AbstractStreamPipeline extends AbstractLoggable implements StreamPipeline, Disposable {
       protected EventPipeline eventPipeline;
  @@ -59,7 +56,7 @@
       protected ComponentManager manager;
   
       /**
  -     * Pass the <code>ComponentManager</code> to the <code>composer</code>.
  +     * Pass the <code>ComponentManager</code> to the <code>Composable</code>.
        * The <code>Composable</code> implementation should use the specified
        * <code>ComponentManager</code> to acquire the components it needs for
        * execution.
  
  
  
  1.1.2.2   +2 -3      xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/CacheableEventPipeline.java
  
  Index: CacheableEventPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/CacheableEventPipeline.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- CacheableEventPipeline.java	2001/04/17 10:33:11	1.1.2.1
  +++ CacheableEventPipeline.java	2001/04/25 17:06:19	1.1.2.2
  @@ -8,16 +8,15 @@
   package org.apache.cocoon.components.pipeline;
   
   import java.util.Map;
  -
  -import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.caching.PipelineCacheKey;
  +import org.apache.cocoon.environment.Environment;
   
   /**
    * This marker interface declares an <code>EventPipeline</code> as cacheable.
    *
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/04/17 10:33:11 $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/25 17:06:19 $
    */
   public interface CacheableEventPipeline {
   
  
  
  
  1.1.2.10  +21 -25    xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/CachingEventPipeline.java
  
  Index: CachingEventPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/CachingEventPipeline.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- CachingEventPipeline.java	2001/04/24 20:18:24	1.1.2.9
  +++ CachingEventPipeline.java	2001/04/25 17:06:19	1.1.2.10
  @@ -7,45 +7,41 @@
    *****************************************************************************/
   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 java.util.HashMap;
  -import java.io.IOException;
  -
  -import org.apache.avalon.component.ComponentManager;
  -import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.activity.Disposable;
   import org.apache.avalon.component.Component;
  +import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.Composable;
  -import org.apache.avalon.Disposable;
   import org.apache.avalon.parameters.Parameters;
  -
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.Processor;
  +import org.apache.cocoon.Roles;
  +import org.apache.cocoon.caching.CacheValidity;
  +import org.apache.cocoon.caching.Cacheable;
  +import org.apache.cocoon.caching.CachedEventObject;
  +import org.apache.cocoon.caching.ComponentCacheKey;
  +import org.apache.cocoon.caching.EventCache;
  +import org.apache.cocoon.caching.PipelineCacheKey;
  +import org.apache.cocoon.components.sax.XMLDeserializer;
  +import org.apache.cocoon.components.sax.XMLSerializer;
  +import org.apache.cocoon.components.sax.XMLTeePipe;
  +import org.apache.cocoon.components.saxconnector.SAXConnector;
   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.XMLProducer;
   import org.apache.cocoon.xml.XMLConsumer;
   import org.apache.cocoon.xml.XMLMulticaster;
   import org.apache.cocoon.xml.XMLPipe;
  -import org.apache.cocoon.Processor;
  -import org.apache.cocoon.Roles;
  -import org.apache.cocoon.components.saxconnector.SAXConnector;
  -import org.apache.cocoon.components.sax.XMLDeserializer;
  -import org.apache.cocoon.components.sax.XMLSerializer;
  -import org.apache.cocoon.caching.EventCache;
  -import org.apache.cocoon.components.sax.XMLTeePipe;
  -
  -import org.apache.cocoon.caching.ComponentCacheKey;
  -import org.apache.cocoon.caching.PipelineCacheKey;
  -import org.apache.cocoon.caching.Cacheable;
  -import org.apache.cocoon.caching.CachedEventObject;
  -import org.apache.cocoon.caching.CacheValidity;
  -import org.apache.cocoon.sitemap.ErrorNotifier;
  -
  -import org.xml.sax.SAXException;
  +import org.apache.cocoon.xml.XMLProducer;
   import org.xml.sax.EntityResolver;
  +import org.xml.sax.SAXException;
   
   /**
    * The CachingEventPipeline
  @@ -56,7 +52,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.1.2.9 $ $Date: 2001/04/24 20:18:24 $
  + * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/25 17:06:19 $
    */
   public final class CachingEventPipeline
   extends AbstractEventPipeline
  
  
  
  1.1.2.7   +5 -7      xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/CachingStreamPipeline.java
  
  Index: CachingStreamPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/CachingStreamPipeline.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- CachingStreamPipeline.java	2001/04/20 20:50:00	1.1.2.6
  +++ CachingStreamPipeline.java	2001/04/25 17:06:20	1.1.2.7
  @@ -12,24 +12,22 @@
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.Map;
  -
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.SAXException;
  -
   import org.apache.avalon.component.Component;
  -import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.Roles;
  +import org.apache.cocoon.caching.CacheValidity;
   import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.CachedStreamObject;
  -import org.apache.cocoon.caching.CacheValidity;
   import org.apache.cocoon.caching.CachingOutputStream;
   import org.apache.cocoon.caching.ComponentCacheKey;
   import org.apache.cocoon.caching.PipelineCacheKey;
   import org.apache.cocoon.caching.StreamCache;
   import org.apache.cocoon.environment.Environment;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.SAXException;
   
   /** A <CODE>StreamPipeline</CODE> either
    * <UL>
  @@ -46,7 +44,7 @@
    *  </ul>
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/20 20:50:00 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/25 17:06:20 $
    */
   public final class CachingStreamPipeline extends AbstractStreamPipeline {
   
  
  
  
  1.1.2.6   +3 -5      xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/EventPipeline.java
  
  Index: EventPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/EventPipeline.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- EventPipeline.java	2001/04/24 20:18:24	1.1.2.5
  +++ EventPipeline.java	2001/04/25 17:06:20	1.1.2.6
  @@ -7,20 +7,18 @@
    *****************************************************************************/
   package org.apache.cocoon.components.pipeline;
   
  -
   import org.apache.avalon.component.Component;
   import org.apache.avalon.component.Composable;
  -import org.apache.excalibur.pool.Recyclable;
   import org.apache.avalon.parameters.Parameters;
  -
   import org.apache.cocoon.Processor;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.generation.Generator;
   import org.apache.cocoon.sitemap.Sitemap;
  +import org.apache.excalibur.pool.Recyclable;
   
   /**
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/24 20:18:24 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:06:20 $
    */
   public interface EventPipeline extends Component, Composable, Recyclable, Processor {
       public void setGenerator (String role, String source, Parameters param, Exception e) throws Exception;
  @@ -28,4 +26,4 @@
       public Generator getGenerator ();
       public void addTransformer (String role, String source, Parameters param) throws Exception;
       public boolean process(Environment environment) throws Exception;
  -}
  \ No newline at end of file
  +}
  
  
  
  1.1.2.6   +11 -15    xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/NonCachingEventPipeline.java
  
  Index: NonCachingEventPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/NonCachingEventPipeline.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- NonCachingEventPipeline.java	2001/04/20 20:50:00	1.1.2.5
  +++ NonCachingEventPipeline.java	2001/04/25 17:06:22	1.1.2.6
  @@ -1,4 +1,4 @@
  -        /*****************************************************************************
  +/*****************************************************************************
    * Copyright (C) The Apache Software Foundation. All rights reserved.        *
    * ------------------------------------------------------------------------- *
    * This software is published under the terms of the Apache Software License *
  @@ -7,35 +7,31 @@
    *****************************************************************************/
   package org.apache.cocoon.components.pipeline;
   
  +import java.io.IOException;
   import java.util.ArrayList;
   import java.util.Iterator;
  -import java.io.IOException;
  -
  -import org.apache.avalon.component.ComponentManager;
  -import org.apache.avalon.component.ComponentException;
   import org.apache.avalon.component.Component;
  +import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.Composable;
   import org.apache.avalon.parameters.Parameters;
  -
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.Processor;
  +import org.apache.cocoon.Roles;
  +import org.apache.cocoon.components.saxconnector.SAXConnector;
   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.XMLProducer;
   import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.cocoon.Processor;
  -import org.apache.cocoon.Roles;
  -import org.apache.cocoon.components.saxconnector.SAXConnector;
  -
  -import org.apache.cocoon.sitemap.ErrorNotifier;
  -
  -import org.xml.sax.SAXException;
  +import org.apache.cocoon.xml.XMLProducer;
   import org.xml.sax.EntityResolver;
  +import org.xml.sax.SAXException;
   
   /**
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/20 20:50:00 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:06:22 $
    */
   public class NonCachingEventPipeline extends AbstractEventPipeline {
   
  
  
  
  1.1.2.7   +1 -2      xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/NonCachingStreamPipeline.java
  
  Index: NonCachingStreamPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/NonCachingStreamPipeline.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- NonCachingStreamPipeline.java	2001/04/19 11:30:39	1.1.2.6
  +++ NonCachingStreamPipeline.java	2001/04/25 17:06:23	1.1.2.7
  @@ -8,7 +8,6 @@
   package org.apache.cocoon.components.pipeline;
   
   import java.io.IOException;
  -
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.Environment;
   
  @@ -20,7 +19,7 @@
    * resource
    * </UL>
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/19 11:30:39 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/25 17:06:23 $
    */
   public final class NonCachingStreamPipeline extends AbstractStreamPipeline {
   
  
  
  
  1.1.2.3   +2 -3      xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/StreamPipeline.java
  
  Index: StreamPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/StreamPipeline.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- StreamPipeline.java	2001/04/20 20:50:00	1.1.2.2
  +++ StreamPipeline.java	2001/04/25 17:06:23	1.1.2.3
  @@ -9,10 +9,9 @@
   
   import org.apache.avalon.component.Component;
   import org.apache.avalon.component.Composable;
  -import org.apache.excalibur.pool.Recyclable;
   import org.apache.avalon.parameters.Parameters;
  -
   import org.apache.cocoon.Processor;
  +import org.apache.excalibur.pool.Recyclable;
   
   /** A <CODE>StreamPipeline</CODE> either
    * <UL>
  @@ -21,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.1.2.2 $ $Date: 2001/04/20 20:50:00 $
  + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/25 17:06:23 $
    */
   public interface StreamPipeline extends Component, Composable, Recyclable, Processor {
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.5   +1 -3      xml-cocoon/src/org/apache/cocoon/components/sax/Attic/XMLByteStreamCompiler.java
  
  Index: XMLByteStreamCompiler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/sax/Attic/XMLByteStreamCompiler.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- XMLByteStreamCompiler.java	2001/04/20 20:50:01	1.1.2.4
  +++ XMLByteStreamCompiler.java	2001/04/25 17:06:30	1.1.2.5
  @@ -8,10 +8,8 @@
   package org.apache.cocoon.components.sax;
   
   import java.util.HashMap;
  -
   import org.apache.avalon.component.Component;
   import org.apache.excalibur.pool.Recyclable;
  -
   import org.xml.sax.Attributes;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.Locator;
  @@ -24,7 +22,7 @@
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/20 20:50:01 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 17:06:30 $
    */
   
   public final class XMLByteStreamCompiler
  
  
  
  1.1.2.4   +2 -5      xml-cocoon/src/org/apache/cocoon/components/sax/Attic/XMLByteStreamInterpreter.java
  
  Index: XMLByteStreamInterpreter.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/sax/Attic/XMLByteStreamInterpreter.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- XMLByteStreamInterpreter.java	2001/04/20 20:50:02	1.1.2.3
  +++ XMLByteStreamInterpreter.java	2001/04/25 17:06:32	1.1.2.4
  @@ -10,23 +10,20 @@
   package org.apache.cocoon.components.sax;
   
   import java.util.ArrayList;
  -
   import org.apache.avalon.component.Component;
  +import org.apache.cocoon.xml.AbstractXMLProducer;
   import org.apache.excalibur.pool.Recyclable;
  -
   import org.xml.sax.ContentHandler;
   import org.xml.sax.EntityResolver;
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  -import org.apache.cocoon.xml.AbstractXMLProducer;
  -
   /**
    * 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.1.2.3 $ $Date: 2001/04/20 20:50:02 $
  + * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/25 17:06:32 $
    */
   
   public final class XMLByteStreamInterpreter
  
  
  
  1.1.2.2   +1 -2      xml-cocoon/src/org/apache/cocoon/components/sax/Attic/XMLDeserializer.java
  
  Index: XMLDeserializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/sax/Attic/XMLDeserializer.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- XMLDeserializer.java	2001/04/11 10:52:51	1.1.2.1
  +++ XMLDeserializer.java	2001/04/25 17:06:32	1.1.2.2
  @@ -8,7 +8,6 @@
   package org.apache.cocoon.components.sax;
   
   import org.apache.cocoon.xml.XMLProducer;
  -
   import org.xml.sax.SAXException;
   
   /**
  @@ -23,7 +22,7 @@
    * the serialized data.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/04/11 10:52:51 $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/25 17:06:32 $
    */
   public interface XMLDeserializer
   extends XMLProducer {
  
  
  
  1.1.2.3   +5 -8      xml-cocoon/src/org/apache/cocoon/components/sax/Attic/XMLTeePipe.java
  
  Index: XMLTeePipe.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/sax/Attic/XMLTeePipe.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- XMLTeePipe.java	2001/04/20 20:50:02	1.1.2.2
  +++ XMLTeePipe.java	2001/04/25 17:06:34	1.1.2.3
  @@ -7,28 +7,25 @@
    * the LICENSE file.                                                         *
    ****************************************************************************
    */
  -
   package org.apache.cocoon.components.sax;
   
  +import org.apache.cocoon.xml.XMLConsumer;
  +import org.apache.cocoon.xml.XMLPipe;
  +import org.apache.cocoon.xml.XMLProducer;
   import org.apache.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;
   
  -import org.apache.cocoon.xml.XMLPipe;
  -import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.cocoon.xml.XMLProducer;
  -
   
   /**
    * This is a simple Tee Component.
    * The incoming events are forwarded to two other components.
    *
    * @author <a href="mailto:cziegeler@sundn.de">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/20 20:50:02 $
  + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/25 17:06:34 $
    */
   
   public final class XMLTeePipe
  @@ -172,4 +169,4 @@
           this.secondLexicalHandler.comment(ary, start, length);
       }
   
  -}
  \ No newline at end of file
  +}
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.6   +6 -9      xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/NullSAXConnector.java
  
  Index: NullSAXConnector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/NullSAXConnector.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- NullSAXConnector.java	2001/04/24 20:18:25	1.1.2.5
  +++ NullSAXConnector.java	2001/04/25 17:06:39	1.1.2.6
  @@ -2,23 +2,20 @@
   
   package org.apache.cocoon.components.saxconnector;
   
  -import org.apache.cocoon.xml.AbstractXMLPipe;
  -import org.apache.excalibur.pool.Poolable;
  +import java.io.IOException;
  +import java.util.Map;
   import org.apache.avalon.parameters.Parameters;
  -
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.sitemap.Sitemap;
  -
  -import org.xml.sax.SAXException;
  +import org.apache.cocoon.xml.AbstractXMLPipe;
  +import org.apache.excalibur.pool.Poolable;
   import org.xml.sax.EntityResolver;
  -
  -import java.util.Map;
  -import java.io.IOException;
  +import org.xml.sax.SAXException;
   
   /**
    * Null implementation of the SAXConnector. Simply sends events on to the next component in the pipeline.
    * @author <a href="prussell@apache.org">Paul Russell</a>
  - * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/24 20:18:25 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:06:39 $
    */
   public class NullSAXConnector extends AbstractXMLPipe implements Poolable, SAXConnector {
   
  
  
  
  1.1.2.6   +2 -3      xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/SAXConnector.java
  
  Index: SAXConnector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/SAXConnector.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- SAXConnector.java	2001/04/24 20:18:25	1.1.2.5
  +++ SAXConnector.java	2001/04/25 17:06:40	1.1.2.6
  @@ -1,17 +1,16 @@
   /* Generated by Together */
  -
   package org.apache.cocoon.components.saxconnector;
   
  -import org.xml.sax.XMLFilter;
   import org.apache.avalon.component.Component;
   import org.apache.cocoon.sitemap.Sitemap;
   import org.apache.cocoon.sitemap.SitemapModelComponent;
   import org.apache.cocoon.xml.XMLPipe;
  +import org.xml.sax.XMLFilter;
   
   /**
    * Provides a connection between SAX components.
    * @author <a href="mailto:prussell@apache.org">Paul Russell</a>
  - * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/24 20:18:25 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:06:40 $
    */
   public interface SAXConnector extends XMLPipe, Component, SitemapModelComponent {
   }
  
  
  
  1.1.2.7   +24 -30    xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/XIncludeSAXConnector.java
  
  Index: XIncludeSAXConnector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/XIncludeSAXConnector.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- XIncludeSAXConnector.java	2001/04/25 15:39:06	1.1.2.6
  +++ XIncludeSAXConnector.java	2001/04/25 17:06:41	1.1.2.7
  @@ -7,47 +7,41 @@
    *****************************************************************************/
   package org.apache.cocoon.components.saxconnector;
   
  -import java.net.URL;
  +import java.io.IOException;
   import java.net.MalformedURLException;
  -import java.util.Stack;
  +import java.net.URL;
   import java.util.ArrayList;
  -
  -import org.xml.sax.Attributes;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.Locator;
  -import org.xml.sax.helpers.AttributesImpl;
  -
  -import org.apache.cocoon.Roles;
  +import java.util.Map;
  +import java.util.Stack;
  +import org.apache.avalon.activity.Disposable;
   import org.apache.avalon.component.Component;
  -import org.apache.avalon.component.ComponentSelector;
  -import org.apache.avalon.parameters.Parameters;
  -import org.apache.avalon.Disposable;
  -import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
  +import org.apache.avalon.component.ComponentSelector;
   import org.apache.avalon.component.Composable;
  -import org.apache.excalibur.pool.Recyclable;
  -
  -import org.apache.cocoon.environment.Environment;
  -import org.apache.cocoon.components.url.URLFactory;
  -import org.apache.cocoon.xml.AbstractXMLPipe;
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.sitemap.Sitemap;
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.components.pipeline.EventPipeline;
   import org.apache.cocoon.components.pipeline.StreamPipeline;
  -import org.apache.cocoon.xml.XMLProducer;
  +import org.apache.cocoon.components.url.URLFactory;
  +import org.apache.cocoon.environment.Environment;
  +import org.apache.cocoon.sitemap.Sitemap;
  +import org.apache.cocoon.xml.AbstractXMLPipe;
   import org.apache.cocoon.xml.IncludeXMLConsumer;
  -
  -
  -import org.xml.sax.SAXException;
  +import org.apache.cocoon.xml.XMLProducer;
  +import org.apache.excalibur.pool.Recyclable;
  +import org.xml.sax.Attributes;
   import org.xml.sax.EntityResolver;
  -
  -import java.util.Map;
  -import java.io.IOException;
  +import org.xml.sax.Locator;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.helpers.AttributesImpl;
   
   /**
    * Copy of code from XIncludeTransformer as a starting point for XIncludeSAXConnector.
    * @author <a href="dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 15:39:06 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/25 17:06:41 $
    */
   public class XIncludeSAXConnector extends AbstractXMLPipe implements Composable, Recyclable, SAXConnector, Disposable {
   
  @@ -158,7 +152,7 @@
           super.setDocumentLocator(locator);
       }
   
  -    protected void processXIncludeElement(String src, String element, String ns, String prefix) 
  +    protected void processXIncludeElement(String src, String element, String ns, String prefix)
           throws SAXException,MalformedURLException,IOException {
   
           ComponentSelector selector = null;
  @@ -168,7 +162,7 @@
           try {
               selector = (ComponentSelector) manager.lookup(Roles.SERVERPAGES);
               sitemap = (Sitemap) selector.select("sitemap");
  -            getLogger().debug("Processing XInclude element: src=" + src 
  +            getLogger().debug("Processing XInclude element: src=" + src
                                   + ", sitemap=" + sitemap
                                   + ", element=" + element
                                   + ", ns=" + ns
  @@ -196,7 +190,7 @@
               getLogger().error("Error selecting sitemap",e);
           } finally {
               if (selector != null) {
  -                if (sitemap != null) 
  +                if (sitemap != null)
                       selector.release((Component)sitemap);
                   this.manager.release((Component)selector);
               }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.16  +12 -7     xml-cocoon/src/org/apache/cocoon/components/store/Attic/FilesystemStore.java
  
  Index: FilesystemStore.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/store/Attic/FilesystemStore.java,v
  retrieving revision 1.1.2.15
  retrieving revision 1.1.2.16
  diff -u -r1.1.2.15 -r1.1.2.16
  --- FilesystemStore.java	2001/04/24 12:14:40	1.1.2.15
  +++ FilesystemStore.java	2001/04/25 17:06:45	1.1.2.16
  @@ -1,17 +1,22 @@
  +/*****************************************************************************
  + * Copyright (C) The Apache Software Foundation. All rights reserved.        *
  + * ------------------------------------------------------------------------- *
  + * This software is published under the terms of the Apache Software License *
  + * version 1.1, a copy of which has been included  with this distribution in *
  + * the LICENSE file.                                                         *
  + *****************************************************************************/
   package org.apache.cocoon.components.store;
   
   import java.io.File;
  +import java.io.IOException;
   import java.util.Enumeration;
  -
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.util.IOUtils;
  +import org.apache.avalon.context.Context;
   import org.apache.avalon.context.ContextException;
  +import org.apache.avalon.context.Contextualizable;
   import org.apache.avalon.logger.AbstractLoggable;
   import org.apache.avalon.thread.ThreadSafe;
  -import org.apache.avalon.context.Contextualizable;
  -import org.apache.avalon.context.Context;
  -
  -import java.io.IOException;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.util.IOUtils;
   
   public class FilesystemStore extends AbstractLoggable implements Contextualizable, Store, ThreadSafe {
     /** The directory repository */
  
  
  
  1.1.2.3   +12 -5     xml-cocoon/src/org/apache/cocoon/components/store/Attic/MRUMemoryStore.java
  
  Index: MRUMemoryStore.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/store/Attic/MRUMemoryStore.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- MRUMemoryStore.java	2001/04/20 20:50:03	1.1.2.2
  +++ MRUMemoryStore.java	2001/04/25 17:06:46	1.1.2.3
  @@ -1,16 +1,23 @@
  +/*****************************************************************************
  + * Copyright (C) The Apache Software Foundation. All rights reserved.        *
  + * ------------------------------------------------------------------------- *
  + * This software is published under the terms of the Apache Software License *
  + * version 1.1, a copy of which has been included  with this distribution in *
  + * the LICENSE file.                                                         *
  + *****************************************************************************/
   package org.apache.cocoon.components.store;
   
   import java.util.Enumeration;
  -import java.util.Hashtable;
   import java.util.HashMap;
  -import java.util.Map;
  +import java.util.Hashtable;
   import java.util.LinkedList;
  +import java.util.Map;
   import org.apache.avalon.component.Component;
  -import org.apache.avalon.thread.ThreadSafe;
  +import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.parameters.Parameters;
  -import org.apache.avalon.configuration.Configurable;
  +import org.apache.avalon.thread.ThreadSafe;
   
   /**
    * This class provides a cache algorithm for the requested documents.
  @@ -237,4 +244,4 @@
         return time;
       }
     }
  -}
  \ No newline at end of file
  +}
  
  
  
  1.1.2.10  +3 -3      xml-cocoon/src/org/apache/cocoon/components/store/Attic/Store.java
  
  Index: Store.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/store/Attic/Store.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- Store.java	2001/04/20 20:50:03	1.1.2.9
  +++ Store.java	2001/04/25 17:06:47	1.1.2.10
  @@ -7,9 +7,9 @@
    *****************************************************************************/
   package org.apache.cocoon.components.store;
   
  +import java.io.IOException;
   import java.util.Enumeration;
   import org.apache.avalon.component.Component;
  -import java.io.IOException;
   
   /**
    *
  @@ -19,7 +19,7 @@
    *         (Apache Software Foundation)
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/20 20:50:03 $
  + * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/25 17:06:47 $
    */
   public interface Store extends Component {
   
  @@ -57,4 +57,4 @@
        */
       Enumeration keys();
   
  -}
  \ No newline at end of file
  +}
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +3 -3      xml-cocoon/src/org/apache/cocoon/components/transcoder/Attic/ExtendableTranscoderFactory.java
  
  Index: ExtendableTranscoderFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/transcoder/Attic/ExtendableTranscoderFactory.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- ExtendableTranscoderFactory.java	2001/03/09 14:55:46	1.1.2.1
  +++ ExtendableTranscoderFactory.java	2001/04/25 17:06:50	1.1.2.2
  @@ -7,11 +7,11 @@
    *****************************************************************************/
   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.Map;
  -import java.util.HashMap;
   
   /**
    * An extendable Batik Transcoder factory.
  @@ -19,7 +19,7 @@
    * type. This factory is extendable as new <code>Transcoder</code>s can
    * be added at runtime.
    * @author Ross Burton
  - * @version $Revision: 1.1.2.1 $, $Date: 2001/03/09 14:55:46 $
  + * @version $Revision: 1.1.2.2 $, $Date: 2001/04/25 17:06:50 $
    */
   public class ExtendableTranscoderFactory implements TranscoderFactory {
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.8   +3 -5      xml-cocoon/src/org/apache/cocoon/components/url/Attic/ContextURLFactory.java
  
  Index: ContextURLFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/url/Attic/ContextURLFactory.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- ContextURLFactory.java	2001/04/24 12:14:41	1.1.2.7
  +++ ContextURLFactory.java	2001/04/25 17:06:53	1.1.2.8
  @@ -7,19 +7,17 @@
    *****************************************************************************/
   package org.apache.cocoon.components.url;
   
  -import java.net.URL;
   import java.net.MalformedURLException;
  -
  -import org.apache.avalon.context.Contextualizable;
  +import java.net.URL;
   import org.apache.avalon.context.ContextException;
  +import org.apache.avalon.context.Contextualizable;
   import org.apache.avalon.logger.AbstractLoggable;
  -
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Context;
   
   /**
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
  - * @version $Id: ContextURLFactory.java,v 1.1.2.7 2001/04/24 12:14:41 dims Exp $
  + * @version $Id: ContextURLFactory.java,v 1.1.2.8 2001/04/25 17:06:53 donaldp Exp $
    */
   public class ContextURLFactory extends AbstractLoggable implements URLFactory, Contextualizable {
   
  
  
  
  1.1.2.5   +2 -4      xml-cocoon/src/org/apache/cocoon/components/url/Attic/ResourceURLFactory.java
  
  Index: ResourceURLFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/url/Attic/ResourceURLFactory.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- ResourceURLFactory.java	2001/04/24 12:14:42	1.1.2.4
  +++ ResourceURLFactory.java	2001/04/25 17:06:54	1.1.2.5
  @@ -7,19 +7,17 @@
    *****************************************************************************/
   package org.apache.cocoon.components.url;
   
  -import java.net.URL;
   import java.net.MalformedURLException;
  -
  +import java.net.URL;
   import org.apache.avalon.context.Context;
   import org.apache.avalon.context.ContextException;
   import org.apache.avalon.context.Contextualizable;
   import org.apache.avalon.logger.AbstractLoggable;
  -
   import org.apache.cocoon.util.ClassUtils;
   
   /**
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
  - * @version $Id: ResourceURLFactory.java,v 1.1.2.4 2001/04/24 12:14:42 dims Exp $
  + * @version $Id: ResourceURLFactory.java,v 1.1.2.5 2001/04/25 17:06:54 donaldp Exp $
    */
   public class ResourceURLFactory extends AbstractLoggable implements URLFactory, Contextualizable {
   
  
  
  
  1.1.2.3   +3 -4      xml-cocoon/src/org/apache/cocoon/components/url/Attic/URLFactory.java
  
  Index: URLFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/url/Attic/URLFactory.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- URLFactory.java	2001/04/20 20:50:04	1.1.2.2
  +++ URLFactory.java	2001/04/25 17:06:54	1.1.2.3
  @@ -7,14 +7,13 @@
    *****************************************************************************/
   package org.apache.cocoon.components.url;
   
  -import java.net.URL;
   import java.net.MalformedURLException;
  -
  +import java.net.URL;
   import org.apache.avalon.thread.ThreadSafe;
   
   /**
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
  - * @version $Id: URLFactory.java,v 1.1.2.2 2001/04/20 20:50:04 bloritsch Exp $
  + * @version $Id: URLFactory.java,v 1.1.2.3 2001/04/25 17:06:54 donaldp Exp $
    */
   public interface URLFactory extends ThreadSafe {
   
  @@ -23,4 +22,4 @@
        */
       URL getURL(String location) throws MalformedURLException;
       URL getURL(URL base, String location) throws MalformedURLException;
  -}
  \ No newline at end of file
  +}
  
  
  
  1.1.2.9   +2 -5      xml-cocoon/src/org/apache/cocoon/components/url/Attic/URLFactoryImpl.java
  
  Index: URLFactoryImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/url/Attic/URLFactoryImpl.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- URLFactoryImpl.java	2001/04/24 12:14:42	1.1.2.8
  +++ URLFactoryImpl.java	2001/04/25 17:06:55	1.1.2.9
  @@ -8,12 +8,11 @@
   package org.apache.cocoon.components.url;
   
   import java.io.File;
  -import java.net.URL;
   import java.net.MalformedURLException;
  +import java.net.URL;
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.Map;
  -
   import org.apache.avalon.component.Component;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
  @@ -23,14 +22,12 @@
   import org.apache.avalon.context.Contextualizable;
   import org.apache.avalon.logger.AbstractLoggable;
   import org.apache.avalon.logger.Loggable;
  -
  -//import org.apache.cocoon.util.NetUtils;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.util.ClassUtils;
   
   /**
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
  - * @version $Id: URLFactoryImpl.java,v 1.1.2.8 2001/04/24 12:14:42 dims Exp $
  + * @version $Id: URLFactoryImpl.java,v 1.1.2.9 2001/04/25 17:06:55 donaldp Exp $
    */
   public class URLFactoryImpl extends AbstractLoggable implements URLFactory, Component, Configurable, Contextualizable {
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.17  +3 -8      xml-cocoon/src/org/apache/cocoon/environment/Attic/AbstractEnvironment.java
  
  Index: AbstractEnvironment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/Attic/AbstractEnvironment.java,v
  retrieving revision 1.1.2.16
  retrieving revision 1.1.2.17
  diff -u -r1.1.2.16 -r1.1.2.17
  --- AbstractEnvironment.java	2001/04/20 20:50:05	1.1.2.16
  +++ AbstractEnvironment.java	2001/04/25 17:06:59	1.1.2.17
  @@ -5,7 +5,6 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  -
   package org.apache.cocoon.environment;
   
   import java.io.File;
  @@ -13,17 +12,13 @@
   import java.net.MalformedURLException;
   import java.net.URL;
   import java.util.ArrayList;
  -import java.util.Map;
   import java.util.HashMap;
  -
  -import org.apache.cocoon.environment.Environment;
  -
  +import java.util.Map;
   import org.apache.avalon.logger.AbstractLoggable;
  -
  +import org.apache.cocoon.environment.Environment;
  +import org.apache.log.LogKit;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  -
  -import org.apache.log.LogKit;
   
   public abstract class AbstractEnvironment extends AbstractLoggable implements Environment {
   
  
  
  
  1.1.2.3   +4 -4      xml-cocoon/src/org/apache/cocoon/environment/Attic/Context.java
  
  Index: Context.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/Attic/Context.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- Context.java	2001/04/18 12:05:53	1.1.2.2
  +++ Context.java	2001/04/25 17:07:00	1.1.2.3
  @@ -8,14 +8,14 @@
   
   package org.apache.cocoon.environment;
   
  -import java.net.URL;
   import java.net.MalformedURLException;
  +import java.net.URL;
   
   /**
  - * Defines an interface to provide client context information .  
  - * 
  + * Defines an interface to provide client context information .
  + *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/18 12:05:53 $
  + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/25 17:07:00 $
    *
    */
   
  
  
  
  1.1.2.2   +1 -2      xml-cocoon/src/org/apache/cocoon/environment/Attic/Cookie.java
  
  Index: Cookie.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/Attic/Cookie.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- Cookie.java	2001/04/18 12:05:54	1.1.2.1
  +++ Cookie.java	2001/04/25 17:07:00	1.1.2.2
  @@ -5,7 +5,6 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  -
   package org.apache.cocoon.environment;
   
   /**
  @@ -44,7 +43,7 @@
    *
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/04/18 12:05:54 $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/25 17:07:00 $
    *
    */
   
  
  
  
  1.1.2.19  +1 -2      xml-cocoon/src/org/apache/cocoon/environment/Attic/Environment.java
  
  Index: Environment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/Attic/Environment.java,v
  retrieving revision 1.1.2.18
  retrieving revision 1.1.2.19
  diff -u -r1.1.2.18 -r1.1.2.19
  --- Environment.java	2001/04/20 11:27:11	1.1.2.18
  +++ Environment.java	2001/04/25 17:07:01	1.1.2.19
  @@ -12,7 +12,6 @@
   import java.io.OutputStream;
   import java.net.MalformedURLException;
   import java.util.Map;
  -
   import org.xml.sax.EntityResolver;
   import org.xml.sax.SAXException;
   
  @@ -20,7 +19,7 @@
    * Base interface for an environment abstraction
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/20 11:27:11 $
  + * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/04/25 17:07:01 $
    */
   
   public interface Environment extends EntityResolver {
  
  
  
  1.1.2.4   +153 -154  xml-cocoon/src/org/apache/cocoon/environment/Attic/Request.java
  
  Index: Request.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/Attic/Request.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- Request.java	2001/04/18 12:05:54	1.1.2.3
  +++ Request.java	2001/04/25 17:07:02	1.1.2.4
  @@ -5,7 +5,6 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  -
   package org.apache.cocoon.environment;
   
   import java.io.BufferedReader;
  @@ -19,7 +18,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.2.3 $ $Date: 2001/04/18 12:05:54 $
  + * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/25 17:07:02 $
    *
    */
   
  @@ -30,12 +29,12 @@
        * Returns the value of the named attribute as an <code>Object</code>,
        * or <code>null</code> if no attribute of the given name exists.
        *
  -     * @param name	a <code>String</code> specifying the name of
  -     *			the attribute
  +     * @param name        a <code>String</code> specifying the name of
  +     *                        the attribute
        *
  -     * @return		an <code>Object</code> containing the value
  -     *			of the attribute, or <code>null</code> if
  -     *			the attribute does not exist
  +     * @return                an <code>Object</code> containing the value
  +     *                        of the attribute, or <code>null</code> if
  +     *                        the attribute does not exist
        *
        */
       Object get(String name);
  @@ -45,12 +44,12 @@
        * Returns the value of the named attribute as an <code>Object</code>,
        * or <code>null</code> if no attribute of the given name exists.
        *
  -     * @param name	a <code>String</code> specifying the name of
  -     *			the attribute
  +     * @param name        a <code>String</code> specifying the name of
  +     *                        the attribute
        *
  -     * @return		an <code>Object</code> containing the value
  -     *			of the attribute, or <code>null</code> if
  -     *			the attribute does not exist
  +     * @return                an <code>Object</code> containing the value
  +     *                        of the attribute, or <code>null</code> if
  +     *                        the attribute does not exist
        *
        */
   
  @@ -63,9 +62,9 @@
        * if the request has no attributes available to it.
        *
        *
  -     * @return		an <code>Enumeration</code> of strings
  -     *			containing the names
  -     * 			of the request's attributes
  +     * @return                an <code>Enumeration</code> of strings
  +     *                        containing the names
  +     *                         of the request's attributes
        *
        */
   
  @@ -77,9 +76,9 @@
        * does not specify a character encoding
        *
        *
  -     * @return		a <code>String</code> containing the name of
  -     *			the chararacter encoding, or <code>null</code>
  -     *			if the request does not specify a character encoding
  +     * @return                a <code>String</code> containing the name of
  +     *                        the chararacter encoding, or <code>null</code>
  +     *                        if the request does not specify a character encoding
        *
        */
   
  @@ -88,8 +87,8 @@
       /**
        * Returns the length, in bytes, of the request body
        *
  -     * @return		an integer containing the length of the
  -     * 			request body or -1 if the length is not known
  +     * @return                an integer containing the length of the
  +     *                         request body or -1 if the length is not known
        *
        */
   
  @@ -98,9 +97,9 @@
       /**
        * Returns the MIME type of the body of the request
        *
  -     * @return		a <code>String</code> containing the name
  -     *			of the MIME type of
  -     * 			the request, or -1 if the type is not known
  +     * @return                a <code>String</code> containing the name
  +     *                        of the MIME type of
  +     *                         the request, or -1 if the type is not known
        *
        */
   
  @@ -109,13 +108,13 @@
       /**
        * Returns the value of a request parameter as a <code>String</code>,
        *
  -     * @param name 	a <code>String</code> specifying the
  -     *			name of the parameter
  +     * @param name         a <code>String</code> specifying the
  +     *                        name of the parameter
        *
  -     * @return		a <code>String</code> representing the
  -     *			single value of the parameter
  +     * @return                a <code>String</code> representing the
  +     *                        single value of the parameter
        *
  -     * @see 		#getParameterValues
  +     * @see                 #getParameterValues
        *
        */
   
  @@ -129,11 +128,11 @@
        * no parameters, the method returns an
        * empty <code>Enumeration</code>.
        *
  -     * @return		an <code>Enumeration</code> of <code>String</code>
  -     *			objects, each <code>String</code> containing
  -     * 			the name of a request parameter; or an
  -     *			empty <code>Enumeration</code> if the
  -     *			request has no parameters
  +     * @return                an <code>Enumeration</code> of <code>String</code>
  +     *                        objects, each <code>String</code> containing
  +     *                         the name of a request parameter; or an
  +     *                        empty <code>Enumeration</code> if the
  +     *                        request has no parameters
        *
        */
   
  @@ -147,13 +146,13 @@
        * <p>If the parameter has a single value, the array has a length
        * of 1.
        *
  -     * @param name	a <code>String</code> containing the name of
  -     *			the parameter whose value is requested
  +     * @param name        a <code>String</code> containing the name of
  +     *                        the parameter whose value is requested
        *
  -     * @return		an array of <code>String</code> objects
  -     *			containing the parameter's values
  +     * @return                an array of <code>String</code> objects
  +     *                        containing the parameter's values
        *
  -     * @see		#getParameter
  +     * @see                #getParameter
        *
        */
   
  @@ -167,8 +166,8 @@
        * returned is the same as the value of the CGI variable
        * <code>SERVER_PROTOCOL</code>.
        *
  -     * @return		a <code>String</code> containing the protocol
  -     *			name and version number
  +     * @return                a <code>String</code> containing the protocol
  +     *                        name and version number
        *
        */
   
  @@ -181,8 +180,8 @@
        * Different schemes have different rules for constructing URLs,
        * as noted in RFC 1738.
        *
  -     * @return		a <code>String</code> containing the name
  -     *			of the scheme used to make this request
  +     * @return                a <code>String</code> containing the name
  +     *                        of the scheme used to make this request
        *
        */
   
  @@ -193,8 +192,8 @@
        * For HTTP servlets, same as the value of the CGI variable
        * <code>SERVER_NAME</code>.
        *
  -     * @return		a <code>String</code> containing the name
  -     *			of the server to which the request was sent
  +     * @return                a <code>String</code> containing the name
  +     *                        of the server to which the request was sent
        */
   
       String getServerName();
  @@ -204,7 +203,7 @@
        * For HTTP servlets, same as the value of the CGI variable
        * <code>SERVER_PORT</code>.
        *
  -     * @return		an integer specifying the port number
  +     * @return                an integer specifying the port number
        *
        */
   
  @@ -215,8 +214,8 @@
        * that sent the request.  For HTTP servlets, same as the value of the
        * CGI variable <code>REMOTE_ADDR</code>.
        *
  -     * @return		a <code>String</code> containing the
  -     *			IP address of the client that sent the request
  +     * @return                a <code>String</code> containing the
  +     *                        IP address of the client that sent the request
        *
        */
   
  @@ -228,8 +227,8 @@
        * determined. For HTTP servlets, same as the value of the CGI variable
        * <code>REMOTE_HOST</code>.
        *
  -     * @return		a <code>String</code> containing the fully qualified name
  -     *			of the client
  +     * @return                a <code>String</code> containing the fully qualified name
  +     *                        of the client
        *
        */
   
  @@ -246,10 +245,10 @@
        * reserved for use by Sun Microsystems.
        *
        *
  -     * @param name			a <code>String</code> specifying
  -     *					the name of the attribute
  +     * @param name                        a <code>String</code> specifying
  +     *                                        the name of the attribute
        *
  -     * @param o				the <code>Object</code> to be stored
  +     * @param o                                the <code>Object</code> to be stored
        *
        */
   
  @@ -267,8 +266,8 @@
        * reserved for use by Sun Microsystems.
        *
        *
  -     * @param name			a <code>String</code> specifying
  -     *					the name of the attribute to remove
  +     * @param name                        a <code>String</code> specifying
  +     *                                        the name of the attribute to remove
        *
        */
   
  @@ -282,7 +281,7 @@
        * this method returns the default locale for the server.
        *
        *
  -     * @return		the preferred <code>Locale</code> for the client
  +     * @return                the preferred <code>Locale</code> for the client
        *
        */
   
  @@ -299,7 +298,7 @@
        * <code>Locale</code>, the default locale for the server.
        *
        *
  -     * @return		an <code>Enumeration</code> of preferred
  +     * @return                an <code>Enumeration</code> of preferred
        *                  <code>Locale</code> objects for the client
        *
        */
  @@ -312,7 +311,7 @@
        * secure channel, such as HTTPS.
        *
        *
  -     * @return		a boolean indicating if the request was made using a
  +     * @return                a boolean indicating if the request was made using a
        *                  secure channel
        *
        */
  @@ -325,9 +324,9 @@
        * objects the client sent with this request.
        * This method returns <code>null</code> if no cookies were sent.
        *
  -     * @return		an array of all the <code>Cookies</code>
  -     *			included with this request, or <code>null</code>
  -     *			if the request has no cookies
  +     * @return                an array of all the <code>Cookies</code>
  +     *                        included with this request, or <code>null</code>
  +     *                        if the request has no cookies
        *
        *
        */
  @@ -351,21 +350,21 @@
        * can't be converted to a date, the method throws
        * an <code>IllegalArgumentException</code>.
        *
  -     * @param name		a <code>String</code> specifying the
  -     *				name of the header
  +     * @param name                a <code>String</code> specifying the
  +     *                                name of the header
        *
  -     * @return			a <code>long</code> value
  -     *				representing the date specified
  -     *				in the header expressed as
  -     *				the number of milliseconds
  -     *				since January 1, 1970 GMT,
  -     *				or -1 if the named header
  -     *				was not included with the
  -     *				reqest
  -     *
  -     * @exception	IllegalArgumentException	If the header value
  -     *							can't be converted
  -     *							to a date
  +     * @return                        a <code>long</code> value
  +     *                                representing the date specified
  +     *                                in the header expressed as
  +     *                                the number of milliseconds
  +     *                                since January 1, 1970 GMT,
  +     *                                or -1 if the named header
  +     *                                was not included with the
  +     *                                reqest
  +     *
  +     * @exception        IllegalArgumentException        If the header value
  +     *                                                        can't be converted
  +     *                                                        to a date
        *
        */
   
  @@ -379,14 +378,14 @@
        * The header name is case insensitive. You can use
        * this method with any request header.
        *
  -     * @param name		a <code>String</code> specifying the
  -     *				header name
  +     * @param name                a <code>String</code> specifying the
  +     *                                header name
        *
  -     * @return			a <code>String</code> containing the
  -     *				value of the requested
  -     *				header, or <code>null</code>
  -     *				if the request does not
  -     *				have a header of that name
  +     * @return                        a <code>String</code> containing the
  +     *                                value of the requested
  +     *                                header, or <code>null</code>
  +     *                                if the request does not
  +     *                                have a header of that name
        *
        */
   
  @@ -407,14 +406,14 @@
        * The header name is case insensitive. You can use
        * this method with any request header.
        *
  -     * @param name		a <code>String</code> specifying the
  -     *				header name
  +     * @param name                a <code>String</code> specifying the
  +     *                                header name
        *
  -     * @return			a <code>Enumeration</code> containing the
  -     *				values of the requested
  -     *				header, or <code>null</code>
  -     *				if the request does not
  -     *				have any headers of that name
  +     * @return                        a <code>Enumeration</code> containing the
  +     *                                values of the requested
  +     *                                header, or <code>null</code>
  +     *                                if the request does not
  +     *                                have any headers of that name
        *
        */
   
  @@ -430,13 +429,13 @@
        * servlets to access headers using this method, in
        * which case this method returns <code>null</code>
        *
  -     * @return			an enumeration of all the
  -     *				header names sent with this
  -     *				request; if the request has
  -     *				no headers, an empty enumeration;
  -     *				if the servlet container does not
  -     *				allow servlets to use this method,
  -     *				<code>null</code>
  +     * @return                        an enumeration of all the
  +     *                                header names sent with this
  +     *                                request; if the request has
  +     *                                no headers, an empty enumeration;
  +     *                                if the servlet container does not
  +     *                                allow servlets to use this method,
  +     *                                <code>null</code>
        *
        */
   
  @@ -448,10 +447,10 @@
        * request was made, for example, GET, POST, or PUT.
        * Same as the value of the CGI variable REQUEST_METHOD.
        *
  -     * @return			a <code>String</code>
  -     *				specifying the name
  -     *				of the method with which
  -     *				this request was made
  +     * @return                        a <code>String</code>
  +     *                                specifying the name
  +     *                                of the method with which
  +     *                                this request was made
        *
        */
   
  @@ -469,12 +468,12 @@
        * <p>Same as the value of the CGI variable PATH_INFO.
        *
        *
  -     * @return		a <code>String</code> specifying
  -     *			extra path information that comes
  -     *			after the servlet path but before
  -     *			the query string in the request URL;
  -     *			or <code>null</code> if the URL does not have
  -     *			any extra path information
  +     * @return                a <code>String</code> specifying
  +     *                        extra path information that comes
  +     *                        after the servlet path but before
  +     *                        the query string in the request URL;
  +     *                        or <code>null</code> if the URL does not have
  +     *                        any extra path information
        *
        */
   
  @@ -490,10 +489,10 @@
        * this method returns <code>null</code>.
        *
        *
  -     * @return		a <code>String</code> specifying the
  -     *			real path, or <code>null</code> if
  -     *			the URL does not have any extra path
  -     *			information
  +     * @return                a <code>String</code> specifying the
  +     *                        real path, or <code>null</code> if
  +     *                        the URL does not have any extra path
  +     *                        information
        *
        *
        */
  @@ -509,9 +508,9 @@
        * returns "".
        *
        *
  -     * @return		a <code>String</code> specifying the
  -     *			portion of the request URI that indicates the context
  -     *			of the request
  +     * @return                a <code>String</code> specifying the
  +     *                        portion of the request URI that indicates the context
  +     *                        of the request
        *
        *
        */
  @@ -525,9 +524,9 @@
        * if the URL does not have a query string. Same as the value
        * of the CGI variable QUERY_STRING.
        *
  -     * @return		a <code>String</code> containing the query
  -     *			string or <code>null</code> if the URL
  -     *			contains no query string
  +     * @return                a <code>String</code> containing the query
  +     *                        string or <code>null</code> if the URL
  +     *                        contains no query string
        *
        */
   
  @@ -542,9 +541,9 @@
        * depends on the browser and type of authentication. Same as the
        * value of the CGI variable REMOTE_USER.
        *
  -     * @return		a <code>String</code> specifying the login
  -     *			of the user making this request, or <code>null</code
  -     *			if the user login is not known
  +     * @return                a <code>String</code> specifying the login
  +     *                        of the user making this request, or <code>null</code
  +     *                        if the user login is not known
        *
        */
   
  @@ -561,11 +560,11 @@
        * <code>null</code>.
        *
        *
  -     * @return		a <code>String</code> specifying the session
  -     *			ID, or <code>null</code> if the request did
  -     *			not specify a session ID
  +     * @return                a <code>String</code> specifying the session
  +     *                        ID, or <code>null</code> if the request did
  +     *                        not specify a session ID
        *
  -     * @see		#isRequestedSessionIdValid
  +     * @see                #isRequestedSessionIdValid
        *
        */
   
  @@ -588,9 +587,9 @@
        * </table>
        * </blockquote>
        *
  -     * @return		a <code>String</code> containing
  -     *			the part of the URL from the
  -     *			protocol name up to the query string
  +     * @return                a <code>String</code> containing
  +     *                        the part of the URL from the
  +     *                        protocol name up to the query string
        *
        *
        */
  @@ -606,9 +605,9 @@
        * of the CGI variable SCRIPT_NAME.
        *
        *
  -     * @return		a <code>String</code> containing
  -     *			the name or path of the servlet being
  -     *			called, as specified in the request URL
  +     * @return                a <code>String</code> containing
  +     *                        the name or path of the servlet being
  +     *                        called, as specified in the request URL
        *
        *
        */
  @@ -633,18 +632,18 @@
        *
        *
        *
  -     * @param		<code>true</code> to create
  -     *			a new session for this request if necessary;
  -     *			<code>false</code> to return <code>null</code>
  -     *			if there's no current session
  +     * @param                <code>true</code> to create
  +     *                        a new session for this request if necessary;
  +     *                        <code>false</code> to return <code>null</code>
  +     *                        if there's no current session
        *
        *
  -     * @return 		the <code>HttpSession</code> associated
  -     *			with this request or <code>null</code> if
  -     * 			<code>create</code> is <code>false</code>
  -     *			and the request has no valid session
  +     * @return                 the <code>HttpSession</code> associated
  +     *                        with this request or <code>null</code> if
  +     *                         <code>create</code> is <code>false</code>
  +     *                        and the request has no valid session
        *
  -     * @see	#getSession()
  +     * @see        #getSession()
        *
        *
        */
  @@ -656,10 +655,10 @@
        * Returns the current session associated with this request,
        * or if the request does not have a session, creates one.
        *
  -     * @return		the <code>HttpSession</code> associated
  -     *			with this request
  +     * @return                the <code>HttpSession</code> associated
  +     *                        with this request
        *
  -     * @see	#getSession(boolean)
  +     * @see        #getSession(boolean)
        *
        */
   
  @@ -669,13 +668,13 @@
        *
        * Checks whether the requested session ID is still valid.
        *
  -     * @return			<code>true</code> if this
  -     *				request has an id for a valid session
  -     *				in the current session context;
  -     *				<code>false</code> otherwise
  +     * @return                        <code>true</code> if this
  +     *                                request has an id for a valid session
  +     *                                in the current session context;
  +     *                                <code>false</code> otherwise
        *
  -     * @see			#getRequestedSessionId
  -     * @see			#getSession
  +     * @see                        #getRequestedSessionId
  +     * @see                        #getSession
        *
        */
   
  @@ -685,12 +684,12 @@
        *
        * Checks whether the requested session ID came in as a cookie.
        *
  -     * @return			<code>true</code> if the session ID
  -     *				came in as a
  -     *				cookie; otherwise, <code>false</code>
  +     * @return                        <code>true</code> if the session ID
  +     *                                came in as a
  +     *                                cookie; otherwise, <code>false</code>
        *
        *
  -     * @see			#getSession
  +     * @see                        #getSession
        *
        */
   
  @@ -701,12 +700,12 @@
        * Checks whether the requested session ID came in as part of the
        * request URL.
        *
  -     * @return			<code>true</code> if the session ID
  -     *				came in as part of a URL; otherwise,
  -     *				<code>false</code>
  +     * @return                        <code>true</code> if the session ID
  +     *                                came in as part of a URL; otherwise,
  +     *                                <code>false</code>
        *
        *
  -     * @see			#getSession
  +     * @see                        #getSession
        *
        */
   
  
  
  
  1.1.2.6   +28 -29    xml-cocoon/src/org/apache/cocoon/environment/Attic/Response.java
  
  Index: Response.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/Attic/Response.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- Response.java	2001/04/19 13:59:30	1.1.2.5
  +++ Response.java	2001/04/25 17:07:03	1.1.2.6
  @@ -5,18 +5,17 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  -
   package org.apache.cocoon.environment;
   
  -import java.util.Locale;
   import java.io.IOException;
  +import java.util.Locale;
   
   /**
    * Defines an interface to provide client response information .
    *
    * @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.2.5 $ $Date: 2001/04/19 13:59:30 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:07:03 $
    *
    */
   
  @@ -32,9 +31,9 @@
        * <p>See RFC 2047 (http://ds.internic.net/rfc/rfc2045.txt)
        * for more information about character encoding and MIME.
        *
  -     * @return		a <code>String</code> specifying the
  -     *			name of the charset, for
  -     *			example, <code>ISO-8859-1</code>
  +     * @return                a <code>String</code> specifying the
  +     *                        name of the charset, for
  +     *                        example, <code>ISO-8859-1</code>
        *
        */
   
  @@ -47,7 +46,7 @@
        *
        * @param loc  the locale of the response
        *
  -     * @see 		#getLocale
  +     * @see                 #getLocale
        *
        */
   
  @@ -57,7 +56,7 @@
        * Returns the locale assigned to the response.
        *
        *
  -     * @see 		#setLocale
  +     * @see                 #setLocale
        *
        */
   
  @@ -81,14 +80,14 @@
        * <code>setVersion</code> method.
        *
        *
  -     * @param name 			a <code>String</code> specifying the name of the cookie
  +     * @param name                         a <code>String</code> specifying the name of the cookie
        *
  -     * @param value			a <code>String</code> specifying the value of the cookie
  +     * @param value                        a <code>String</code> specifying the value of the cookie
        *
  -     * @throws IllegalArgumentException	if the cookie name contains illegal characters
  -     *					(for example, a comma, space, or semicolon)
  -     *					or it is one of the tokens reserved for use
  -     *					by the cookie protocol
  +     * @throws IllegalArgumentException        if the cookie name contains illegal characters
  +     *                                        (for example, a comma, space, or semicolon)
  +     *                                        or it is one of the tokens reserved for use
  +     *                                        by the cookie protocol
        *
        */
       Cookie createCookie(String name, String value);
  @@ -107,10 +106,10 @@
        * Returns a boolean indicating whether the named response header
        * has already been set.
        *
  -     * @param	name	the header name
  -     * @return		<code>true</code> if the named response header
  -     *			has already been set;
  -     * 			<code>false</code> otherwise
  +     * @param        name        the header name
  +     * @return                <code>true</code> if the named response header
  +     *                        has already been set;
  +     *                         <code>false</code> otherwise
        */
   
       boolean containsHeader(String name);
  @@ -128,9 +127,9 @@
        * method.  Otherwise, URL rewriting cannot be used with browsers
        * which do not support cookies.
        *
  -     * @param	url	the url to be encoded.
  -     * @return		the encoded URL if encoding is needed;
  -     * 			the unchanged URL otherwise.
  +     * @param        url        the url to be encoded.
  +     * @return                the encoded URL if encoding is needed;
  +     *                         the unchanged URL otherwise.
        */
   
       String encodeURL(String url);
  @@ -144,8 +143,8 @@
        * <code>containsHeader</code> method can be used to test for the
        * presence of a header before setting its value.
        *
  -     * @param	name	the name of the header to set
  -     * @param	value	the assigned date value
  +     * @param        name        the name of the header to set
  +     * @param        value        the assigned date value
        *
        * @see #containsHeader
        * @see #addDateHeader
  @@ -160,8 +159,8 @@
        * milliseconds since the epoch.  This method allows response headers
        * to have multiple values.
        *
  -     * @param	name	the name of the header to set
  -     * @param	value	the additional date value
  +     * @param        name        the name of the header to set
  +     * @param        value        the additional date value
        *
        * @see #setDateHeader
        */
  @@ -176,8 +175,8 @@
        * used to test for the presence of a header before setting its
        * value.
        *
  -     * @param	name	the name of the header
  -     * @param	value	the header value
  +     * @param        name        the name of the header
  +     * @param        value        the header value
        *
        * @see #containsHeader
        * @see #addHeader
  @@ -189,8 +188,8 @@
        * Adds a response header with the given name and value.
        * This method allows response headers to have multiple values.
        *
  -     * @param	name	the name of the header
  -     * @param	value	the additional header value
  +     * @param        name        the name of the header
  +     * @param        value        the additional header value
        *
        * @see #setHeader
        */
  
  
  
  1.1.2.2   +50 -51    xml-cocoon/src/org/apache/cocoon/environment/Attic/Session.java
  
  Index: Session.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/Attic/Session.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- Session.java	2001/04/18 12:05:55	1.1.2.1
  +++ Session.java	2001/04/25 17:07:04	1.1.2.2
  @@ -5,7 +5,6 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  -
   package org.apache.cocoon.environment;
   
   import java.util.Enumeration;
  @@ -35,7 +34,7 @@
    * will not be directly visible in another.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/04/18 12:05:55 $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/25 17:07:04 $
    *
    */
   
  @@ -46,13 +45,13 @@
        * Returns the time when this session was created, measured
        * in milliseconds since midnight January 1, 1970 GMT.
        *
  -     * @return				a <code>long</code> specifying
  -     * 					when this session was created,
  -     *					expressed in
  -     *					milliseconds since 1/1/1970 GMT
  +     * @return                                a <code>long</code> specifying
  +     *                                         when this session was created,
  +     *                                        expressed in
  +     *                                        milliseconds since 1/1/1970 GMT
        *
  -     * @exception IllegalStateException	if this method is called on an
  -     *					invalidated session
  +     * @exception IllegalStateException        if this method is called on an
  +     *                                        invalidated session
        *
        */
       long getCreationTime();
  @@ -63,11 +62,11 @@
        * to this session. The identifier is assigned
        * by the context container and is implementation dependent.
        *
  -     * @return				a string specifying the identifier
  -     *					assigned to this session
  +     * @return                                a string specifying the identifier
  +     *                                        assigned to this session
        *
  -     * @exeption IllegalStateException	if this method is called on an
  -     *					invalidated session
  +     * @exeption IllegalStateException        if this method is called on an
  +     *                                        invalidated session
        *
        */
       String getId();
  @@ -82,14 +81,14 @@
        * a value associated with the session, do not affect the access
        * time.
        *
  -     * @return				a <code>long</code>
  -     *					representing the last time
  -     *					the client sent a request associated
  -     *					with this session, expressed in
  -     *					milliseconds since 1/1/1970 GMT
  +     * @return                                a <code>long</code>
  +     *                                        representing the last time
  +     *                                        the client sent a request associated
  +     *                                        with this session, expressed in
  +     *                                        milliseconds since 1/1/1970 GMT
        *
  -     * @exeption IllegalStateException	if this method is called on an
  -     *					invalidated session
  +     * @exeption IllegalStateException        if this method is called on an
  +     *                                        invalidated session
        *
        */
   
  @@ -101,8 +100,8 @@
        * contextcontainer will invalidate this session.  A negative time
        * indicates the session should never timeout.
        *
  -     * @param interval		An integer specifying the number
  -     * 				of seconds
  +     * @param interval                An integer specifying the number
  +     *                                 of seconds
        *
        */
       void setMaxInactiveInterval(int interval);
  @@ -116,11 +115,11 @@
       * A negative time indicates the session should never timeout.
       *
       *
  -    * @return		an integer specifying the number of
  -    *			seconds this session remains open
  -    *			between client requests
  +    * @return                an integer specifying the number of
  +    *                        seconds this session remains open
  +    *                        between client requests
       *
  -    * @see		#setMaxInactiveInterval
  +    * @see                #setMaxInactiveInterval
       *
       *
       */
  @@ -131,12 +130,12 @@
        * Returns the object bound with the specified name in this session, or
        * <code>null</code> if no object is bound under the name.
        *
  -     * @param name		a string specifying the name of the object
  +     * @param name                a string specifying the name of the object
        *
  -     * @return			the object with the specified name
  +     * @return                        the object with the specified name
        *
  -     * @exception IllegalStateException	if this method is called on an
  -     *					invalidated session
  +     * @exception IllegalStateException        if this method is called on an
  +     *                                        invalidated session
        *
        */
       Object getAttribute(String name);
  @@ -146,13 +145,13 @@
        * Returns an <code>Enumeration</code> of <code>String</code> objects
        * containing the names of all the objects bound to this session.
        *
  -     * @return			an <code>Enumeration</code> of
  -     *				<code>String</code> objects specifying the
  -     *				names of all the objects bound to
  -     *				this session
  +     * @return                        an <code>Enumeration</code> of
  +     *                                <code>String</code> objects specifying the
  +     *                                names of all the objects bound to
  +     *                                this session
        *
  -     * @exception IllegalStateException	if this method is called on an
  -     *					invalidated session
  +     * @exception IllegalStateException        if this method is called on an
  +     *                                        invalidated session
        *
        */
       Enumeration getAttributeNames();
  @@ -163,13 +162,13 @@
        * the object is replaced.
        *
        *
  -     * @param name			the name to which the object is bound;
  -     *					cannot be null
  +     * @param name                        the name to which the object is bound;
  +     *                                        cannot be null
        *
  -     * @param value			the object to be bound; cannot be null
  +     * @param value                        the object to be bound; cannot be null
        *
  -     * @exception IllegalStateException	if this method is called on an
  -     *					invalidated session
  +     * @exception IllegalStateException        if this method is called on an
  +     *                                        invalidated session
        *
        */
       void setAttribute(String name, Object value);
  @@ -181,11 +180,11 @@
        * bound with the specified name, this method does nothing.
        *
        *
  -     * @param name				the name of the object to
  -     *						remove from this session
  +     * @param name                                the name of the object to
  +     *                                                remove from this session
        *
  -     * @exception IllegalStateException	if this method is called on an
  -     *					invalidated session
  +     * @exception IllegalStateException        if this method is called on an
  +     *                                        invalidated session
        */
       void removeAttribute(String name);
   
  @@ -194,8 +193,8 @@
        * Invalidates this session
        * to it.
        *
  -     * @exception IllegalStateException	if this method is called on an
  -     *					already invalidated session
  +     * @exception IllegalStateException        if this method is called on an
  +     *                                        already invalidated session
        *
        */
       void invalidate();
  @@ -208,12 +207,12 @@
        * the client had disabled the use of cookies, then a session would
        * be new on each request.
        *
  -     * @return 				<code>true</code> if the
  -     *					server has created a session,
  -     *					but the client has not yet joined
  +     * @return                                 <code>true</code> if the
  +     *                                        server has created a session,
  +     *                                        but the client has not yet joined
        *
  -     * @exception IllegalStateException	if this method is called on an
  -     *					already invalidated session
  +     * @exception IllegalStateException        if this method is called on an
  +     *                                        already invalidated session
        *
        */
       boolean isNew();
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +2 -4      xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/AbstractCommandLineEnvironment.java
  
  Index: AbstractCommandLineEnvironment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/AbstractCommandLineEnvironment.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- AbstractCommandLineEnvironment.java	2001/04/18 12:05:56	1.1.2.3
  +++ AbstractCommandLineEnvironment.java	2001/04/25 17:07:10	1.1.2.4
  @@ -9,18 +9,16 @@
   package org.apache.cocoon.environment.commandline;
   
   import java.io.File;
  -import java.io.OutputStream;
   import java.io.IOException;
  -
  +import java.io.OutputStream;
   import java.net.MalformedURLException;
  -
   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.1.2.3 $ $Date: 2001/04/18 12:05:56 $
  + * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/25 17:07:10 $
    */
   
   public abstract class AbstractCommandLineEnvironment extends AbstractEnvironment {
  
  
  
  1.1.2.13  +3 -5      xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/CommandLineRequest.java
  
  Index: CommandLineRequest.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/CommandLineRequest.java,v
  retrieving revision 1.1.2.12
  retrieving revision 1.1.2.13
  diff -u -r1.1.2.12 -r1.1.2.13
  --- CommandLineRequest.java	2001/04/18 12:05:56	1.1.2.12
  +++ CommandLineRequest.java	2001/04/25 17:07:12	1.1.2.13
  @@ -8,16 +8,14 @@
   
   package org.apache.cocoon.environment.commandline;
   
  -import org.apache.cocoon.Constants;
  -
   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.Iterator;
  -
  +import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Cookie;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
  @@ -26,7 +24,7 @@
    * Creates a specific servlet request simulation from command line usage.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/18 12:05:56 $
  + * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/25 17:07:12 $
    */
   
   /*
  
  
  
  1.1.2.8   +1 -3      xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/CommandLineResponse.java
  
  Index: CommandLineResponse.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/CommandLineResponse.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- CommandLineResponse.java	2001/04/18 12:05:56	1.1.2.7
  +++ CommandLineResponse.java	2001/04/25 17:07:13	1.1.2.8
  @@ -12,8 +12,6 @@
   import java.io.PrintWriter;
   import java.io.UnsupportedEncodingException;
   import java.util.Locale;
  -
  -
   import org.apache.cocoon.environment.Cookie;
   import org.apache.cocoon.environment.Response;
   
  @@ -21,7 +19,7 @@
    * 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.2.7 $ $Date: 2001/04/18 12:05:56 $
  + * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/25 17:07:13 $
    */
   
   public class CommandLineResponse implements Response {
  
  
  
  1.1.2.14  +3 -7      xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/FileSavingEnvironment.java
  
  Index: FileSavingEnvironment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/FileSavingEnvironment.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- FileSavingEnvironment.java	2001/04/18 12:05:57	1.1.2.13
  +++ FileSavingEnvironment.java	2001/04/25 17:07:14	1.1.2.14
  @@ -9,24 +9,20 @@
   package org.apache.cocoon.environment.commandline;
   
   import java.io.File;
  +import java.io.FileOutputStream;
   import java.io.IOException;
   import java.io.OutputStream;
  -import java.io.FileOutputStream;
  -
  -import java.util.Map;
  -
   import java.net.MalformedURLException;
  -
  +import java.util.Map;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.AbstractEnvironment;
  -
   import org.apache.log.LogKit;
   
   /**
    * 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.1.2.13 $ $Date: 2001/04/18 12:05:57 $
  + * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/25 17:07:14 $
    */
   
   public class FileSavingEnvironment extends AbstractCommandLineEnvironment {
  
  
  
  1.1.2.14  +12 -17    xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/LinkSamplingEnvironment.java
  
  Index: LinkSamplingEnvironment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/LinkSamplingEnvironment.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- LinkSamplingEnvironment.java	2001/04/18 12:05:57	1.1.2.13
  +++ LinkSamplingEnvironment.java	2001/04/25 17:07:15	1.1.2.14
  @@ -5,37 +5,32 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  -
   package org.apache.cocoon.environment.commandline;
   
  -import java.util.Iterator;
  -import java.util.List;
  -import java.util.Collection;
  -import java.util.Collections;
  -import java.util.ArrayList;
  -import java.util.Map;
  -
  -import java.io.File;
  -import java.io.IOException;
  -import java.io.OutputStream;
   import java.io.BufferedReader;
  -import java.io.InputStreamReader;
   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 org.apache.cocoon.Main;
  +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.LogKit;
   
   /**
    * This environment is sample the links of the resource.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/18 12:05:57 $
  + * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/25 17:07:15 $
    */
   
   public class LinkSamplingEnvironment extends AbstractCommandLineEnvironment {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +14 -15    xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpContext.java
  
  Index: HttpContext.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpContext.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- HttpContext.java	2001/04/11 20:08:22	1.1.2.2
  +++ HttpContext.java	2001/04/25 17:07:22	1.1.2.3
  @@ -8,10 +8,9 @@
   package org.apache.cocoon.environment.http;
   
   import java.lang.String;
  -import java.net.URL;
   import java.net.MalformedURLException;
  +import java.net.URL;
   import javax.servlet.ServletContext;
  -
   import org.apache.cocoon.environment.Context;
   
   /**
  @@ -28,24 +27,24 @@
        * Constructs a HttpContext object from a ServletContext object
        */
       public HttpContext (ServletContext servletContext) {
  -		this.servletContext = servletContext;
  -	}
  +                this.servletContext = servletContext;
  +        }
   
       public Object getAttribute(String name) {
  -		return servletContext.getAttribute(name);
  -	}
  +                return servletContext.getAttribute(name);
  +        }
   
  -	public URL getResource(String path)
  +        public URL getResource(String path)
                            throws MalformedURLException {
  -		return servletContext.getResource(path);
  -	}
  +                return servletContext.getResource(path);
  +        }
   
  -	public String getRealPath(String path)
  +        public String getRealPath(String path)
                            throws MalformedURLException {
  -		return servletContext.getRealPath(path);
  -	}
  +                return servletContext.getRealPath(path);
  +        }
   
  -	public java.lang.String getMimeType(String file) {
  -		return servletContext.getMimeType(file);
  -	}
  +        public java.lang.String getMimeType(String file) {
  +                return servletContext.getMimeType(file);
  +        }
   }
  
  
  
  1.1.2.3   +40 -41    xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpCookie.java
  
  Index: HttpCookie.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpCookie.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- HttpCookie.java	2001/04/20 13:05:02	1.1.2.2
  +++ HttpCookie.java	2001/04/25 17:07:23	1.1.2.3
  @@ -5,7 +5,6 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  -
   package org.apache.cocoon.environment.http;
   
   import org.apache.cocoon.environment.Cookie;
  @@ -46,7 +45,7 @@
    *
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/20 13:05:02 $
  + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/25 17:07:23 $
    *
    */
   
  @@ -86,14 +85,14 @@
        * <code>setVersion</code> method.
        *
        *
  -     * @param name 			a <code>String</code> specifying the name of the cookie
  +     * @param name                         a <code>String</code> specifying the name of the cookie
        *
  -     * @param value			a <code>String</code> specifying the value of the cookie
  +     * @param value                        a <code>String</code> specifying the value of the cookie
        *
  -     * @throws IllegalArgumentException	if the cookie name contains illegal characters
  -     *					(for example, a comma, space, or semicolon)
  -     *					or it is one of the tokens reserved for use
  -     *					by the cookie protocol
  +     * @throws IllegalArgumentException        if the cookie name contains illegal characters
  +     *                                        (for example, a comma, space, or semicolon)
  +     *                                        or it is one of the tokens reserved for use
  +     *                                        by the cookie protocol
        * @see #setValue
        * @see #setVersion
        *
  @@ -121,8 +120,8 @@
        * to the user. Comments
        * are not supported by Netscape Version 0 cookies.
        *
  -     * @param purpose		a <code>String</code> specifying the comment
  -     *				to display to the user
  +     * @param purpose                a <code>String</code> specifying the comment
  +     *                                to display to the user
        *
        * @see #getComment
        *
  @@ -140,8 +139,8 @@
        * Returns the comment describing the purpose of this cookie, or
        * <code>null</code> if the cookie has no comment.
        *
  -     * @return			a <code>String</code> containing the comment,
  -     *				or <code>null</code> if none
  +     * @return                        a <code>String</code> containing the comment,
  +     *                                or <code>null</code> if none
        *
        * @see #setComment
        *
  @@ -167,9 +166,9 @@
        * to the server that sent them.
        *
        *
  -     * @param pattern		a <code>String</code> containing the domain name
  -     *				within which this cookie is visible;
  -     *				form is according to RFC 2109
  +     * @param pattern                a <code>String</code> containing the domain name
  +     *                                within which this cookie is visible;
  +     *                                form is according to RFC 2109
        *
        * @see #getDomain
        *
  @@ -188,7 +187,7 @@
        * Returns the domain name set for this cookie. The form of
        * the domain name is set by RFC 2109.
        *
  -     * @return			a <code>String</code> containing the domain name
  +     * @return                        a <code>String</code> containing the domain name
        *
        * @see #setDomain
        *
  @@ -215,10 +214,10 @@
        * when the Web browser exits. A zero value causes the cookie
        * to be deleted.
        *
  -     * @param expiry		an integer specifying the maximum age of the
  -     * 				cookie in seconds; if negative, means
  -     *				the cookie is not stored; if zero, deletes
  -     *				the cookie
  +     * @param expiry                an integer specifying the maximum age of the
  +     *                                 cookie in seconds; if negative, means
  +     *                                the cookie is not stored; if zero, deletes
  +     *                                the cookie
        *
        *
        * @see #getMaxAge
  @@ -239,9 +238,9 @@
        * until browser shutdown.
        *
        *
  -     * @return			an integer specifying the maximum age of the
  -     *				cookie in seconds; if negative, means
  -     *				the cookie persists until browser shutdown
  +     * @return                        an integer specifying the maximum age of the
  +     *                                cookie in seconds; if negative, means
  +     *                                the cookie persists until browser shutdown
        *
        *
        * @see #setMaxAge
  @@ -270,7 +269,7 @@
        * information on setting path names for cookies.
        *
        *
  -     * @param uri		a <code>String</code> specifying a path
  +     * @param uri                a <code>String</code> specifying a path
        *
        *
        * @see #getPath
  @@ -291,8 +290,8 @@
        * cookie is visible to all subpaths on the server.
        *
        *
  -     * @return		a <code>String</code> specifying a path that contains
  -     *			a servlet name, for example, <i>/catalog</i>
  +     * @return                a <code>String</code> specifying a path that contains
  +     *                        a servlet name, for example, <i>/catalog</i>
        *
        * @see #setPath
        *
  @@ -313,9 +312,9 @@
        *
        * <p>The default value is <code>false</code>.
        *
  -     * @param flag	if <code>true</code>, sends the cookie from the browser
  -     *			to the server using only when using a secure protocol;
  -     *			if <code>false</code>, sent on any protocol
  +     * @param flag        if <code>true</code>, sends the cookie from the browser
  +     *                        to the server using only when using a secure protocol;
  +     *                        if <code>false</code>, sent on any protocol
        *
        * @see #getSecure
        *
  @@ -334,8 +333,8 @@
        * only over a secure protocol, or <code>false</code> if the
        * browser can send cookies using any protocol.
        *
  -     * @return		<code>true</code> if the browser can use
  -     *			any standard protocol; otherwise, <code>false</code>
  +     * @return                <code>true</code> if the browser can use
  +     *                        any standard protocol; otherwise, <code>false</code>
        *
        * @see #setSecure
        *
  @@ -354,7 +353,7 @@
        * Returns the name of the cookie. The name cannot be changed after
        * creation.
        *
  -     * @return		a <code>String</code> specifying the cookie's name
  +     * @return                a <code>String</code> specifying the cookie's name
        *
        */
   
  @@ -378,7 +377,7 @@
        * and semicolons. Empty values may not behave the same way
        * on all browsers.
        *
  -     * @param newValue		a <code>String</code> specifying the new value
  +     * @param newValue                a <code>String</code> specifying the new value
        *
        *
        * @see #getValue
  @@ -397,8 +396,8 @@
       /**
        * Returns the value of the cookie.
        *
  -     * @return			a <code>String</code> containing the cookie's
  -     *				present value
  +     * @return                        a <code>String</code> containing the cookie's
  +     *                                present value
        *
        * @see #setValue
        * @see Cookie
  @@ -421,9 +420,9 @@
        * by a browser use and identify the browser's cookie version.
        *
        *
  -     * @return			0 if the cookie complies with the
  -     *				original Netscape specification; 1
  -     *				if the cookie complies with RFC 2109
  +     * @return                        0 if the cookie complies with the
  +     *                                original Netscape specification; 1
  +     *                                if the cookie complies with RFC 2109
        *
        * @see #setVersion
        *
  @@ -446,9 +445,9 @@
        * version 1 as experimental; do not use it yet on production sites.
        *
        *
  -     * @param v			0 if the cookie should comply with
  -     *				the original Netscape specification;
  -     *				1 if the cookie should comply with RFC 2109
  +     * @param v                        0 if the cookie should comply with
  +     *                                the original Netscape specification;
  +     *                                1 if the cookie should comply with RFC 2109
        *
        * @see #getVersion
        *
  
  
  
  1.1.2.27  +0 -3      xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpEnvironment.java
  
  Index: HttpEnvironment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpEnvironment.java,v
  retrieving revision 1.1.2.26
  retrieving revision 1.1.2.27
  diff -u -r1.1.2.26 -r1.1.2.27
  --- HttpEnvironment.java	2001/04/20 13:05:02	1.1.2.26
  +++ HttpEnvironment.java	2001/04/25 17:07:24	1.1.2.27
  @@ -14,15 +14,12 @@
   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.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  
  
  
  1.1.2.11  +5 -8      xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpRequest.java
  
  Index: HttpRequest.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpRequest.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- HttpRequest.java	2001/04/20 13:05:02	1.1.2.10
  +++ HttpRequest.java	2001/04/25 17:07:24	1.1.2.11
  @@ -13,14 +13,11 @@
   import java.util.Enumeration;
   import java.util.Locale;
   import java.util.Vector;
  -
  -import javax.servlet.ServletInputStream;
   import javax.servlet.RequestDispatcher;
  -
  +import javax.servlet.ServletInputStream;
   import javax.servlet.http.HttpServletRequest;
  -
  -import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Cookie;
  +import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
   
   /**
  @@ -28,7 +25,7 @@
    * to provide request information for HTTP servlets.
    *
    * @author <a href="mailto:giacomo@apache,org">Giacomo Pati</a>
  - * @version CVS $Id: HttpRequest.java,v 1.1.2.10 2001/04/20 13:05:02 cziegeler Exp $
  + * @version CVS $Id: HttpRequest.java,v 1.1.2.11 2001/04/25 17:07:24 donaldp Exp $
    */
   
   public class HttpRequest implements Request {
  @@ -186,7 +183,7 @@
       }
   
       /**
  -     * @deprecated		As of Version 2.1 of the Java Servlet
  +     * @deprecated                As of Version 2.1 of the Java Servlet
        * API, use {@link #isRequestedSessionIdFromURL}
        *instead.
        */
  @@ -285,7 +282,7 @@
       }
   
       /**
  -     * @deprecated 	As of Version 2.1 of the Java Servlet API,
  +     * @deprecated         As of Version 2.1 of the Java Servlet API,
        * use {@link javax.servlet.ServletContext#getRealPath} instead.
        */
       public String getRealPath(String path) {
  
  
  
  1.1.2.10  +4 -6      xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpResponse.java
  
  Index: HttpResponse.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpResponse.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- HttpResponse.java	2001/04/19 13:11:48	1.1.2.9
  +++ HttpResponse.java	2001/04/25 17:07:25	1.1.2.10
  @@ -11,13 +11,11 @@
   import java.io.PrintWriter;
   import java.io.UnsupportedEncodingException;
   import java.util.Locale;
  -
  -import javax.servlet.http.HttpServletResponse;
   import javax.servlet.ServletException;
   import javax.servlet.ServletOutputStream;
  -
  -import org.apache.cocoon.environment.Response;
  +import javax.servlet.http.HttpServletResponse;
   import org.apache.cocoon.environment.Cookie;
  +import org.apache.cocoon.environment.Response;
   
   /**
    *
  @@ -115,14 +113,14 @@
       }
   
       /**
  -     * @deprecated	As of version 2.1, use encodeURL(String url) instead
  +     * @deprecated        As of version 2.1, use encodeURL(String url) instead
        */
       public String encodeUrl(String url) {
           return this.res.encodeUrl(url);
       }
   
       /**
  -     * @deprecated	As of version 2.1, use
  +     * @deprecated        As of version 2.1, use
        *              encodeRedirectURL(String url) instead
        */
       public String encodeRedirectUrl(String url) {
  
  
  
  1.1.2.2   +50 -50    xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpSession.java
  
  Index: HttpSession.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpSession.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- HttpSession.java	2001/04/18 12:05:59	1.1.2.1
  +++ HttpSession.java	2001/04/25 17:07:25	1.1.2.2
  @@ -36,7 +36,7 @@
    * will not be directly visible in another.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/04/18 12:05:59 $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/25 17:07:25 $
    *
    */
   
  @@ -57,13 +57,13 @@
        * Returns the time when this session was created, measured
        * in milliseconds since midnight January 1, 1970 GMT.
        *
  -     * @return				a <code>long</code> specifying
  -     * 					when this session was created,
  -     *					expressed in
  -     *					milliseconds since 1/1/1970 GMT
  +     * @return                                a <code>long</code> specifying
  +     *                                         when this session was created,
  +     *                                        expressed in
  +     *                                        milliseconds since 1/1/1970 GMT
        *
  -     * @exception IllegalStateException	if this method is called on an
  -     *					invalidated session
  +     * @exception IllegalStateException        if this method is called on an
  +     *                                        invalidated session
        *
        */
       public long getCreationTime() {
  @@ -76,11 +76,11 @@
        * to this session. The identifier is assigned
        * by the context container and is implementation dependent.
        *
  -     * @return				a string specifying the identifier
  -     *					assigned to this session
  +     * @return                                a string specifying the identifier
  +     *                                        assigned to this session
        *
  -     * @exeption IllegalStateException	if this method is called on an
  -     *					invalidated session
  +     * @exeption IllegalStateException        if this method is called on an
  +     *                                        invalidated session
        *
        */
       public String getId() {
  @@ -97,14 +97,14 @@
        * a value associated with the session, do not affect the access
        * time.
        *
  -     * @return				a <code>long</code>
  -     *					representing the last time
  -     *					the client sent a request associated
  -     *					with this session, expressed in
  -     *					milliseconds since 1/1/1970 GMT
  +     * @return                                a <code>long</code>
  +     *                                        representing the last time
  +     *                                        the client sent a request associated
  +     *                                        with this session, expressed in
  +     *                                        milliseconds since 1/1/1970 GMT
        *
  -     * @exeption IllegalStateException	if this method is called on an
  -     *					invalidated session
  +     * @exeption IllegalStateException        if this method is called on an
  +     *                                        invalidated session
        *
        */
   
  @@ -118,8 +118,8 @@
        * contextcontainer will invalidate this session.  A negative time
        * indicates the session should never timeout.
        *
  -     * @param interval		An integer specifying the number
  -     * 				of seconds
  +     * @param interval                An integer specifying the number
  +     *                                 of seconds
        *
        */
       public void setMaxInactiveInterval(int interval) {
  @@ -135,11 +135,11 @@
       * A negative time indicates the session should never timeout.
       *
       *
  -    * @return		an integer specifying the number of
  -    *			seconds this session remains open
  -    *			between client requests
  +    * @return                an integer specifying the number of
  +    *                        seconds this session remains open
  +    *                        between client requests
       *
  -    * @see		#setMaxInactiveInterval
  +    * @see                #setMaxInactiveInterval
       *
       *
       */
  @@ -152,12 +152,12 @@
        * Returns the object bound with the specified name in this session, or
        * <code>null</code> if no object is bound under the name.
        *
  -     * @param name		a string specifying the name of the object
  +     * @param name                a string specifying the name of the object
        *
  -     * @return			the object with the specified name
  +     * @return                        the object with the specified name
        *
  -     * @exception IllegalStateException	if this method is called on an
  -     *					invalidated session
  +     * @exception IllegalStateException        if this method is called on an
  +     *                                        invalidated session
        *
        */
       public Object getAttribute(String name) {
  @@ -169,13 +169,13 @@
        * Returns an <code>Enumeration</code> of <code>String</code> objects
        * containing the names of all the objects bound to this session.
        *
  -     * @return			an <code>Enumeration</code> of
  -     *				<code>String</code> objects specifying the
  -     *				names of all the objects bound to
  -     *				this session
  +     * @return                        an <code>Enumeration</code> of
  +     *                                <code>String</code> objects specifying the
  +     *                                names of all the objects bound to
  +     *                                this session
        *
  -     * @exception IllegalStateException	if this method is called on an
  -     *					invalidated session
  +     * @exception IllegalStateException        if this method is called on an
  +     *                                        invalidated session
        *
        */
       public Enumeration getAttributeNames() {
  @@ -188,13 +188,13 @@
        * the object is replaced.
        *
        *
  -     * @param name			the name to which the object is bound;
  -     *					cannot be null
  +     * @param name                        the name to which the object is bound;
  +     *                                        cannot be null
        *
  -     * @param value			the object to be bound; cannot be null
  +     * @param value                        the object to be bound; cannot be null
        *
  -     * @exception IllegalStateException	if this method is called on an
  -     *					invalidated session
  +     * @exception IllegalStateException        if this method is called on an
  +     *                                        invalidated session
        *
        */
       public void setAttribute(String name, Object value) {
  @@ -208,11 +208,11 @@
        * bound with the specified name, this method does nothing.
        *
        *
  -     * @param name				the name of the object to
  -     *						remove from this session
  +     * @param name                                the name of the object to
  +     *                                                remove from this session
        *
  -     * @exception IllegalStateException	if this method is called on an
  -     *					invalidated session
  +     * @exception IllegalStateException        if this method is called on an
  +     *                                        invalidated session
        */
       public void removeAttribute(String name) {
           this.session.removeAttribute(name);
  @@ -223,8 +223,8 @@
        * Invalidates this session
        * to it.
        *
  -     * @exception IllegalStateException	if this method is called on an
  -     *					already invalidated session
  +     * @exception IllegalStateException        if this method is called on an
  +     *                                        already invalidated session
        *
        */
       public void invalidate() {
  @@ -239,12 +239,12 @@
        * the client had disabled the use of cookies, then a session would
        * be new on each request.
        *
  -     * @return 				<code>true</code> if the
  -     *					server has created a session,
  -     *					but the client has not yet joined
  +     * @return                                 <code>true</code> if the
  +     *                                        server has created a session,
  +     *                                        but the client has not yet joined
        *
  -     * @exception IllegalStateException	if this method is called on an
  -     *					already invalidated session
  +     * @exception IllegalStateException        if this method is called on an
  +     *                                        already invalidated session
        *
        */
       public boolean isNew() {
  
  
  
  1.1.2.5   +2 -6      xml-cocoon/src/org/apache/cocoon/environment/http/Attic/RequestWrapper22.java
  
  Index: RequestWrapper22.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/RequestWrapper22.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- RequestWrapper22.java	2001/04/18 12:05:59	1.1.2.4
  +++ RequestWrapper22.java	2001/04/25 17:07:26	1.1.2.5
  @@ -8,21 +8,17 @@
   package org.apache.cocoon.environment.http;
   
   import java.io.BufferedReader;
  +import java.io.File;
   import java.io.IOException;
   import java.io.UnsupportedEncodingException;
  -import java.io.File;
   import java.util.Enumeration;
   import java.util.Locale;
   import java.util.Vector;
  -
   import javax.servlet.RequestDispatcher;
  -
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpSession;
  -
  -import uk.co.weft.maybeupload.MaybeUploadRequestWrapper;
  -
   import org.apache.cocoon.environment.Request;
  +import uk.co.weft.maybeupload.MaybeUploadRequestWrapper;
   
   /**
    *
  
  
  
  1.1.2.5   +2 -6      xml-cocoon/src/org/apache/cocoon/environment/http/Attic/RequestWrapper23.java
  
  Index: RequestWrapper23.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/RequestWrapper23.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- RequestWrapper23.java	2001/04/18 12:05:59	1.1.2.4
  +++ RequestWrapper23.java	2001/04/25 17:07:27	1.1.2.5
  @@ -8,21 +8,17 @@
   package org.apache.cocoon.environment.http;
   
   import java.io.BufferedReader;
  +import java.io.File;
   import java.io.IOException;
   import java.io.UnsupportedEncodingException;
  -import java.io.File;
   import java.util.Enumeration;
   import java.util.Locale;
   import java.util.Vector;
  -
   import javax.servlet.RequestDispatcher;
  -
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpSession;
  -
  -import uk.co.weft.maybeupload.MaybeUploadRequestWrapper;
  -
   import org.apache.cocoon.environment.Request;
  +import uk.co.weft.maybeupload.MaybeUploadRequestWrapper;
   
   /**
    *
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.13  +3 -6      xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractGenerator.java
  
  Index: AbstractGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractGenerator.java,v
  retrieving revision 1.1.2.12
  retrieving revision 1.1.2.13
  diff -u -r1.1.2.12 -r1.1.2.13
  --- AbstractGenerator.java	2001/04/20 20:50:06	1.1.2.12
  +++ AbstractGenerator.java	2001/04/25 17:07:34	1.1.2.13
  @@ -7,14 +7,11 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.util.Map;
   import java.io.IOException;
  -
  +import java.util.Map;
   import org.apache.avalon.parameters.Parameters;
  -
  -import org.apache.cocoon.xml.AbstractXMLProducer;
   import org.apache.cocoon.ProcessingException;
  -
  +import org.apache.cocoon.xml.AbstractXMLProducer;
   import org.xml.sax.EntityResolver;
   import org.xml.sax.SAXException;
   
  @@ -22,7 +19,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/20 20:50:06 $
  + * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/25 17:07:34 $
    */
   public abstract class AbstractGenerator extends AbstractXMLProducer implements Generator {
   
  
  
  
  1.1.2.8   +3 -5      xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractServerPage.java
  
  Index: AbstractServerPage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractServerPage.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- AbstractServerPage.java	2001/03/30 17:14:32	1.1.2.7
  +++ AbstractServerPage.java	2001/04/25 17:07:35	1.1.2.8
  @@ -7,20 +7,18 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import org.apache.cocoon.components.language.generator.CompiledComponent;
  -
   import java.io.File;
  +import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.environment.Request;
  -import org.xml.sax.helpers.AttributesImpl;
  -
   import org.xml.sax.SAXException;
  +import org.xml.sax.helpers.AttributesImpl;
   
   /**
    * 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.2.7 $ $Date: 2001/03/30 17:14:32 $
  + * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/25 17:07:35 $
    */
   public abstract class AbstractServerPage
     extends ServletGenerator implements CompiledComponent
  
  
  
  1.1.2.24  +7 -11     xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java
  
  Index: DirectoryGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java,v
  retrieving revision 1.1.2.23
  retrieving revision 1.1.2.24
  diff -u -r1.1.2.23 -r1.1.2.24
  --- DirectoryGenerator.java	2001/04/20 20:50:06	1.1.2.23
  +++ DirectoryGenerator.java	2001/04/25 17:07:37	1.1.2.24
  @@ -15,23 +15,19 @@
   import java.util.Date;
   import java.util.Map;
   import java.util.Stack;
  -
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.InputSource;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.helpers.AttributesImpl;
  -
   import org.apache.avalon.component.Component;
   import org.apache.avalon.parameters.Parameters;
  -import org.apache.excalibur.pool.Poolable;
  -
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.Roles;
   import org.apache.cocoon.ResourceNotFoundException;
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.components.url.URLFactory;
  -
  +import org.apache.excalibur.pool.Poolable;
   import org.apache.regexp.RE;
   import org.apache.regexp.RESyntaxException;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.helpers.AttributesImpl;
   
   /**
    * Generates an XML directory listing.
  @@ -68,7 +64,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.1.2.23 $ $Date: 2001/04/20 20:50:06 $ */
  + * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/04/25 17:07:37 $ */
   
   public class DirectoryGenerator extends ComposerGenerator implements Poolable {
   
  
  
  
  1.1.2.31  +11 -11    xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java
  
  Index: FileGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java,v
  retrieving revision 1.1.2.30
  retrieving revision 1.1.2.31
  diff -u -r1.1.2.30 -r1.1.2.31
  --- FileGenerator.java	2001/04/20 20:50:06	1.1.2.30
  +++ FileGenerator.java	2001/04/25 17:07:37	1.1.2.31
  @@ -7,25 +7,25 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.io.IOException;
   import java.io.File;
  +import java.io.IOException;
   import java.util.Map;
  -import org.apache.cocoon.caching.Cacheable;
  -import org.apache.cocoon.caching.CacheValidity;
  -import org.apache.cocoon.caching.TimeStampCacheValidity;
  -import org.apache.cocoon.components.parser.Parser;
  +import org.apache.avalon.component.Component;
  +import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
   import org.apache.cocoon.Roles;
  +import org.apache.cocoon.caching.CacheValidity;
  +import org.apache.cocoon.caching.Cacheable;
  +import org.apache.cocoon.caching.TimeStampCacheValidity;
  +import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.util.HashUtil;
  +import org.apache.excalibur.pool.Poolable;
   import org.xml.sax.EntityResolver;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  -import org.apache.avalon.component.ComponentManager;
  -import org.apache.avalon.component.ComponentException;
  -import org.apache.avalon.parameters.Parameters;
  -import org.apache.excalibur.pool.Poolable;
  -import org.apache.avalon.component.Component;
   
   /**
    *
  @@ -37,7 +37,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.1.2.30 $ $Date: 2001/04/20 20:50:06 $
  + * @version CVS $Revision: 1.1.2.31 $ $Date: 2001/04/25 17:07:37 $
    */
   public class FileGenerator extends ComposerGenerator
   implements Cacheable {
  
  
  
  1.1.2.13  +14 -17    xml-cocoon/src/org/apache/cocoon/generation/Attic/FragmentExtractorGenerator.java
  
  Index: FragmentExtractorGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/FragmentExtractorGenerator.java,v
  retrieving revision 1.1.2.12
  retrieving revision 1.1.2.13
  diff -u -r1.1.2.12 -r1.1.2.13
  --- FragmentExtractorGenerator.java	2001/04/20 20:50:06	1.1.2.12
  +++ FragmentExtractorGenerator.java	2001/04/25 17:07:39	1.1.2.13
  @@ -7,30 +7,27 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import org.apache.cocoon.caching.Cacheable;
  +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.parameters.Parameters;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.ResourceNotFoundException;
   import org.apache.cocoon.caching.CacheValidity;
  +import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.NOPCacheValidity;
  -import org.apache.cocoon.ResourceNotFoundException;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.generation.AbstractGenerator;
  -import org.apache.cocoon.xml.dom.DOMStreamer;
   import org.apache.cocoon.environment.AbstractEnvironment;
  -import org.apache.cocoon.Constants;
  +import org.apache.cocoon.generation.AbstractGenerator;
   import org.apache.cocoon.util.HashUtil;
  -import org.apache.avalon.parameters.Parameters;
  +import org.apache.cocoon.xml.dom.DOMStreamer;
   import org.apache.excalibur.pool.Poolable;
  -
  +import org.w3c.dom.Document;
   import org.xml.sax.EntityResolver;
   import org.xml.sax.SAXException;
   
  -import org.w3c.dom.Document;
  -
  -import java.util.Map;
  -import java.util.HashMap;
  -import java.util.Collections;
  -import java.rmi.server.UID;
  -import java.io.IOException;
  -
   /** 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
  @@ -41,7 +38,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.1.2.12 $ $Date: 2001/04/20 20:50:06 $
  + * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/25 17:07:39 $
    */
   public class FragmentExtractorGenerator extends AbstractGenerator
           implements Poolable, Cacheable {
  
  
  
  1.1.2.6   +1 -3      xml-cocoon/src/org/apache/cocoon/generation/Attic/Generator.java
  
  Index: Generator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/Generator.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- Generator.java	2000/12/11 16:06:49	1.1.2.5
  +++ Generator.java	2001/04/25 17:07:39	1.1.2.6
  @@ -8,18 +8,16 @@
   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;
   
   /**
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/12/11 16:06:49 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:07:39 $
    */
   public interface Generator extends XMLProducer, SitemapModelComponent {
   
  
  
  
  1.1.2.18  +12 -15    xml-cocoon/src/org/apache/cocoon/generation/Attic/HTMLGenerator.java
  
  Index: HTMLGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/HTMLGenerator.java,v
  retrieving revision 1.1.2.17
  retrieving revision 1.1.2.18
  diff -u -r1.1.2.17 -r1.1.2.18
  --- HTMLGenerator.java	2001/04/20 20:50:06	1.1.2.17
  +++ HTMLGenerator.java	2001/04/25 17:07:41	1.1.2.18
  @@ -7,30 +7,27 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  +import java.io.BufferedInputStream;
  +import java.io.BufferedOutputStream;
  +import java.io.ByteArrayInputStream;
  +import java.io.ByteArrayOutputStream;
  +import java.io.IOException;
  +import java.net.URL;
   import org.apache.avalon.component.Component;
  -import org.apache.excalibur.pool.Poolable;
  -import org.apache.cocoon.components.parser.Parser;
  -import org.apache.cocoon.components.url.URLFactory;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
   import org.apache.cocoon.Roles;
  +import org.apache.cocoon.components.parser.Parser;
  +import org.apache.cocoon.components.url.URLFactory;
   import org.apache.cocoon.xml.dom.DOMStreamer;
  -
  -import org.xml.sax.SAXException;
  -import org.xml.sax.InputSource;
  -
  -import java.net.URL;
  -import java.io.IOException;
  -import java.io.ByteArrayInputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.BufferedInputStream;
  -import java.io.BufferedOutputStream;
  -
  +import org.apache.excalibur.pool.Poolable;
   import org.w3c.tidy.Tidy;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.SAXException;
   
   /**
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/20 20:50:06 $
  + * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/25 17:07:41 $
    */
   public class HTMLGenerator extends ComposerGenerator implements Poolable {
   
  
  
  
  1.1.2.8   +2 -3      xml-cocoon/src/org/apache/cocoon/generation/Attic/ImageDirectoryGenerator.java
  
  Index: ImageDirectoryGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ImageDirectoryGenerator.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- ImageDirectoryGenerator.java	2001/02/19 15:58:08	1.1.2.7
  +++ ImageDirectoryGenerator.java	2001/04/25 17:07:42	1.1.2.8
  @@ -2,16 +2,15 @@
   
   import java.io.*;
   import java.util.*;
  -import org.xml.sax.SAXException;
  -
   import org.apache.log.LogKit;
  +import org.xml.sax.SAXException;
   
   /**
    * 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.1.2.7 $ $Date: 2001/02/19 15:58:08 $
  + * @version $Revision: 1.1.2.8 $ $Date: 2001/04/25 17:07:42 $
    */
   public class ImageDirectoryGenerator extends DirectoryGenerator {
   
  
  
  
  1.1.2.21  +4 -9      xml-cocoon/src/org/apache/cocoon/generation/Attic/PhpGenerator.java
  
  Index: PhpGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/PhpGenerator.java,v
  retrieving revision 1.1.2.20
  retrieving revision 1.1.2.21
  diff -u -r1.1.2.20 -r1.1.2.21
  --- PhpGenerator.java	2001/04/20 20:50:07	1.1.2.20
  +++ PhpGenerator.java	2001/04/25 17:07:43	1.1.2.21
  @@ -9,23 +9,18 @@
   
   import java.io.*;
   import java.util.*;
  -
  -import net.php.servlet;
  -
   import javax.servlet.ServletConfig;
   import javax.servlet.ServletContext;
  +import javax.servlet.ServletException;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  -import javax.servlet.ServletException;
  -
  +import net.php.servlet;
   import org.apache.avalon.component.Component;
  -import org.apache.excalibur.pool.Poolable;
  -
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.Roles;
   import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.environment.http.HttpEnvironment;
  -
  +import org.apache.excalibur.pool.Poolable;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  @@ -35,7 +30,7 @@
    * results into SAX events.
    *
    * @author <a href="mailto:rubys@us.ibm.com">Sam Ruby</a>
  - * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/04/20 20:50:07 $
  + * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/04/25 17:07:43 $
    */
   public class PhpGenerator extends ServletGenerator implements Poolable {
   
  
  
  
  1.1.2.13  +5 -8      xml-cocoon/src/org/apache/cocoon/generation/Attic/RequestGenerator.java
  
  Index: RequestGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/RequestGenerator.java,v
  retrieving revision 1.1.2.12
  retrieving revision 1.1.2.13
  diff -u -r1.1.2.12 -r1.1.2.13
  --- RequestGenerator.java	2001/04/20 20:50:07	1.1.2.12
  +++ RequestGenerator.java	2001/04/25 17:07:44	1.1.2.13
  @@ -7,23 +7,20 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.util.Iterator;
   import java.util.Enumeration;
  -
  -import org.xml.sax.SAXException;
  -import org.xml.sax.helpers.AttributesImpl;
  -
  -import org.apache.excalibur.pool.Poolable;
  -
  +import java.util.Iterator;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Request;
  +import org.apache.excalibur.pool.Poolable;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.helpers.AttributesImpl;
   
   /**
    *
    * @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.1.2.12 $ $Date: 2001/04/20 20:50:07 $
  + * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/25 17:07:44 $
    */
   public class RequestGenerator extends ServletGenerator implements Poolable {
   
  
  
  
  1.1.2.5   +11 -25    xml-cocoon/src/org/apache/cocoon/generation/Attic/ScriptGenerator.java
  
  Index: ScriptGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ScriptGenerator.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- ScriptGenerator.java	2001/04/20 20:50:07	1.1.2.4
  +++ ScriptGenerator.java	2001/04/25 17:07:45	1.1.2.5
  @@ -8,34 +8,20 @@
   
   package org.apache.cocoon.generation;
   
  -// Cocoon imports
  -
  -import org.apache.cocoon.Roles;
  -import org.apache.cocoon.components.parser.Parser;
  -import org.apache.cocoon.ProcessingException;
  -
  -// Avalon imports
  -
  +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.component.Component;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
  -
  -// Java runtime imports
  -
  -import java.io.Reader;
  -import java.io.FileReader;
  -import java.io.StringReader;
  -import java.io.FileNotFoundException;
  -
  -// BSF imports
  -
  -import com.ibm.bsf.BSFManager;
  -import com.ibm.bsf.util.IOUtils;
  -import com.ibm.bsf.BSFException;
  -
  -// SAX imports
  -
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.Roles;
  +import org.apache.cocoon.components.parser.Parser;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  @@ -44,7 +30,7 @@
    * and additional interpreter (Rhino, Jython, etc.) as a Cocoon Generator
    *
    * @author <a href="mailto:jafoster@engmail.uwaterloo.ca">Jason Foster</a>
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/20 20:50:07 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 17:07:45 $
    */
   public class ScriptGenerator extends ComposerGenerator {
   
  
  
  
  1.1.2.26  +16 -21    xml-cocoon/src/org/apache/cocoon/generation/Attic/ServerPagesGenerator.java
  
  Index: ServerPagesGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ServerPagesGenerator.java,v
  retrieving revision 1.1.2.25
  retrieving revision 1.1.2.26
  diff -u -r1.1.2.25 -r1.1.2.26
  --- ServerPagesGenerator.java	2001/04/23 17:52:44	1.1.2.25
  +++ ServerPagesGenerator.java	2001/04/25 17:07:47	1.1.2.26
  @@ -8,42 +8,37 @@
   package org.apache.cocoon.generation;
   
   import java.io.File;
  +import java.io.IOException;
  +import java.net.MalformedURLException;
   import java.net.URL;
  -
  -import org.xml.sax.InputSource;
  -import org.xml.sax.EntityResolver;
  -
   import java.util.LinkedList;
  -import org.xml.sax.Locator;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.ext.LexicalHandler;
  -
  -import org.apache.avalon.component.Composable;
  +import org.apache.avalon.activity.Disposable;
   import org.apache.avalon.component.Component;
   import org.apache.avalon.component.ComponentManager;
  -import org.apache.excalibur.pool.Poolable;
  -import org.apache.excalibur.pool.Recyclable;
  -import org.apache.avalon.Disposable;
  -
  +import org.apache.avalon.component.Composable;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.ResourceNotFoundException;
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.components.language.generator.ProgramGenerator;
   import org.apache.cocoon.components.language.markup.xsp.XSPGenerator;
   import org.apache.cocoon.components.url.URLFactory;
  -
  -import java.io.IOException;
  +import org.apache.excalibur.pool.Poolable;
  +import org.apache.excalibur.pool.Recyclable;
  +import org.xml.sax.Attributes;
  +import org.xml.sax.ContentHandler;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
  -import java.net.MalformedURLException;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.ResourceNotFoundException;
  -import org.apache.cocoon.Roles;
  +import org.xml.sax.ext.LexicalHandler;
   
   /**
    * 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.1.2.25 $ $Date: 2001/04/23 17:52:44 $
  + * @version CVS $Revision: 1.1.2.26 $ $Date: 2001/04/25 17:07:47 $
    */
   public class ServerPagesGenerator
     extends ServletGenerator
  
  
  
  1.1.2.16  +4 -7      xml-cocoon/src/org/apache/cocoon/generation/Attic/ServletGenerator.java
  
  Index: ServletGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ServletGenerator.java,v
  retrieving revision 1.1.2.15
  retrieving revision 1.1.2.16
  diff -u -r1.1.2.15 -r1.1.2.16
  --- ServletGenerator.java	2001/04/20 20:50:07	1.1.2.15
  +++ ServletGenerator.java	2001/04/25 17:07:48	1.1.2.16
  @@ -7,25 +7,22 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.util.Map;
   import java.io.IOException;
  -
  -import org.apache.avalon.parameters.Parameters;
  +import java.util.Map;
   import org.apache.avalon.component.Composable;
  -
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.environment.Context;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Response;
  -import org.apache.cocoon.environment.Context;
  -
   import org.xml.sax.EntityResolver;
   import org.xml.sax.SAXException;
   
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/20 20:50:07 $
  + * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/25 17:07:48 $
    */
   public abstract class ServletGenerator extends ComposerGenerator
   implements Composable {
  
  
  
  1.1.2.12  +8 -11     xml-cocoon/src/org/apache/cocoon/generation/Attic/StatusGenerator.java
  
  Index: StatusGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/StatusGenerator.java,v
  retrieving revision 1.1.2.11
  retrieving revision 1.1.2.12
  diff -u -r1.1.2.11 -r1.1.2.12
  --- StatusGenerator.java	2001/04/20 20:50:07	1.1.2.11
  +++ StatusGenerator.java	2001/04/25 17:07:49	1.1.2.12
  @@ -5,25 +5,22 @@
   * version 1.1, a copy of which has been included  with this distribution in *
   * the LICENSE file.                                                         *
   *****************************************************************************/
  -
   package org.apache.cocoon.generation;
   
   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.ArrayList;
   import java.util.StringTokenizer;
  -import java.text.DateFormat;
  -import java.net.InetAddress;
  -import java.net.UnknownHostException;
  -
  -import org.xml.sax.SAXException;
  -import org.xml.sax.helpers.AttributesImpl;
  +import org.apache.excalibur.pool.Poolable;
   import org.xml.sax.Attributes;
   import org.xml.sax.ContentHandler;
  -
  -import org.apache.excalibur.pool.Poolable;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.helpers.AttributesImpl;
   
   /** Generates an XML representation of the current status of Cocoon.
    * Potted DTD:
  @@ -51,7 +48,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.1.2.11 $ $Date: 2001/04/20 20:50:07 $
  + * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/25 17:07:49 $
    */
   public class StatusGenerator extends ComposerGenerator implements Poolable {
   
  
  
  
  1.1.2.5   +11 -14    xml-cocoon/src/org/apache/cocoon/generation/Attic/VelocityGenerator.java
  
  Index: VelocityGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/VelocityGenerator.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- VelocityGenerator.java	2001/04/20 20:50:07	1.1.2.4
  +++ VelocityGenerator.java	2001/04/25 17:07:50	1.1.2.5
  @@ -7,29 +7,26 @@
    *****************************************************************************/
   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.component.Component;
   import org.apache.avalon.component.ComponentException;
  -import org.apache.excalibur.pool.Poolable;
  -import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
   import org.apache.cocoon.Roles;
  -
  -import org.xml.sax.SAXException;
  -import org.xml.sax.InputSource;
  -
  -import java.net.URL;
  -import java.io.IOException;
  -import java.io.StringWriter;
  -import java.io.StringReader;
  -import java.util.Properties;
  -
  -import org.apache.velocity.app.Velocity;
  +import org.apache.cocoon.components.parser.Parser;
  +import org.apache.excalibur.pool.Poolable;
   import org.apache.velocity.VelocityContext;
  +import org.apache.velocity.app.Velocity;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.SAXException;
   
   /**
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/20 20:50:07 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 17:07:50 $
    */
   public class VelocityGenerator extends ServletGenerator implements Poolable {
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.14  +4 -7      xml-cocoon/src/org/apache/cocoon/matching/Attic/BrowserMatcherFactory.java
  
  Index: BrowserMatcherFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/BrowserMatcherFactory.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- BrowserMatcherFactory.java	2001/03/12 04:38:55	1.1.2.13
  +++ BrowserMatcherFactory.java	2001/04/25 17:08:02	1.1.2.14
  @@ -8,14 +8,11 @@
   package org.apache.cocoon.matching;
   
   import java.util.Stack;
  -
  -import org.w3c.dom.NodeList;
  -import org.w3c.dom.Node;
  -import org.w3c.dom.NamedNodeMap;
  -
   import org.apache.avalon.configuration.ConfigurationException;
  -
   import org.apache.xerces.dom.TreeWalkerImpl;
  +import org.w3c.dom.NamedNodeMap;
  +import org.w3c.dom.Node;
  +import org.w3c.dom.NodeList;
   
   /**
    * This class generates source code which matches a specific browser pattern
  @@ -23,7 +20,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.1.2.13 $ $Date: 2001/03/12 04:38:55 $
  + * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/25 17:08:02 $
    */
   
   public class BrowserMatcherFactory implements org.apache.cocoon.CodeFactory {
  
  
  
  1.1.2.11  +1 -2      xml-cocoon/src/org/apache/cocoon/matching/Attic/Matcher.java
  
  Index: Matcher.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/Matcher.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- Matcher.java	2001/04/20 20:50:08	1.1.2.10
  +++ Matcher.java	2001/04/25 17:08:03	1.1.2.11
  @@ -8,13 +8,12 @@
   package org.apache.cocoon.matching;
   
   import java.util.Map;
  -
   import org.apache.avalon.component.Component;
   
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/20 20:50:08 $
  + * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/25 17:08:03 $
    */
   public interface Matcher extends Component {
       /**
  
  
  
  1.1.2.15  +3 -7      xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpTargetHostMatcherFactory.java
  
  Index: RegexpTargetHostMatcherFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpTargetHostMatcherFactory.java,v
  retrieving revision 1.1.2.14
  retrieving revision 1.1.2.15
  diff -u -r1.1.2.14 -r1.1.2.15
  --- RegexpTargetHostMatcherFactory.java	2001/04/23 17:52:49	1.1.2.14
  +++ RegexpTargetHostMatcherFactory.java	2001/04/25 17:08:04	1.1.2.15
  @@ -7,18 +7,14 @@
    *****************************************************************************/
   package org.apache.cocoon.matching;
   
  +import org.apache.avalon.configuration.ConfigurationException;
  +import org.apache.avalon.logger.AbstractLoggable;
   import org.apache.cocoon.CodeFactory;
  -
   import org.apache.regexp.RECompiler;
   import org.apache.regexp.REProgram;
   import org.apache.regexp.RESyntaxException;
  -
  -import org.apache.avalon.configuration.ConfigurationException;
  -
   import org.w3c.dom.NodeList;
   
  -import org.apache.avalon.logger.AbstractLoggable;
  -
   
   /**
    * This class generates source code which represents a specific pattern matcher
  @@ -27,7 +23,7 @@
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
  - * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/23 17:52:49 $
  + * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/25 17:08:04 $
    */
   
   public class RegexpTargetHostMatcherFactory extends AbstractLoggable implements CodeFactory {
  
  
  
  1.1.2.27  +3 -7      xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java
  
  Index: RegexpURIMatcherFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java,v
  retrieving revision 1.1.2.26
  retrieving revision 1.1.2.27
  diff -u -r1.1.2.26 -r1.1.2.27
  --- RegexpURIMatcherFactory.java	2001/04/23 17:52:51	1.1.2.26
  +++ RegexpURIMatcherFactory.java	2001/04/25 17:08:05	1.1.2.27
  @@ -7,25 +7,21 @@
    *****************************************************************************/
   package org.apache.cocoon.matching;
   
  +import org.apache.avalon.configuration.ConfigurationException;
  +import org.apache.avalon.logger.AbstractLoggable;
   import org.apache.cocoon.CodeFactory;
  -
   import org.apache.regexp.RECompiler;
   import org.apache.regexp.REProgram;
   import org.apache.regexp.RESyntaxException;
  -
  -import org.apache.avalon.configuration.ConfigurationException;
  -
   import org.w3c.dom.NodeList;
   
  -import org.apache.avalon.logger.AbstractLoggable;
  -
   /**
    * This class generates source code which represents a specific pattern matcher
    * for request URIs
    *
    * @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.2.26 $ $Date: 2001/04/23 17:52:51 $
  + * @version CVS $Revision: 1.1.2.27 $ $Date: 2001/04/25 17:08:05 $
    */
   
   public class RegexpURIMatcherFactory extends AbstractLoggable implements CodeFactory {
  
  
  
  1.1.2.35  +8 -12     xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java
  
  Index: WildcardURIMatcherFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java,v
  retrieving revision 1.1.2.34
  retrieving revision 1.1.2.35
  diff -u -r1.1.2.34 -r1.1.2.35
  --- WildcardURIMatcherFactory.java	2001/04/23 17:52:53	1.1.2.34
  +++ WildcardURIMatcherFactory.java	2001/04/25 17:08:05	1.1.2.35
  @@ -5,16 +5,12 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  -
   package org.apache.cocoon.matching;
   
  -import org.apache.cocoon.CodeFactory;
  -
   import org.apache.avalon.configuration.ConfigurationException;
  -
  -import org.w3c.dom.NodeList;
  -
   import org.apache.avalon.logger.AbstractLoggable;
  +import org.apache.cocoon.CodeFactory;
  +import org.w3c.dom.NodeList;
   
   /**
    * This class generates source code which represents a specific pattern matcher
  @@ -23,21 +19,21 @@
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @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.2.34 $ $Date: 2001/04/23 17:52:53 $
  + * @version CVS $Revision: 1.1.2.35 $ $Date: 2001/04/25 17:08:05 $
    */
   
   public class WildcardURIMatcherFactory extends AbstractLoggable implements CodeFactory {
   
       /** The int representing '*' in the pattern <code>int []</code>. */
  -    protected static final int MATCH_FILE	= -1;
  +    protected static final int MATCH_FILE        = -1;
       /** The int representing '**' in the pattern <code>int []</code>. */
  -    protected static final int MATCH_PATH	= -2;
  +    protected static final int MATCH_PATH        = -2;
       /** The int representing begin in the pattern <code>int []</code>. */
  -    protected static final int MATCH_BEGIN	= -4;
  +    protected static final int MATCH_BEGIN        = -4;
       /** The int representing end in pattern <code>int []</code>. */
  -    protected static final int MATCH_THEEND	= -5;
  +    protected static final int MATCH_THEEND        = -5;
       /** The int value that terminates the pattern <code>int []</code>. */
  -    protected static final int MATCH_END	= -3;
  +    protected static final int MATCH_END        = -3;
   
       /** The <code>int []</code> identifying the pattern to match. */
       protected int[] sourcePattern = null;
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +1 -2      xml-cocoon/src/org/apache/cocoon/matching/helpers/Attic/WildcardURIMatcher.java
  
  Index: WildcardURIMatcher.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/helpers/Attic/WildcardURIMatcher.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- WildcardURIMatcher.java	2000/12/15 20:35:15	1.1.2.6
  +++ WildcardURIMatcher.java	2001/04/25 17:08:10	1.1.2.7
  @@ -5,7 +5,6 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  -
   package org.apache.cocoon.matching.helpers;
   
   import java.util.HashMap;
  @@ -18,7 +17,7 @@
    *         (Apache Software Foundation, Exoffice Technologies)
    * @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.1.2.6 $ $Date: 2000/12/15 20:35:15 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/25 17:08:10 $
    */
   public class WildcardURIMatcher {
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.18  +6 -9      xml-cocoon/src/org/apache/cocoon/reading/Attic/AbstractReader.java
  
  Index: AbstractReader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/AbstractReader.java,v
  retrieving revision 1.1.2.17
  retrieving revision 1.1.2.18
  diff -u -r1.1.2.17 -r1.1.2.18
  --- AbstractReader.java	2001/04/20 20:50:09	1.1.2.17
  +++ AbstractReader.java	2001/04/25 17:08:13	1.1.2.18
  @@ -7,24 +7,21 @@
    *****************************************************************************/
   package org.apache.cocoon.reading;
   
  -import java.io.OutputStream;
   import java.io.BufferedOutputStream;
   import java.io.IOException;
  +import java.io.OutputStream;
   import java.util.Map;
  -
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.SAXException;
  -
  -import org.apache.cocoon.ProcessingException;
  -
  -import org.apache.avalon.parameters.Parameters;
   import org.apache.avalon.logger.AbstractLoggable;
  +import org.apache.avalon.parameters.Parameters;
  +import org.apache.cocoon.ProcessingException;
   import org.apache.excalibur.pool.Recyclable;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.SAXException;
   
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/20 20:50:09 $
  + * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/25 17:08:13 $
    */
   public abstract class AbstractReader extends AbstractLoggable implements Reader, Recyclable {
       /** The current <code>EntityResolver</code>. */
  
  
  
  1.1.2.14  +18 -22    xml-cocoon/src/org/apache/cocoon/reading/Attic/DatabaseReader.java
  
  Index: DatabaseReader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/DatabaseReader.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- DatabaseReader.java	2001/04/20 20:50:09	1.1.2.13
  +++ DatabaseReader.java	2001/04/25 17:08:14	1.1.2.14
  @@ -7,37 +7,33 @@
    *****************************************************************************/
   package org.apache.cocoon.reading;
   
  -import org.apache.avalon.component.Composable;
  +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 org.apache.avalon.activity.Disposable;
   import org.apache.avalon.component.Component;
  -import org.apache.avalon.component.ComponentSelector;
  -import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.ComponentException;
  -import org.apache.avalon.Disposable;
  -import org.apache.excalibur.datasource.DataSourceComponent;
  +import org.apache.avalon.component.ComponentManager;
  +import org.apache.avalon.component.ComponentSelector;
  +import org.apache.avalon.component.Composable;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
  -
  -import org.apache.cocoon.Roles;
  +import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
  -import org.apache.cocoon.Constants;
  -
  -import java.sql.Connection;
  -import java.sql.PreparedStatement;
  -import java.sql.ResultSet;
  -import java.sql.Blob;
  -import java.sql.Timestamp;
  -import java.sql.SQLException;
  -import java.io.InputStream;
  -import java.io.BufferedInputStream;
  -import java.io.IOException;
  -import java.util.Date;
  -
  -import org.xml.sax.SAXException;
  -
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Response;
  +import org.apache.excalibur.datasource.DataSourceComponent;
  +import org.xml.sax.SAXException;
   
   /**
    * This Reader pulls a resource from a database.  It is configured with
  
  
  
  1.1.2.7   +1 -3      xml-cocoon/src/org/apache/cocoon/reading/Attic/Reader.java
  
  Index: Reader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/Reader.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- Reader.java	2001/04/20 11:27:21	1.1.2.6
  +++ Reader.java	2001/04/25 17:08:14	1.1.2.7
  @@ -8,17 +8,15 @@
   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;
   
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/20 11:27:21 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/25 17:08:14 $
    */
   public interface Reader extends SitemapModelComponent, SitemapOutputComponent {
   
  
  
  
  1.1.2.31  +14 -17    xml-cocoon/src/org/apache/cocoon/reading/Attic/ResourceReader.java
  
  Index: ResourceReader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/ResourceReader.java,v
  retrieving revision 1.1.2.30
  retrieving revision 1.1.2.31
  diff -u -r1.1.2.30 -r1.1.2.31
  --- ResourceReader.java	2001/04/20 20:50:10	1.1.2.30
  +++ ResourceReader.java	2001/04/25 17:08:15	1.1.2.31
  @@ -7,45 +7,42 @@
    *****************************************************************************/
   package org.apache.cocoon.reading;
   
  -import java.io.IOException;
  +import java.io.BufferedInputStream;
   import java.io.File;
   import java.io.FileInputStream;
  +import java.io.IOException;
   import java.io.InputStream;
  -import java.io.BufferedInputStream;
  -import java.net.URL;
   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.Date;
   import java.util.Map;
  -
  -import org.apache.cocoon.caching.Cacheable;
  -import org.apache.cocoon.caching.CacheValidity;
  -import org.apache.cocoon.caching.TimeStampCacheValidity;
  +import org.apache.avalon.component.Component;
  +import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
  +import org.apache.avalon.component.Composable;
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
   import org.apache.cocoon.Roles;
  +import org.apache.cocoon.caching.CacheValidity;
  +import org.apache.cocoon.caching.Cacheable;
  +import org.apache.cocoon.caching.TimeStampCacheValidity;
   import org.apache.cocoon.components.url.URLFactory;
  +import org.apache.cocoon.environment.Context;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Response;
  -import org.apache.cocoon.environment.Context;
   import org.apache.cocoon.util.HashUtil;
  -
  -import org.apache.avalon.component.ComponentManager;
  -import org.apache.avalon.component.Composable;
  -import org.apache.avalon.component.Component;
  -import org.apache.avalon.component.ComponentException;
  -import org.apache.avalon.parameters.Parameters;
  -
   import org.xml.sax.EntityResolver;
   import org.xml.sax.SAXException;
   
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.30 $ $Date: 2001/04/20 20:50:10 $
  + * @version CVS $Revision: 1.1.2.31 $ $Date: 2001/04/25 17:08:15 $
    *
    * The <code>ResourceReader</code> component is used to serve binary data
    * in a sitemap pipeline. It makes use of HTTP Headers to determine if
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.18  +6 -9      xml-cocoon/src/org/apache/cocoon/selection/Attic/BrowserSelectorFactory.java
  
  Index: BrowserSelectorFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/BrowserSelectorFactory.java,v
  retrieving revision 1.1.2.17
  retrieving revision 1.1.2.18
  diff -u -r1.1.2.17 -r1.1.2.18
  --- BrowserSelectorFactory.java	2001/03/23 19:38:19	1.1.2.17
  +++ BrowserSelectorFactory.java	2001/04/25 17:08:18	1.1.2.18
  @@ -8,16 +8,13 @@
   package org.apache.cocoon.selection;
   
   import org.apache.avalon.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.TreeWalker;
   import org.w3c.dom.traversal.NodeFilter;
  -import org.w3c.dom.Node;
  -import org.w3c.dom.NamedNodeMap;
  -
  -import org.apache.xerces.dom.TreeWalkerImpl;
  -
  -import org.apache.cocoon.CodeFactory;
  +import org.w3c.dom.traversal.TreeWalker;
   
   /**
    * This class generates source code which tests a specific browser pattern
  @@ -26,7 +23,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.2.17 $ $Date: 2001/03/23 19:38:19 $
  + * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/25 17:08:18 $
   */
   
   
  
  
  
  1.1.2.10  +2 -4      xml-cocoon/src/org/apache/cocoon/selection/Attic/CodedSelectorFactory.java
  
  Index: CodedSelectorFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/CodedSelectorFactory.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- CodedSelectorFactory.java	2001/03/12 04:38:59	1.1.2.9
  +++ CodedSelectorFactory.java	2001/04/25 17:08:19	1.1.2.10
  @@ -7,18 +7,16 @@
    *****************************************************************************/
   package org.apache.cocoon.selection;
   
  -
   import org.apache.avalon.configuration.ConfigurationException;
  -import org.w3c.dom.NodeList;
   import org.apache.cocoon.CodeFactory;
  -
  +import org.w3c.dom.NodeList;
   
   /**
    * This class generates source code which tests the enviromnent based on
    * embedded java code within the 'test' clause of the select.
    *
    * @author <a href="mailto:Marcus.Crafter@osa.de">Marcus Crafter</a>
  - * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/03/12 04:38:59 $
  + * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/25 17:08:19 $
    */
   public class CodedSelectorFactory extends java.lang.Object
           implements CodeFactory {
  
  
  
  1.1.2.5   +7 -10     xml-cocoon/src/org/apache/cocoon/selection/Attic/HostSelectorFactory.java
  
  Index: HostSelectorFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/HostSelectorFactory.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- HostSelectorFactory.java	2001/04/20 13:05:06	1.1.2.4
  +++ HostSelectorFactory.java	2001/04/25 17:08:19	1.1.2.5
  @@ -8,16 +8,13 @@
   package org.apache.cocoon.selection;
   
   import org.apache.avalon.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.TreeWalker;
   import org.w3c.dom.traversal.NodeFilter;
  -import org.w3c.dom.Node;
  -import org.w3c.dom.NamedNodeMap;
  -
  -import org.apache.xerces.dom.TreeWalkerImpl;
  -
  -import org.apache.cocoon.CodeFactory;
  +import org.w3c.dom.traversal.TreeWalker;
   
   /**
    * This class generates source code to implement a selector that
  @@ -30,7 +27,7 @@
    *
    *   <map:select type="host">
    *      <map:when test="uk-site">
  - *    	<map:transform src="stylesheets/page/uk.xsl"/>
  + *            <map:transform src="stylesheets/page/uk.xsl"/>
    *      </map:when>
    *      <map:otherwise>
    *     <map:transform src="stylesheets/page/us.xsl"/>
  @@ -38,7 +35,7 @@
    *   </map:select>
    *
    * @author <a href="mailto:cbritton@centervilletech.com">Colin Britton</a>
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/20 13:05:06 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 17:08:19 $
   */
   
   
  
  
  
  1.1.2.9   +1 -2      xml-cocoon/src/org/apache/cocoon/selection/Attic/Selector.java
  
  Index: Selector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/Selector.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- Selector.java	2001/04/20 20:50:11	1.1.2.8
  +++ Selector.java	2001/04/25 17:08:20	1.1.2.9
  @@ -8,13 +8,12 @@
   package org.apache.cocoon.selection;
   
   import java.util.Map;
  -
   import org.apache.avalon.component.Component;
   
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/20 20:50:11 $
  + * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/25 17:08:20 $
    */
   public interface Selector extends Component {
       /**
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +3 -5      xml-cocoon/src/org/apache/cocoon/selection/helpers/Attic/CodedSelectorHelper.java
  
  Index: CodedSelectorHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/selection/helpers/Attic/CodedSelectorHelper.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- CodedSelectorHelper.java	2001/04/18 12:06:04	1.1.2.6
  +++ CodedSelectorHelper.java	2001/04/25 17:08:22	1.1.2.7
  @@ -7,13 +7,11 @@
    *****************************************************************************/
   package org.apache.cocoon.selection.helpers;
   
  -import org.apache.cocoon.Constants;
  -
   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.Context;
   import org.apache.cocoon.environment.Session;
   
   /**
  @@ -23,7 +21,7 @@
    * variables for developer ease.
    *
    * @author <a href="mailto:Marcus.Crafter@osa.de">Marcus Crafter</a>
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/18 12:06:04 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/25 17:08:22 $
    */
   public abstract class CodedSelectorHelper
   {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.14  +3 -3      xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractSerializer.java
  
  Index: AbstractSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractSerializer.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- AbstractSerializer.java	2001/04/20 20:50:11	1.1.2.13
  +++ AbstractSerializer.java	2001/04/25 17:08:25	1.1.2.14
  @@ -8,16 +8,16 @@
   
   package org.apache.cocoon.serialization;
   
  -import java.io.OutputStream;
   import java.io.BufferedOutputStream;
  -import org.apache.excalibur.pool.Recyclable;
  +import java.io.OutputStream;
   import org.apache.cocoon.xml.AbstractXMLPipe;
  +import org.apache.excalibur.pool.Recyclable;
   
   /**
    * @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.1.2.13 $ $Date: 2001/04/20 20:50:11 $
  + * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/25 17:08:25 $
    */
   
   public abstract class AbstractSerializer extends AbstractXMLPipe implements Serializer, Recyclable {
  
  
  
  1.1.2.13  +5 -9      xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractTextSerializer.java
  
  Index: AbstractTextSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractTextSerializer.java,v
  retrieving revision 1.1.2.12
  retrieving revision 1.1.2.13
  diff -u -r1.1.2.12 -r1.1.2.13
  --- AbstractTextSerializer.java	2001/04/23 17:11:45	1.1.2.12
  +++ AbstractTextSerializer.java	2001/04/25 17:08:26	1.1.2.13
  @@ -9,26 +9,22 @@
   package org.apache.cocoon.serialization;
   
   import java.util.Properties;
  -
  +import javax.xml.transform.OutputKeys;
  +import javax.xml.transform.TransformerFactory;
  +import javax.xml.transform.sax.SAXTransformerFactory;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
  -
  -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 javax.xml.transform.TransformerFactory;
  -import javax.xml.transform.OutputKeys;
  -import javax.xml.transform.sax.SAXTransformerFactory;
  -
   import org.apache.cocoon.util.TraxErrorHandler;
   
   /**
    * @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.1.2.12 $ $Date: 2001/04/23 17:11:45 $
  + * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/25 17:08:26 $
    */
   public abstract class AbstractTextSerializer extends AbstractSerializer implements Configurable, Cacheable {
   
  
  
  
  1.1.2.17  +6 -9      xml-cocoon/src/org/apache/cocoon/serialization/Attic/FOPSerializer.java
  
  Index: FOPSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/FOPSerializer.java,v
  retrieving revision 1.1.2.16
  retrieving revision 1.1.2.17
  diff -u -r1.1.2.16 -r1.1.2.17
  --- FOPSerializer.java	2001/04/20 20:50:11	1.1.2.16
  +++ FOPSerializer.java	2001/04/25 17:08:27	1.1.2.17
  @@ -11,19 +11,16 @@
   import java.io.IOException;
   import java.io.OutputStream;
   import java.io.PrintWriter;
  -
  +import org.apache.cocoon.caching.CacheValidity;
  +import org.apache.cocoon.caching.Cacheable;
  +import org.apache.cocoon.caching.NOPCacheValidity;
   import org.apache.excalibur.pool.Recyclable;
   import org.apache.fop.apps.Driver;
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.apps.Version;
  -import org.apache.fop.messaging.MessageListener;
  -import org.apache.fop.messaging.MessageHandler;
   import org.apache.fop.messaging.MessageEvent;
  -
  -import org.apache.cocoon.caching.Cacheable;
  -import org.apache.cocoon.caching.CacheValidity;
  -import org.apache.cocoon.caching.NOPCacheValidity;
  -
  +import org.apache.fop.messaging.MessageHandler;
  +import org.apache.fop.messaging.MessageListener;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.SAXException;
   
  @@ -34,7 +31,7 @@
    *         (PWR Organisation &amp; Entwicklung)
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/20 20:50:11 $
  + * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/25 17:08:27 $
    *
    */
   public class FOPSerializer extends AbstractSerializer
  
  
  
  1.1.2.21  +4 -6      xml-cocoon/src/org/apache/cocoon/serialization/Attic/HTMLSerializer.java
  
  Index: HTMLSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/HTMLSerializer.java,v
  retrieving revision 1.1.2.20
  retrieving revision 1.1.2.21
  diff -u -r1.1.2.20 -r1.1.2.21
  --- HTMLSerializer.java	2001/04/23 17:11:47	1.1.2.20
  +++ HTMLSerializer.java	2001/04/25 17:08:28	1.1.2.21
  @@ -9,18 +9,16 @@
   package org.apache.cocoon.serialization;
   
   import java.io.OutputStream;
  -
  +import javax.xml.transform.OutputKeys;
  +import javax.xml.transform.sax.TransformerHandler;
  +import javax.xml.transform.stream.StreamResult;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.excalibur.pool.Poolable;
   
  -import javax.xml.transform.sax.TransformerHandler;
  -import javax.xml.transform.stream.StreamResult;
  -import javax.xml.transform.OutputKeys;
  -
   /**
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/04/23 17:11:47 $
  + * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/04/25 17:08:28 $
    */
   
   public class HTMLSerializer extends AbstractTextSerializer implements Poolable {
  
  
  
  1.1.2.9   +3 -6      xml-cocoon/src/org/apache/cocoon/serialization/Attic/LinkSerializer.java
  
  Index: LinkSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/LinkSerializer.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- LinkSerializer.java	2001/04/20 20:50:11	1.1.2.8
  +++ LinkSerializer.java	2001/04/25 17:08:29	1.1.2.9
  @@ -8,21 +8,18 @@
   
   package org.apache.cocoon.serialization;
   
  +import java.io.IOException;
   import java.io.OutputStream;
   import java.io.PrintStream;
  -import java.io.IOException;
  -
   import org.apache.cocoon.Constants;
  +import org.apache.cocoon.xml.xlink.ExtendedXLinkPipe;
   import org.apache.excalibur.pool.Poolable;
  -
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   
  -import org.apache.cocoon.xml.xlink.ExtendedXLinkPipe;
  -
   /**
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/20 20:50:11 $
  + * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/25 17:08:29 $
    */
   
   public class LinkSerializer extends ExtendedXLinkPipe implements Serializer, Poolable {
  
  
  
  1.1.2.33  +18 -18    xml-cocoon/src/org/apache/cocoon/serialization/Attic/SVGSerializer.java
  
  Index: SVGSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/SVGSerializer.java,v
  retrieving revision 1.1.2.32
  retrieving revision 1.1.2.33
  diff -u -r1.1.2.32 -r1.1.2.33
  --- SVGSerializer.java	2001/04/20 20:50:12	1.1.2.32
  +++ SVGSerializer.java	2001/04/25 17:08:29	1.1.2.33
  @@ -8,40 +8,40 @@
   
   package org.apache.cocoon.serialization;
   
  +import java.awt.*;
  +import java.awt.image.*;
  +import java.io.*;
  +import java.util.Iterator;
  +import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
  +import org.apache.avalon.component.Composable;
  +import org.apache.avalon.configuration.Configurable;
  +import org.apache.avalon.configuration.Configuration;
  +import org.apache.avalon.configuration.ConfigurationException;
  +import org.apache.batik.transcoder.*;
   import org.apache.cocoon.*;
  -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.environment.Environment;
   import org.apache.cocoon.components.parser.Parser;
  -import org.apache.cocoon.components.transcoder.TranscoderFactory;
   import org.apache.cocoon.components.transcoder.ExtendableTranscoderFactory;
  +import org.apache.cocoon.components.transcoder.TranscoderFactory;
  +import org.apache.cocoon.environment.Environment;
  +import org.apache.cocoon.util.ClassUtils;
   import org.apache.cocoon.xml.*;
   import org.apache.cocoon.xml.dom.*;
   import org.apache.excalibur.pool.Poolable;
  -import org.apache.avalon.component.Composable;
  -import org.apache.avalon.component.ComponentManager;
  -import org.apache.avalon.component.ComponentException;
  -import org.apache.avalon.configuration.Configurable;
  -import org.apache.avalon.configuration.Configuration;
  -import org.apache.avalon.configuration.ConfigurationException;
  -import java.io.*;
  -import java.awt.*;
  -import java.awt.image.*;
  -import java.util.Iterator;
  -import org.xml.sax.*;
  -import org.xml.sax.ext.*;
   import org.w3c.dom.*;
   import org.w3c.dom.svg.*;
  -import org.apache.batik.transcoder.*;
  -import org.apache.cocoon.util.ClassUtils;
  +import org.xml.sax.*;
  +import org.xml.sax.ext.*;
   
   /**
    * 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.1.2.32 $ $Date: 2001/04/20 20:50:12 $
  + * @version CVS $Revision: 1.1.2.33 $ $Date: 2001/04/25 17:08:29 $
    */
   public class SVGSerializer extends SVGBuilder
           implements Composable, Serializer, Configurable, Poolable, Cacheable {
  
  
  
  1.1.2.16  +2 -4      xml-cocoon/src/org/apache/cocoon/serialization/Attic/TextSerializer.java
  
  Index: TextSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/TextSerializer.java,v
  retrieving revision 1.1.2.15
  retrieving revision 1.1.2.16
  diff -u -r1.1.2.15 -r1.1.2.16
  --- TextSerializer.java	2001/04/23 17:11:49	1.1.2.15
  +++ TextSerializer.java	2001/04/25 17:08:30	1.1.2.16
  @@ -9,18 +9,16 @@
   package org.apache.cocoon.serialization;
   
   import java.io.OutputStream;
  -
  +import javax.xml.transform.OutputKeys;
   import javax.xml.transform.sax.TransformerHandler;
   import javax.xml.transform.stream.StreamResult;
  -import javax.xml.transform.OutputKeys;
  -
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.excalibur.pool.Poolable;
   
   /**
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/23 17:11:49 $
  + * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/25 17:08:30 $
    */
   
   public class TextSerializer extends AbstractTextSerializer implements Poolable {
  
  
  
  1.1.2.21  +2 -4      xml-cocoon/src/org/apache/cocoon/serialization/Attic/XMLSerializer.java
  
  Index: XMLSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/XMLSerializer.java,v
  retrieving revision 1.1.2.20
  retrieving revision 1.1.2.21
  diff -u -r1.1.2.20 -r1.1.2.21
  --- XMLSerializer.java	2001/04/23 17:11:50	1.1.2.20
  +++ XMLSerializer.java	2001/04/25 17:08:30	1.1.2.21
  @@ -9,18 +9,16 @@
   package org.apache.cocoon.serialization;
   
   import java.io.OutputStream;
  -
  +import javax.xml.transform.OutputKeys;
   import javax.xml.transform.sax.TransformerHandler;
   import javax.xml.transform.stream.StreamResult;
  -import javax.xml.transform.OutputKeys;
  -
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.excalibur.pool.Poolable;
   
   /**
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/04/23 17:11:50 $
  + * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/04/25 17:08:30 $
    */
   
   public class XMLSerializer extends AbstractTextSerializer implements Poolable {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.89  +14 -23    xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java,v
  retrieving revision 1.1.4.88
  retrieving revision 1.1.4.89
  diff -u -r1.1.4.88 -r1.1.4.89
  --- CocoonServlet.java	2001/04/25 15:27:03	1.1.4.88
  +++ CocoonServlet.java	2001/04/25 17:08:36	1.1.4.89
  @@ -5,21 +5,16 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  -
   package org.apache.cocoon.servlet;
   
  -import java.util.Date;
  -
   import java.io.File;
   import java.io.IOException;
   import java.io.PrintWriter;
  -
   import java.net.MalformedURLException;
   import java.net.URL;
  -
   import java.util.Arrays;
  +import java.util.Date;
   import java.util.StringTokenizer;
  -
   import javax.servlet.ServletConfig;
   import javax.servlet.ServletContext;
   import javax.servlet.ServletException;
  @@ -27,35 +22,31 @@
   import javax.servlet.http.HttpServlet;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  -
  -import org.xml.sax.SAXException;
  -
   import org.apache.avalon.component.ComponentException;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.context.DefaultContext;
  -
   import org.apache.cocoon.Cocoon;
   import org.apache.cocoon.Constants;
  -import org.apache.cocoon.Notifier;
   import org.apache.cocoon.Notification;
  +import org.apache.cocoon.Notifier;
   import org.apache.cocoon.ResourceNotFoundException;
  -import org.apache.cocoon.environment.http.HttpEnvironment;
  -import org.apache.cocoon.environment.http.RequestWrapper;
  -import org.apache.cocoon.environment.http.HttpContext;
  +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.NetUtils;
   import org.apache.cocoon.util.IOUtils;
  -import org.apache.cocoon.components.classloader.RepositoryClassLoader;
  -
  -import org.apache.log.Logger;
  +import org.apache.cocoon.util.NetUtils;
  +import org.apache.log.Category;
   import org.apache.log.LogKit;
  +import org.apache.log.LogTarget;
  +import org.apache.log.Logger;
   import org.apache.log.Priority;
  -import org.apache.log.Category;
   import org.apache.log.output.FileOutputLogTarget;
   import org.apache.log.output.ServletOutputLogTarget;
  -import org.apache.log.LogTarget;
  +import org.xml.sax.SAXException;
   
   /**
    * This is the entry point for Cocoon execution as an HTTP Servlet.
  @@ -65,7 +56,7 @@
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @author <a href="mailto:nicolaken@supereva.it">Nicola Ken Barozzi</a> Aisa
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.4.88 $ $Date: 2001/04/25 15:27:03 $
  + * @version CVS $Revision: 1.1.4.89 $ $Date: 2001/04/25 17:08:36 $
    */
   
   public class CocoonServlet extends HttpServlet {
  @@ -140,7 +131,7 @@
           String uploadDirParam = conf.getInitParameter("upload-directory");
           if ((uploadDirParam != null) && (uploadDirParam.trim().equals("") == false)) {
               this.uploadDir = IOUtils.createFile( new File(this.servletContext.getRealPath("/")) , uploadDirParam);
  -        } else	{
  +        } else        {
               this.uploadDir = IOUtils.createFile(workDir, "image-dir" + File.separator);
           }
   
  @@ -530,7 +521,7 @@
               Cocoon c = (Cocoon) ClassUtils.newInstance("org.apache.cocoon.Cocoon");
               c.contextualize(this.appContext);
               c.setLogger(this.log);
  -            c.init();
  +            c.initialize();
               this.creationTime = new Date().getTime();
   
               if (this.cocoon != null) {
  
  
  
  1.1.2.8   +4 -9      xml-cocoon/src/org/apache/cocoon/servlet/Attic/ParanoidCocoonServlet.java
  
  Index: ParanoidCocoonServlet.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/ParanoidCocoonServlet.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- ParanoidCocoonServlet.java	2001/04/24 12:14:44	1.1.2.7
  +++ ParanoidCocoonServlet.java	2001/04/25 17:08:37	1.1.2.8
  @@ -8,22 +8,17 @@
   
   package org.apache.cocoon.servlet;
   
  -import java.util.Date;
  -
   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.context.ContextException;
   import org.apache.cocoon.Constants;
  -import org.apache.cocoon.util.IOUtils;
   import org.apache.cocoon.components.classloader.RepositoryClassLoader;
  -
  -import org.apache.avalon.context.ContextException;
  +import org.apache.cocoon.util.IOUtils;
   
   /**
    * This is the entry point for Cocoon execution as an HTTP Servlet.
  @@ -34,7 +29,7 @@
    * of it.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/24 12:14:44 $
  + * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/25 17:08:37 $
    */
   
   public class ParanoidCocoonServlet extends CocoonServlet {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.38  +10 -13    xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemap.java
  
  Index: AbstractSitemap.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemap.java,v
  retrieving revision 1.1.2.37
  retrieving revision 1.1.2.38
  diff -u -r1.1.2.37 -r1.1.2.38
  --- AbstractSitemap.java	2001/04/24 12:14:45	1.1.2.37
  +++ AbstractSitemap.java	2001/04/25 17:08:41	1.1.2.38
  @@ -14,40 +14,37 @@
   import java.util.ArrayList;
   import java.util.List;
   import java.util.Map;
  -
  -import org.apache.avalon.component.ComponentManager;
  -import org.apache.avalon.thread.ThreadSafe;
  -import org.apache.avalon.context.Contextualizable;
  -import org.apache.avalon.context.Context;
  +import org.apache.avalon.activity.Disposable;
   import org.apache.avalon.component.Component;
  +import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.Composable;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
  -import org.apache.avalon.component.ComponentException;
  -import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.context.Context;
   import org.apache.avalon.context.ContextException;
  +import org.apache.avalon.context.Contextualizable;
   import org.apache.avalon.logger.AbstractLoggable;
  -import org.apache.avalon.Disposable;
  -import org.apache.excalibur.component.DefaultComponentSelector;
  -
  +import org.apache.avalon.thread.ThreadSafe;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.Processor;
   import org.apache.cocoon.Roles;
   import org.apache.cocoon.components.classloader.RepositoryClassLoader;
  -import org.apache.cocoon.components.pipeline.StreamPipeline;
   import org.apache.cocoon.components.pipeline.EventPipeline;
  +import org.apache.cocoon.components.pipeline.StreamPipeline;
   import org.apache.cocoon.components.url.URLFactory;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.util.ClassUtils;
  -
  +import org.apache.excalibur.component.DefaultComponentSelector;
   import org.xml.sax.SAXException;
   
   /**
    * Base class for generated <code>Sitemap</code> classes
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.37 $ $Date: 2001/04/24 12:14:45 $
  + * @version CVS $Revision: 1.1.2.38 $ $Date: 2001/04/25 17:08:41 $
    */
   public abstract class AbstractSitemap extends AbstractLoggable implements Sitemap, Disposable, ThreadSafe {
       private Context context;
  
  
  
  1.1.2.9   +10 -13    xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ContentAggregator.java
  
  Index: ContentAggregator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ContentAggregator.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- ContentAggregator.java	2001/04/24 22:26:50	1.1.2.8
  +++ ContentAggregator.java	2001/04/25 17:08:43	1.1.2.9
  @@ -11,24 +11,15 @@
   import java.io.IOException;
   import java.util.ArrayList;
   import java.util.Map;
  -
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.helpers.AttributesImpl;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.ext.LexicalHandler;
  -
   import org.apache.avalon.component.Component;
  -import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.Composable;
   import org.apache.avalon.parameters.Parameters;
  -
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.Roles;
  -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.components.pipeline.EventPipeline;
   import org.apache.cocoon.components.pipeline.StreamPipeline;
  @@ -38,10 +29,16 @@
   import org.apache.cocoon.xml.ContentHandlerWrapper;
   import org.apache.cocoon.xml.XMLConsumer;
   import org.apache.cocoon.xml.XMLProducer;
  +import org.xml.sax.Attributes;
  +import org.xml.sax.ContentHandler;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.ext.LexicalHandler;
  +import org.xml.sax.helpers.AttributesImpl;
   
   /**
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
  - * @version CVS $Id: ContentAggregator.java,v 1.1.2.8 2001/04/24 22:26:50 giacomo Exp $
  + * @version CVS $Id: ContentAggregator.java,v 1.1.2.9 2001/04/25 17:08:43 donaldp Exp $
    */
   
   public class ContentAggregator extends ContentHandlerWrapper
  @@ -98,7 +95,7 @@
       private int rootElementIndex;
   
       /**
  -     * Pass the <code>ComponentManager</code> to the <code>composer</code>.
  +     * Pass the <code>ComponentManager</code> to the <code>Composable</code>.
        * The <code>Composable</code> implementation should use the specified
        * <code>ComponentManager</code> to acquire the components it needs for
        * execution.
  
  
  
  1.1.2.6   +6 -12     xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ErrorNotifier.java
  
  Index: ErrorNotifier.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ErrorNotifier.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- ErrorNotifier.java	2001/04/20 20:50:14	1.1.2.5
  +++ ErrorNotifier.java	2001/04/25 17:08:43	1.1.2.6
  @@ -5,21 +5,16 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  -
   package org.apache.cocoon.sitemap;
   
  -import java.util.Hashtable;
   import java.util.Enumeration;
  -
  -import org.xml.sax.SAXException;
  -import org.xml.sax.ContentHandler;
  -
  -import org.apache.cocoon.Notifier;
  +import java.util.Hashtable;
  +import org.apache.avalon.thread.ThreadSafe;
   import org.apache.cocoon.Notification;
  -
  +import org.apache.cocoon.Notifier;
   import org.apache.cocoon.generation.ComposerGenerator;
  -
  -import org.apache.avalon.thread.ThreadSafe;
  +import org.xml.sax.ContentHandler;
  +import org.xml.sax.SAXException;
   
   /**
    * Generates an XML representation of the current notification.
  @@ -27,9 +22,8 @@
    * @author <a href="mailto:nicolaken@supereva.it">Nicola Ken Barozzi</a> Aisa
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @created 31 July 2000
  - * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/20 20:50:14 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:08:43 $
    */
  -
   public class ErrorNotifier extends ComposerGenerator {
   
       /**
  
  
  
  1.1.2.30  +18 -23    xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Handler.java
  
  Index: Handler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Handler.java,v
  retrieving revision 1.1.2.29
  retrieving revision 1.1.2.30
  diff -u -r1.1.2.29 -r1.1.2.30
  --- Handler.java	2001/04/24 12:14:46	1.1.2.29
  +++ Handler.java	2001/04/25 17:08:44	1.1.2.30
  @@ -5,45 +5,40 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  -
   package org.apache.cocoon.sitemap;
   
   import java.io.File;
   import java.io.FileNotFoundException;
   import java.io.IOException;
  -
   import java.net.URL;
  -
  -import org.xml.sax.InputSource;
  -import org.xml.sax.SAXException;
  -
  -import org.apache.cocoon.Processor;
  +import org.apache.avalon.activity.Disposable;
  +import org.apache.avalon.component.Component;
  +import org.apache.avalon.component.ComponentManager;
  +import org.apache.avalon.component.Composable;
  +import org.apache.avalon.configuration.Configurable;
  +import org.apache.avalon.configuration.Configuration;
  +import org.apache.avalon.context.Context;
  +import org.apache.avalon.context.ContextException;
  +import org.apache.avalon.context.Contextualizable;
  +import org.apache.avalon.logger.AbstractLoggable;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.language.generator.ProgramGenerator;
  +import org.apache.cocoon.Processor;
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.components.language.generator.CompiledComponent;
  -import org.apache.cocoon.components.pipeline.StreamPipeline;
  +import org.apache.cocoon.components.language.generator.ProgramGenerator;
   import org.apache.cocoon.components.pipeline.EventPipeline;
  +import org.apache.cocoon.components.pipeline.StreamPipeline;
   import org.apache.cocoon.components.url.URLFactory;
   import org.apache.cocoon.environment.Environment;
  -import org.apache.cocoon.Roles;
  -
  -import org.apache.avalon.configuration.Configurable;
  -import org.apache.avalon.configuration.Configuration;
  -import org.apache.avalon.component.Composable;
  -import org.apache.avalon.component.ComponentManager;
  -import org.apache.avalon.context.Contextualizable;
  -import org.apache.avalon.context.ContextException;
  -import org.apache.avalon.context.Context;
  -import org.apache.avalon.component.Component;
  -import org.apache.avalon.Disposable;
  -import org.apache.avalon.logger.AbstractLoggable;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.SAXException;
   
   /**
    * Handles the manageing and stating of one <code>Sitemap</code>
    *
    * @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.1.2.29 $ $Date: 2001/04/24 12:14:46 $
  + * @version CVS $Revision: 1.1.2.30 $ $Date: 2001/04/25 17:08:44 $
    */
   public class Handler extends AbstractLoggable implements Runnable, Configurable, Composable, Contextualizable, Processor, Disposable {
       private Context context;
  @@ -228,7 +223,7 @@
       }
   
       public void throwEventualException() throws Exception {
  -        if (this.exception != null) 
  +        if (this.exception != null)
               throw new ProcessingException("Exception in Handler",this.exception);
       }
   
  
  
  
  1.1.2.17  +6 -11     xml-cocoon/src/org/apache/cocoon/sitemap/Attic/LinkTranslator.java
  
  Index: LinkTranslator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/LinkTranslator.java,v
  retrieving revision 1.1.2.16
  retrieving revision 1.1.2.17
  diff -u -r1.1.2.16 -r1.1.2.17
  --- LinkTranslator.java	2001/04/20 20:50:14	1.1.2.16
  +++ LinkTranslator.java	2001/04/25 17:08:45	1.1.2.17
  @@ -5,29 +5,24 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  -
   package org.apache.cocoon.sitemap;
   
  -import java.io.PrintStream;
   import java.io.IOException;
  -
  +import java.io.PrintStream;
   import java.util.Map;
  -
  -import org.xml.sax.SAXException;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.EntityResolver;
  -
   import org.apache.avalon.parameters.Parameters;
  -
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.xml.xlink.ExtendedXLinkPipe;
   import org.apache.cocoon.transformation.Transformer;
   import org.apache.cocoon.util.NetUtils;
  +import org.apache.cocoon.xml.xlink.ExtendedXLinkPipe;
  +import org.xml.sax.Attributes;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.SAXException;
   
   /**
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/20 20:50:14 $
  + * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/25 17:08:45 $
    */
   
   public class LinkTranslator extends ExtendedXLinkPipe implements Transformer {
  
  
  
  1.1.2.18  +5 -9      xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Manager.java
  
  Index: Manager.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Manager.java,v
  retrieving revision 1.1.2.17
  retrieving revision 1.1.2.18
  diff -u -r1.1.2.17 -r1.1.2.18
  --- Manager.java	2001/04/24 12:14:46	1.1.2.17
  +++ Manager.java	2001/04/25 17:08:46	1.1.2.18
  @@ -5,32 +5,28 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  -
   package org.apache.cocoon.sitemap;
   
   import java.io.FileNotFoundException;
   import java.io.IOException;
   import java.net.MalformedURLException;
  -import java.util.Iterator;
   import java.util.HashMap;
  -
  -import org.apache.avalon.context.Contextualizable;
  -import org.apache.avalon.context.Context;
  +import java.util.Iterator;
   import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.Composable;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
  +import org.apache.avalon.context.Context;
   import org.apache.avalon.context.ContextException;
  +import org.apache.avalon.context.Contextualizable;
   import org.apache.avalon.logger.AbstractLoggable;
  -
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.pipeline.StreamPipeline;
   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 org.apache.cocoon.sitemap.XSLTFactoryLoader;
  -
   import org.xml.sax.SAXException;
   
   /**
  @@ -39,7 +35,7 @@
    * checking regeneration of the sub <code>Sitemap</code>
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/24 12:14:46 $
  + * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/25 17:08:46 $
    */
   public class Manager extends AbstractLoggable implements Configurable, Composable, Contextualizable {
   
  
  
  
  1.1.4.19  +4 -5      xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Sitemap.java
  
  Index: Sitemap.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Sitemap.java,v
  retrieving revision 1.1.4.18
  retrieving revision 1.1.4.19
  diff -u -r1.1.4.18 -r1.1.4.19
  --- Sitemap.java	2001/04/20 20:50:14	1.1.4.18
  +++ Sitemap.java	2001/04/25 17:08:46	1.1.4.19
  @@ -7,21 +7,20 @@
    *****************************************************************************/
   package org.apache.cocoon.sitemap;
   
  -import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.component.ComponentManager;
  +import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.context.Contextualizable;
  -
  +import org.apache.cocoon.Processor;
   import org.apache.cocoon.components.language.generator.CompiledComponent;
  -import org.apache.cocoon.components.pipeline.StreamPipeline;
   import org.apache.cocoon.components.pipeline.EventPipeline;
  +import org.apache.cocoon.components.pipeline.StreamPipeline;
   import org.apache.cocoon.environment.Environment;
  -import org.apache.cocoon.Processor;
   
   /**
    * Base interface for generated <code>Sitemap</code> classes
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.4.18 $ $Date: 2001/04/20 20:50:14 $
  + * @version CVS $Revision: 1.1.4.19 $ $Date: 2001/04/25 17:08:46 $
    */
   public interface Sitemap extends CompiledComponent, Configurable, Contextualizable, Processor {
       int GENERATOR = 1;
  
  
  
  1.1.2.10  +5 -7      xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapComponentSelector.java
  
  Index: SitemapComponentSelector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapComponentSelector.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- SitemapComponentSelector.java	2001/04/20 20:50:14	1.1.2.9
  +++ SitemapComponentSelector.java	2001/04/25 17:08:47	1.1.2.10
  @@ -9,21 +9,19 @@
   package org.apache.cocoon.sitemap;
   
   import java.util.HashMap;
  -
  -import org.apache.avalon.component.Composable;
  +import org.apache.avalon.component.Component;
  +import org.apache.avalon.component.ComponentException;
   import org.apache.avalon.component.ComponentManager;
  +import org.apache.avalon.component.Composable;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
  -import org.apache.avalon.component.Component;
  -import org.apache.avalon.component.ComponentException;
  -import org.apache.excalibur.component.DefaultComponentSelector;
  -
   import org.apache.cocoon.components.url.URLFactory;
  +import org.apache.excalibur.component.DefaultComponentSelector;
   
   /** 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.1.2.9 2001/04/20 20:50:14 bloritsch Exp $
  + * @version CVS $Id: SitemapComponentSelector.java,v 1.1.2.10 2001/04/25 17:08:47 donaldp Exp $
    */
   public class SitemapComponentSelector extends DefaultComponentSelector {
       HashMap mime_types;
  
  
  
  1.1.2.7   +2 -4      xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapModelComponent.java
  
  Index: SitemapModelComponent.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapModelComponent.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- SitemapModelComponent.java	2001/04/20 20:50:14	1.1.2.6
  +++ SitemapModelComponent.java	2001/04/25 17:08:49	1.1.2.7
  @@ -9,19 +9,17 @@
   
   import java.io.IOException;
   import java.util.Map;
  -
   import org.apache.avalon.component.Component;
   import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  -
  -import org.xml.sax.SAXException;
   import org.xml.sax.EntityResolver;
  +import org.xml.sax.SAXException;
   
   /**
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/20 20:50:14 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/25 17:08:49 $
    */
   public interface SitemapModelComponent extends Component {
   
  
  
  
  1.1.2.5   +1 -2      xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapOutputComponent.java
  
  Index: SitemapOutputComponent.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapOutputComponent.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- SitemapOutputComponent.java	2001/04/20 20:50:14	1.1.2.4
  +++ SitemapOutputComponent.java	2001/04/25 17:08:50	1.1.2.5
  @@ -9,13 +9,12 @@
   
   import java.io.IOException;
   import java.io.OutputStream;
  -
   import org.apache.avalon.component.Component;
   
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/20 20:50:14 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 17:08:50 $
    */
   public interface SitemapOutputComponent extends Component {
   
  
  
  
  1.1.2.12  +3 -6      xml-cocoon/src/org/apache/cocoon/sitemap/Attic/XSLTFactoryLoader.java
  
  Index: XSLTFactoryLoader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/XSLTFactoryLoader.java,v
  retrieving revision 1.1.2.11
  retrieving revision 1.1.2.12
  diff -u -r1.1.2.11 -r1.1.2.12
  --- XSLTFactoryLoader.java	2001/04/20 20:50:14	1.1.2.11
  +++ XSLTFactoryLoader.java	2001/04/25 17:08:51	1.1.2.12
  @@ -9,14 +9,11 @@
   package org.apache.cocoon.sitemap;
   
   import java.util.HashMap;
  -
  +import org.apache.avalon.logger.Loggable;
   import org.apache.cocoon.CodeFactory;
   import org.apache.cocoon.util.ClassUtils;
  -
  -import org.w3c.dom.NodeList;
  -
   import org.apache.log.Logger;
  -import org.apache.avalon.logger.Loggable;
  +import org.w3c.dom.NodeList;
   
   /**
    * This class is used as a XSLT extension class. It is used by the sitemap
  @@ -28,7 +25,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.1.2.11 $ $Date: 2001/04/20 20:50:14 $
  + * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/25 17:08:51 $
    */
   
   public class XSLTFactoryLoader {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.10  +15 -15    xml-cocoon/src/org/apache/cocoon/transformation/Attic/AbstractDOMTransformer.java
  
  Index: AbstractDOMTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/AbstractDOMTransformer.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- AbstractDOMTransformer.java	2001/04/20 20:50:17	1.1.2.9
  +++ AbstractDOMTransformer.java	2001/04/25 17:08:59	1.1.2.10
  @@ -1,25 +1,25 @@
   package org.apache.cocoon.transformation;
   
  -import java.util.Map;
   import java.io.IOException;
  +import java.util.Map;
  +import org.apache.avalon.activity.Disposable;
  +import org.apache.avalon.component.Component;
  +import org.apache.avalon.component.ComponentManager;
  +import org.apache.avalon.component.Composable;
  +import org.apache.avalon.parameters.Parameters;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.Roles;
  +import org.apache.cocoon.components.parser.Parser;
  +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.SAXException;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.EntityResolver;
  +import org.xml.sax.SAXException;
   import org.xml.sax.ext.LexicalHandler;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.xml.dom.DOMBuilder;
  -import org.apache.cocoon.xml.dom.DOMStreamer;
  -import org.apache.cocoon.xml.dom.DOMFactory;
  -import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.cocoon.transformation.Transformer;
  -import org.apache.cocoon.components.parser.Parser;
  -import org.apache.cocoon.Roles;
  -import org.apache.avalon.component.Composable;
  -import org.apache.avalon.component.Component;
  -import org.apache.avalon.component.ComponentManager;
  -import org.apache.avalon.parameters.Parameters;
  -import org.apache.avalon.Disposable;
   
   /**
    * An Abstract DOM Transformer, for use when a transformer needs a DOM-based
  
  
  
  1.1.2.10  +19 -22    xml-cocoon/src/org/apache/cocoon/transformation/Attic/FragmentExtractorTransformer.java
  
  Index: FragmentExtractorTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/FragmentExtractorTransformer.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- FragmentExtractorTransformer.java	2001/04/20 20:50:17	1.1.2.9
  +++ FragmentExtractorTransformer.java	2001/04/25 17:09:00	1.1.2.10
  @@ -7,35 +7,32 @@
    *****************************************************************************/
   package org.apache.cocoon.transformation;
   
  -import org.apache.cocoon.caching.Cacheable;
  +import java.io.IOException;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.Map;
  +import org.apache.avalon.activity.Disposable;
  +import org.apache.avalon.component.Component;
  +import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
  +import org.apache.avalon.component.Composable;
  +import org.apache.avalon.parameters.Parameters;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.caching.CacheValidity;
  +import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.NOPCacheValidity;
  +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.apache.cocoon.Roles;
  -import org.apache.cocoon.util.HashUtil;
  -import org.apache.cocoon.transformation.AbstractTransformer;
  -import org.apache.cocoon.generation.FragmentExtractorGenerator;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.avalon.parameters.Parameters;
  -import org.apache.avalon.component.ComponentManager;
  -import org.apache.avalon.component.Composable;
  -import org.apache.avalon.component.ComponentException;
  -import org.apache.avalon.component.Component;
  -import org.apache.avalon.Disposable;
  -
  -import org.xml.sax.SAXException;
  +import org.w3c.dom.Document;
   import org.xml.sax.Attributes;
   import org.xml.sax.EntityResolver;
  +import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  -import org.w3c.dom.Document;
  -
  -import java.util.Map;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.io.IOException;
  -
   
   /** The transformation half of the FragmentExtractor.
    * This transformer sieves an incoming stream of xml with embedded SVG images
  @@ -45,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.1.2.9 $ $Date: 2001/04/20 20:50:17 $
  + * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/25 17:09:00 $
    */
   public class FragmentExtractorTransformer extends AbstractTransformer
       implements Composable, Disposable, Cacheable {
  
  
  
  1.1.2.14  +36 -40    xml-cocoon/src/org/apache/cocoon/transformation/Attic/I18nTransformer.java
  
  Index: I18nTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/I18nTransformer.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- I18nTransformer.java	2001/04/20 20:50:17	1.1.2.13
  +++ I18nTransformer.java	2001/04/25 17:09:01	1.1.2.14
  @@ -9,20 +9,27 @@
    */
   package org.apache.cocoon.transformation;
   
  -import org.apache.cocoon.Roles;
  +import java.io.BufferedInputStream;
  +import java.io.BufferedReader;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.Reader;
  +import java.net.MalformedURLException;
  +import java.net.URL;
  +import java.util.Hashtable;
  +import java.util.Map;
  +import org.apache.avalon.component.Component;
  +import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
  +import org.apache.avalon.component.Composable;
  +import org.apache.avalon.logger.Loggable;
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.acting.LangSelect;
   import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.components.url.URLFactory;
  -
   import org.apache.excalibur.pool.Poolable;
  -import org.apache.avalon.component.ComponentManager;
  -import org.apache.avalon.component.ComponentException;
  -import org.apache.avalon.component.Composable;
  -import org.apache.avalon.component.Component;
  -import org.apache.avalon.parameters.Parameters;
  -import org.apache.avalon.logger.Loggable;
  -
   import org.xml.sax.Attributes;
   import org.xml.sax.EntityResolver;
   import org.xml.sax.InputSource;
  @@ -30,17 +37,6 @@
   import org.xml.sax.helpers.AttributesImpl;
   import org.xml.sax.helpers.DefaultHandler;
   
  -import java.io.InputStream;
  -import java.io.BufferedInputStream;
  -import java.io.IOException;
  -import java.io.Reader;
  -import java.io.BufferedReader;
  -import java.util.Map;
  -import java.util.Hashtable;
  -
  -import java.net.URL;
  -import java.net.MalformedURLException;
  -
   /**
    * I18nTransformer. Cocoon2 port of Infozone groups I18nProcessor.
    * <p>
  @@ -48,20 +44,20 @@
    * </p>
    * <p>
    * &lt;map:transformer<br>
  - *	name="translate"<br>
  - *	src="org.apache.cocoon.transformation.I18nTransformer"/&gt;<br>
  + *        name="translate"<br>
  + *        src="org.apache.cocoon.transformation.I18nTransformer"/&gt;<br>
    * </p>
    * <p>
    * &lt;map:match pattern="file"&gt;<br>
  - *	&lt;map:generate src="file.xml"/&gt;<br>
  - * 	&lt;map:transform type="translate"&gt;<br>
  - *		&lt;parameter name="default_lang" value="fi"/&gt;<br>
  - *		&lt;parameter name="available_lang_1" value="fi"/&gt;<br>
  - *		&lt;parameter name="available_lang_2" value="en"/&gt;<br>
  - *		&lt;parameter name="available_lang_3" value="sv"/&gt;<br>
  - *		&lt;parameter name="src"<br>
  - *			value="translations/file_trans.xml"/&gt;<br>
  - *	&lt;/map:transform&gt;<br>
  + *        &lt;map:generate src="file.xml"/&gt;<br>
  + *         &lt;map:transform type="translate"&gt;<br>
  + *                &lt;parameter name="default_lang" value="fi"/&gt;<br>
  + *                &lt;parameter name="available_lang_1" value="fi"/&gt;<br>
  + *                &lt;parameter name="available_lang_2" value="en"/&gt;<br>
  + *                &lt;parameter name="available_lang_3" value="sv"/&gt;<br>
  + *                &lt;parameter name="src"<br>
  + *                        value="translations/file_trans.xml"/&gt;<br>
  + *        &lt;/map:transform&gt;<br>
    * </p>
    * <p>
    * When user requests .../file?lang=fi<br>
  @@ -71,17 +67,17 @@
    * <p>
    * file.xml:<br>
    * &lt;root xmlns:i="http://apache.org/cocoon/i18n"&gt;<br>
  - * 	&lt;elem i:tr="y"&gt;Translate me&lt;/elem&gt;<br>
  - * 	&lt;elem&gt;&lt;i:tr&gt;Translate me&lt;/i:tr&gt;&lt;/elem&gt;<br>
  + *         &lt;elem i:tr="y"&gt;Translate me&lt;/elem&gt;<br>
  + *         &lt;elem&gt;&lt;i:tr&gt;Translate me&lt;/i:tr&gt;&lt;/elem&gt;<br>
    * &lt;/root&gt;
    * </p>
    * <p>
    * file_trans.xml:<br>
    * &lt;translations&gt;<br>
  - * 	&lt;entry&gt;&lt;key&gt;Translate me&lt;/key&gt;<br>
  - * 		&lt;translation lang="sv"&gt;Översätta mej&lt;/translation&gt;<br>
  - * 		&lt;translation lang="fi"&gt;Käännä minut&lt;/translation&gt;<br>
  - *	&lt;/entry&gt;<br>
  + *         &lt;entry&gt;&lt;key&gt;Translate me&lt;/key&gt;<br>
  + *                 &lt;translation lang="sv"&gt;Översätta mej&lt;/translation&gt;<br>
  + *                 &lt;translation lang="fi"&gt;Käännä minut&lt;/translation&gt;<br>
  + *        &lt;/entry&gt;<br>
    * &lt;/translations&gt;<br>
    * </p>
    * <p>
  @@ -98,9 +94,9 @@
    * </p>
    *
    *
  - *TODO 	-Caching dictionaries in memory.<br>
  - * 		-Implementing Infozone group I18nProcessors param substitutions
  - * 		where you can enter params in the translated text.
  + *TODO         -Caching dictionaries in memory.<br>
  + *                 -Implementing Infozone group I18nProcessors param substitutions
  + *                 where you can enter params in the translated text.
    *
    *
    * @author <a href="mailto:lassi.immonen@valkeus.com">Lassi Immonen</a>
  
  
  
  1.1.2.19  +7 -10     xml-cocoon/src/org/apache/cocoon/transformation/Attic/LogTransformer.java
  
  Index: LogTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/LogTransformer.java,v
  retrieving revision 1.1.2.18
  retrieving revision 1.1.2.19
  diff -u -r1.1.2.18 -r1.1.2.19
  --- LogTransformer.java	2001/04/20 20:50:17	1.1.2.18
  +++ LogTransformer.java	2001/04/25 17:09:01	1.1.2.19
  @@ -7,20 +7,17 @@
    *****************************************************************************/
   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.parameters.Parameters;
  -import org.apache.excalibur.pool.Poolable;
  -
   import org.apache.cocoon.ProcessingException;
  -
  +import org.apache.excalibur.pool.Poolable;
   import org.xml.sax.Attributes;
  +import org.xml.sax.EntityResolver;
   import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
  -import org.xml.sax.EntityResolver;
  -
  -import java.io.FileWriter;
  -import java.io.IOException;
  -import java.util.Date;
  -import java.util.Map;
   
   /**
    *
  @@ -46,7 +43,7 @@
    *
    * @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
    *         (PWR Organisation &amp; Entwicklung)
  - * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/20 20:50:17 $
  + * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/04/25 17:09:01 $
    *
    */
   public class LogTransformer extends AbstractTransformer implements Poolable {
  
  
  
  1.1.2.27  +15 -18    xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java
  
  Index: SQLTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java,v
  retrieving revision 1.1.2.26
  retrieving revision 1.1.2.27
  diff -u -r1.1.2.26 -r1.1.2.27
  --- SQLTransformer.java	2001/04/24 08:41:07	1.1.2.26
  +++ SQLTransformer.java	2001/04/25 17:09:02	1.1.2.27
  @@ -10,46 +10,43 @@
   import java.io.IOException;
   import java.sql.Connection;
   import java.sql.DriverManager;
  -import java.sql.Statement;
   import java.sql.ResultSet;
   import java.sql.ResultSetMetaData;
   import java.sql.SQLException;
  +import java.sql.Statement;
  +import java.util.Enumeration;
  +import java.util.Map;
   import java.util.Properties;
   import java.util.Vector;
  -import java.util.Map;
  -import java.util.Enumeration;
  -
  -import org.apache.avalon.parameters.Parameters;
  -import org.apache.avalon.component.ComponentManager;
  +import org.apache.avalon.activity.Disposable;
  +import org.apache.avalon.component.Component;
   import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.ComponentSelector;
   import org.apache.avalon.component.Composable;
  -import org.apache.avalon.component.Component;
  -import org.apache.log.Logger;
  -import org.apache.excalibur.pool.Poolable;
  -import org.apache.avalon.Disposable;
  -import org.apache.excalibur.datasource.DataSourceComponent;
  -
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.Roles;
  +import org.apache.cocoon.util.ClassUtils;
   import org.apache.cocoon.xml.XMLConsumer;
   import org.apache.cocoon.xml.XMLProducer;
  -import org.apache.cocoon.util.ClassUtils;
  -
  +import org.apache.excalibur.datasource.DataSourceComponent;
  +import org.apache.excalibur.pool.Poolable;
  +import org.apache.log.Logger;
  +import org.xml.sax.Attributes;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.EntityResolver;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.helpers.AttributesImpl;
  -import org.xml.sax.SAXException;
   import org.xml.sax.Locator;
  +import org.xml.sax.SAXException;
   import org.xml.sax.ext.LexicalHandler;
  +import org.xml.sax.helpers.AttributesImpl;
   
   /**
    *
    * @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a>
    * @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
    *         (PWR Organisation & Entwicklung)
  - * @version CVS $Revision: 1.1.2.26 $ $Date: 2001/04/24 08:41:07 $ $Author: cziegeler $
  + * @version CVS $Revision: 1.1.2.27 $ $Date: 2001/04/25 17:09:02 $ $Author: donaldp $
    */
   
   public class SQLTransformer extends AbstractTransformer implements Composable, Poolable, Disposable {
  
  
  
  1.1.2.28  +27 -33    xml-cocoon/src/org/apache/cocoon/transformation/Attic/TraxTransformer.java
  
  Index: TraxTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/TraxTransformer.java,v
  retrieving revision 1.1.2.27
  retrieving revision 1.1.2.28
  diff -u -r1.1.2.27 -r1.1.2.28
  --- TraxTransformer.java	2001/04/24 14:26:16	1.1.2.27
  +++ TraxTransformer.java	2001/04/25 17:09:02	1.1.2.28
  @@ -7,68 +7,62 @@
    *****************************************************************************/
   package org.apache.cocoon.transformation;
   
  -import java.io.IOException;
  -import java.util.Iterator;
   import java.io.File;
  +import java.io.IOException;
  +import java.lang.reflect.Method;
  +import java.text.StringCharacterIterator;
   import java.util.Enumeration;
  -import java.util.Map;
  -import java.util.Hashtable;
   import java.util.HashMap;
  +import java.util.Hashtable;
   import java.util.Iterator;
  -import java.text.StringCharacterIterator;
  -
  -import java.lang.reflect.Method;
  -
  -import org.apache.cocoon.environment.Request;
  -
  +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.sax.SAXResult;
  +import javax.xml.transform.sax.SAXSource;
  +import javax.xml.transform.sax.SAXTransformerFactory;
  +import javax.xml.transform.sax.TransformerHandler;
  +import org.apache.avalon.activity.Disposable;
   import org.apache.avalon.component.Component;
   import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.Composable;
  -import org.apache.avalon.Disposable;
  -import org.apache.avalon.logger.Loggable;
  -import org.apache.excalibur.pool.Poolable;
  -import org.apache.excalibur.pool.Recyclable;
   import org.apache.avalon.configuration.Configurable;
  -import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.configuration.Configuration;
  +import org.apache.avalon.configuration.ConfigurationException;
  +import org.apache.avalon.logger.Loggable;
   import org.apache.avalon.parameters.Parameters;
  -
   import org.apache.cocoon.Constants;
  -import org.apache.cocoon.Roles;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.store.Store;
  -import org.apache.cocoon.components.browser.Browser;
  -import org.apache.cocoon.caching.Cacheable;
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.caching.CacheValidity;
  -import org.apache.cocoon.caching.TimeStampCacheValidity;
  +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.store.Store;
  +import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.util.HashUtil;
   import org.apache.cocoon.util.TraxErrorHandler;
  -import org.apache.cocoon.xml.XMLConsumer;
   import org.apache.cocoon.xml.ContentHandlerWrapper;
  -
  +import org.apache.cocoon.xml.XMLConsumer;
  +import org.apache.excalibur.pool.Poolable;
  +import org.apache.excalibur.pool.Recyclable;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.EntityResolver;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   import org.xml.sax.ext.LexicalHandler;
   
  -import javax.xml.transform.TransformerFactory;
  -import javax.xml.transform.Templates;
  -import javax.xml.transform.TransformerConfigurationException;
  -import javax.xml.transform.sax.SAXSource;
  -import javax.xml.transform.sax.TransformerHandler;
  -import javax.xml.transform.sax.SAXTransformerFactory;
  -import javax.xml.transform.sax.SAXResult;
  -
   /**
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
    * @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.2.27 $ $Date: 2001/04/24 14:26:16 $
  + * @version CVS $Revision: 1.1.2.28 $ $Date: 2001/04/25 17:09:02 $
    */
   public class TraxTransformer extends ContentHandlerWrapper
   implements Transformer, Composable, Recyclable, Configurable, Cacheable, Disposable {
  @@ -124,7 +118,7 @@
           return handler;
       }
   
  -    private Templates getTemplates (String systemID, String xsluri) 
  +    private Templates getTemplates (String systemID, String xsluri)
          throws IOException
       {
           Templates templates = null;
  
  
  
  1.1.2.30  +26 -26    xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java
  
  Index: XIncludeTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java,v
  retrieving revision 1.1.2.29
  retrieving revision 1.1.2.30
  diff -u -r1.1.2.29 -r1.1.2.30
  --- XIncludeTransformer.java	2001/04/24 14:12:41	1.1.2.29
  +++ XIncludeTransformer.java	2001/04/25 17:09:03	1.1.2.30
  @@ -7,44 +7,44 @@
    *****************************************************************************/
   package org.apache.cocoon.transformation;
   
  -import java.net.URL;
  -import java.net.MalformedURLException;
  +import java.io.BufferedInputStream;
  +import java.io.BufferedReader;
   import java.io.IOException;
  -import java.io.Reader;
   import java.io.InputStream;
   import java.io.InputStreamReader;
  -import java.io.BufferedReader;
  -import java.io.BufferedInputStream;
  -import java.util.Stack;
  +import java.io.Reader;
  +import java.net.MalformedURLException;
  +import java.net.URL;
   import java.util.Map;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.InputSource;
  -import org.xml.sax.Locator;
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.ext.LexicalHandler;
  -import org.xml.sax.ContentHandler;
  -import org.w3c.dom.NodeList;
  -import org.w3c.dom.Node;
  -import org.w3c.dom.Document;
  -import org.apache.avalon.parameters.Parameters;
  -import org.apache.avalon.component.ComponentManager;
  +import java.util.Stack;
  +import javax.xml.transform.TransformerException;
  +import org.apache.avalon.activity.Disposable;
  +import org.apache.avalon.component.Component;
   import org.apache.avalon.component.ComponentException;
  +import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.Composable;
  -import org.apache.avalon.logger.Loggable;
   import org.apache.avalon.logger.AbstractLoggable;
  -import org.apache.excalibur.pool.Poolable;
  -import org.apache.avalon.Disposable;
  -import org.apache.avalon.component.Component;
  -import org.apache.cocoon.Roles;
  +import org.apache.avalon.logger.Loggable;
  +import org.apache.avalon.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.components.url.URLFactory;
  +import org.apache.cocoon.xml.XIncludeContentHandler;
   import org.apache.cocoon.xml.dom.DOMBuilder;
   import org.apache.cocoon.xml.dom.DOMStreamer;
  -import org.apache.cocoon.xml.XIncludeContentHandler;
  +import org.apache.excalibur.pool.Poolable;
   import org.apache.xpath.XPathAPI;
  -import javax.xml.transform.TransformerException;
  +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.EntityResolver;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.Locator;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.ext.LexicalHandler;
   
   /**
    * My first pass at an XInclude transformation. Currently it should set the base URI
  @@ -54,7 +54,7 @@
    * by the SAX event FSM yet.
    *
    * @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a>
  - * @version CVS $Revision: 1.1.2.29 $ $Date: 2001/04/24 14:12:41 $ $Author: dims $
  + * @version CVS $Revision: 1.1.2.30 $ $Date: 2001/04/25 17:09:03 $ $Author: donaldp $
    */
   public class XIncludeTransformer extends AbstractTransformer implements Composable, Poolable, Disposable {
   
  
  
  
  1.1.2.23  +34 -40    xml-cocoon/src/org/apache/cocoon/transformation/Attic/XTTransformer.java
  
  Index: XTTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XTTransformer.java,v
  retrieving revision 1.1.2.22
  retrieving revision 1.1.2.23
  diff -u -r1.1.2.22 -r1.1.2.23
  --- XTTransformer.java	2001/04/24 15:27:49	1.1.2.22
  +++ XTTransformer.java	2001/04/25 17:09:04	1.1.2.23
  @@ -8,71 +8,65 @@
   
   package org.apache.cocoon.transformation;
   
  +import com.jclark.xsl.om.Name;
  +import com.jclark.xsl.om.Node;
  +import com.jclark.xsl.om.XSLException;
  +import com.jclark.xsl.sax.ExtensionHandlerImpl;
  +import com.jclark.xsl.sax.MultiNamespaceResult;
  +import com.jclark.xsl.sax.OutputMethodHandler;
  +import com.jclark.xsl.sax.ResultBase;
  +import com.jclark.xsl.sax.XMLProcessorEx;
  +import com.jclark.xsl.sax.XMLProcessorImpl;
  +import com.jclark.xsl.tr.Engine;
  +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.Map;
   import java.util.HashMap;
  -
  -import org.apache.cocoon.environment.Request;
  -
  -import org.apache.log.Logger;
  -import org.apache.avalon.logger.Loggable;
  +import java.util.Map;
  +import javax.xml.parsers.ParserConfigurationException;
  +import javax.xml.parsers.SAXParser;
  +import javax.xml.parsers.SAXParserFactory;
  +import org.apache.avalon.activity.Disposable;
   import org.apache.avalon.component.Component;
   import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.Composable;
  +import org.apache.avalon.logger.Loggable;
   import org.apache.avalon.parameters.Parameters;
  -import org.apache.excalibur.pool.Poolable;
  -import org.apache.avalon.Disposable;
  -
  -import org.apache.cocoon.Modifiable;
   import org.apache.cocoon.Constants;
  -import org.apache.cocoon.Roles;
  +import org.apache.cocoon.Modifiable;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.cocoon.xml.DocumentHandlerAdapter;
  -import org.apache.cocoon.xml.DocumentHandlerWrapper;
  -import org.apache.cocoon.transformation.Transformer;
  +import org.apache.cocoon.Roles;
   import org.apache.cocoon.components.store.Store;
   import org.apache.cocoon.components.url.URLFactory;
  -
  +import org.apache.cocoon.environment.Request;
  +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.excalibur.pool.Poolable;
  +import org.apache.log.Logger;
  +import org.xml.sax.AttributeList;
   import org.xml.sax.ContentHandler;
  -import org.xml.sax.Locator;
  -import org.xml.sax.Parser;
   import org.xml.sax.DTDHandler;
   import org.xml.sax.DocumentHandler;
  -import org.xml.sax.HandlerBase;
   import org.xml.sax.EntityResolver;
  -import org.xml.sax.InputSource;
   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;
   import org.xml.sax.SAXException;
   import org.xml.sax.SAXParseException;
  -import org.xml.sax.AttributeList;
   import org.xml.sax.ext.LexicalHandler;
   
  -import com.jclark.xsl.sax.XMLProcessorImpl;
  -import com.jclark.xsl.sax.XMLProcessorEx;
  -import com.jclark.xsl.sax.OutputMethodHandler;
  -import com.jclark.xsl.sax.ResultBase;
  -import com.jclark.xsl.sax.MultiNamespaceResult;
  -import com.jclark.xsl.sax.ExtensionHandlerImpl;
  -import com.jclark.xsl.tr.ParameterSet;
  -import com.jclark.xsl.tr.Sheet;
  -import com.jclark.xsl.tr.Engine;
  -import com.jclark.xsl.tr.EngineImpl;
  -import com.jclark.xsl.om.Node;
  -import com.jclark.xsl.om.Name;
  -import com.jclark.xsl.om.XSLException;
  -
  -import javax.xml.parsers.SAXParserFactory;
  -import javax.xml.parsers.SAXParser;
  -import javax.xml.parsers.ParserConfigurationException;
  -
   /**
    * This Transformer use the XT processor.
    *
    * @author <a href="mailto:ssahuc@imediation.com">Sahuc Sebastien</a>
  - * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/04/24 15:27:49 $
  + * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/04/25 17:09:04 $
    */
   public class XTTransformer extends DocumentHandlerWrapper
   implements Transformer, Composable, Loggable, Poolable, Disposable {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.13  +3 -4      xml-cocoon/src/org/apache/cocoon/util/Attic/ClassUtils.java
  
  Index: ClassUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/util/Attic/ClassUtils.java,v
  retrieving revision 1.1.2.12
  retrieving revision 1.1.2.13
  diff -u -r1.1.2.12 -r1.1.2.13
  --- ClassUtils.java	2001/03/30 17:14:41	1.1.2.12
  +++ ClassUtils.java	2001/04/25 17:09:11	1.1.2.13
  @@ -9,17 +9,16 @@
   package org.apache.cocoon.util;
   
   import java.io.File;
  -import java.net.URL;
  -import java.net.MalformedURLException;
  -
   import java.io.IOException;
  +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.1.2.12 $ $Date: 2001/03/30 17:14:41 $
  + * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/25 17:09:11 $
    */
   public class ClassUtils {
   
  
  
  
  1.1.2.17  +21 -23    xml-cocoon/src/org/apache/cocoon/util/Attic/IOUtils.java
  
  Index: IOUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/util/Attic/IOUtils.java,v
  retrieving revision 1.1.2.16
  retrieving revision 1.1.2.17
  diff -u -r1.1.2.16 -r1.1.2.17
  --- IOUtils.java	2001/03/12 05:55:25	1.1.2.16
  +++ IOUtils.java	2001/04/25 17:09:12	1.1.2.17
  @@ -7,21 +7,19 @@
    *****************************************************************************/
   package org.apache.cocoon.util;
   
  -import java.io.File;
  -import java.io.FileWriter;
  -import java.io.FileReader;
  -import java.io.FileOutputStream;
  -import java.io.ObjectOutputStream;
  +import java.io.BufferedInputStream;
   import java.io.BufferedOutputStream;
  +import java.io.File;
   import java.io.FileInputStream;
  -import java.io.ObjectInputStream;
  -import java.io.BufferedInputStream;
  +import java.io.FileOutputStream;
  +import java.io.FileReader;
  +import java.io.FileWriter;
   import java.io.IOException;
  -
  +import java.io.ObjectInputStream;
  +import java.io.ObjectOutputStream;
   import java.text.Collator;
  -import java.util.Locale;
   import java.util.Arrays;
  -
  +import java.util.Locale;
   import org.apache.log.LogKit;
   
   /**
  @@ -30,7 +28,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.1.2.16 $ $Date: 2001/03/12 05:55:25 $
  + * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/25 17:09:12 $
    */
   public class IOUtils {
   
  @@ -111,21 +109,21 @@
       return object;
     }
   
  -  /** 
  +  /**
      * These are java keywords as specified at the following URL (sorted alphabetically).
      * http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#229308
  -   */     
  -  static final String keywords[] = 
  +   */
  +  static final String keywords[] =
     {
         "abstract",  "boolean",     "break",    "byte",         "case",
         "catch",     "char",        "class",    "const",        "continue",
         "default",   "do",          "double",   "else",         "extends",
         "final",     "finally",     "float",    "for",          "goto",
         "if",        "implements",  "import",   "instanceof",   "int",
  -      "interface", "long",        "native",   "new",          "package",  
  +      "interface", "long",        "native",   "new",          "package",
         "private",   "protected",   "public",   "return",       "short",
  -      "static",    "strictfp",    "super",    "switch",       "synchronized", 
  -      "this",      "throw",       "throws",   "transient",    "try",          
  +      "static",    "strictfp",    "super",    "switch",       "synchronized",
  +      "this",      "throw",       "throws",   "transient",    "try",
         "void",      "volatile",    "while"
     };
   
  @@ -142,7 +140,7 @@
     private static boolean isJavaKeyword(String keyword) {
       return (Arrays.binarySearch(keywords, keyword, englishCollator) >= 0);
     }
  -        
  +
     // **********************
     // File Methods
     // **********************
  @@ -168,7 +166,7 @@
         if (i > start) {
           buffer.append(File.separator);
         }
  -    
  +
         boolean isJavaKeyword = isJavaKeyword(path[i]);
   
         char[] chars = path[i].toCharArray();
  @@ -257,20 +255,20 @@
             directoryPath = directory.getCanonicalPath();
             filePath = file.getCanonicalPath();
   
  -          // If the context directory does not have a File.separator 
  +          // If the context directory does not have a File.separator
             // at the end then add one explicitly
             if(!directoryPath.endsWith(File.separator)){
               directoryPath += File.separator;
             }
  -      
  -          // If the context dir contains both kinds of spearator 
  +
  +          // If the context dir contains both kinds of spearator
             // then standardize on using the File.separator
             if ((directoryPath.indexOf('/') !=-1) && (directoryPath.indexOf('\\') !=-1)) {
               directoryPath = directoryPath.replace('\\', File.separator.charAt(0));
               directoryPath = directoryPath.replace('/', File.separator.charAt(0));
             }
   
  -          // If the file path contains both kinds of spearator 
  +          // If the file path contains both kinds of spearator
             // then standardize on using the File.separator
             if ((filePath.indexOf('/') !=-1) && (filePath.indexOf('\\') !=-1)) {
               filePath = filePath.replace('\\', File.separator.charAt(0));
  
  
  
  1.1.2.2   +2 -3      xml-cocoon/src/org/apache/cocoon/util/Attic/JavaArchiveFilter.java
  
  Index: JavaArchiveFilter.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/util/Attic/JavaArchiveFilter.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- JavaArchiveFilter.java	2000/09/25 14:49:56	1.1.2.1
  +++ JavaArchiveFilter.java	2001/04/25 17:09:13	1.1.2.2
  @@ -5,7 +5,6 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  -
   package org.apache.cocoon.util;
   
   import java.io.File;
  @@ -16,7 +15,7 @@
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</A>
    */
  - 
  +
   public class JavaArchiveFilter implements FileFilter {
   
       public boolean accept(File file) {
  @@ -24,4 +23,4 @@
           return (name.endsWith(".jar") || name.endsWith(".zip"));
       }
   
  -} 
  +}
  
  
  
  1.1.2.9   +3 -3      xml-cocoon/src/org/apache/cocoon/util/Attic/NetUtils.java
  
  Index: NetUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/util/Attic/NetUtils.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- NetUtils.java	2001/02/12 13:30:47	1.1.2.8
  +++ NetUtils.java	2001/04/25 17:09:13	1.1.2.9
  @@ -9,9 +9,9 @@
   package org.apache.cocoon.util;
   
   import java.io.File;
  -import java.util.Map;
  -import java.net.URL;
   import java.net.MalformedURLException;
  +import java.net.URL;
  +import java.util.Map;
   import org.apache.log.LogKit;
   
   /**
  @@ -19,7 +19,7 @@
    * utility methods
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/02/12 13:30:47 $
  + * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/25 17:09:13 $
    */
   
   public class NetUtils {
  
  
  
  1.1.2.4   +3 -3      xml-cocoon/src/org/apache/cocoon/util/Attic/Tokenizer.java
  
  Index: Tokenizer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/util/Attic/Tokenizer.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- Tokenizer.java	2000/07/29 18:30:42	1.1.2.3
  +++ Tokenizer.java	2001/04/25 17:09:14	1.1.2.4
  @@ -85,11 +85,11 @@
      * after the current position; false otherwise.
      */
     public boolean hasMoreTokens() {
  -    return ((current < max) ? (true) : 
  -      (((current == max) && (max == 0 
  +    return ((current < max) ? (true) :
  +      (((current == max) && (max == 0
           || (returnTokens && delim.indexOf(str.charAt(previous)) >= 0)))));
     }
  -  
  +
     /**
      * Returns the next token from this string tokenizer.
      *
  
  
  
  1.1.2.2   +4 -5      xml-cocoon/src/org/apache/cocoon/util/Attic/TraxErrorHandler.java
  
  Index: TraxErrorHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/util/Attic/TraxErrorHandler.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- TraxErrorHandler.java	2001/04/20 14:48:32	1.1.2.1
  +++ TraxErrorHandler.java	2001/04/25 17:09:15	1.1.2.2
  @@ -8,10 +8,9 @@
   
   package org.apache.cocoon.util;
   
  -import javax.xml.transform.TransformerException;
   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 {
  @@ -45,7 +44,7 @@
       private void printLocation(TransformerException exception)
       {
         SourceLocator locator = exception.getLocator();
  -  
  +
         if(null != locator)
         {
           // System.out.println("Parser fatal error: "+exception.getMessage());
  @@ -56,9 +55,9 @@
           if(logger != null)
               logger.error("Error in TraxTransformer: " + id + "; Line " + locator.getLineNumber()
                              + "; Column " + locator.getColumnNumber()+"; ", exception);
  -        else 
  +        else
               System.out.println("Error in TraxTransformer: " + id + "; Line " + locator.getLineNumber()
                              + "; Column " + locator.getColumnNumber()+";" + exception);
         }
       }
  -}
  \ No newline at end of file
  +}
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +4 -5      xml-cocoon/src/org/apache/cocoon/util/url/Attic/CocoonURLStreamHandlerFactory.java
  
  Index: CocoonURLStreamHandlerFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/util/url/Attic/CocoonURLStreamHandlerFactory.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- CocoonURLStreamHandlerFactory.java	2001/04/20 20:50:18	1.1.2.2
  +++ CocoonURLStreamHandlerFactory.java	2001/04/25 17:09:21	1.1.2.3
  @@ -8,18 +8,17 @@
   
   package org.apache.cocoon.util.url;
   
  -import java.net.URLStreamHandlerFactory;
   import java.net.URLStreamHandler;
  -import org.apache.cocoon.util.ClassUtils;
  +import java.net.URLStreamHandlerFactory;
   import org.apache.avalon.logger.AbstractLoggable;
   import org.apache.avalon.logger.Loggable;
  -
  +import org.apache.cocoon.util.ClassUtils;
   
   /**
    *  This class implements the Factory for URLStreamHandlers
    *
    * @author: <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/20 20:50:18 $
  + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/25 17:09:21 $
    */
   public class CocoonURLStreamHandlerFactory extends AbstractLoggable implements URLStreamHandlerFactory {
   
  @@ -44,4 +43,4 @@
   
           return null;
       }
  -}
  \ No newline at end of file
  +}
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +3 -3      xml-cocoon/src/org/apache/cocoon/util/url/context/Attic/Handler.java
  
  Index: Handler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/util/url/context/Attic/Handler.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- Handler.java	2001/03/30 17:14:43	1.1.2.3
  +++ Handler.java	2001/04/25 17:09:24	1.1.2.4
  @@ -8,11 +8,11 @@
   
   package org.apache.cocoon.util.url.context;
   
  +import java.io.FileNotFoundException;
  +import java.io.IOException;
   import java.net.URL;
   import java.net.URLConnection;
   import java.net.URLStreamHandler;
  -import java.io.IOException;
  -import java.io.FileNotFoundException;
   import org.apache.cocoon.environment.Context;
   
   /**
  @@ -20,7 +20,7 @@
    *
    * @author: <a href="mailto:ovidiu@cup.hp.com">Ovidiu Predescu</a>
    * @author: <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/03/30 17:14:43 $
  + * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/25 17:09:24 $
    */
   public class Handler extends URLStreamHandler {
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +4 -4      xml-cocoon/src/org/apache/cocoon/util/url/resource/Attic/Handler.java
  
  Index: Handler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/util/url/resource/Attic/Handler.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- Handler.java	2001/04/20 20:50:19	1.1.2.3
  +++ Handler.java	2001/04/25 17:09:27	1.1.2.4
  @@ -8,13 +8,13 @@
   
   package org.apache.cocoon.util.url.resource;
   
  +import java.io.FileNotFoundException;
  +import java.io.IOException;
   import java.net.URL;
   import java.net.URLConnection;
   import java.net.URLStreamHandler;
  -import java.io.IOException;
  -import java.io.FileNotFoundException;
  -import org.apache.cocoon.util.ClassUtils;
   import org.apache.avalon.logger.Loggable;
  +import org.apache.cocoon.util.ClassUtils;
   import org.apache.log.Logger;
   
   /**
  @@ -22,7 +22,7 @@
    *
    * @author: <a href="mailto:ovidiu@cup.hp.com">Ovidiu Predescu</a>
    * @author: <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/20 20:50:19 $
  + * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/25 17:09:27 $
    */
   public class Handler extends URLStreamHandler implements Loggable {
       private Logger log;
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.9   +3 -4      xml-cocoon/src/org/apache/cocoon/xml/Attic/AbstractXMLConsumer.java
  
  Index: AbstractXMLConsumer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/AbstractXMLConsumer.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- AbstractXMLConsumer.java	2001/04/20 20:50:19	1.1.2.8
  +++ AbstractXMLConsumer.java	2001/04/25 17:09:31	1.1.2.9
  @@ -7,22 +7,21 @@
    *****************************************************************************/
   package org.apache.cocoon.xml;
   
  +import org.apache.avalon.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;
   
  -import org.apache.log.Logger;
  -import org.apache.avalon.logger.AbstractLoggable;
  -
   /**
    * This abstract class provides default implementation of the methods specified
    * by the <code>XMLConsumer</code> interface.
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/20 20:50:19 $
  + * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/25 17:09:31 $
    */
   public abstract class AbstractXMLConsumer extends AbstractLoggable implements XMLConsumer {
   
  
  
  
  1.1.2.2   +4 -5      xml-cocoon/src/org/apache/cocoon/xml/Attic/AbstractXMLPipe.java
  
  Index: AbstractXMLPipe.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/AbstractXMLPipe.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- AbstractXMLPipe.java	2000/09/27 14:33:36	1.1.2.1
  +++ AbstractXMLPipe.java	2001/04/25 17:09:32	1.1.2.2
  @@ -5,23 +5,22 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  - 
  +
   package org.apache.cocoon.xml;
   
  +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;
   
  -import org.apache.cocoon.xml.AbstractXMLProducer;
  -
   /**
  - * This class provides a bridge class to connect to existing content 
  + * 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.1.2.1 $ $Date: 2000/09/27 14:33:36 $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/25 17:09:32 $
    */
   public class AbstractXMLPipe extends AbstractXMLProducer implements XMLPipe {
   
  
  
  
  1.1.2.12  +3 -4      xml-cocoon/src/org/apache/cocoon/xml/Attic/AbstractXMLProducer.java
  
  Index: AbstractXMLProducer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/AbstractXMLProducer.java,v
  retrieving revision 1.1.2.11
  retrieving revision 1.1.2.12
  diff -u -r1.1.2.11 -r1.1.2.12
  --- AbstractXMLProducer.java	2001/04/20 20:50:19	1.1.2.11
  +++ AbstractXMLProducer.java	2001/04/25 17:09:33	1.1.2.12
  @@ -7,11 +7,10 @@
    *****************************************************************************/
   package org.apache.cocoon.xml;
   
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.ext.LexicalHandler;
  -
   import org.apache.avalon.logger.AbstractLoggable;
   import org.apache.excalibur.pool.Recyclable;
  +import org.xml.sax.ContentHandler;
  +import org.xml.sax.ext.LexicalHandler;
   
   /**
    * This abstract class provides default implementation of the methods specified
  @@ -19,7 +18,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/20 20:50:19 $
  + * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/25 17:09:33 $
    */
   public abstract class AbstractXMLProducer extends AbstractLoggable implements XMLProducer, Recyclable {
   
  
  
  
  1.1.2.9   +1 -3      xml-cocoon/src/org/apache/cocoon/xml/Attic/ContentHandlerWrapper.java
  
  Index: ContentHandlerWrapper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/ContentHandlerWrapper.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- ContentHandlerWrapper.java	2001/04/20 20:50:19	1.1.2.8
  +++ ContentHandlerWrapper.java	2001/04/25 17:09:34	1.1.2.9
  @@ -9,10 +9,8 @@
   package org.apache.cocoon.xml;
   
   import java.util.Vector;
  -
   import org.apache.cocoon.xml.AbstractXMLConsumer;
   import org.apache.excalibur.pool.Recyclable;
  -
   import org.xml.sax.Attributes;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.Locator;
  @@ -27,7 +25,7 @@
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    *         (Apache Software Foundation, Computer Associates)
  - * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/20 20:50:19 $
  + * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/25 17:09:34 $
    */
   public class ContentHandlerWrapper extends AbstractXMLConsumer implements Recyclable {
   
  
  
  
  1.1.2.2   +29 -31    xml-cocoon/src/org/apache/cocoon/xml/Attic/DocumentHandlerAdapter.java
  
  Index: DocumentHandlerAdapter.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/DocumentHandlerAdapter.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- DocumentHandlerAdapter.java	2000/09/27 14:33:39	1.1.2.1
  +++ DocumentHandlerAdapter.java	2001/04/25 17:09:36	1.1.2.2
  @@ -5,17 +5,15 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  - 
  +
   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.XMLConsumer;
   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;
  @@ -31,10 +29,10 @@
    * <code>xmlns:...</code> element attributes into appropriate
    * <code>startPrefixMapping(...)</code> and <code>endPrefixMapping(...)</code>
    * calls.
  - * 
  + *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/09/27 14:33:39 $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/25 17:09:36 $
    */
   public class DocumentHandlerAdapter extends AbstractXMLProducer
   implements DocumentHandler {
  @@ -76,32 +74,32 @@
           if (super.contentHandler==null) return;
           else super.contentHandler.setDocumentLocator(locator);
       }
  -    
  +
       /**
        * Receive notification of the beginning of a document.
        */
       public void startDocument ()
  -	throws SAXException {
  +        throws SAXException {
           if (super.contentHandler==null)
               throw new SAXException("ContentHandler not set");
           super.contentHandler.startDocument();
  -    }    
  -    
  +    }
  +
       /**
        * Receive notification of the end of a document.
        */
       public void endDocument ()
  -	throws SAXException {
  +        throws SAXException {
           if (super.contentHandler==null)
               throw new SAXException("ContentHandler not set");
           super.contentHandler.endDocument();
  -    }    
  -    
  +    }
  +
       /**
        * Receive notification of the beginning of an element.
        */
       public void startElement (String name, AttributeList a)
  -	throws SAXException {
  +        throws SAXException {
           if (super.contentHandler==null)
               throw new SAXException("ContentHandler not set");
           // Check for namespace declarations (two loops because we're not sure
  @@ -138,17 +136,17 @@
                                             w.getQName(),a2);
           // Forward on the stack
           this.stack++;
  -    }    
  -    
  +    }
  +
       /**
        * Receive notification of the end of an element.
        */
       public void endElement (String name)
  -	throws SAXException {
  +        throws SAXException {
           if (super.contentHandler==null)
               throw new SAXException("ContentHandler not set");
  -	    // Get back on the stack
  -	    this.stack--;
  +            // Get back on the stack
  +            this.stack--;
           // Notify the contentHandler
           NamespacesTable.Name w=this.namespaces.resolve(null,name,null,null);
           super.contentHandler.endElement(w.getUri(),w.getLocalName(),
  @@ -163,36 +161,36 @@
               NamespacesTable.Declaration d=namespaces.removeDeclaration(prefix);
               super.contentHandler.endPrefixMapping(d.getPrefix());
           }
  -    }    
  -    
  -    
  +    }
  +
  +
       /**
        * Receive notification of character data.
        */
       public void characters (char ch[], int start, int len)
  -	throws SAXException {
  +        throws SAXException {
           if (super.contentHandler==null)
               throw new SAXException("ContentHandler not set");
           super.contentHandler.characters(ch,start,len);
  -    }    
  -    
  -    
  +    }
  +
  +
       /**
        * Receive notification of ignorable whitespace in element content.
        */
       public void ignorableWhitespace (char ch[], int start, int len)
  -	throws SAXException {
  +        throws SAXException {
           if (super.contentHandler==null)
               throw new SAXException("ContentHandler not set");
           super.contentHandler.ignorableWhitespace(ch,start,len);
  -    }    
  -    
  -    
  +    }
  +
  +
       /**
        * Receive notification of a processing instruction.
        */
       public void processingInstruction (String target, String data)
  -	throws SAXException {
  +        throws SAXException {
           if (super.contentHandler==null)
               throw new SAXException("ContentHandler not set");
           super.contentHandler.processingInstruction(target,data);
  
  
  
  1.1.2.6   +4 -7      xml-cocoon/src/org/apache/cocoon/xml/Attic/DocumentHandlerWrapper.java
  
  Index: DocumentHandlerWrapper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/DocumentHandlerWrapper.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- DocumentHandlerWrapper.java	2001/04/20 20:50:19	1.1.2.5
  +++ DocumentHandlerWrapper.java	2001/04/25 17:09:37	1.1.2.6
  @@ -9,20 +9,17 @@
   package org.apache.cocoon.xml;
   
   import java.util.Vector;
  -
  -import org.apache.excalibur.pool.Recyclable;
  +import org.apache.avalon.logger.Loggable;
   import org.apache.cocoon.xml.AbstractXMLConsumer;
   import org.apache.cocoon.xml.NamespacesTable;
  -
  +import org.apache.excalibur.pool.Recyclable;
  +import org.apache.log.Logger;
   import org.xml.sax.Attributes;
   import org.xml.sax.DocumentHandler;
   import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributeListImpl;
   
  -import org.apache.log.Logger;
  -import org.apache.avalon.logger.Loggable;
  -
   /**
    * 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
  @@ -35,7 +32,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/20 20:50:19 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:09:37 $
    */
   public class DocumentHandlerWrapper extends AbstractXMLConsumer implements Loggable /*, Recyclable*/ {
   
  
  
  
  1.1.2.3   +2 -2      xml-cocoon/src/org/apache/cocoon/xml/Attic/IncludeXMLConsumer.java
  
  Index: IncludeXMLConsumer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/IncludeXMLConsumer.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- IncludeXMLConsumer.java	2001/04/25 13:51:34	1.1.2.2
  +++ IncludeXMLConsumer.java	2001/04/25 17:09:37	1.1.2.3
  @@ -19,7 +19,7 @@
    * </code>endDocument</code> messages.
    *
    * @author <a href="mailto:bloritsch@apache.org>Berin Loritsch</a>
  - * @version $Revision: 1.1.2.2 $ $Date: 2001/04/25 13:51:34 $
  + * @version $Revision: 1.1.2.3 $ $Date: 2001/04/25 17:09:37 $
    */
   public class IncludeXMLConsumer extends AbstractXMLConsumer {
       final private ContentHandler contentHandler;
  @@ -113,4 +113,4 @@
           throws SAXException {
           lexicalHandler.comment(ary,start,length);
       }
  -}
  \ No newline at end of file
  +}
  
  
  
  1.1.2.3   +6 -6      xml-cocoon/src/org/apache/cocoon/xml/Attic/LoggingEntityResolver.java
  
  Index: LoggingEntityResolver.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/LoggingEntityResolver.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- LoggingEntityResolver.java	2001/04/20 20:50:19	1.1.2.2
  +++ LoggingEntityResolver.java	2001/04/25 17:09:38	1.1.2.3
  @@ -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.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 org.apache.log.Logger;
  -import org.apache.avalon.logger.AbstractLoggable;
  -import java.util.Set;
  -import java.util.HashSet;
  -import java.util.Collections;
   
   /**
    * Logging entity resolver to assist in caching.
  
  
  
  1.1.2.2   +2 -3      xml-cocoon/src/org/apache/cocoon/xml/Attic/XIncludeContentHandler.java
  
  Index: XIncludeContentHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/XIncludeContentHandler.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- XIncludeContentHandler.java	2001/04/24 14:12:43	1.1.2.1
  +++ XIncludeContentHandler.java	2001/04/25 17:09:39	1.1.2.2
  @@ -8,18 +8,17 @@
   package org.apache.cocoon.xml;
   
   import org.apache.avalon.logger.AbstractLoggable;
  -
   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.ContentHandler;
   
   /**
    * Extracted class from XIncludeTransformer for use in XIncludeSAXConnector.
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/04/24 14:12:43 $ $Author: dims $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/25 17:09:39 $ $Author: donaldp $
    */
   public class XIncludeContentHandler extends AbstractLoggable implements ContentHandler, LexicalHandler {
   
  
  
  
  1.1.2.5   +2 -2      xml-cocoon/src/org/apache/cocoon/xml/Attic/XMLConsumer.java
  
  Index: XMLConsumer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/XMLConsumer.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- XMLConsumer.java	2000/07/29 18:30:43	1.1.2.4
  +++ XMLConsumer.java	2001/04/25 17:09:40	1.1.2.5
  @@ -11,7 +11,7 @@
   import org.xml.sax.ext.LexicalHandler;
   
   /**
  - * This interfaces identifies classes that consume XML data, receiving 
  + * This interfaces identifies classes that consume XML data, receiving
    * notification of SAX events.
    * <br>
    * This interface unites the idea of SAX <code>ContentHandler</code> and
  @@ -19,7 +19,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/07/29 18:30:43 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 17:09:40 $
    */
   public interface XMLConsumer extends ContentHandler, LexicalHandler {
   }
  
  
  
  1.1.2.3   +3 -3      xml-cocoon/src/org/apache/cocoon/xml/Attic/XMLMulticaster.java
  
  Index: XMLMulticaster.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/XMLMulticaster.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- XMLMulticaster.java	2001/04/11 12:41:31	1.1.2.2
  +++ XMLMulticaster.java	2001/04/25 17:09:41	1.1.2.3
  @@ -17,7 +17,7 @@
   
   /**
    * @author <a href="mailto:cziegeler@sundn.de">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/11 12:41:31 $
  + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/25 17:09:41 $
    */
   
   public final class XMLMulticaster implements XMLConsumer {
  @@ -112,7 +112,7 @@
       }
   
       public void startDTD(String name, String public_id, String system_id)
  -			throws SAXException {
  +                        throws SAXException {
           for(int i=0; i<this.lexicalHandlerList.length; i++)
               if (this.lexicalHandlerList[i] != null)
                   this.lexicalHandlerList[i].startDTD(name, public_id, system_id);
  @@ -149,7 +149,7 @@
       }
   
       public void comment(char ary[], int start, int length)
  -			throws SAXException {
  +                        throws SAXException {
           for(int i=0; i<this.lexicalHandlerList.length; i++)
               if (this.lexicalHandlerList[i] != null)
                   this.lexicalHandlerList[i].comment(ary, start, length);
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.12  +4 -8      xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/DOMBuilder.java
  
  Index: DOMBuilder.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/DOMBuilder.java,v
  retrieving revision 1.1.2.11
  retrieving revision 1.1.2.12
  diff -u -r1.1.2.11 -r1.1.2.12
  --- DOMBuilder.java	2001/04/20 20:50:20	1.1.2.11
  +++ DOMBuilder.java	2001/04/25 17:09:54	1.1.2.12
  @@ -9,10 +9,10 @@
   package org.apache.cocoon.xml.dom;
   
   import java.util.Vector;
  -
  -import org.apache.cocoon.xml.XMLConsumer;
  +import org.apache.avalon.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;
  @@ -25,22 +25,18 @@
   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 org.apache.avalon.logger.Loggable;
  -import org.apache.log.Logger;
  -
   /**
    * 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.1.2.11 $ $Date: 2001/04/20 20:50:20 $
  + * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/25 17:09:54 $
    */
   public class DOMBuilder implements XMLConsumer, Loggable {
       protected Logger log;
  
  
  
  1.1.2.6   +2 -5      xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/DOMStreamer.java
  
  Index: DOMStreamer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/DOMStreamer.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- DOMStreamer.java	2001/02/12 14:17:49	1.1.2.5
  +++ DOMStreamer.java	2001/04/25 17:09:55	1.1.2.6
  @@ -9,10 +9,8 @@
   package org.apache.cocoon.xml.dom;
   
   import java.util.Vector;
  -
   import org.apache.cocoon.xml.AbstractXMLProducer;
   import org.apache.cocoon.xml.XMLConsumer;
  -
   import org.w3c.dom.Attr;
   import org.w3c.dom.CDATASection;
   import org.w3c.dom.Comment;
  @@ -25,7 +23,6 @@
   import org.w3c.dom.NodeList;
   import org.w3c.dom.ProcessingInstruction;
   import org.w3c.dom.Text;
  -
   import org.xml.sax.ContentHandler;
   import org.xml.sax.SAXException;
   import org.xml.sax.ext.LexicalHandler;
  @@ -37,7 +34,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/02/12 14:17:49 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:09:55 $
    */
   public class DOMStreamer extends AbstractXMLProducer {
   
  @@ -191,7 +188,7 @@
                   if (raw.length()>5) prefix=raw.substring(6);
                   nslist.addElement(prefix);
                   super.contentHandler.startPrefixMapping(prefix,val);
  -            } 
  +            }
               atts.addAttribute(uri,loc,raw,"CDATA",val);
           }
           // Get and normalize values for the Element
  
  
  
  1.1.2.6   +6 -11     xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/SVGBuilder.java
  
  Index: SVGBuilder.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/SVGBuilder.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- SVGBuilder.java	2001/04/20 20:50:20	1.1.2.5
  +++ SVGBuilder.java	2001/04/25 17:09:56	1.1.2.6
  @@ -9,9 +9,12 @@
   package org.apache.cocoon.xml.dom;
   
   import java.util.Vector;
  -
  +import org.apache.avalon.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;
  @@ -24,25 +27,17 @@
   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 org.apache.avalon.logger.Loggable;
  -import org.apache.log.Logger;
  -
  -import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
  -import org.apache.batik.dom.svg.SVGDOMImplementation;
  -import org.apache.batik.css.CSSDocumentHandler;
  -
   /**
    * The <code>SVGBuilder</code> is a utility class that will generate a
    * SVG-DOM Document from SAX events using Batik's SVGDocumentFactory.
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/20 20:50:20 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:09:56 $
    */
   public class SVGBuilder extends SAXSVGDocumentFactory implements XMLConsumer, Loggable {
       protected Logger log;
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +6 -7      xml-cocoon/src/org/apache/cocoon/xml/xlink/Attic/ExtendedXLinkPipe.java
  
  Index: ExtendedXLinkPipe.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/xlink/Attic/ExtendedXLinkPipe.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- ExtendedXLinkPipe.java	2000/10/01 00:16:45	1.1.2.2
  +++ ExtendedXLinkPipe.java	2001/04/25 17:10:01	1.1.2.3
  @@ -8,12 +8,11 @@
   
   package org.apache.cocoon.xml.xlink;
   
  -import org.xml.sax.SAXException;
  +import org.apache.cocoon.xml.AbstractXMLPipe;
   import org.xml.sax.Attributes;
  +import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  -import org.apache.cocoon.xml.AbstractXMLPipe;
  -
   /**
    * This class extends the XLink semantic capabilities to understand those
    * elements that are have default linking semantics associated.
  @@ -22,13 +21,13 @@
    * the semantics of XHTML/WML/SMIL/SVG and all the rest of the languages that
    * use either XLink of the above attributes.
    *
  - * NOTE: this class is clearly a hack and is not future compatible, but 
  + * NOTE: this class is clearly a hack and is not future compatible, but
    * since many XML formats to date are not compatible with the XLink semantics
    * this is what we have to do to live in the bleeding edge. Once there will
    * 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.2.2 $ $Date: 2000/10/01 00:16:45 $
  + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/25 17:10:01 $
    */
   
   public abstract class ExtendedXLinkPipe extends XLinkPipe {
  @@ -40,13 +39,13 @@
               simpleLink(href, null, null, null, null, null, uri, name, raw, attr);
               return;
           }
  -        
  +
           String src = attr.getValue(uri, "src");
           if (src != null) {
               simpleLink(src, null, null, null, null, null, uri, name, raw, attr);
               return;
           }
  -        
  +
           super.startElement(uri, name, raw, attr);
       }
   
  
  
  
  1.1.2.3   +125 -126  xml-cocoon/src/org/apache/cocoon/xml/xlink/Attic/XLinkPipe.java
  
  Index: XLinkPipe.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/xlink/Attic/XLinkPipe.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- XLinkPipe.java	2000/10/01 00:16:05	1.1.2.2
  +++ XLinkPipe.java	2001/04/25 17:10:03	1.1.2.3
  @@ -8,12 +8,11 @@
   
   package org.apache.cocoon.xml.xlink;
   
  -import org.xml.sax.SAXException;
  +import org.apache.cocoon.xml.AbstractXMLPipe;
   import org.xml.sax.Attributes;
  +import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  -import org.apache.cocoon.xml.AbstractXMLPipe;
  -
   /**
    * This class implements a SAX consumer wrapper that transforms the
    * general SAX semantic into XLink semantics for easier consumption.
  @@ -24,28 +23,28 @@
    * NOTE: this is based on XLink W3C Candidate Recommendation 3 July 2000
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/10/01 00:16:05 $
  + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/25 17:10:03 $
    */
  - 
  +
   public abstract class XLinkPipe extends AbstractXMLPipe implements XLinkHandler {
   
  -	public static final String XLINK_NAMESPACE_URI = "http://www.w3.org/1999/xlink";
  -	public static final String XLINK_TYPE          = "type";
  -	public static final String XLINK_HREF          = "href";
  -	public static final String XLINK_ROLE          = "role";
  -	public static final String XLINK_ARCROLE       = "arcrole";
  -	public static final String XLINK_TITLE         = "title";
  -	public static final String XLINK_SHOW          = "show";
  -	public static final String XLINK_ACTUATE       = "actuate";
  -	public static final String XLINK_LABEL         = "label";
  -	public static final String XLINK_FROM          = "from";
  -	public static final String XLINK_TO            = "to";
  -	public static final String XLINK_TYPE_SIMPLE   = "simple";
  -	public static final String XLINK_TYPE_EXTENDED = "extended";
  -	public static final String XLINK_TYPE_LOCATOR  = "locator";
  -	public static final String XLINK_TYPE_ARC      = "arc";
  -	public static final String XLINK_TYPE_RESOURCE = "resource";
  -	public static final String XLINK_TYPE_TITLE    = "title";
  +        public static final String XLINK_NAMESPACE_URI = "http://www.w3.org/1999/xlink";
  +        public static final String XLINK_TYPE          = "type";
  +        public static final String XLINK_HREF          = "href";
  +        public static final String XLINK_ROLE          = "role";
  +        public static final String XLINK_ARCROLE       = "arcrole";
  +        public static final String XLINK_TITLE         = "title";
  +        public static final String XLINK_SHOW          = "show";
  +        public static final String XLINK_ACTUATE       = "actuate";
  +        public static final String XLINK_LABEL         = "label";
  +        public static final String XLINK_FROM          = "from";
  +        public static final String XLINK_TO            = "to";
  +        public static final String XLINK_TYPE_SIMPLE   = "simple";
  +        public static final String XLINK_TYPE_EXTENDED = "extended";
  +        public static final String XLINK_TYPE_LOCATOR  = "locator";
  +        public static final String XLINK_TYPE_ARC      = "arc";
  +        public static final String XLINK_TYPE_RESOURCE = "resource";
  +        public static final String XLINK_TYPE_TITLE    = "title";
   
       private String extendedLinkElementName = null;
       private String extendedLinkElementURI = null;
  @@ -53,113 +52,113 @@
       private String linkLocatorElementURI = null;
       private String linkArcElementName = null;
       private String linkArcElementURI = null;
  -    
  -	public void startElement(String uri, String name, String raw, Attributes attr) throws SAXException {
  -		String type = attr.getValue(XLINK_NAMESPACE_URI, XLINK_TYPE);
  -		if (type != null) {
  -		    if (type.equals(XLINK_TYPE_SIMPLE)) {
  -		        if (this.extendedLinkElementName != null) {
  -		            throw new SAXException("An XLink simple link cannot be included into an 'extended' element");
  -		        } else if (this.linkLocatorElementName != null) {
  -		            throw new SAXException("An XLink simple link cannot be included into a 'locator' element");
  -		        } else if (this.linkArcElementName != null) {
  -		            throw new SAXException("An XLink simple link cannot be included into an 'arc' element");
  -		        }
  -		        String href    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_HREF);
  -		        String role    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_ROLE);
  -		        String arcrole = attr.getValue(XLINK_NAMESPACE_URI, XLINK_ARCROLE);
  -		        String title   = attr.getValue(XLINK_NAMESPACE_URI, XLINK_TITLE);
  -		        String show    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_SHOW);
  -		        String actuate = attr.getValue(XLINK_NAMESPACE_URI, XLINK_ACTUATE);
  -		        simpleLink(href, role, arcrole, title, show, actuate, uri, name, raw, attr);
  -		    } else if (type.equals(XLINK_TYPE_EXTENDED)) {
  -		        if (this.extendedLinkElementName != null) {
  -		            throw new SAXException("An XLink extended link cannot include another 'extended' element");
  -		        } else if (this.linkLocatorElementName != null) {
  -		            throw new SAXException("An XLink extended link cannot be included into a 'locator' element");
  -		        } else if (this.linkArcElementName != null) {
  -		            throw new SAXException("An XLink extended link cannot be included into an 'arc' element");
  -		        }
  -		        String role    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_ROLE);
  -		        String title   = attr.getValue(XLINK_NAMESPACE_URI, XLINK_TITLE);
  -		        this.extendedLinkElementName = name;
  -		        this.extendedLinkElementURI = uri;
  -		        startExtendedLink(role, title, uri, name, raw, attr);
  -		    } else if (type.equals(XLINK_TYPE_LOCATOR)) {
  +
  +        public void startElement(String uri, String name, String raw, Attributes attr) throws SAXException {
  +                String type = attr.getValue(XLINK_NAMESPACE_URI, XLINK_TYPE);
  +                if (type != null) {
  +                    if (type.equals(XLINK_TYPE_SIMPLE)) {
  +                        if (this.extendedLinkElementName != null) {
  +                            throw new SAXException("An XLink simple link cannot be included into an 'extended' element");
  +                        } else if (this.linkLocatorElementName != null) {
  +                            throw new SAXException("An XLink simple link cannot be included into a 'locator' element");
  +                        } else if (this.linkArcElementName != null) {
  +                            throw new SAXException("An XLink simple link cannot be included into an 'arc' element");
  +                        }
  +                        String href    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_HREF);
  +                        String role    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_ROLE);
  +                        String arcrole = attr.getValue(XLINK_NAMESPACE_URI, XLINK_ARCROLE);
  +                        String title   = attr.getValue(XLINK_NAMESPACE_URI, XLINK_TITLE);
  +                        String show    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_SHOW);
  +                        String actuate = attr.getValue(XLINK_NAMESPACE_URI, XLINK_ACTUATE);
  +                        simpleLink(href, role, arcrole, title, show, actuate, uri, name, raw, attr);
  +                    } else if (type.equals(XLINK_TYPE_EXTENDED)) {
  +                        if (this.extendedLinkElementName != null) {
  +                            throw new SAXException("An XLink extended link cannot include another 'extended' element");
  +                        } else if (this.linkLocatorElementName != null) {
  +                            throw new SAXException("An XLink extended link cannot be included into a 'locator' element");
  +                        } else if (this.linkArcElementName != null) {
  +                            throw new SAXException("An XLink extended link cannot be included into an 'arc' element");
  +                        }
  +                        String role    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_ROLE);
  +                        String title   = attr.getValue(XLINK_NAMESPACE_URI, XLINK_TITLE);
  +                        this.extendedLinkElementName = name;
  +                        this.extendedLinkElementURI = uri;
  +                        startExtendedLink(role, title, uri, name, raw, attr);
  +                    } else if (type.equals(XLINK_TYPE_LOCATOR)) {
                   if (this.extendedLinkElementName == null) {
  -		            throw new SAXException("An XLink locator must be included into an 'extended' element");
  +                            throw new SAXException("An XLink locator must be included into an 'extended' element");
                   } else if (this.linkLocatorElementName != null) {
  -		            throw new SAXException("An XLink locator  cannot be included into another 'locator' element");
  -		        } else if (this.linkArcElementName != null) {
  -		            throw new SAXException("An XLink locator cannot be included into an 'arc' element");
  -		        }
  -		        String href    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_HREF);
  -		        String role    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_ROLE);
  -		        String title   = attr.getValue(XLINK_NAMESPACE_URI, XLINK_TITLE);
  -		        String label   = attr.getValue(XLINK_NAMESPACE_URI, XLINK_LABEL);
  -		        this.linkLocatorElementName = name;
  -		        this.linkLocatorElementURI = uri;
  -		        startLocator(href, role, title, label, uri, name, raw, attr);
  -		    } else if (type.equals(XLINK_TYPE_ARC)) {
  +                            throw new SAXException("An XLink locator  cannot be included into another 'locator' element");
  +                        } else if (this.linkArcElementName != null) {
  +                            throw new SAXException("An XLink locator cannot be included into an 'arc' element");
  +                        }
  +                        String href    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_HREF);
  +                        String role    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_ROLE);
  +                        String title   = attr.getValue(XLINK_NAMESPACE_URI, XLINK_TITLE);
  +                        String label   = attr.getValue(XLINK_NAMESPACE_URI, XLINK_LABEL);
  +                        this.linkLocatorElementName = name;
  +                        this.linkLocatorElementURI = uri;
  +                        startLocator(href, role, title, label, uri, name, raw, attr);
  +                    } else if (type.equals(XLINK_TYPE_ARC)) {
                   if (this.extendedLinkElementName == null) {
  -		            throw new SAXException("An XLink arc must be included into an 'extended' element");
  +                            throw new SAXException("An XLink arc must be included into an 'extended' element");
                   } else if (this.linkLocatorElementName != null) {
  -		            throw new SAXException("An XLink arc cannot be included into a 'locator' element");
  -		        } else if (this.linkArcElementName != null) {
  -		            throw new SAXException("An XLink arc cannot be included into another 'arc' element");
  -		        }
  -		        String arcrole = attr.getValue(XLINK_NAMESPACE_URI, XLINK_ARCROLE);
  -		        String title   = attr.getValue(XLINK_NAMESPACE_URI, XLINK_TITLE);
  -		        String show    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_SHOW);
  -		        String actuate = attr.getValue(XLINK_NAMESPACE_URI, XLINK_ACTUATE);
  -		        String from    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_FROM);
  -		        String to      = attr.getValue(XLINK_NAMESPACE_URI, XLINK_TO);
  -		        this.linkArcElementName = name;
  -		        this.linkArcElementURI = uri;
  -		        startArc(arcrole, title, show, actuate, from, to, uri, name, raw, attr);
  -		    } else if (type.equals(XLINK_TYPE_RESOURCE)) {
  +                            throw new SAXException("An XLink arc cannot be included into a 'locator' element");
  +                        } else if (this.linkArcElementName != null) {
  +                            throw new SAXException("An XLink arc cannot be included into another 'arc' element");
  +                        }
  +                        String arcrole = attr.getValue(XLINK_NAMESPACE_URI, XLINK_ARCROLE);
  +                        String title   = attr.getValue(XLINK_NAMESPACE_URI, XLINK_TITLE);
  +                        String show    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_SHOW);
  +                        String actuate = attr.getValue(XLINK_NAMESPACE_URI, XLINK_ACTUATE);
  +                        String from    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_FROM);
  +                        String to      = attr.getValue(XLINK_NAMESPACE_URI, XLINK_TO);
  +                        this.linkArcElementName = name;
  +                        this.linkArcElementURI = uri;
  +                        startArc(arcrole, title, show, actuate, from, to, uri, name, raw, attr);
  +                    } else if (type.equals(XLINK_TYPE_RESOURCE)) {
                   if (this.extendedLinkElementName == null) {
  -		            throw new SAXException("An XLink resource must be included into an 'extended' element");
  -		        }
  -		        String role    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_ROLE);
  -		        String title   = attr.getValue(XLINK_NAMESPACE_URI, XLINK_TITLE);
  -		        String label   = attr.getValue(XLINK_NAMESPACE_URI, XLINK_LABEL);
  -		        linkResource(role, title, label, uri, name, raw, attr);
  -		    } else if (type.equals(XLINK_TYPE_TITLE)) {
  -                if ((this.extendedLinkElementName == null) 
  -                  && (this.linkLocatorElementName == null) 
  +                            throw new SAXException("An XLink resource must be included into an 'extended' element");
  +                        }
  +                        String role    = attr.getValue(XLINK_NAMESPACE_URI, XLINK_ROLE);
  +                        String title   = attr.getValue(XLINK_NAMESPACE_URI, XLINK_TITLE);
  +                        String label   = attr.getValue(XLINK_NAMESPACE_URI, XLINK_LABEL);
  +                        linkResource(role, title, label, uri, name, raw, attr);
  +                    } else if (type.equals(XLINK_TYPE_TITLE)) {
  +                if ((this.extendedLinkElementName == null)
  +                  && (this.linkLocatorElementName == null)
                     && (this.linkArcElementName == null)) {
  -		            throw new SAXException("An XLink title must be included into an 'extended', 'locator' or 'arc' element");
  -		        }
  -		        linkTitle(uri, name, raw, attr);
  -		    } else {
  +                            throw new SAXException("An XLink title must be included into an 'extended', 'locator' or 'arc' element");
  +                        }
  +                        linkTitle(uri, name, raw, attr);
  +                    } else {
                   super.startElement(uri, name, raw, attr);
               }
  -		} else {
  +                } else {
               super.startElement(uri, name, raw, attr);
           }
  -	}
  +        }
   
  -	public void endElement(String uri, String name, String raw) throws SAXException {
  -	    if ((name.equals(this.extendedLinkElementName)) && (uri.equals(this.extendedLinkElementURI))) {
  -	        this.extendedLinkElementName = null;
  -	        this.extendedLinkElementURI = null;
  -	        this.endExtendedLink(uri, name, raw);
  -	    } else if ((name.equals(this.linkLocatorElementName)) && (uri.equals(this.linkLocatorElementURI))) {
  -	        this.linkLocatorElementName = null;
  -	        this.linkLocatorElementURI = null;
  -	        this.endLocator(uri, name, raw);
  -	    } else if ((name.equals(this.linkArcElementName)) && (uri.equals(this.linkArcElementURI))) {
  -	        this.linkArcElementName = null;
  -	        this.linkArcElementURI = null;
  -	        this.endArc(uri, name, raw);
  -	    } else {
  -	        super.endElement(uri, name, raw);
  -	    }
  -	}
  +        public void endElement(String uri, String name, String raw) throws SAXException {
  +            if ((name.equals(this.extendedLinkElementName)) && (uri.equals(this.extendedLinkElementURI))) {
  +                this.extendedLinkElementName = null;
  +                this.extendedLinkElementURI = null;
  +                this.endExtendedLink(uri, name, raw);
  +            } else if ((name.equals(this.linkLocatorElementName)) && (uri.equals(this.linkLocatorElementURI))) {
  +                this.linkLocatorElementName = null;
  +                this.linkLocatorElementURI = null;
  +                this.endLocator(uri, name, raw);
  +            } else if ((name.equals(this.linkArcElementName)) && (uri.equals(this.linkArcElementURI))) {
  +                this.linkArcElementName = null;
  +                this.linkArcElementURI = null;
  +                this.endArc(uri, name, raw);
  +            } else {
  +                super.endElement(uri, name, raw);
  +            }
  +        }
   
       // Default XLinkHandler implementation (defaults to copy over)
  -    
  +
       public void simpleLink(String href, String role, String arcrole, String title, String show, String actuate, String uri, String name, String raw, Attributes attr) throws SAXException {
           AttributesImpl newattr = new AttributesImpl(attr);
           int hrefIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_HREF);
  @@ -167,7 +166,7 @@
           int arcroleIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_ARCROLE);
           int titleIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_TITLE);
           int showIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_SHOW);
  -        int actuateIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_ACTUATE); 
  +        int actuateIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_ACTUATE);
           if (hrefIndex > -1) newattr.setValue(hrefIndex, href);
           if (roleIndex > -1) newattr.setValue(roleIndex, role);
           if (arcroleIndex > -1) newattr.setValue(arcroleIndex, arcrole);
  @@ -185,7 +184,7 @@
           if (titleIndex > -1) newattr.setValue(titleIndex, title);
           super.startElement(uri, name, raw, newattr);
       }
  -    
  +
       public void startLocator(String href, String role, String title, String label, String uri, String name, String raw, Attributes attr) throws SAXException {
           AttributesImpl newattr = new AttributesImpl(attr);
           int hrefIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_HREF);
  @@ -204,9 +203,9 @@
           int arcroleIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_ARCROLE);
           int titleIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_TITLE);
           int showIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_SHOW);
  -        int actuateIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_ACTUATE); 
  -        int fromIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_FROM); 
  -        int toIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_TO); 
  +        int actuateIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_ACTUATE);
  +        int fromIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_FROM);
  +        int toIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_TO);
           if (arcroleIndex > -1) newattr.setValue(arcroleIndex, arcrole);
           if (titleIndex > -1) newattr.setValue(titleIndex, title);
           if (showIndex > -1) newattr.setValue(showIndex, show);
  @@ -215,7 +214,7 @@
           if (toIndex > -1) newattr.setValue(actuateIndex, to);
           super.startElement(uri, name, raw, newattr);
       }
  -    
  +
       public void linkResource(String role, String title, String label, String uri, String name, String raw, Attributes attr) throws SAXException {
           AttributesImpl newattr = new AttributesImpl(attr);
           int roleIndex = attr.getIndex(XLINK_NAMESPACE_URI, XLINK_ROLE);
  @@ -226,19 +225,19 @@
           if (labelIndex > -1) newattr.setValue(labelIndex, label);
           super.startElement(uri, name, raw, newattr);
       }
  -    
  +
       public void linkTitle(String uri, String name, String raw, Attributes attr) throws SAXException {
           super.startElement(uri, name, raw, attr);
       }
  -    
  +
       public void endExtendedLink(String uri, String name, String raw) throws SAXException {
           super.endElement(uri, name, raw);
       }
  -    
  +
       public void endLocator(String uri, String name, String raw) throws SAXException {
           super.endElement(uri, name, raw);
       }
  -    
  +
       public void endArc(String uri, String name, String raw) throws SAXException {
           super.endElement(uri, name, raw);
       }
  
  
  

----------------------------------------------------------------------
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