You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/10/19 16:02:47 UTC

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

cziegeler    2003/10/19 07:02:47

  Modified:    src/java/org/apache/cocoon/environment
                        AbstractEnvironment.java
  Log:
  Changing to Serviceable
  
  Revision  Changes    Path
  1.18      +6 -6      cocoon-2.2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java
  
  Index: AbstractEnvironment.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- AbstractEnvironment.java	15 Oct 2003 18:03:52 -0000	1.17
  +++ AbstractEnvironment.java	19 Oct 2003 14:02:47 -0000	1.18
  @@ -60,9 +60,9 @@
   import java.util.Map;
   
   import org.apache.avalon.framework.CascadingRuntimeException;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.cocoon.components.CocoonComponentManager;
   import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.cocoon.util.BufferedOutputStream;
  @@ -107,8 +107,8 @@
       /** The real source resolver */
       protected org.apache.excalibur.source.SourceResolver sourceResolver;
   
  -    /** The component manager */
  -    protected ComponentManager manager;
  +    /** The service manager */
  +    protected ServiceManager manager;
   
       /** The attributes */
       private Map attributes = new HashMap();
  @@ -458,7 +458,7 @@
                   }
                   this.tempInitContext = null;
               }
  -        } catch (ComponentException ce) {
  +        } catch (ServiceException ce) {
               // this should never happen!
               throw new CascadingRuntimeException("Unable to lookup component.", ce);
           } catch (IOException ie) {