cziegeler    02/02/07 00:17:53

  Modified:    src/java/org/apache/cocoon/generation
                        DirectoryGenerator.java FileGenerator.java
                        FragmentExtractorGenerator.java HTMLGenerator.java
                        JspGenerator.java PhpGenerator.java
                        RequestGenerator.java ScriptGenerator.java
                        SearchGenerator.java ServerPagesGenerator.java
                        StatusGenerator.java StreamGenerator.java
                        VelocityGenerator.java
                        XMLDBCollectionGenerator.java XMLDBGenerator.java
               src/scratchpad/src/org/apache/cocoon/generation
                        XPathDirectoryGenerator.java
  Log:
  Fixed lifecycle interfaces of generators
  
  Revision  Changes    Path
  1.6       +2 -3      
xml-cocoon2/src/java/org/apache/cocoon/generation/DirectoryGenerator.java
  
  Index: DirectoryGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/DirectoryGenerator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DirectoryGenerator.java   4 Feb 2002 14:23:45 -0000       1.5
  +++ DirectoryGenerator.java   7 Feb 2002 08:17:52 -0000       1.6
  @@ -55,7 +55,6 @@
   
   package org.apache.cocoon.generation;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
  @@ -109,9 +108,9 @@
    *         (Apache Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:[EMAIL PROTECTED]";>Conny Krappatsch</a>
    *         (SMB GmbH) for Virbus AG
  - * @version CVS $Id: DirectoryGenerator.java,v 1.5 2002/02/04 14:23:45 vgritsenko 
Exp $
  + * @version CVS $Id: DirectoryGenerator.java,v 1.6 2002/02/07 08:17:52 cziegeler 
Exp $
    */
  -public class DirectoryGenerator extends ComposerGenerator implements Recyclable {
  +public class DirectoryGenerator extends ComposerGenerator  {
     private static final String FILE = "file:";
   
       /** The URI of the namespace of this generator. */
  
  
  
  1.4       +2 -3      
xml-cocoon2/src/java/org/apache/cocoon/generation/FileGenerator.java
  
  Index: FileGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/FileGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FileGenerator.java        4 Feb 2002 13:15:04 -0000       1.3
  +++ FileGenerator.java        7 Feb 2002 08:17:52 -0000       1.4
  @@ -54,7 +54,6 @@
    */
   package org.apache.cocoon.generation;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.parameters.Parameters;
  @@ -80,10 +79,10 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
  - * @version CVS $Id: FileGenerator.java,v 1.3 2002/02/04 13:15:04 cziegeler Exp $
  + * @version CVS $Id: FileGenerator.java,v 1.4 2002/02/07 08:17:52 cziegeler Exp $
    */
   public class FileGenerator extends ComposerGenerator
  -implements Cacheable, Recyclable {
  +implements Cacheable {
   
       /** The input source */
       protected Source inputSource;
  
  
  
  1.6       +2 -10     
xml-cocoon2/src/java/org/apache/cocoon/generation/FragmentExtractorGenerator.java
  
  Index: FragmentExtractorGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/FragmentExtractorGenerator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FragmentExtractorGenerator.java   4 Feb 2002 13:15:04 -0000       1.5
  +++ FragmentExtractorGenerator.java   7 Feb 2002 08:17:52 -0000       1.6
  @@ -54,7 +54,6 @@
    */
   package org.apache.cocoon.generation;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
  @@ -87,23 +86,16 @@
    * and the associated transformer are very likely to fail on a clustered server.</b>
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Paul Russell</a>
  - * @version CVS $Id: FragmentExtractorGenerator.java,v 1.5 2002/02/04 13:15:04 
cziegeler Exp $
  + * @version CVS $Id: FragmentExtractorGenerator.java,v 1.6 2002/02/07 08:17:52 
cziegeler Exp $
    */
   public class FragmentExtractorGenerator extends AbstractGenerator
  -        implements Recyclable, Cacheable {
  +        implements Cacheable {
   
       /** The fragment store. */
       private static Map fragmentStore = new HashMap();
   
       /** flag for cleanup */
       boolean cleanupStore = true;
  -
  -    /** Construct a new <code>FragmentExtractorGenerator</code> and ensure that the
  -     * fragment store is initialized and threadsafe (since it is a global store, not
  -     * per-instance.
  -     */
  -    public FragmentExtractorGenerator() {
  -    }
   
       public void setup(SourceResolver resolver, Map objectModel, String src, 
Parameters par)
           throws ProcessingException, SAXException, IOException {
  
  
  
  1.8       +3 -3      
xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java
  
  Index: HTMLGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- HTMLGenerator.java        6 Feb 2002 17:10:16 -0000       1.7
  +++ HTMLGenerator.java        7 Feb 2002 08:17:52 -0000       1.8
  @@ -54,7 +54,6 @@
    */
   package org.apache.cocoon.generation;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentManager;
  @@ -94,9 +93,10 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Nicola Ken Barozzi</a>
  - * @version CVS $Id: HTMLGenerator.java,v 1.7 2002/02/06 17:10:16 cziegeler Exp $
  + * @version CVS $Id: HTMLGenerator.java,v 1.8 2002/02/07 08:17:52 cziegeler Exp $
    */
  -public class HTMLGenerator extends ComposerGenerator implements Cacheable, 
Recyclable, Composable, Disposable {
  +public class HTMLGenerator extends ComposerGenerator
  +implements Cacheable, Composable, Disposable {
   
       /** The  source */
       private Source inputSource;
  
  
  
  1.4       +2 -3      
xml-cocoon2/src/java/org/apache/cocoon/generation/JspGenerator.java
  
  Index: JspGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/JspGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JspGenerator.java 4 Feb 2002 13:15:04 -0000       1.3
  +++ JspGenerator.java 7 Feb 2002 08:17:52 -0000       1.4
  @@ -54,7 +54,6 @@
    */
   package org.apache.cocoon.generation;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -79,9 +78,9 @@
    * results into SAX events.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
  - * @version CVS $Id: JspGenerator.java,v 1.3 2002/02/04 13:15:04 cziegeler Exp $
  + * @version CVS $Id: JspGenerator.java,v 1.4 2002/02/07 08:17:52 cziegeler Exp $
    */
  -public class JspGenerator extends ServletGenerator implements Recyclable, 
Configurable {
  +public class JspGenerator extends ServletGenerator implements Configurable {
   
       public void configure(Configuration conf) throws ConfigurationException
       {
  
  
  
  1.4       +2 -3      
xml-cocoon2/src/java/org/apache/cocoon/generation/PhpGenerator.java
  
  Index: PhpGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/PhpGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PhpGenerator.java 4 Feb 2002 13:15:04 -0000       1.3
  +++ PhpGenerator.java 7 Feb 2002 08:17:52 -0000       1.4
  @@ -54,7 +54,6 @@
    */
   package org.apache.cocoon.generation;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.environment.Source;
  @@ -79,9 +78,9 @@
    * results into SAX events.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Sam Ruby</a>
  - * @version CVS $Id: PhpGenerator.java,v 1.3 2002/02/04 13:15:04 cziegeler Exp $
  + * @version CVS $Id: PhpGenerator.java,v 1.4 2002/02/07 08:17:52 cziegeler Exp $
    */
  -public class PhpGenerator extends ServletGenerator implements Recyclable {
  +public class PhpGenerator extends ServletGenerator  {
   
       /**
        * Stub implementation of Servlet Config
  
  
  
  1.5       +2 -3      
xml-cocoon2/src/java/org/apache/cocoon/generation/RequestGenerator.java
  
  Index: RequestGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/RequestGenerator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- RequestGenerator.java     6 Feb 2002 17:10:16 -0000       1.4
  +++ RequestGenerator.java     7 Feb 2002 08:17:52 -0000       1.5
  @@ -54,7 +54,6 @@
    */
   package org.apache.cocoon.generation;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.parameters.ParameterException;
  @@ -87,9 +86,9 @@
    *         (Apache Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
  - * @version CVS $Id: RequestGenerator.java,v 1.4 2002/02/06 17:10:16 cziegeler Exp $
  + * @version CVS $Id: RequestGenerator.java,v 1.5 2002/02/07 08:17:52 cziegeler Exp $
    */
  -public class RequestGenerator extends ServletGenerator implements Parameterizable, 
Recyclable {
  +public class RequestGenerator extends ServletGenerator implements Parameterizable {
   
       /** The URI of the namespace of this generator. */
       private String URI="http://xml.apache.org/cocoon/requestgenerator/2.0";;
  
  
  
  1.6       +2 -4      
xml-cocoon2/src/java/org/apache/cocoon/generation/ScriptGenerator.java
  
  Index: ScriptGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/ScriptGenerator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ScriptGenerator.java      4 Feb 2002 13:15:04 -0000       1.5
  +++ ScriptGenerator.java      7 Feb 2002 08:17:52 -0000       1.6
  @@ -58,7 +58,6 @@
   import com.ibm.bsf.BSFException;
   import com.ibm.bsf.BSFManager;
   import com.ibm.bsf.util.IOUtils;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -92,10 +91,9 @@
    * </pre>
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason Foster</a>
  - * @version CVS $Id: ScriptGenerator.java,v 1.5 2002/02/04 13:15:04 cziegeler Exp $
  + * @version CVS $Id: ScriptGenerator.java,v 1.6 2002/02/07 08:17:52 cziegeler Exp $
    */
  -public class ScriptGenerator extends ComposerGenerator implements Configurable,
  -Recyclable {
  +public class ScriptGenerator extends ComposerGenerator implements Configurable {
   
       protected class BSFLanguage
       {
  
  
  
  1.6       +2 -4      
xml-cocoon2/src/java/org/apache/cocoon/generation/SearchGenerator.java
  
  Index: SearchGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/SearchGenerator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SearchGenerator.java      6 Feb 2002 17:10:16 -0000       1.5
  +++ SearchGenerator.java      7 Feb 2002 08:17:52 -0000       1.6
  @@ -63,8 +63,6 @@
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.parameters.Parameters;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
  -
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.search.LuceneCocoonSearcher;
  @@ -127,10 +125,10 @@
    *
    * @author     <a href="mailto:[EMAIL PROTECTED]";>Bernhard Huber</a>
    * @author     <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
  - * @version    CVS $Id: SearchGenerator.java,v 1.5 2002/02/06 17:10:16 cziegeler 
Exp $
  + * @version    CVS $Id: SearchGenerator.java,v 1.6 2002/02/07 08:17:52 cziegeler 
Exp $
    */
   public class SearchGenerator extends ComposerGenerator
  -    implements Recyclable, Contextualizable, Initializable, Disposable
  +    implements Contextualizable, Initializable, Disposable
   {
   
       /**
  
  
  
  1.12      +2 -3      
xml-cocoon2/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java
  
  Index: ServerPagesGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ServerPagesGenerator.java 7 Feb 2002 04:58:24 -0000       1.11
  +++ ServerPagesGenerator.java 7 Feb 2002 08:17:52 -0000       1.12
  @@ -64,7 +64,6 @@
   import org.apache.avalon.framework.parameters.Parameters;
   
   import org.apache.avalon.excalibur.collections.ArrayStack;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
  @@ -101,10 +100,10 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
  - * @version CVS $Id: ServerPagesGenerator.java,v 1.11 2002/02/07 04:58:24 
vgritsenko Exp $
  + * @version CVS $Id: ServerPagesGenerator.java,v 1.12 2002/02/07 08:17:52 cziegeler 
Exp $
    */
   public class ServerPagesGenerator extends ServletGenerator
  -        implements Recyclable, Disposable, Cacheable, Configurable {
  +        implements Disposable, Cacheable, Configurable {
       /**
        * The sitemap-defined server pages program generator
        */
  
  
  
  1.4       +2 -4      
xml-cocoon2/src/java/org/apache/cocoon/generation/StatusGenerator.java
  
  Index: StatusGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/StatusGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StatusGenerator.java      4 Feb 2002 13:15:04 -0000       1.3
  +++ StatusGenerator.java      7 Feb 2002 08:17:52 -0000       1.4
  @@ -58,8 +58,6 @@
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
  -
   import org.apache.cocoon.components.store.StoreJanitor;
   import org.apache.cocoon.components.store.Store;
   
  @@ -100,9 +98,9 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Paul Russell</a> (Luminas Limited)
    * @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>S&eacute;bastien K&oelig;chlin</a> 
(iVision)
  - * @version CVS $Id: StatusGenerator.java,v 1.3 2002/02/04 13:15:04 cziegeler Exp $
  + * @version CVS $Id: StatusGenerator.java,v 1.4 2002/02/07 08:17:52 cziegeler Exp $
    */
  -public class StatusGenerator extends ComposerGenerator implements Recyclable {
  +public class StatusGenerator extends ComposerGenerator {
   
       /** The StoreJanitor used to get cache statistics
        */
  
  
  
  1.5       +2 -3      
xml-cocoon2/src/java/org/apache/cocoon/generation/StreamGenerator.java
  
  Index: StreamGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/StreamGenerator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StreamGenerator.java      4 Feb 2002 13:15:04 -0000       1.4
  +++ StreamGenerator.java      7 Feb 2002 08:17:52 -0000       1.5
  @@ -60,7 +60,6 @@
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
   import org.apache.cocoon.components.parser.Parser;
  -import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.cocoon.environment.http.HttpEnvironment;
   import javax.servlet.http.HttpServletRequest;
   import org.apache.cocoon.util.PostInputStream;
  @@ -91,9 +90,9 @@
    * number of bytes read is equal to the getContentLength() value.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Kinga Dziembowski</a>
  - * @version CVS $Id: StreamGenerator.java,v 1.4 2002/02/04 13:15:04 cziegeler Exp $
  + * @version CVS $Id: StreamGenerator.java,v 1.5 2002/02/07 08:17:52 cziegeler Exp $
    */
  -public class StreamGenerator extends ComposerGenerator implements Poolable
  +public class StreamGenerator extends ComposerGenerator
   {
       public static final String CLASS = StreamGenerator.class.getName();
   
  
  
  
  1.6       +2 -3      
xml-cocoon2/src/java/org/apache/cocoon/generation/VelocityGenerator.java
  
  Index: VelocityGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/VelocityGenerator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- VelocityGenerator.java    6 Feb 2002 17:10:16 -0000       1.5
  +++ VelocityGenerator.java    7 Feb 2002 08:17:52 -0000       1.6
  @@ -54,7 +54,6 @@
    */
   package org.apache.cocoon.generation;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.configuration.Configurable;
  @@ -172,10 +171,10 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Michael McKibben</a>
  - * @version CVS $Id: VelocityGenerator.java,v 1.5 2002/02/06 17:10:16 cziegeler Exp 
$
  + * @version CVS $Id: VelocityGenerator.java,v 1.6 2002/02/07 08:17:52 cziegeler Exp 
$
    */
   public class VelocityGenerator extends ComposerGenerator
  -    implements Initializable, Configurable, Recyclable, LogSystem
  +    implements Initializable, Configurable, LogSystem
   {
   
       /**
  
  
  
  1.4       +2 -3      
xml-cocoon2/src/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java
  
  Index: XMLDBCollectionGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XMLDBCollectionGenerator.java     4 Feb 2002 13:15:04 -0000       1.3
  +++ XMLDBCollectionGenerator.java     7 Feb 2002 08:17:52 -0000       1.4
  @@ -54,7 +54,6 @@
    */
   package org.apache.cocoon.generation;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
  @@ -101,11 +100,11 @@
    * slash in the base tag is important!
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Gianugo Rabellino</a>
  - * @version CVS $Id: XMLDBCollectionGenerator.java,v 1.3 2002/02/04 13:15:04 
cziegeler Exp $
  + * @version CVS $Id: XMLDBCollectionGenerator.java,v 1.4 2002/02/07 08:17:52 
cziegeler Exp $
    */
   
    public class XMLDBCollectionGenerator extends ComposerGenerator
  -   implements Cacheable, Recyclable,Configurable,Initializable {
  +   implements Cacheable, Configurable,Initializable {
   
       protected static final String URI =
         "http://apache.org/cocoon/xmldb/1.0";;
  
  
  
  1.4       +2 -3      
xml-cocoon2/src/java/org/apache/cocoon/generation/XMLDBGenerator.java
  
  Index: XMLDBGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/XMLDBGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XMLDBGenerator.java       4 Feb 2002 13:15:04 -0000       1.3
  +++ XMLDBGenerator.java       7 Feb 2002 08:17:52 -0000       1.4
  @@ -54,7 +54,6 @@
    */
   package org.apache.cocoon.generation;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
  @@ -100,11 +99,11 @@
    * slash in the base tag is important!
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Gianugo Rabellino</a>
  - * @version CVS $Id: XMLDBGenerator.java,v 1.3 2002/02/04 13:15:04 cziegeler Exp $
  + * @version CVS $Id: XMLDBGenerator.java,v 1.4 2002/02/07 08:17:52 cziegeler Exp $
    */
   
    public class XMLDBGenerator extends ComposerGenerator
  -   implements Cacheable, Recyclable,Configurable,Initializable {
  +   implements Cacheable, Configurable,Initializable {
   
       protected String driver;
       protected String base;
  
  
  
  1.3       +1 -2      
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/XPathDirectoryGenerator.java
  
  Index: XPathDirectoryGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/XPathDirectoryGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XPathDirectoryGenerator.java      4 Feb 2002 09:51:21 -0000       1.2
  +++ XPathDirectoryGenerator.java      7 Feb 2002 08:17:52 -0000       1.3
  @@ -55,7 +55,6 @@
   
   package org.apache.cocoon.generation;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.parameters.Parameters;
  @@ -116,7 +115,7 @@
    * &lt;/dir:directory&gt;
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Gianugo Rabellino</a>
  - * @version CVS $Id: XPathDirectoryGenerator.java,v 1.2 2002/02/04 09:51:21 
cziegeler Exp $
  + * @version CVS $Id: XPathDirectoryGenerator.java,v 1.3 2002/02/07 08:17:52 
cziegeler Exp $
    */
   public class XPathDirectoryGenerator extends DirectoryGenerator {
   
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to