cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/source/impl ContextSourceFactory.java

[joerg]

joerg       2003/10/25 11:14:25

  Modified:    src/java/org/apache/cocoon/components/source/impl
                        ContextSourceFactory.java
  Log:
  Composable => Serviceable
  
  Revision  Changes    Path
  1.4       +10 -10    
cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java
  
  Index: ContextSourceFactory.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ContextSourceFactory.java 7 Jun 2003 21:19:36 -0000       1.3
  +++ ContextSourceFactory.java 25 Oct 2003 18:14:25 -0000      1.4
  @@ -58,12 +58,12 @@
   
   import org.apache.excalibur.source.*;
   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.context.ContextException;
   import org.apache.avalon.framework.context.Contextualizable;
   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 org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Context;
  @@ -79,14 +79,14 @@
    */
   public class ContextSourceFactory
       extends AbstractLogEnabled
  -    implements SourceFactory, Composable, Disposable, Contextualizable, 
ThreadSafe, URIAbsolutizer
  +    implements SourceFactory, Serviceable, Disposable, Contextualizable, 
ThreadSafe, URIAbsolutizer
   {
   
       /** The context */
       protected Context envContext;
   
  -    /** The component manager */
  -    protected ComponentManager manager;
  +    /** The ServiceManager */
  +    protected ServiceManager manager;
   
       /** The Source Resolver */
       protected SourceResolver resolver;
  @@ -94,7 +94,7 @@
       /**
        * Composable Interface
        */
  -    public void compose(ComponentManager manager) throws ComponentException {
  +    public void service(ServiceManager manager) throws ServiceException {
           this.manager = manager;
           // FIXME : Looking up the resolver here leads to an infinite loop
           // (is this because of Avalon or CocoonComponentManager ??)
  @@ -136,8 +136,8 @@
           if (this.resolver == null) {
               try {
                   this.resolver = (SourceResolver)this.manager.lookup( 
SourceResolver.ROLE );
  -            } catch (ComponentException ce) {
  -             throw new SourceException("Unable to lookup source resolver.", 
ce);
  +            } catch (ServiceException se) {
  +             throw new SourceException("Unable to lookup source resolver.", 
se);
               }
           }