You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by un...@apache.org on 2003/12/28 21:50:52 UTC

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

unico       2003/12/28 12:50:52

  Modified:    src/java/org/apache/cocoon/bean CocoonBean.java
  Log:
  make logging work organize imports
  
  Revision  Changes    Path
  1.43      +12 -6     cocoon-2.2/src/java/org/apache/cocoon/bean/CocoonBean.java
  
  Index: CocoonBean.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/bean/CocoonBean.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- CocoonBean.java	26 Dec 2003 18:41:38 -0000	1.42
  +++ CocoonBean.java	28 Dec 2003 20:50:52 -0000	1.43
  @@ -49,6 +49,13 @@
   */
   package org.apache.cocoon.bean;
   
  +import java.io.File;
  +import java.util.ArrayList;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.List;
  +import java.util.Map;
  +
   import org.apache.avalon.fortress.ContainerManager;
   import org.apache.avalon.fortress.impl.DefaultContainerManager;
   import org.apache.avalon.fortress.util.FortressConfig;
  @@ -65,9 +72,6 @@
   import org.apache.cocoon.components.CocoonContainer;
   import org.apache.cocoon.components.SitemapConfigurableAccessor;
   
  -import java.io.File;
  -import java.util.*;
  -
   /**
    * CocoonBean does XYZ
    *
  @@ -82,7 +86,7 @@
       private String m_contextURI = Constants.DEFAULT_CONTEXT_DIR;
       private File m_workDirectory = new File( System.getProperty( "java.io.tmpdir" ) );
       private String m_logConfigURI = m_contextURI + File.separator + "cocoon.xlog";
  -    private String m_logCategory = "cocoon";
  +    private String m_logCategory = "";
       private String m_configURI = Constants.DEFAULT_CONF_FILE;
       private String m_roleConfigURI = "resource://org/apache/cocoon/cocoon.roles";
       private List m_classForceLoadList = new ArrayList();
  @@ -142,11 +146,13 @@
   
       public Logger getInitializationLogger()
       {
  -        return m_initializationLogger; }
  +        return m_initializationLogger;
  +    }
   
       public void setInitializationLogger( Logger initializationLogger )
       {
  -        m_initializationLogger = initializationLogger; }
  +        m_initializationLogger = initializationLogger;
  +    }
   
       public File getWorkDirectory()
       {