cvs commit: cocoon-2.2/src/java/org/apache/cocoon cocoon.roles

[cziegeler]

cziegeler    2004/01/07 03:18:49

  Modified:    src/java/org/apache/cocoon/components/modules/input
                        GlobalInputModule.java SitemapVariableHolder.java
               src/java/org/apache/cocoon cocoon.roles
  Log:
  Composable -> Serviceable
  
  Revision  Changes    Path
  1.2       +18 -12    
cocoon-2.2/src/java/org/apache/cocoon/components/modules/input/GlobalInputModule.java
  
  Index: GlobalInputModule.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/modules/input/GlobalInputModule.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- GlobalInputModule.java    9 Mar 2003 00:09:03 -0000       1.1
  +++ GlobalInputModule.java    7 Jan 2004 11:18:49 -0000       1.2
  @@ -50,12 +50,12 @@
   */
   package org.apache.cocoon.components.modules.input;
   
  -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.logger.AbstractLogEnabled;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.Serviceable;
   import org.apache.avalon.framework.thread.ThreadSafe;
   
   import java.util.Iterator;
  @@ -68,17 +68,24 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
    * @version CVS $Id$
  + * 
  + * @avalon.component
  + * @avalon.service type=InputModule
  + * @x-avalon.lifestyle type=singleton
  + * @x-avalon.info name=global-input
    */
   public final class GlobalInputModule 
       extends AbstractLogEnabled
  -    implements InputModule, Composable, ThreadSafe {
  +    implements InputModule, Serviceable, ThreadSafe {
   
  -    private ComponentManager manager;
  +    private ServiceManager manager;
       
       /**
  -     * Composable
  +     * Serviceable
  +     * 
  +     * @avalon.dependency  type=SitemapVariableHolder
        */
  -    public void compose(ComponentManager manager) {
  +    public void service(ServiceManager manager) {
           this.manager = manager;
       }
       
  @@ -102,7 +109,7 @@
           try {
               holder = 
(SitemapVariableHolder)this.manager.lookup(SitemapVariableHolder.ROLE);
               return holder.get(name); 
  -        } catch (ComponentException ce) {
  +        } catch (ServiceException ce) {
               throw new ConfigurationException("Unable to lookup 
SitemapVariableHolder.", ce);
           } finally {
               this.manager.release(holder);
  @@ -123,9 +130,8 @@
           SitemapVariableHolder holder = null;
           try {
               holder = 
(SitemapVariableHolder)this.manager.lookup(SitemapVariableHolder.ROLE);
  -            // return holder.getKeys(); 
  -            return null; 
  -        } catch (ComponentException ce) {
  +            return holder.getKeys(); 
  +        } catch (ServiceException ce) {
               throw new ConfigurationException("Unable to lookup 
SitemapVariableHolder.", ce);
           } finally {
               this.manager.release(holder);
  
  
  
  1.6       +7 -3      
cocoon-2.2/src/java/org/apache/cocoon/components/modules/input/SitemapVariableHolder.java
  
  Index: SitemapVariableHolder.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/modules/input/SitemapVariableHolder.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SitemapVariableHolder.java        5 Sep 2003 11:57:05 -0000       1.5
  +++ SitemapVariableHolder.java        7 Jan 2004 11:18:49 -0000       1.6
  @@ -54,7 +54,6 @@
   import java.util.Iterator;
   import java.util.Map;
   
  -import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -70,10 +69,15 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
    * @version CVS $Id$
  + * 
  + * @avalon.component
  + * @avalon.service type=SitemapVariableHolder
  + * @x-avalon.lifestyle type=singleton
  + * @x-avalon.info name=global-variables
    */
   public final class SitemapVariableHolder
       extends AbstractLogEnabled
  -    implements Component, Configurable, SitemapConfigurable, ThreadSafe
  +    implements Configurable, SitemapConfigurable, ThreadSafe
   {
    
       public static final String ROLE = SitemapVariableHolder.class.getName();
  
  
  
  1.16      +1 -1      cocoon-2.2/src/java/org/apache/cocoon/cocoon.roles
  
  Index: cocoon.roles
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/cocoon.roles,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- cocoon.roles      28 Dec 2003 20:50:02 -0000      1.15
  +++ cocoon.roles      7 Jan 2004 11:18:49 -0000       1.16
  @@ -90,13 +90,13 @@
       />
     </role>
   
  +  -->
     <role 
name="org.apache.cocoon.components.modules.input.SitemapVariableHolder">
       <component 
         shorthand="global-variables"
         
class="org.apache.cocoon.components.modules.input.SitemapVariableHolder"
       />
     </role>
  -  -->
     
     <!--
     <role 
name="org.apache.cocoon.components.language.generator.ServerPagesSelector"