cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation LexicalTransformer.java ParserTransformer.java PatternTransformer.java
Date Fri, 24 Oct 2003 23:44:26 GMT
joerg       2003/10/24 16:44:26

  Modified:    src/blocks/chaperon/java/org/apache/cocoon/transformation
                        LexicalTransformer.java ParserTransformer.java
                        PatternTransformer.java
  Log:
  moving to Serviceable
  
  Revision  Changes    Path
  1.6       +13 -13    cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java
  
  Index: LexicalTransformer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LexicalTransformer.java	24 Sep 2003 21:54:48 -0000	1.5
  +++ LexicalTransformer.java	24 Oct 2003 23:44:26 -0000	1.6
  @@ -65,9 +65,6 @@
   
   import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
  @@ -76,6 +73,9 @@
   import org.apache.avalon.framework.parameters.ParameterException;
   import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.Serviceable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.caching.CacheableProcessingComponent;
   import org.apache.cocoon.components.source.SourceUtil;
  @@ -111,14 +111,14 @@
    * @version CVS $Id$
    */
   public class LexicalTransformer extends LexicalProcessorAdapter
  -  implements Transformer, LogEnabled, Composable, Recyclable, Disposable,
  +  implements Transformer, LogEnabled, Serviceable, Recyclable, Disposable,
                Parameterizable, CacheableProcessingComponent {
   
       private String lexicon;
       private Source lexiconSource;
   
       private Logger logger;
  -    private ComponentManager manager;
  +    private ServiceManager manager;
       private SourceResolver resolver;
   
       private LexicalAutomaton automaton = null;
  @@ -135,13 +135,13 @@
       }
   
       /**
  -     * Pass the ComponentManager to the composer. The Composable
  -     * implementation should use the specified ComponentManager
  -     * to acquire the components it needs for execution.
  +     * Pass the ServiceManager to the Serviceable. The Serviceable
  +     * implementation should use the specified ServiceManager
  +     * to acquire the services it needs for execution.
        *
  -     * @param manager The ComponentManager which this Composable uses.
  +     * @param manager The ServiceManager which this Serviceable uses.
        */
  -    public void compose(ComponentManager manager) {
  +    public void service(ServiceManager manager) {
           this.manager = manager;
       }
   
  @@ -252,9 +252,9 @@
           } catch (SourceException se) {
               throw new ProcessingException("Error during resolving of '"+src+
                                             "'.", se);
  -        } catch (ComponentException ce) {
  +        } catch (ServiceException se) {
               throw new ProcessingException("Could not lookup for component",
  -                                          ce);
  +                                          se);
           } finally {
               if (store!=null) {
                   this.manager.release(store);
  
  
  
  1.6       +13 -14    cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java
  
  Index: ParserTransformer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ParserTransformer.java	24 Sep 2003 21:54:48 -0000	1.5
  +++ ParserTransformer.java	24 Oct 2003 23:44:26 -0000	1.6
  @@ -65,9 +65,6 @@
   
   import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
  @@ -76,6 +73,9 @@
   import org.apache.avalon.framework.parameters.ParameterException;
   import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.Serviceable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.caching.CacheableProcessingComponent;
   import org.apache.cocoon.components.source.SourceUtil;
  @@ -113,14 +113,14 @@
    * @version CVS $Id$
    */
   public class ParserTransformer extends ParserProcessorAdapter
  -  implements Transformer, LogEnabled, Composable, Parameterizable,
  +  implements Transformer, LogEnabled, Serviceable, Parameterizable,
                Recyclable, Disposable, CacheableProcessingComponent {
   
       private String grammar;
       private Source grammarSource;
   
       private Logger logger;
  -    private ComponentManager manager;
  +    private ServiceManager manager;
       private SourceResolver resolver;
   
       private ParserAutomaton automaton;
  @@ -137,13 +137,13 @@
       }
   
       /**
  -     * Pass the ComponentManager to the composer. The Composable
  -     * implementation should use the specified ComponentManager
  -     * to acquire the components it needs for execution.
  +     * Pass the ServiceManager to the Serviceable. The Serviceable
  +     * implementation should use the specified ServiceManager
  +     * to acquire the services it needs for execution.
        *
  -     * @param manager The ComponentManager which this Composable uses.
  +     * @param manager The ServiceManager which this Serviceable uses.
        */
  -    public void compose(ComponentManager manager) {
  +    public void service(ServiceManager manager) {
           this.manager = manager;
       }
   
  @@ -255,9 +255,8 @@
           } catch (SourceException se) {
               throw new ProcessingException("Error during resolving of '"+src+
                                             "'.", se);
  -        } catch (ComponentException ce) {
  -            throw new ProcessingException("Could not lookup for component",
  -                                          ce);
  +        } catch (ServiceException se) {
  +            throw new ProcessingException("Could not lookup for component", se);
           } finally {
               if (store!=null) {
                   this.manager.release(store);
  
  
  
  1.5       +14 -15    cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/PatternTransformer.java
  
  Index: PatternTransformer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/PatternTransformer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PatternTransformer.java	5 Sep 2003 07:10:53 -0000	1.4
  +++ PatternTransformer.java	24 Oct 2003 23:44:26 -0000	1.5
  @@ -64,9 +64,6 @@
   
   import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
  @@ -75,6 +72,9 @@
   import org.apache.avalon.framework.parameters.ParameterException;
   import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.Serviceable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.caching.CacheableProcessingComponent;
   import org.apache.cocoon.components.source.SourceUtil;
  @@ -111,7 +111,7 @@
    * @version CVS $Id$
    */
   public class PatternTransformer extends AbstractTransformer
  -  implements LogEnabled, Composable, Recyclable, Disposable, Parameterizable,
  +  implements LogEnabled, Serviceable, Recyclable, Disposable, Parameterizable,
                CacheableProcessingComponent {
   
       /** Namespace for the SAX events. */
  @@ -121,7 +121,7 @@
       private Source lexiconSource = null;
   
       private Logger logger = null;
  -    private ComponentManager manager = null;
  +    private ServiceManager manager = null;
       private SourceResolver resolver = null;
   
       private LexicalAutomaton automaton = null;
  @@ -142,13 +142,13 @@
       }
   
       /**
  -     * Pass the ComponentManager to the composer. The Composable
  -     * implementation should use the specified ComponentManager
  -     * to acquire the components it needs for execution.
  +     * Pass the ServiceManager to the Serviceable. The Serviceable
  +     * implementation should use the specified ServiceManager
  +     * to acquire the services it needs for execution.
        *
  -     * @param manager The ComponentManager which this Composable uses.
  +     * @param manager The ServiceManager which this Serviceable uses.
        */
  -    public void compose(ComponentManager manager) {
  +    public void service(ServiceManager manager) {
           this.manager = manager;
       }
   
  @@ -232,11 +232,10 @@
               throw new ProcessingException("Error during retrieving the lexicon",
                                             confige);
           } catch (SourceException se) {
  -            throw new ProcessingException("Error during resolving of '"+src+
  +            throw new ProcessingException("Error during resolving of '" + src +
                                             "'.", se);
  -        } catch (ComponentException ce) {
  -            throw new ProcessingException("Could not lookup for component",
  -                                          ce);
  +        } catch (ServiceException se) {
  +            throw new ProcessingException("Could not lookup for component", se);
           } finally {
               if (store!=null) {
                   this.manager.release(store);
  
  
  

Mime
View raw message