cvs commit: xml-cocoon2/src/java/org/apache/cocoon Cocoon.java

[vgritsenko]

vgritsenko    02/02/20 16:03:51

  Modified:    src/java/org/apache/cocoon Cocoon.java
  Log:
  Unclutter [core] log category, add:
  core.manager
  core.startup
  core.roles
  core.roles.user
  (is this correct approach?)
  
  Revision  Changes    Path
  1.17      +7 -8      xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java
  
  Index: Cocoon.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Cocoon.java       14 Feb 2002 09:30:13 -0000      1.16
  +++ Cocoon.java       21 Feb 2002 00:03:51 -0000      1.17
  @@ -103,7 +103,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Pierpaolo Fumagalli</a> (Apache 
Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Leo Sutic</a>
  - * @version CVS $Id: Cocoon.java,v 1.16 2002/02/14 09:30:13 cziegeler Exp $
  + * @version CVS $Id: Cocoon.java,v 1.17 2002/02/21 00:03:51 vgritsenko Exp $
    */
   public class Cocoon
           extends AbstractLoggable
  @@ -220,7 +220,7 @@
           } else {
               this.componentManager = new 
ExcaliburComponentManager((ClassLoader)this.context.get(Constants.CONTEXT_CLASS_LOADER));
           }
  -        this.componentManager.setLogger(getLogger());
  +        this.componentManager.setLogger(getLogger().getChildLogger("manager"));
           this.componentManager.contextualize(this.context);
   
           if (getLogger().isDebugEnabled()) {
  @@ -250,7 +250,7 @@
               getLogger().debug("Using parser: " + parser);
           }
           ExcaliburComponentManager startupManager = new 
ExcaliburComponentManager((ClassLoader)this.context.get(Constants.CONTEXT_CLASS_LOADER));
  -        startupManager.setLogger(getLogger());
  +        startupManager.setLogger(getLogger().getChildLogger("startup"));
           startupManager.contextualize(this.context);
           startupManager.setLogKitManager(this.logKitManager);
   
  @@ -267,7 +267,7 @@
           }
           startupManager.initialize();
   
  -        Configuration conf = this.configure(startupManager);
  +        this.configure(startupManager);
           startupManager.dispose();
           startupManager = null;
   
  @@ -339,7 +339,7 @@
           }
   
           DefaultRoleManager drm = new DefaultRoleManager();
  -        drm.setLogger(getLogger());
  +        drm.setLogger(getLogger().getChildLogger("roles"));
           drm.configure(roleConfig);
           roleConfig = null;
   
  @@ -357,7 +357,6 @@
           }
   
           Configuration conf = this.configuration;
  -
           if (getLogger().isDebugEnabled()) {
               getLogger().debug("Root configuration: " + conf.getName());
           }
  @@ -387,11 +386,11 @@
                   getLogger().error("Could not configure Cocoon environment with user 
roles file", e);
                   throw new ConfigurationException("Error trying to load user-roles 
configuration", e);
               } finally {
  -                if (p != null) startupManager.release(p);
  +                startupManager.release(p);
               }
   
               DefaultRoleManager urm = new DefaultRoleManager(drm);
  -            urm.setLogger(getLogger());
  +            
urm.setLogger(getLogger().getChildLogger("roles").getChildLogger("user"));
               urm.configure(roleConfig);
               roleConfig = null;
               drm = urm;
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]