cvs commit: cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/generation EventCacheGenerator.java

[joerg]

joerg       2003/09/23 11:40:52

  Modified:    src/blocks/eventcache/java/org/apache/cocoon/generation
                        EventCacheGenerator.java
  Log:
  ComposerGenerator => ServiceableGenerator
  
  Revision  Changes    Path
  1.3       +7 -9      
cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/generation/EventCacheGenerator.java
  
  Index: EventCacheGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/generation/EventCacheGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EventCacheGenerator.java  5 Sep 2003 07:04:35 -0000       1.2
  +++ EventCacheGenerator.java  23 Sep 2003 18:40:52 -0000      1.3
  @@ -56,13 +56,14 @@
   import java.util.Map;
   
   import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.ComponentSelector;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.parameters.ParameterException;
   import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.caching.CacheableProcessingComponent;
   import org.apache.cocoon.caching.validity.Event;
  @@ -114,7 +115,7 @@
    * TODO: share common code with EventCacheTransformer
    * @author Unico Hommes
    */
  -public class EventCacheGenerator extends ComposerGenerator 
  +public class EventCacheGenerator extends ServiceableGenerator 
   implements Configurable, CacheableProcessingComponent {
   
   
  @@ -144,8 +145,8 @@
       
       // ---------------------------------------------------- lifecycle methods
       
  -    public void compose(ComponentManager manager)  throws ComponentException 
{
  -        super.compose(manager);
  +    public void service(ServiceManager manager)  throws ServiceException {
  +        super.service(manager);
           m_generatorSelector = (ComponentSelector) 
               manager.lookup(Generator.ROLE + "Selector");
       }
  @@ -173,11 +174,8 @@
           }
       }
       
  -    public void setup(
  -        SourceResolver resolver,
  -        Map objectModel,
  -        String src,
  -        Parameters par)
  +    public void setup(SourceResolver resolver, Map objectModel, String src,
  +                      Parameters par)
           throws ProcessingException, SAXException, IOException {
   
           // delegate