cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sylv...@apache.org
Subject cvs commit: xml-cocoon2/src/org/apache/cocoon/servlet CocoonServlet.java
Date Wed, 10 Oct 2001 11:14:35 GMT
sylvain     01/10/10 04:14:35

  Modified:    src/org/apache/cocoon Tag: cocoon_20_branch Main.java
               src/org/apache/cocoon/servlet Tag: cocoon_20_branch
                        CocoonServlet.java
  Log:
  Use default logger hierarchy (some non-loggable classes use it)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.17  +22 -22    xml-cocoon2/src/org/apache/cocoon/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Main.java,v
  retrieving revision 1.4.2.16
  retrieving revision 1.4.2.17
  diff -u -r1.4.2.16 -r1.4.2.17
  --- Main.java	2001/10/08 20:18:49	1.4.2.16
  +++ Main.java	2001/10/10 11:14:35	1.4.2.17
  @@ -8,33 +8,33 @@
   
   package org.apache.cocoon;
   
  -import org.apache.avalon.excalibur.cli.CLArgsParser;
  -import org.apache.avalon.excalibur.cli.CLOption;
  -import org.apache.avalon.excalibur.cli.CLOptionDescriptor;
  -import org.apache.avalon.excalibur.cli.CLUtil;
  -import org.apache.avalon.excalibur.logger.DefaultLogKitManager;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
  -import org.apache.avalon.framework.context.DefaultContext;
  -import org.apache.cocoon.environment.Environment;
  -import org.apache.cocoon.environment.commandline.CommandlineContext;
  -import org.apache.cocoon.environment.commandline.FileSavingEnvironment;
  -import org.apache.cocoon.environment.commandline.LinkSamplingEnvironment;
  -import org.apache.cocoon.util.IOUtils;
  -import org.apache.cocoon.util.MIMEUtils;
  -import org.apache.cocoon.util.NetUtils;
  -import org.apache.log.Hierarchy;
  -import org.apache.log.Logger;
  -import org.apache.log.Priority;
  -
  -import java.io.*;
  +import org.apache.avalon.excalibur.cli.CLArgsParser;
  +import org.apache.avalon.excalibur.cli.CLOption;
  +import org.apache.avalon.excalibur.cli.CLOptionDescriptor;
  +import org.apache.avalon.excalibur.cli.CLUtil;
  +import org.apache.avalon.excalibur.logger.DefaultLogKitManager;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
  +import org.apache.avalon.framework.context.DefaultContext;
  +import org.apache.cocoon.environment.Environment;
  +import org.apache.cocoon.environment.commandline.CommandlineContext;
  +import org.apache.cocoon.environment.commandline.FileSavingEnvironment;
  +import org.apache.cocoon.environment.commandline.LinkSamplingEnvironment;
  +import org.apache.cocoon.util.IOUtils;
  +import org.apache.cocoon.util.MIMEUtils;
  +import org.apache.cocoon.util.NetUtils;
  +import org.apache.log.Hierarchy;
  +import org.apache.log.Logger;
  +import org.apache.log.Priority;
  +
  +import java.io.*;
   import java.util.*;
   
   /**
    * Command line entry point.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.4.2.16 $ $Date: 2001/10/08 20:18:49 $
  + * @version CVS $Revision: 1.4.2.17 $ $Date: 2001/10/10 11:14:35 $
    */
   
   public class Main {
  @@ -265,7 +265,7 @@
                   final FileInputStream fis = new FileInputStream(logKit);
                   final DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
                   final Configuration logKitConf = builder.build(fis);
  -                logKitManager = new DefaultLogKitManager();
  +                logKitManager = new DefaultLogKitManager(Hierarchy.getDefaultHierarchy());
                   logKitManager.setLogger(log);
                   final DefaultContext subcontext = new DefaultContext(appContext);
                   subcontext.put("context-root", contextDir);
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.13.2.27 +41 -41    xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java,v
  retrieving revision 1.13.2.26
  retrieving revision 1.13.2.27
  diff -u -r1.13.2.26 -r1.13.2.27
  --- CocoonServlet.java	2001/10/08 20:19:01	1.13.2.26
  +++ CocoonServlet.java	2001/10/10 11:14:35	1.13.2.27
  @@ -7,45 +7,45 @@
    *****************************************************************************/
   package org.apache.cocoon.servlet;
   
  -import org.apache.avalon.excalibur.logger.DefaultLogKitManager;
  -import org.apache.avalon.excalibur.logger.LogKitManager;
  -import org.apache.avalon.framework.activity.Initializable;
  -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.context.DefaultContext;
  -import org.apache.avalon.framework.logger.Loggable;
  -import org.apache.cocoon.*;
  -import org.apache.cocoon.components.classloader.RepositoryClassLoader;
  -import org.apache.cocoon.environment.Environment;
  -import org.apache.cocoon.environment.http.HttpContext;
  -import org.apache.cocoon.environment.http.HttpEnvironment;
  -import org.apache.cocoon.environment.http.RequestWrapper;
  -import org.apache.cocoon.util.ClassUtils;
  -import org.apache.cocoon.util.IOUtils;
  -import org.apache.cocoon.util.StringUtils;
  -import org.apache.cocoon.util.log.CocoonLogFormatter;
  -import org.apache.log.ContextMap;
  -import org.apache.log.Hierarchy;
  -import org.apache.log.Logger;
  -import org.apache.log.Priority;
  -import org.apache.log.output.ServletOutputLogTarget;
  -
  -import javax.servlet.ServletConfig;
  -import javax.servlet.ServletContext;
  -import javax.servlet.ServletException;
  -import javax.servlet.ServletOutputStream;
  -import javax.servlet.http.HttpServlet;
  -import javax.servlet.http.HttpServletRequest;
  -import javax.servlet.http.HttpServletResponse;
  -import java.io.File;
  -import java.io.FileInputStream;
  -import java.io.IOException;
  -import java.io.OutputStream;
  -import java.lang.reflect.Constructor;
  -import java.net.URL;
  -import java.util.Arrays;
  -import java.util.Date;
  +import org.apache.avalon.excalibur.logger.DefaultLogKitManager;
  +import org.apache.avalon.excalibur.logger.LogKitManager;
  +import org.apache.avalon.framework.activity.Initializable;
  +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.context.DefaultContext;
  +import org.apache.avalon.framework.logger.Loggable;
  +import org.apache.cocoon.*;
  +import org.apache.cocoon.components.classloader.RepositoryClassLoader;
  +import org.apache.cocoon.environment.Environment;
  +import org.apache.cocoon.environment.http.HttpContext;
  +import org.apache.cocoon.environment.http.HttpEnvironment;
  +import org.apache.cocoon.environment.http.RequestWrapper;
  +import org.apache.cocoon.util.ClassUtils;
  +import org.apache.cocoon.util.IOUtils;
  +import org.apache.cocoon.util.StringUtils;
  +import org.apache.cocoon.util.log.CocoonLogFormatter;
  +import org.apache.log.ContextMap;
  +import org.apache.log.Hierarchy;
  +import org.apache.log.Logger;
  +import org.apache.log.Priority;
  +import org.apache.log.output.ServletOutputLogTarget;
  +
  +import javax.servlet.ServletConfig;
  +import javax.servlet.ServletContext;
  +import javax.servlet.ServletException;
  +import javax.servlet.ServletOutputStream;
  +import javax.servlet.http.HttpServlet;
  +import javax.servlet.http.HttpServletRequest;
  +import javax.servlet.http.HttpServletResponse;
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.IOException;
  +import java.io.OutputStream;
  +import java.lang.reflect.Constructor;
  +import java.net.URL;
  +import java.util.Arrays;
  +import java.util.Date;
   import java.util.StringTokenizer;
   
   /**
  @@ -58,7 +58,7 @@
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
    * @author <a href="mailto:leo.sutic@inspireinfrastructure.com">Leo Sutic</a>
  - * @version CVS $Revision: 1.13.2.26 $ $Date: 2001/10/08 20:19:01 $
  + * @version CVS $Revision: 1.13.2.27 $ $Date: 2001/10/10 11:14:35 $
    */
   
   public class CocoonServlet extends HttpServlet {
  @@ -380,7 +380,7 @@
           Hierarchy.getDefaultHierarchy().setDefaultLogTarget(servTarget);
           Hierarchy.getDefaultHierarchy().setDefaultPriority(logPriority);
           final Logger logger = Hierarchy.getDefaultHierarchy().getLoggerFor("");
  -        final DefaultLogKitManager logKitManager = new DefaultLogKitManager();
  +        final DefaultLogKitManager logKitManager = new DefaultLogKitManager(Hierarchy.getDefaultHierarchy());
           logKitManager.setLogger(logger);
           final DefaultContext subcontext = new DefaultContext(this.appContext);
           subcontext.put("servlet-context", this.servletContext);
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message