cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon/generation FileGenerator.java FragmentExtractorGenerator.java HTMLGenerator.java PhpGenerator.java RequestGenerator.java ServerPagesGenerator.java
Date Mon, 19 Feb 2001 21:13:39 GMT
bloritsch    01/02/19 13:13:39

  Modified:    src/org/apache/cocoon/generation Tag: xml-cocoon2
                        FileGenerator.java FragmentExtractorGenerator.java
                        HTMLGenerator.java PhpGenerator.java
                        RequestGenerator.java ServerPagesGenerator.java
  Log:
  Make PoolClient
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.19  +14 -2     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.18
  retrieving revision 1.1.2.19
  diff -u -r1.1.2.18 -r1.1.2.19
  --- FileGenerator.java	2001/02/19 15:58:08	1.1.2.18
  +++ FileGenerator.java	2001/02/19 21:13:30	1.1.2.19
  @@ -31,6 +31,8 @@
   import org.apache.avalon.Configuration;
   import org.apache.avalon.ConfigurationException;
   import org.apache.avalon.Parameters;
  +import org.apache.avalon.util.pool.Pool;
  +import org.apache.cocoon.PoolClient;
   
   /**
    *
  @@ -57,9 +59,9 @@
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:cziegeler@sundn.de">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/02/19 15:58:08 $
  + * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/02/19 21:13:30 $
    */
  -public class FileGenerator extends ComposerGenerator implements ThreadSafe, Configurable
{
  +public class FileGenerator extends ComposerGenerator implements PoolClient, Configurable
{
   
       /** The store service instance */
       private Store store = null;
  @@ -69,6 +71,16 @@
   
       /** The default configuration for useStore */
       private boolean defaultUseStore;
  +
  +    private Pool pool;
  +
  +    public void setPool(Pool pool) {
  +        this.pool = pool;
  +    }
  +
  +    public void returnToPool() {
  +        this.pool.put(this);
  +    }
   
       /**
        * Set the current <code>ComponentManager</code> instance used by this
  
  
  
  1.1.2.4   +14 -3     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.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- FragmentExtractorGenerator.java	2001/02/19 15:58:08	1.1.2.3
  +++ FragmentExtractorGenerator.java	2001/02/19 21:13:31	1.1.2.4
  @@ -5,7 +5,8 @@
   import org.apache.cocoon.generation.AbstractGenerator;
   import org.apache.cocoon.xml.dom.DOMStreamer;
   import org.apache.avalon.Parameters;
  -import org.apache.avalon.ThreadSafe;
  +import org.apache.avalon.util.pool.Pool;
  +import org.apache.cocoon.PoolClient;
   
   import org.xml.sax.EntityResolver;
   import org.xml.sax.SAXException;
  @@ -28,12 +29,22 @@
    * 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.3 $ $Date: 2001/02/19 15:58:08 $
  + * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/02/19 21:13:31 $
    */
  -public class FragmentExtractorGenerator extends AbstractGenerator implements ThreadSafe
{
  +public class FragmentExtractorGenerator extends AbstractGenerator implements PoolClient
{
   
       /** The fragment store. */
       private static Map fragmentStore;
  +
  +    private Pool pool;
  +
  +    public void setPool(Pool pool) {
  +        this.pool = pool;
  +    }
  +
  +    public void returnToPool() {
  +        this.pool.put(this);
  +    }
   
       /** Construct a new <code>FragmentExtractorGenerator</code> and ensure
that the
        * fragment store is initialized and threadsafe (since it is a global store, not
  
  
  
  1.1.2.11  +14 -3     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.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- HTMLGenerator.java	2001/02/19 15:58:08	1.1.2.10
  +++ HTMLGenerator.java	2001/02/19 21:13:32	1.1.2.11
  @@ -7,7 +7,8 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import org.apache.avalon.ThreadSafe;
  +import org.apache.avalon.util.pool.Pool;
  +import org.apache.cocoon.PoolClient;
   import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.components.url.URLFactory;
   import org.apache.cocoon.ProcessingException;
  @@ -29,9 +30,19 @@
   
   /**
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/02/19 15:58:08 $
  + * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/02/19 21:13:32 $
    */
  -public class HTMLGenerator extends ComposerGenerator implements ThreadSafe {
  +public class HTMLGenerator extends ComposerGenerator implements PoolClient {
  +    private Pool pool;
  +
  +    public void setPool(Pool pool) {
  +        this.pool = pool;
  +    }
  +
  +    public void returnToPool() {
  +        this.pool.put(this);
  +    }
  +
       /**
        * Generate XML data.
        */
  
  
  
  1.1.2.13  +14 -3     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.12
  retrieving revision 1.1.2.13
  diff -u -r1.1.2.12 -r1.1.2.13
  --- PhpGenerator.java	2001/02/19 15:58:08	1.1.2.12
  +++ PhpGenerator.java	2001/02/19 21:13:33	1.1.2.13
  @@ -17,7 +17,8 @@
   
   import org.apache.cocoon.components.parser.Parser;
   
  -import org.apache.avalon.ThreadSafe;
  +import org.apache.avalon.util.pool.Pool;
  +import org.apache.cocoon.PoolClient;
   
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  @@ -28,9 +29,19 @@
    * results into SAX events.
    *
    * @author <a href="mailto:rubys@us.ibm.com">Sam Ruby</a>
  - * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/02/19 15:58:08 $
  + * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/02/19 21:13:33 $
    */
  -public class PhpGenerator extends ServletGenerator implements ThreadSafe {
  +public class PhpGenerator extends ServletGenerator implements Poolable {
  +
  +    private Pool pool;
  +
  +    public void setPool(Pool pool) {
  +        this.pool = pool;
  +    }
  +
  +    public void returnToPool() {
  +        this.pool.put(this);
  +    }
   
       /**
        * Stub implementation of Servlet Config
  
  
  
  1.1.2.8   +14 -3     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.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- RequestGenerator.java	2001/02/19 15:58:08	1.1.2.7
  +++ RequestGenerator.java	2001/02/19 21:13:33	1.1.2.8
  @@ -13,19 +13,30 @@
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  -import org.apache.avalon.ThreadSafe;
  +import org.apache.avalon.util.pool.Pool;
  +import org.apache.cocoon.PoolClient;
   
   /**
    *
    * @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.7 $ $Date: 2001/02/19 15:58:08 $
  + * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/02/19 21:13:33 $
    */
  -public class RequestGenerator extends ServletGenerator implements ThreadSafe {
  +public class RequestGenerator extends ServletGenerator implements PoolClient {
   
       /** The URI of the namespace of this generator. */
       private String URI="http://xml.apache.org/cocoon/2.0/RequestGenerator";
  +
  +    private Pool pool;
  +
  +    public void setPool(Pool pool) {
  +        this.pool = pool;
  +    }
  +
  +    public void returnToPool() {
  +        this.pool.put(this);
  +    }
   
       /**
        * Generate XML data.
  
  
  
  1.1.2.19  +14 -3     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.18
  retrieving revision 1.1.2.19
  diff -u -r1.1.2.18 -r1.1.2.19
  --- ServerPagesGenerator.java	2001/02/16 22:07:39	1.1.2.18
  +++ ServerPagesGenerator.java	2001/02/19 21:13:34	1.1.2.19
  @@ -21,7 +21,7 @@
   
   import org.apache.avalon.Composer;
   import org.apache.avalon.ComponentManager;
  -import org.apache.avalon.ThreadSafe;
  +import org.apache.avalon.util.pool.Pool;
   
   import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.components.language.generator.ProgramGenerator;
  @@ -34,6 +34,7 @@
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
   import org.apache.cocoon.Roles;
  +import org.apache.cocoon.PoolClient;
   import org.apache.avalon.Loggable;
   
   /**
  @@ -41,11 +42,11 @@
    * delegating actual SAX event generation.
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/02/16 22:07:39 $
  + * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/02/19 21:13:34 $
    */
   public class ServerPagesGenerator
     extends ServletGenerator
  -  implements ContentHandler, LexicalHandler, ThreadSafe
  +  implements ContentHandler, LexicalHandler, PoolClient
   {
     /**
      * The sitemap-defined server pages program generator
  @@ -53,6 +54,16 @@
     protected static ProgramGenerator programGenerator = null;
   
     protected static URLFactory factory = null;
  +
  +    private Pool pool;
  +
  +    public void setPool(Pool pool) {
  +        this.pool = pool;
  +    }
  +
  +    public void returnToPool() {
  +        this.pool.put(this);
  +    }
   
     /**
      * Set the global component manager. This method sets the sitemap-defined
  
  
  

Mime
View raw message