cvs commit: cocoon-2.1/src/java/org/apache/cocoon/servlet CocoonServlet.java

[cziegeler]

cziegeler    2003/10/19 10:53:03

  Modified:    src/java/org/apache/cocoon/servlet CocoonServlet.java
  Log:
  Moving to ContainerUtil
  
  Revision  Changes    Path
  1.17      +7 -6      
cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- CocoonServlet.java        16 Sep 2003 01:51:05 -0000      1.16
  +++ CocoonServlet.java        19 Oct 2003 17:53:03 -0000      1.17
  @@ -86,6 +86,7 @@
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
  +import org.apache.avalon.framework.container.ContainerUtil;
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.context.DefaultContext;
   import org.apache.avalon.framework.logger.LogEnabled;
  @@ -1348,14 +1349,14 @@
                   getLogger().info("Reloading from: " + 
configFile.toExternalForm());
               }
               Cocoon c = (Cocoon) 
ClassUtils.newInstance("org.apache.cocoon.Cocoon");
  -            c.enableLogging( getCocoonLogger() );
  +            ContainerUtil.enableLogging(c, getCocoonLogger() );
               c.setLoggerManager( getLoggerManager() );
  -            c.contextualize(this.appContext);
  -            c.compose(getParentComponentManager());
  +            ContainerUtil.contextualize(c, this.appContext);
  +            ContainerUtil.compose(c, getParentComponentManager());
               if (this.enableInstrumentation) {
                   c.setInstrumentManager(getInstrumentManager());
               }
  -            c.initialize();
  +            ContainerUtil.initialize(c);
               this.creationTime = System.currentTimeMillis();
   
               disposeCocoon();
  @@ -1485,7 +1486,7 @@
       private final void disposeCocoon()
       {
           if (this.cocoon != null) {
  -            this.cocoon.dispose();
  +            ContainerUtil.dispose(this.cocoon);
               this.cocoon = null;
           }
       }