cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: xml-cocoon2/src/org/apache/cocoon/xml AbstractXMLPipe.java AbstractXMLProducer.java
Date Thu, 10 May 2001 21:17:10 GMT
bloritsch    01/05/10 14:17:10

  Modified:    src/org/apache/cocoon/components/language/markup/xsp
                        XSPGenerator.java
               src/org/apache/cocoon/components/parser JaxpParser.java
               src/org/apache/cocoon/components/pipeline
                        CachingEventPipeline.java
                        NonCachingEventPipeline.java
               src/org/apache/cocoon/generation DirectoryGenerator.java
                        FileGenerator.java FragmentExtractorGenerator.java
                        HTMLGenerator.java JspGenerator.java
                        PhpGenerator.java RequestGenerator.java
                        ScriptGenerator.java ServerPagesGenerator.java
                        StatusGenerator.java VelocityGenerator.java
               src/org/apache/cocoon/sitemap ErrorNotifier.java
               src/org/apache/cocoon/transformation
                        XIncludeTransformer.java XTTransformer.java
               src/org/apache/cocoon/xml AbstractXMLPipe.java
                        AbstractXMLProducer.java
  Log:
  Delay marking classes Recyclable until the final class.  Perfect example:
  AbstractXMLProducer was marked Recyclable, and Parser extended from
  it.  Unfortunately, JaxpParser has not proven itself stable as a Recyclable.
  Excalibur complains loudly if the class implements multiple lifestyle interfaces.
  JaxpParser is now SingleThreaded (created for each request).
  
  Revision  Changes    Path
  1.2       +3 -3      xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java
  
  Index: XSPGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XSPGenerator.java	2001/05/09 20:49:52	1.1
  +++ XSPGenerator.java	2001/05/10 21:16:41	1.2
  @@ -15,15 +15,15 @@
   import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.generation.AbstractServerPage;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   
   /**
    * Base class for XSP-generated <code>ServerPagesGenerator</code> classes
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:52 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:41 $
    */
  -public abstract class XSPGenerator extends AbstractServerPage implements CompiledComponent,
Contextualizable, Poolable {
  +public abstract class XSPGenerator extends AbstractServerPage implements CompiledComponent,
Contextualizable, Recyclable {
     protected Context avalonContext = null;
   
     /** Contextualize this class */
  
  
  
  1.2       +3 -2      xml-cocoon2/src/org/apache/cocoon/components/parser/JaxpParser.java
  
  Index: JaxpParser.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/parser/JaxpParser.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JaxpParser.java	2001/05/09 20:49:57	1.1
  +++ JaxpParser.java	2001/05/10 21:16:43	1.2
  @@ -22,16 +22,17 @@
   import org.xml.sax.SAXException;
   import org.xml.sax.SAXParseException;
   import org.xml.sax.XMLReader;
  +import org.apache.avalon.framework.thread.SingleThreaded;
   
   /**
    * 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 $ $Date: 2001/05/09 20:49:57 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:43 $
    */
   public class JaxpParser extends AbstractXMLProducer
  -implements Parser, ErrorHandler {
  +implements Parser, ErrorHandler, SingleThreaded {
   
       final SAXParserFactory factory = SAXParserFactory.newInstance();
       final DocumentBuilderFactory docfactory = DocumentBuilderFactory.newInstance();
  
  
  
  1.2       +3 -2      xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java
  
  Index: CachingEventPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CachingEventPipeline.java	2001/05/09 20:49:47	1.1
  +++ CachingEventPipeline.java	2001/05/10 21:16:45	1.2
  @@ -18,6 +18,7 @@
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.Processor;
   import org.apache.cocoon.Roles;
  @@ -52,11 +53,11 @@
    * 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 $ $Date: 2001/05/09 20:49:47 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:45 $
    */
   public final class CachingEventPipeline
   extends AbstractEventPipeline
  -implements Disposable, CacheableEventPipeline {
  +implements Disposable, CacheableEventPipeline, Recyclable {
   
       /** The store for the cached sax events */
       private EventCache eventCache;
  
  
  
  1.2       +3 -2      xml-cocoon2/src/org/apache/cocoon/components/pipeline/NonCachingEventPipeline.java
  
  Index: NonCachingEventPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/NonCachingEventPipeline.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NonCachingEventPipeline.java	2001/05/09 20:49:48	1.1
  +++ NonCachingEventPipeline.java	2001/05/10 21:16:46	1.2
  @@ -15,6 +15,7 @@
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.Processor;
   import org.apache.cocoon.Roles;
  @@ -31,9 +32,9 @@
   
   /**
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:48 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:46 $
    */
  -public class NonCachingEventPipeline extends AbstractEventPipeline {
  +public class NonCachingEventPipeline extends AbstractEventPipeline implements Recyclable
{
   
       public void recycle() {
           getLogger().debug("Recycling of NonCachingEventPipeline");
  
  
  
  1.2       +3 -3      xml-cocoon2/src/org/apache/cocoon/generation/DirectoryGenerator.java
  
  Index: DirectoryGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/DirectoryGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DirectoryGenerator.java	2001/05/09 20:49:40	1.1
  +++ DirectoryGenerator.java	2001/05/10 21:16:49	1.2
  @@ -21,7 +21,7 @@
   import org.apache.cocoon.ResourceNotFoundException;
   import org.apache.cocoon.Roles;
   import org.apache.cocoon.components.url.URLFactory;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.regexp.RE;
   import org.apache.regexp.RESyntaxException;
   import org.xml.sax.EntityResolver;
  @@ -64,9 +64,9 @@
    *         (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 $ $Date: 2001/05/09 20:49:40 $ */
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:49 $ */
   
  -public class DirectoryGenerator extends ComposerGenerator implements Poolable {
  +public class DirectoryGenerator extends ComposerGenerator implements Recyclable {
   
       /** The URI of the namespace of this generator. */
       protected static final String URI =
  
  
  
  1.2       +3 -3      xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java
  
  Index: FileGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FileGenerator.java	2001/05/09 20:49:41	1.1
  +++ FileGenerator.java	2001/05/10 21:16:50	1.2
  @@ -23,7 +23,7 @@
   import org.apache.cocoon.caching.TimeStampCacheValidity;
   import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.util.HashUtil;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.xml.sax.EntityResolver;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  @@ -38,10 +38,10 @@
    * @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 $ $Date: 2001/05/09 20:49:41 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:50 $
    */
   public class FileGenerator extends ComposerGenerator
  -implements Cacheable, Poolable {
  +implements Cacheable, Recyclable {
   
       /** The input source */
       private InputSource inputSource;
  
  
  
  1.2       +3 -3      xml-cocoon2/src/org/apache/cocoon/generation/FragmentExtractorGenerator.java
  
  Index: FragmentExtractorGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/FragmentExtractorGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FragmentExtractorGenerator.java	2001/05/09 20:49:41	1.1
  +++ FragmentExtractorGenerator.java	2001/05/10 21:16:50	1.2
  @@ -23,7 +23,7 @@
   import org.apache.cocoon.generation.AbstractGenerator;
   import org.apache.cocoon.util.HashUtil;
   import org.apache.cocoon.xml.dom.DOMStreamer;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.w3c.dom.Document;
   import org.xml.sax.EntityResolver;
   import org.xml.sax.SAXException;
  @@ -38,10 +38,10 @@
    * 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 $ $Date: 2001/05/09 20:49:41 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:50 $
    */
   public class FragmentExtractorGenerator extends AbstractGenerator
  -        implements Poolable, Cacheable {
  +        implements Recyclable, Cacheable {
   
       /** The fragment store. */
       private static Map fragmentStore = new HashMap();
  
  
  
  1.2       +3 -3      xml-cocoon2/src/org/apache/cocoon/generation/HTMLGenerator.java
  
  Index: HTMLGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/HTMLGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HTMLGenerator.java	2001/05/09 20:49:41	1.1
  +++ HTMLGenerator.java	2001/05/10 21:16:51	1.2
  @@ -15,7 +15,7 @@
   import java.io.IOException;
   import java.net.URL;
   import java.util.Map;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.excalibur.pool.Poolable;
  @@ -37,9 +37,9 @@
   /**
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:41 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:51 $
    */
  -public class HTMLGenerator extends ComposerGenerator implements Cacheable, Poolable {
  +public class HTMLGenerator extends ComposerGenerator implements Cacheable, Recyclable {
   
       /** The system ID of the input source */
       private String      systemID;
  
  
  
  1.2       +3 -3      xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java
  
  Index: JspGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JspGenerator.java	2001/05/09 20:49:41	1.1
  +++ JspGenerator.java	2001/05/10 21:16:51	1.2
  @@ -37,7 +37,7 @@
   import org.apache.cocoon.environment.http.HttpEnvironment;
   import org.apache.cocoon.xml.AbstractXMLProducer;
   import org.apache.cocoon.xml.XMLProducer;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.log.Logger;
   import org.xml.sax.EntityResolver;
   import org.xml.sax.InputSource;
  @@ -49,9 +49,9 @@
    * results into SAX events.
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:41 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:51 $
    */
  -public class JspGenerator extends ServletGenerator implements Poolable {
  +public class JspGenerator extends ServletGenerator implements Recyclable {
   
       public static final String INC_SERVLET_PATH = "javax.servlet.include.servlet_path";
   
  
  
  
  1.2       +3 -3      xml-cocoon2/src/org/apache/cocoon/generation/PhpGenerator.java
  
  Index: PhpGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/PhpGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PhpGenerator.java	2001/05/09 20:49:42	1.1
  +++ PhpGenerator.java	2001/05/10 21:16:52	1.2
  @@ -28,7 +28,7 @@
   import org.apache.cocoon.environment.http.HttpEnvironment;
   import org.apache.cocoon.xml.AbstractXMLProducer;
   import org.apache.cocoon.xml.XMLProducer;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.log.Logger;
   import org.xml.sax.EntityResolver;
   import org.xml.sax.InputSource;
  @@ -40,9 +40,9 @@
    * results into SAX events.
    *
    * @author <a href="mailto:rubys@us.ibm.com">Sam Ruby</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:42 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:52 $
    */
  -public class PhpGenerator extends ServletGenerator implements Poolable {
  +public class PhpGenerator extends ServletGenerator implements Recyclable {
   
       /**
        * Stub implementation of Servlet Config
  
  
  
  1.2       +3 -3      xml-cocoon2/src/org/apache/cocoon/generation/RequestGenerator.java
  
  Index: RequestGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/RequestGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RequestGenerator.java	2001/05/09 20:49:42	1.1
  +++ RequestGenerator.java	2001/05/10 21:16:53	1.2
  @@ -11,7 +11,7 @@
   import java.util.Iterator;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Request;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  @@ -20,9 +20,9 @@
    * @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 $ $Date: 2001/05/09 20:49:42 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:53 $
    */
  -public class RequestGenerator extends ServletGenerator implements Poolable {
  +public class RequestGenerator extends ServletGenerator implements Recyclable {
   
       /** The URI of the namespace of this generator. */
       private String URI="http://xml.apache.org/cocoon/2.0/RequestGenerator";
  
  
  
  1.2       +3 -2      xml-cocoon2/src/org/apache/cocoon/generation/ScriptGenerator.java
  
  Index: ScriptGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ScriptGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ScriptGenerator.java	2001/05/09 20:49:42	1.1
  +++ ScriptGenerator.java	2001/05/10 21:16:53	1.2
  @@ -19,6 +19,7 @@
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.Roles;
   import org.apache.cocoon.components.parser.Parser;
  @@ -30,9 +31,9 @@
    * 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 $ $Date: 2001/05/09 20:49:42 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:53 $
    */
  -public class ScriptGenerator extends ComposerGenerator {
  +public class ScriptGenerator extends ComposerGenerator implements Recyclable {
   
       public void configure(Configuration conf) throws ConfigurationException {
           // TODO: figure out what configure might be good for
  
  
  
  1.2       +2 -3      xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java
  
  Index: ServerPagesGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServerPagesGenerator.java	2001/05/09 20:49:42	1.1
  +++ ServerPagesGenerator.java	2001/05/10 21:16:54	1.2
  @@ -32,7 +32,6 @@
   import org.apache.cocoon.components.language.markup.xsp.XSPGenerator;
   import org.apache.cocoon.components.url.URLFactory;
   import org.apache.cocoon.util.HashUtil;
  -import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.avalon.excalibur.pool.Recyclable;
   import org.xml.sax.Attributes;
   import org.xml.sax.ContentHandler;
  @@ -47,11 +46,11 @@
    * delegating actual SAX event generation.
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:42 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:54 $
    */
   public class ServerPagesGenerator
     extends ServletGenerator
  -  implements ContentHandler, LexicalHandler, Recyclable, Disposable, Cacheable, Poolable
  +  implements ContentHandler, LexicalHandler, Recyclable, Disposable, Cacheable
   {
     /**
      * The sitemap-defined server pages program generator
  
  
  
  1.2       +3 -3      xml-cocoon2/src/org/apache/cocoon/generation/StatusGenerator.java
  
  Index: StatusGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/StatusGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StatusGenerator.java	2001/05/09 20:49:42	1.1
  +++ StatusGenerator.java	2001/05/10 21:16:54	1.2
  @@ -16,7 +16,7 @@
   import java.util.Date;
   import java.util.List;
   import java.util.StringTokenizer;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.xml.sax.Attributes;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.SAXException;
  @@ -48,9 +48,9 @@
    *
    * @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 $ $Date: 2001/05/09 20:49:42 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:54 $
    */
  -public class StatusGenerator extends ComposerGenerator implements Poolable {
  +public class StatusGenerator extends ComposerGenerator implements Recyclable {
   
       /** The XML namespace for the output document.
        */
  
  
  
  1.2       +3 -3      xml-cocoon2/src/org/apache/cocoon/generation/VelocityGenerator.java
  
  Index: VelocityGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/VelocityGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- VelocityGenerator.java	2001/05/09 20:49:42	1.1
  +++ VelocityGenerator.java	2001/05/10 21:16:55	1.2
  @@ -18,7 +18,7 @@
   import org.apache.cocoon.ResourceNotFoundException;
   import org.apache.cocoon.Roles;
   import org.apache.cocoon.components.parser.Parser;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.velocity.VelocityContext;
   import org.apache.velocity.app.Velocity;
   import org.xml.sax.InputSource;
  @@ -26,9 +26,9 @@
   
   /**
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:42 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:55 $
    */
  -public class VelocityGenerator extends ServletGenerator implements Poolable {
  +public class VelocityGenerator extends ServletGenerator implements Recyclable {
   
       /** Flag for checking initialization */
       private static boolean initVelocity = false;
  
  
  
  1.2       +3 -3      xml-cocoon2/src/org/apache/cocoon/sitemap/ErrorNotifier.java
  
  Index: ErrorNotifier.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/ErrorNotifier.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ErrorNotifier.java	2001/05/09 20:49:36	1.1
  +++ ErrorNotifier.java	2001/05/10 21:17:02	1.2
  @@ -9,7 +9,7 @@
   
   import java.util.Enumeration;
   import java.util.Hashtable;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.cocoon.Notification;
   import org.apache.cocoon.Notifier;
   import org.apache.cocoon.generation.ComposerGenerator;
  @@ -22,9 +22,9 @@
    * @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 $ $Date: 2001/05/09 20:49:36 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:17:02 $
    */
  -public class ErrorNotifier extends ComposerGenerator {
  +public class ErrorNotifier extends ComposerGenerator implements Recyclable {
   
       /**
        * The <code>Notification</code> to report.
  
  
  
  1.2       +3 -3      xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java
  
  Index: XIncludeTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XIncludeTransformer.java	2001/05/09 20:49:35	1.1
  +++ XIncludeTransformer.java	2001/05/10 21:17:04	1.2
  @@ -33,7 +33,7 @@
   import org.apache.cocoon.xml.XIncludeContentHandler;
   import org.apache.cocoon.xml.dom.DOMBuilder;
   import org.apache.cocoon.xml.dom.DOMStreamer;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.xpath.XPathAPI;
   import org.w3c.dom.Document;
   import org.w3c.dom.Node;
  @@ -54,9 +54,9 @@
    * by the SAX event FSM yet.
    *
    * @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:35 $ $Author: giacomo $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:17:04 $ $Author: bloritsch $
    */
  -public class XIncludeTransformer extends AbstractTransformer implements Composable, Poolable,
Disposable {
  +public class XIncludeTransformer extends AbstractTransformer implements Composable, Recyclable,
Disposable {
   
       protected URLFactory urlFactory;
   
  
  
  
  1.2       +3 -3      xml-cocoon2/src/org/apache/cocoon/transformation/XTTransformer.java
  
  Index: XTTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/XTTransformer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XTTransformer.java	2001/05/09 20:49:35	1.1
  +++ XTTransformer.java	2001/05/10 21:17:05	1.2
  @@ -46,7 +46,7 @@
   import org.apache.cocoon.xml.DocumentHandlerAdapter;
   import org.apache.cocoon.xml.DocumentHandlerWrapper;
   import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.avalon.excalibur.pool.Poolable;
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.log.Logger;
   import org.xml.sax.AttributeList;
   import org.xml.sax.ContentHandler;
  @@ -66,10 +66,10 @@
    * This Transformer use the XT processor.
    *
    * @author <a href="mailto:ssahuc@imediation.com">Sahuc Sebastien</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:35 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:17:05 $
    */
   public class XTTransformer extends DocumentHandlerWrapper
  -implements Transformer, Composable, Loggable, Poolable, Disposable {
  +implements Transformer, Composable, Loggable, Recyclable, Disposable {
       private Logger log;
   
       /** The component manager */
  
  
  
  1.2       +3 -2      xml-cocoon2/src/org/apache/cocoon/xml/AbstractXMLPipe.java
  
  Index: AbstractXMLPipe.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/AbstractXMLPipe.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractXMLPipe.java	2001/05/09 20:49:29	1.1
  +++ AbstractXMLPipe.java	2001/05/10 21:17:07	1.2
  @@ -8,6 +8,7 @@
   
   package org.apache.cocoon.xml;
   
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.cocoon.xml.AbstractXMLProducer;
   import org.xml.sax.Attributes;
   import org.xml.sax.ContentHandler;
  @@ -20,9 +21,9 @@
    * handlers and lexical handlers.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:29 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:17:07 $
    */
  -public class AbstractXMLPipe extends AbstractXMLProducer implements XMLPipe {
  +public class AbstractXMLPipe extends AbstractXMLProducer implements XMLPipe, Recyclable
{
   
       /**
        * Receive an object for locating the origin of SAX document events.
  
  
  
  1.2       +2 -3      xml-cocoon2/src/org/apache/cocoon/xml/AbstractXMLProducer.java
  
  Index: AbstractXMLProducer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/AbstractXMLProducer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractXMLProducer.java	2001/05/09 20:49:30	1.1
  +++ AbstractXMLProducer.java	2001/05/10 21:17:08	1.2
  @@ -8,7 +8,6 @@
   package org.apache.cocoon.xml;
   
   import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.ext.LexicalHandler;
   
  @@ -18,9 +17,9 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:30 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:17:08 $
    */
  -public abstract class AbstractXMLProducer extends AbstractLoggable implements XMLProducer,
Recyclable {
  +public abstract class AbstractXMLProducer extends AbstractLoggable implements XMLProducer
{
   
       /** The <code>XMLConsumer</code> receiving SAX events. */
       protected XMLConsumer xmlConsumer;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
For additional commands, email: cocoon-dev-help@xml.apache.org


Mime
View raw message