You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@locus.apache.org on 2000/09/29 09:01:58 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/threads ThreadPool.java
costin 00/09/29 00:01:57
Modified: src/facade22/org/apache/tomcat/facade
Servlet22Interceptor.java ServletWrapper.java
WebXmlReader.java
src/facade22/org/apache/tomcat/modules/facade22
JspInterceptor.java
src/facade23/org/apache/tomcat/facade23 ServletWrapper.java
src/share/org/apache/jasper Constants.java
EmbededServletOptions.java JspC.java
JspEngineContext.java
src/share/org/apache/jasper/compiler Compiler.java
JspCompiler.java JspParseEventListener.java
JspReader.java Parser.java TagLibraryInfoImpl.java
src/share/org/apache/jasper/runtime JspFactoryImpl.java
JspLoader.java PageContextImpl.java
src/share/org/apache/jasper/servlet JasperLoader.java
JasperLoader12.java JspServlet.java
src/share/org/apache/tomcat/context DefaultCMSetter.java
LoadOnStartupInterceptor.java
PolicyInterceptor.java
src/share/org/apache/tomcat/core BaseInterceptor.java
Context.java ContextManager.java Handler.java
OutputBuffer.java Request.java
src/share/org/apache/tomcat/helper ServerXmlHelper.java
src/share/org/apache/tomcat/modules/server
Ajp13Interceptor.java Http10.java
Http10Interceptor.java
src/share/org/apache/tomcat/request InvokerInterceptor.java
SimpleMapper1.java
src/share/org/apache/tomcat/service
JNIEndpointConnector.java PoolTcpConnector.java
src/share/org/apache/tomcat/service/connector
Ajp12ConnectionHandler.java
Ajp13ConnectionHandler.java
src/share/org/apache/tomcat/service/http
HttpConnectionHandler.java HttpInterceptor.java
HttpRequestAdapter.java HttpResponseAdapter.java
src/share/org/apache/tomcat/session
ServerSessionManager.java
src/share/org/apache/tomcat/startup EmbededTomcat.java
Tomcat.java
src/share/org/apache/tomcat/task ApacheConfig.java
Expand.java IISConfig.java NSConfig.java
StartTomcat.java StopTomcat.java
src/share/org/apache/tomcat/util FileUtil.java
src/share/org/apache/tomcat/util/net PoolTcpEndpoint.java
src/share/org/apache/tomcat/util/threads ThreadPool.java
Removed: src/share/org/apache/tomcat/logging DefaultLogger.java
LogAware.java Logger.java TomcatLogger.java
Log:
As proposed (long time ago), moved tomcat.logging to tomcat.util.log
Since this is just code move, with no benefit other than esthetics,
I also optimized a bit the logger ( no more StringBuffer.toString,
reuse the StringBuffer, etc).
Logger.Helper is now renamed to Log() ( this is the main class used by
clients, it deserves a simple name ).
TomcatLogger is now renamed QueueLogger - it has nothing to do with tomcat,
but it put all log messages in a queue to save time in the critical
path ( we still have a sync. - but I don't think that can be done without
sync, at least not in 2 hours )
I also moved some code arround to simplify a bit QueueLogger.
Revision Changes Path
1.2 +0 -1 jakarta-tomcat/src/facade22/org/apache/tomcat/facade/Servlet22Interceptor.java
Index: Servlet22Interceptor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/Servlet22Interceptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Servlet22Interceptor.java 2000/09/28 03:25:44 1.1
+++ Servlet22Interceptor.java 2000/09/29 06:59:51 1.2
@@ -62,7 +62,6 @@
import org.apache.tomcat.util.*;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.logging.*;
import java.io.*;
import java.net.*;
import java.security.*;
1.6 +0 -1 jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletWrapper.java
Index: ServletWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletWrapper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServletWrapper.java 2000/09/28 03:25:45 1.5
+++ ServletWrapper.java 2000/09/29 06:59:52 1.6
@@ -60,7 +60,6 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.*;
-import org.apache.tomcat.logging.*;
import java.io.*;
import java.net.*;
import java.util.*;
1.2 +0 -1 jakarta-tomcat/src/facade22/org/apache/tomcat/facade/WebXmlReader.java
Index: WebXmlReader.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/WebXmlReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebXmlReader.java 2000/09/28 03:25:45 1.1
+++ WebXmlReader.java 2000/09/29 06:59:52 1.2
@@ -3,7 +3,6 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.*;
import org.apache.tomcat.util.xml.*;
-import org.apache.tomcat.logging.*;
import java.beans.*;
import java.io.*;
import java.io.IOException;
1.6 +2 -1 jakarta-tomcat/src/facade22/org/apache/tomcat/modules/facade22/JspInterceptor.java
Index: JspInterceptor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/modules/facade22/JspInterceptor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JspInterceptor.java 2000/09/28 03:25:45 1.5
+++ JspInterceptor.java 2000/09/29 06:59:56 1.6
@@ -64,11 +64,12 @@
import java.io.*;
import java.net.*;
+import org.apache.tomcat.util.log.*;
+
import org.apache.jasper.*;
import org.apache.jasper.Constants;
import org.apache.jasper.runtime.*;
import org.apache.jasper.compiler.*;
-import org.apache.tomcat.logging.Logger;
import org.apache.jasper.compiler.Compiler;
import org.apache.tomcat.core.*;
import org.apache.tomcat.facade.ServletWrapper;
1.4 +0 -1 jakarta-tomcat/src/facade23/org/apache/tomcat/facade23/ServletWrapper.java
Index: ServletWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/facade23/org/apache/tomcat/facade23/ServletWrapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServletWrapper.java 2000/09/24 18:11:28 1.3
+++ ServletWrapper.java 2000/09/29 06:59:57 1.4
@@ -60,7 +60,6 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.*;
-import org.apache.tomcat.logging.*;
import java.io.*;
import java.net.*;
import java.util.*;
1.14 +1 -1 jakarta-tomcat/src/share/org/apache/jasper/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Constants.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Constants.java 2000/06/19 16:29:15 1.13
+++ Constants.java 2000/09/29 06:59:59 1.14
@@ -60,7 +60,7 @@
import java.util.MissingResourceException;
import java.text.MessageFormat;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
/**
* Some constants and other global data that are used by the compiler and the runtime.
1.5 +4 -4 jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java
Index: EmbededServletOptions.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EmbededServletOptions.java 2000/05/26 18:55:09 1.4
+++ EmbededServletOptions.java 2000/09/29 07:00:00 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java,v 1.4 2000/05/26 18:55:09 costin Exp $
- * $Revision: 1.4 $
- * $Date: 2000/05/26 18:55:09 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java,v 1.5 2000/09/29 07:00:00 costin Exp $
+ * $Revision: 1.5 $
+ * $Date: 2000/09/29 07:00:00 $
*
* ====================================================================
*
@@ -66,7 +66,7 @@
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
/**
* A class to hold all init parameters specific to the JSP engine.
1.17 +5 -6 jakarta-tomcat/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JspC.java 2000/07/11 00:15:03 1.16
+++ JspC.java 2000/09/29 07:00:01 1.17
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v 1.16 2000/07/11 00:15:03 shemnon Exp $
- * $Revision: 1.16 $
- * $Date: 2000/07/11 00:15:03 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v 1.17 2000/09/29 07:00:01 costin Exp $
+ * $Revision: 1.17 $
+ * $Date: 2000/09/29 07:00:01 $
*
* ====================================================================
*
@@ -73,8 +73,7 @@
//import org.apache.jasper.runtime.JspLoader;
import org.apache.jasper.servlet.JasperLoader;
-import org.apache.tomcat.logging.Logger;
-import org.apache.tomcat.logging.TomcatLogger;
+import org.apache.tomcat.util.log.*;
/**
* Shell for the jspc compiler. Handles all options associated with the
@@ -314,7 +313,7 @@
}
}
- Constants.jasperLog = new TomcatLogger();
+ Constants.jasperLog = new QueueLogger();
Constants.jasperLog.setVerbosityLevel(verbosityLevel);
}
1.10 +4 -4 jakarta-tomcat/src/share/org/apache/jasper/JspEngineContext.java
Index: JspEngineContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspEngineContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JspEngineContext.java 2000/07/11 00:15:04 1.9
+++ JspEngineContext.java 2000/09/29 07:00:02 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspEngineContext.java,v 1.9 2000/07/11 00:15:04 shemnon Exp $
- * $Revision: 1.9 $
- * $Date: 2000/07/11 00:15:04 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspEngineContext.java,v 1.10 2000/09/29 07:00:02 costin Exp $
+ * $Revision: 1.10 $
+ * $Date: 2000/09/29 07:00:02 $
*
* ====================================================================
*
@@ -81,7 +81,7 @@
import org.apache.jasper.compiler.SunJavaCompiler;
import org.apache.jasper.compiler.JavaCompiler;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
/**
* A place holder for various things that are used through out the JSP
* engine. This is a per-request/per-context data structure. Some of
1.20 +4 -4 jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java
Index: Compiler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Compiler.java 2000/06/27 20:59:40 1.19
+++ Compiler.java 2000/09/29 07:00:26 1.20
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java,v 1.19 2000/06/27 20:59:40 costin Exp $
- * $Revision: 1.19 $
- * $Date: 2000/06/27 20:59:40 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java,v 1.20 2000/09/29 07:00:26 costin Exp $
+ * $Revision: 1.20 $
+ * $Date: 2000/09/29 07:00:26 $
*
* ====================================================================
*
@@ -72,7 +72,7 @@
import org.apache.jasper.JasperException;
import org.apache.jasper.compiler.ParseException;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
/**
* If you want to customize JSP compilation aspects, this class is
1.17 +2 -2 jakarta-tomcat/src/share/org/apache/jasper/compiler/JspCompiler.java
Index: JspCompiler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspCompiler.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JspCompiler.java 2000/07/25 20:14:23 1.16
+++ JspCompiler.java 2000/09/29 07:00:27 1.17
@@ -62,7 +62,7 @@
import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
/**
* JspCompiler is an implementation of Compiler with a funky code
@@ -88,7 +88,7 @@
boolean outDated;
static final int JSP_TOKEN_LEN= Constants.JSP_TOKEN.length();
- Logger.Helper loghelper = new Logger.Helper("JASPER_LOG", "JspCompiler");
+ Log loghelper = new Log("JASPER_LOG", "JspCompiler");
public JspCompiler(JspCompilationContext ctxt) throws JasperException {
super(ctxt);
1.20 +4 -4 jakarta-tomcat/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- JspParseEventListener.java 2000/07/11 03:48:34 1.19
+++ JspParseEventListener.java 2000/09/29 07:00:27 1.20
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v 1.19 2000/07/11 03:48:34 alex Exp $
- * $Revision: 1.19 $
- * $Date: 2000/07/11 03:48:34 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v 1.20 2000/09/29 07:00:27 costin Exp $
+ * $Revision: 1.20 $
+ * $Date: 2000/09/29 07:00:27 $
*
* ====================================================================
*
@@ -81,7 +81,7 @@
import org.apache.jasper.Constants;
import org.apache.jasper.JspCompilationContext;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
/**
* JSP code generator "backend".
1.20 +2 -2 jakarta-tomcat/src/share/org/apache/jasper/compiler/JspReader.java
Index: JspReader.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspReader.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- JspReader.java 2000/07/25 04:55:57 1.19
+++ JspReader.java 2000/09/29 07:00:28 1.20
@@ -70,7 +70,7 @@
import org.apache.jasper.Constants;
import org.apache.jasper.JspCompilationContext;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
/**
* JspReader is an input buffer for the JSP parser. It should allow
@@ -93,7 +93,7 @@
private JspCompilationContext context;
- Logger.Helper loghelper = new Logger.Helper("JASPER_LOG", "JspReader");
+ Log loghelper = new Log("JASPER_LOG", "JspReader");
public String getFile(int fileid) {
return (String) sourceFiles.elementAt(fileid);
1.25 +1 -1 jakarta-tomcat/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Parser.java 2000/06/19 23:22:25 1.24
+++ Parser.java 2000/09/29 07:00:29 1.25
@@ -65,7 +65,7 @@
import javax.servlet.jsp.tagext.TagLibraryInfo;
import javax.servlet.jsp.tagext.TagInfo;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
/**
* The class that parses the JSP input and calls the right methods on
1.26 +4 -4 jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- TagLibraryInfoImpl.java 2000/08/07 19:04:37 1.25
+++ TagLibraryInfoImpl.java 2000/09/29 07:00:30 1.26
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v 1.25 2000/08/07 19:04:37 glenn Exp $
- * $Revision: 1.25 $
- * $Date: 2000/08/07 19:04:37 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v 1.26 2000/09/29 07:00:30 costin Exp $
+ * $Revision: 1.26 $
+ * $Date: 2000/09/29 07:00:30 $
*
* The Apache Software License, Version 1.1
*
@@ -88,7 +88,7 @@
import org.apache.jasper.Constants;
//import org.apache.jasper.runtime.JspLoader;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
/**
* Implementation of the TagLibraryInfo class from the JSP spec.
1.6 +5 -5 jakarta-tomcat/src/share/org/apache/jasper/runtime/JspFactoryImpl.java
Index: JspFactoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspFactoryImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JspFactoryImpl.java 2000/07/11 03:48:35 1.5
+++ JspFactoryImpl.java 2000/09/29 07:00:38 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspFactoryImpl.java,v 1.5 2000/07/11 03:48:35 alex Exp $
- * $Revision: 1.5 $
- * $Date: 2000/07/11 03:48:35 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspFactoryImpl.java,v 1.6 2000/09/29 07:00:38 costin Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/09/29 07:00:38 $
*
* ====================================================================
*
@@ -69,7 +69,7 @@
import javax.servlet.jsp.PageContext;
import org.apache.tomcat.util.SimplePool;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
/**
* Implementation of JspFactory from the spec. Helps create
@@ -81,7 +81,7 @@
private SimplePool pool=new SimplePool( 100 );
private static final boolean usePool=true;
- Logger.Helper loghelper = new Logger.Helper("JASPER_LOG", "JspFactoryImpl");
+ Log loghelper = new Log("JASPER_LOG", "JspFactoryImpl");
public PageContext getPageContext(Servlet servlet, ServletRequest request,
ServletResponse response,
1.14 +1 -1 jakarta-tomcat/src/share/org/apache/jasper/runtime/JspLoader.java
Index: JspLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspLoader.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JspLoader.java 2000/06/26 18:01:28 1.13
+++ JspLoader.java 2000/09/29 07:00:39 1.14
@@ -76,7 +76,7 @@
import org.apache.jasper.Constants;
import org.apache.jasper.Options;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
import javax.servlet.http.*;
/**
* Jsp compiler and runtime depends on special features from the
1.16 +5 -5 jakarta-tomcat/src/share/org/apache/jasper/runtime/PageContextImpl.java
Index: PageContextImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PageContextImpl.java 2000/09/14 03:11:06 1.15
+++ PageContextImpl.java 2000/09/29 07:00:40 1.16
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/PageContextImpl.java,v 1.15 2000/09/14 03:11:06 larryi Exp $
- * $Revision: 1.15 $
- * $Date: 2000/09/14 03:11:06 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/PageContextImpl.java,v 1.16 2000/09/29 07:00:40 costin Exp $
+ * $Revision: 1.16 $
+ * $Date: 2000/09/29 07:00:40 $
*
* ====================================================================
*
@@ -87,7 +87,7 @@
import javax.servlet.jsp.tagext.BodyContent;
import org.apache.jasper.Constants;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
/**
* Implementation of the PageContext class from the JSP spec.
@@ -100,7 +100,7 @@
*/
public class PageContextImpl extends PageContext {
- Logger.Helper loghelper = new Logger.Helper("JASPER_LOG", "JspFactoryImpl");
+ Log loghelper = new Log("JASPER_LOG", "JspFactoryImpl");
PageContextImpl(JspFactory factory) {
this.factory = factory;
1.2 +1 -1 jakarta-tomcat/src/share/org/apache/jasper/servlet/JasperLoader.java
Index: JasperLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/servlet/JasperLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JasperLoader.java 2000/06/23 21:37:32 1.1
+++ JasperLoader.java 2000/09/29 07:00:44 1.2
@@ -79,7 +79,7 @@
import org.apache.jasper.Options;
import org.apache.jasper.compiler.Compiler;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
import javax.servlet.http.*;
/**
* This is a class loader that loads JSP files as though they were
1.3 +1 -1 jakarta-tomcat/src/share/org/apache/jasper/servlet/JasperLoader12.java
Index: JasperLoader12.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/servlet/JasperLoader12.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JasperLoader12.java 2000/07/11 03:48:37 1.2
+++ JasperLoader12.java 2000/09/29 07:00:48 1.3
@@ -79,7 +79,7 @@
import org.apache.jasper.Options;
import org.apache.jasper.compiler.Compiler;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
import javax.servlet.http.*;
/**
* 1.2 version of the JspLoader
1.5 +2 -2 jakarta-tomcat/src/share/org/apache/jasper/servlet/JspServlet.java
Index: JspServlet.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/servlet/JspServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JspServlet.java 2000/07/11 03:48:37 1.4
+++ JspServlet.java 2000/09/29 07:00:48 1.5
@@ -84,7 +84,7 @@
import org.apache.jasper.compiler.Compiler;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
/**
* The JSP engine (a.k.a Jasper)!
@@ -94,7 +94,7 @@
*/
public class JspServlet extends HttpServlet {
- Logger.Helper loghelper = new Logger.Helper("JASPER_LOG", "JspServlet");
+ Log loghelper = new Log("JASPER_LOG", "JspServlet");
class JspServletWrapper {
Servlet theServlet;
1.52 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/context/DefaultCMSetter.java
Index: DefaultCMSetter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/context/DefaultCMSetter.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- DefaultCMSetter.java 2000/09/26 04:58:24 1.51
+++ DefaultCMSetter.java 2000/09/29 07:00:55 1.52
@@ -68,7 +68,7 @@
import java.util.*;
import java.security.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
/**
* Check ContextManager and set defaults for non-set properties
1.25 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/context/LoadOnStartupInterceptor.java
Index: LoadOnStartupInterceptor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/context/LoadOnStartupInterceptor.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- LoadOnStartupInterceptor.java 2000/09/26 04:58:24 1.24
+++ LoadOnStartupInterceptor.java 2000/09/29 07:00:56 1.25
@@ -62,7 +62,7 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import java.io.*;
import java.net.*;
import java.util.*;
1.11 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/context/PolicyInterceptor.java
Index: PolicyInterceptor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/context/PolicyInterceptor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PolicyInterceptor.java 2000/09/28 06:46:16 1.10
+++ PolicyInterceptor.java 2000/09/29 07:00:56 1.11
@@ -68,7 +68,7 @@
import java.util.*;
import java.security.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
/**
* Set policy-based access to tomcat.
1.21 +3 -4 jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java
Index: BaseInterceptor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- BaseInterceptor.java 2000/09/28 03:25:46 1.20
+++ BaseInterceptor.java 2000/09/29 07:00:59 1.21
@@ -62,8 +62,7 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.*;
-import org.apache.tomcat.logging.Logger.Helper;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
import java.io.*;
import java.net.*;
import java.util.*;
@@ -85,7 +84,7 @@
public static final int OK=0;
// loghelper will use name of actual impl subclass
- protected Logger.Helper loghelper = new Logger.Helper("tc_log", this);
+ protected Log loghelper = new Log("tc_log", this);
public BaseInterceptor() {
}
@@ -131,7 +130,7 @@
public void setContext( Context ctx ) {
this.ct=ctx.getContainer();
- loghelper.setLogger(ctx.getLoggerHelper().getLogger());
+ loghelper.setLogger(ctx.getLog().getLogger());
}
protected void log( String s ) {
1.122 +10 -13 jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java
Index: Context.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- Context.java 2000/09/29 04:11:48 1.121
+++ Context.java 2000/09/29 07:01:00 1.122
@@ -65,7 +65,7 @@
import org.apache.tomcat.util.*;
import java.security.*;
import java.lang.reflect.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import java.io.*;
import java.net.*;
import java.util.*;
@@ -856,8 +856,8 @@
// ------------------- Logging ---------------
- Logger.Helper loghelper = new Logger.Helper("tc_log", this);
- Logger.Helper loghelperServlet;
+ Log loghelper = new Log("tc_log", this);
+ Log loghelperServlet;
/** Internal log method
*/
@@ -884,9 +884,8 @@
*/
public void logServlet( String msg , Throwable t ) {
if (loghelperServlet == null) {
- loghelperServlet = new Logger.Helper
- ("servlet_log",
- (vhost==null ? "" : vhost + ":" ) + path);
+ String pr= ((vhost==null) ? "" : vhost + ":" ) + path;
+ loghelperServlet = new Log("servlet_log", pr );
}
if (t == null)
loghelperServlet.log(msg); // uses level INFORMATION
@@ -901,23 +900,21 @@
public void setLogger(Logger logger) {
if (loghelper == null) {
- loghelper = new Logger.Helper
- ("tc_log",
- (vhost==null ? "" : vhost + ":" ) + path);
+ String pr=((vhost==null ? "" : vhost + ":" ) + path);
+ loghelper = new Log("tc_log", pr );
}
loghelper.setLogger(logger);
}
public void setServletLogger(Logger logger) {
if (loghelperServlet == null) {
- loghelperServlet = new Logger.Helper
- ("servlet_log",
- (vhost==null ? "" : vhost + ":" ) + path);
+ String pr=((vhost==null ? "" : vhost + ":" ) + path);
+ loghelperServlet = new Log("servlet_log",pr);
}
loghelperServlet.setLogger(logger);
}
- public Logger.Helper getLoggerHelper() {
+ public Log getLog() {
return loghelper;
}
1.137 +3 -3 jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- ContextManager.java 2000/09/28 03:25:46 1.136
+++ ContextManager.java 2000/09/29 07:01:01 1.137
@@ -64,7 +64,7 @@
import org.apache.tomcat.context.*;
import org.apache.tomcat.request.*;
import org.apache.tomcat.util.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import java.io.*;
import java.net.*;
import java.util.*;
@@ -1106,7 +1106,7 @@
// -------------------- Logging and debug --------------------
boolean firstLog = true;
- Logger.Helper loghelper = new Logger.Helper("tc_log", "ContextManager");
+ Log loghelper = new Log("tc_log", "ContextManager");
/**
* Get the Logger object that the context manager is writing to (necessary?)
@@ -1119,7 +1119,7 @@
* So other classes can piggyback on the context manager's log
* stream, using Logger.Helper.setProxy()
**/
- public Logger.Helper getLoggerHelper() {
+ public Log getLog() {
return loghelper;
}
1.16 +4 -4 jakarta-tomcat/src/share/org/apache/tomcat/core/Handler.java
Index: Handler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Handler.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Handler.java 2000/09/26 03:49:54 1.15
+++ Handler.java 2000/09/29 07:01:01 1.16
@@ -59,7 +59,7 @@
package org.apache.tomcat.core;
import org.apache.tomcat.util.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import java.io.*;
import java.net.*;
import java.util.*;
@@ -341,7 +341,7 @@
// -------------------- Debug --------------------
- Logger.Helper loghelper = new Logger.Helper("tc_log", this);
+ Log loghelper = new Log("tc_log", this);
public void setDebug( int d ) {
debug=d;
@@ -349,13 +349,13 @@
protected void log( String s ) {
if (context != null)
- loghelper.setLogger(context.getLoggerHelper().getLogger());
+ loghelper.setLogger(context.getLog().getLogger());
loghelper.log(s);
}
protected void log( String s, Throwable t ) {
if (context != null)
- loghelper.setLogger(context.getLoggerHelper().getLogger());
+ loghelper.setLogger(context.getLog().getLogger());
loghelper.log(s, t);
}
1.6 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/core/OutputBuffer.java
Index: OutputBuffer.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/OutputBuffer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OutputBuffer.java 2000/09/26 00:59:27 1.5
+++ OutputBuffer.java 2000/09/29 07:01:02 1.6
@@ -125,7 +125,7 @@
if( conv!= null ) {
conv.reset(); // reset ?
} else {
- log( "Recycle without conv ??");
+ // log( "Recycle without conv ??");
}
}
1.64 +0 -1 jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java
Index: Request.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- Request.java 2000/09/28 03:25:46 1.63
+++ Request.java 2000/09/29 07:01:03 1.64
@@ -62,7 +62,6 @@
import org.apache.tomcat.util.*;
import org.apache.tomcat.session.*;
-import org.apache.tomcat.logging.*;
import org.apache.tomcat.helper.*;
import java.io.IOException;
import java.io.*;
1.5 +7 -7 jakarta-tomcat/src/share/org/apache/tomcat/helper/ServerXmlHelper.java
Index: ServerXmlHelper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/helper/ServerXmlHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServerXmlHelper.java 2000/09/29 04:11:48 1.4
+++ ServerXmlHelper.java 2000/09/29 07:01:07 1.5
@@ -68,7 +68,7 @@
import org.apache.tomcat.util.*;
import org.apache.tomcat.util.xml.*;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import org.xml.sax.*;
/**
@@ -196,25 +196,25 @@
*/
public void setLogHelper( XmlMapper xh ) {
xh.addRule("Server/Logger",
- xh.objectCreate("org.apache.tomcat.logging.TomcatLogger"));
+ xh.objectCreate("org.apache.tomcat.util.log.QueueLogger"));
xh.addRule("Server/Logger", xh.setProperties());
xh.addRule("Server/Logger",
xh.addChild("addLogger",
- "org.apache.tomcat.logging.Logger") );
+ "org.apache.tomcat.util.log.Logger") );
xh.addRule("Context/Logger",
- xh.objectCreate("org.apache.tomcat.logging.TomcatLogger"));
+ xh.objectCreate("org.apache.tomcat.util.log.QueueLogger"));
xh.addRule("Context/Logger", xh.setProperties());
xh.addRule("Context/Logger",
xh.addChild("setLogger",
- "org.apache.tomcat.logging.Logger") );
+ "org.apache.tomcat.util.log.Logger") );
xh.addRule("Context/ServletLogger",
- xh.objectCreate("org.apache.tomcat.logging.TomcatLogger"));
+ xh.objectCreate("org.apache.tomcat.util.log.QueueLogger"));
xh.addRule("Context/ServletLogger", xh.setProperties());
xh.addRule("Context/ServletLogger",
xh.addChild("setServletLogger",
- "org.apache.tomcat.logging.Logger") );
+ "org.apache.tomcat.util.log.Logger") );
}
1.3 +4 -4 jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13Interceptor.java
Index: Ajp13Interceptor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13Interceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Ajp13Interceptor.java 2000/09/24 18:09:54 1.2
+++ Ajp13Interceptor.java 2000/09/29 07:01:16 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13Interceptor.java,v 1.2 2000/09/24 18:09:54 costin Exp $
- * $Revision: 1.2 $
- * $Date: 2000/09/24 18:09:54 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13Interceptor.java,v 1.3 2000/09/29 07:01:16 costin Exp $
+ * $Revision: 1.3 $
+ * $Date: 2000/09/29 07:01:16 $
*
* ====================================================================
*
@@ -69,7 +69,7 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.net.*;
import org.apache.tomcat.util.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
public class Ajp13Interceptor extends PoolTcpConnector
implements TcpConnectionHandler
1.3 +2 -2 jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10.java
Index: Http10.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Http10.java 2000/09/24 18:09:55 1.2
+++ Http10.java 2000/09/29 07:01:17 1.3
@@ -63,7 +63,7 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.helper.*;
import org.apache.tomcat.util.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import java.io.*;
import java.net.*;
import java.util.*;
@@ -85,7 +85,7 @@
protected int oBufferCount = 0;
static final byte CRLF[]= { (byte)'\r', (byte)'\n' };
- Logger.Helper loghelper = new Logger.Helper("tc_log", this);
+ Log loghelper = new Log("tc_log", this);
public Http10() {
super();
1.3 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10Interceptor.java
Index: Http10Interceptor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10Interceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Http10Interceptor.java 2000/09/24 18:09:56 1.2
+++ Http10Interceptor.java 2000/09/29 07:01:18 1.3
@@ -68,7 +68,7 @@
import org.apache.tomcat.util.*;
import org.apache.tomcat.util.net.*;
import org.apache.tomcat.util.net.ServerSocketFactory;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
/** Standalone http.
*
1.13 +0 -3 jakarta-tomcat/src/share/org/apache/tomcat/request/InvokerInterceptor.java
Index: InvokerInterceptor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/InvokerInterceptor.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- InvokerInterceptor.java 2000/09/28 03:25:47 1.12
+++ InvokerInterceptor.java 2000/09/29 07:01:21 1.13
@@ -60,7 +60,6 @@
import org.apache.tomcat.util.*;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.logging.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -77,8 +76,6 @@
String prefix="/servlet/";
int prefixLen=prefix.length();
- Logger.Helper loghelper = new Logger.Helper("tc_log", "InvokerInterceptor");
-
public int requestMap(Request req) {
// If we have an explicit mapper - return
Container ct=req.getContainer();
1.22 +0 -3 jakarta-tomcat/src/share/org/apache/tomcat/request/SimpleMapper1.java
Index: SimpleMapper1.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/SimpleMapper1.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SimpleMapper1.java 2000/09/26 04:58:27 1.21
+++ SimpleMapper1.java 2000/09/29 07:01:21 1.22
@@ -63,7 +63,6 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.helper.*;
import org.apache.tomcat.util.*;
-import org.apache.tomcat.logging.*;
import java.util.*;
/**
@@ -102,8 +101,6 @@
// Property for the PrefixMapper - cache the mapping results
boolean mapCacheEnabled=false;
- Logger.Helper loghelper = new Logger.Helper("tc_log", "SimpleMapper1");
-
public SimpleMapper1() {
map=new PrefixMapper();
}
1.7 +5 -5 jakarta-tomcat/src/share/org/apache/tomcat/service/JNIEndpointConnector.java
Index: JNIEndpointConnector.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/JNIEndpointConnector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JNIEndpointConnector.java 2000/08/11 16:24:23 1.6
+++ JNIEndpointConnector.java 2000/09/29 07:01:24 1.7
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/JNIEndpointConnector.java,v 1.6 2000/08/11 16:24:23 costin Exp $
- * $Revision: 1.6 $
- * $Date: 2000/08/11 16:24:23 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/JNIEndpointConnector.java,v 1.7 2000/09/29 07:01:24 costin Exp $
+ * $Revision: 1.7 $
+ * $Date: 2000/09/29 07:01:24 $
*
* ====================================================================
*
@@ -67,7 +67,7 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.*;
import org.apache.tomcat.service.connector.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
/**
* Connector for a JNI connections using the API in tomcat.service.
@@ -153,7 +153,7 @@
return null;
}
- private Logger.Helper loghelper = new Logger.Helper("tc_log", "JNIEndpointConnector");
+ private Log loghelper = new Log("tc_log", "JNIEndpointConnector");
/**
* Set a logger explicitly.
1.14 +6 -6 jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpConnector.java
Index: PoolTcpConnector.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpConnector.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PoolTcpConnector.java 2000/08/14 21:54:19 1.13
+++ PoolTcpConnector.java 2000/09/29 07:01:25 1.14
@@ -63,7 +63,7 @@
import org.apache.tomcat.util.*;
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.net.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import java.io.*;
import java.net.*;
import java.util.*;
@@ -227,9 +227,9 @@
// -------------------- Bean-setters for TcpConnector --------------------
public void setServer( Object ctx ) {
this.cm=ctx;
- if (cm instanceof LogAware) {
- loghelper.setProxy(((LogAware)cm).getLoggerHelper());
- }
+// if (cm instanceof LogAware) {
+// loghelper.setProxy(((LogAware)cm).getLoggerHelper());
+// }
}
public void setDebug( int i ) {
@@ -333,7 +333,7 @@
}
// ----- Logging -----
- private Logger.Helper loghelper = new Logger.Helper("tc_log", "PoolTcpConnector");
+ private Log loghelper = new Log("tc_log", "PoolTcpConnector");
/**
* Set a logger explicitly. Note that setLogger(null) will not
@@ -344,7 +344,7 @@
loghelper.setLogger(logger);
}
- public Logger.Helper getLoggerHelper() {
+ public Log getLog() {
return loghelper;
}
1.38 +2 -2 jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp12ConnectionHandler.java
Index: Ajp12ConnectionHandler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp12ConnectionHandler.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Ajp12ConnectionHandler.java 2000/09/25 07:20:56 1.37
+++ Ajp12ConnectionHandler.java 2000/09/29 07:01:27 1.38
@@ -71,7 +71,7 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.net.*;
import org.apache.tomcat.util.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import org.apache.tomcat.service.http.*;
import org.apache.tomcat.service.http.HttpResponseAdapter;
import org.apache.tomcat.service.http.HttpRequestAdapter;
@@ -84,7 +84,7 @@
ContextManager contextM;
- Logger.Helper loghelper = new Logger.Helper("tc_log", this);
+ Log loghelper = new Log("tc_log", this);
public Ajp12ConnectionHandler() {
}
1.8 +5 -5 jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp13ConnectionHandler.java
Index: Ajp13ConnectionHandler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp13ConnectionHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Ajp13ConnectionHandler.java 2000/09/25 07:20:57 1.7
+++ Ajp13ConnectionHandler.java 2000/09/29 07:01:28 1.8
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp13ConnectionHandler.java,v 1.7 2000/09/25 07:20:57 costin Exp $
- * $Revision: 1.7 $
- * $Date: 2000/09/25 07:20:57 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp13ConnectionHandler.java,v 1.8 2000/09/29 07:01:28 costin Exp $
+ * $Revision: 1.8 $
+ * $Date: 2000/09/29 07:01:28 $
*
* ====================================================================
*
@@ -71,7 +71,7 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.net.*;
import org.apache.tomcat.util.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
public class Ajp13ConnectionHandler implements TcpConnectionHandler
{
@@ -80,7 +80,7 @@
public static final byte JK_AJP13_FORWARD_REQUEST = 2;
public static final byte JK_AJP13_SHUTDOWN = 7;
- Logger.Helper loghelper = new Logger.Helper("tc_log", "Ajp13ConnectionHandler");
+ Log loghelper = new Log("tc_log", "Ajp13ConnectionHandler");
public Ajp13ConnectionHandler()
{
1.32 +6 -6 jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpConnectionHandler.java
Index: HttpConnectionHandler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpConnectionHandler.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- HttpConnectionHandler.java 2000/09/25 07:21:17 1.31
+++ HttpConnectionHandler.java 2000/09/29 07:01:30 1.32
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpConnectionHandler.java,v 1.31 2000/09/25 07:21:17 costin Exp $
- * $Revision: 1.31 $
- * $Date: 2000/09/25 07:21:17 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpConnectionHandler.java,v 1.32 2000/09/29 07:01:30 costin Exp $
+ * $Revision: 1.32 $
+ * $Date: 2000/09/29 07:01:30 $
*
* ====================================================================
*
@@ -71,7 +71,7 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.*;
import org.apache.tomcat.util.net.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
public class HttpConnectionHandler implements TcpConnectionHandler {
@@ -94,7 +94,7 @@
public void setServer( Object contextM ) {
this.contextM=(ContextManager)contextM;
- loghelper.setProxy(this.contextM.getLoggerHelper());
+ // loghelper.setProxy(this.contextM.getLoggerHelper());
}
public Object[] init() {
@@ -244,7 +244,7 @@
// System.out.print("6");
}
- Logger.Helper loghelper = new Logger.Helper("tc_log", this);
+ Log loghelper = new Log("tc_log", this);
// note: as soon as we get a ContextManager, we start using its
// log stream, see setServer()
1.5 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpInterceptor.java
Index: HttpInterceptor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpInterceptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HttpInterceptor.java 2000/09/25 07:21:19 1.4
+++ HttpInterceptor.java 2000/09/29 07:01:31 1.5
@@ -68,7 +68,7 @@
import org.apache.tomcat.util.*;
import org.apache.tomcat.util.net.*;
import org.apache.tomcat.util.net.ServerSocketFactory;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
/** Standalone http.
*
1.32 +5 -5 jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpRequestAdapter.java
Index: HttpRequestAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpRequestAdapter.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- HttpRequestAdapter.java 2000/09/25 07:21:22 1.31
+++ HttpRequestAdapter.java 2000/09/29 07:01:32 1.32
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpRequestAdapter.java,v 1.31 2000/09/25 07:21:22 costin Exp $
- * $Revision: 1.31 $
- * $Date: 2000/09/25 07:21:22 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpRequestAdapter.java,v 1.32 2000/09/29 07:01:32 costin Exp $
+ * $Revision: 1.32 $
+ * $Date: 2000/09/29 07:01:32 $
*
* ====================================================================
*
@@ -68,7 +68,7 @@
import org.apache.tomcat.helper.*;
import org.apache.tomcat.util.*;
import org.apache.tomcat.util.net.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import java.io.*;
import java.net.*;
import java.util.*;
@@ -84,7 +84,7 @@
int count=0;
public static final String DEFAULT_CHARACTER_ENCODING = "8859_1";
- Logger.Helper loghelper = new Logger.Helper("tc_log", this);
+ Log loghelper = new Log("tc_log", this);
public HttpRequestAdapter() {
super();
1.21 +5 -5 jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpResponseAdapter.java
Index: HttpResponseAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpResponseAdapter.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- HttpResponseAdapter.java 2000/09/25 07:21:23 1.20
+++ HttpResponseAdapter.java 2000/09/29 07:01:32 1.21
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpResponseAdapter.java,v 1.20 2000/09/25 07:21:23 costin Exp $
- * $Revision: 1.20 $
- * $Date: 2000/09/25 07:21:23 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpResponseAdapter.java,v 1.21 2000/09/29 07:01:32 costin Exp $
+ * $Revision: 1.21 $
+ * $Date: 2000/09/29 07:01:32 $
*
* ====================================================================
*
@@ -67,7 +67,7 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.*;
import org.apache.tomcat.helper.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import java.io.*;
import java.net.*;
import java.util.*;
@@ -86,7 +86,7 @@
protected byte[] buffer = new byte[DEFAULT_HEAD_BUFFER_SIZE];
protected int bufferCount = 0;
- Logger.Helper loghelper = new Logger.Helper("tc_log", this);
+ Log loghelper = new Log("tc_log", this);
public HttpResponseAdapter() {
super();
1.10 +2 -3 jakarta-tomcat/src/share/org/apache/tomcat/session/ServerSessionManager.java
Index: ServerSessionManager.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/session/ServerSessionManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ServerSessionManager.java 2000/09/26 03:49:54 1.9
+++ ServerSessionManager.java 2000/09/29 07:01:36 1.10
@@ -68,8 +68,7 @@
import org.apache.tomcat.util.threads.*;
import org.apache.tomcat.helper.*;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.logging.Logger.Helper;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
/**
*
@@ -77,7 +76,7 @@
*/
public final class ServerSessionManager
{
- protected Logger.Helper loghelper = new Logger.Helper("tc_log", this);
+ protected Log loghelper = new Log("tc_log", this);
/** The set of previously recycled Sessions for this Manager.
*/
1.27 +2 -2 jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java
Index: EmbededTomcat.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- EmbededTomcat.java 2000/09/28 06:46:22 1.26
+++ EmbededTomcat.java 2000/09/29 07:01:38 1.27
@@ -8,7 +8,7 @@
import org.apache.tomcat.modules.server.*;
import org.apache.tomcat.session.StandardSessionInterceptor;
import org.apache.tomcat.context.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import java.security.*;
import java.util.*;
@@ -48,7 +48,7 @@
String workDir;
- Logger.Helper loghelper = new Logger.Helper("tc_log", this);
+ Log loghelper = new Log("tc_log", this);
// configurable properties
int debug=0;
1.43 +2 -2 jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java
Index: Tomcat.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Tomcat.java 2000/09/26 04:58:28 1.42
+++ Tomcat.java 2000/09/29 07:01:39 1.43
@@ -12,7 +12,7 @@
import org.apache.tomcat.task.*;
import org.apache.tomcat.util.xml.*;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import org.xml.sax.*;
/**
@@ -21,7 +21,7 @@
*
* @author costin@dnt.ro
*/
-public class Tomcat extends Logger.Helper {
+public class Tomcat extends Log {
private static StringManager sm =
StringManager.getManager("org.apache.tomcat.resources");
1.19 +2 -2 jakarta-tomcat/src/share/org/apache/tomcat/task/ApacheConfig.java
Index: ApacheConfig.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/ApacheConfig.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ApacheConfig.java 2000/09/26 05:17:11 1.18
+++ ApacheConfig.java 2000/09/29 07:01:44 1.19
@@ -60,7 +60,7 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import java.io.*;
import java.net.*;
import java.util.*;
@@ -89,7 +89,7 @@
return null;
}
- Logger.Helper loghelper = new Logger.Helper("tc_log", this);
+ Log loghelper = new Log("tc_log", this);
public void execute(ContextManager cm) throws TomcatException {
try {
1.3 +2 -2 jakarta-tomcat/src/share/org/apache/tomcat/task/Expand.java
Index: Expand.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/Expand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Expand.java 2000/07/11 03:49:01 1.2
+++ Expand.java 2000/09/29 07:01:45 1.3
@@ -56,7 +56,7 @@
import java.io.*;
import java.util.zip.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
/**
* Unzip a file. "Imported" from Ant, with small adaptations.
@@ -67,7 +67,7 @@
private String dest; // req
private String source; // req
- Logger.Helper loghelper = new Logger.Helper("tc_log", this);
+ Log loghelper = new Log("tc_log", this);
/**
* Do the work.
1.5 +2 -2 jakarta-tomcat/src/share/org/apache/tomcat/task/IISConfig.java
Index: IISConfig.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/IISConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IISConfig.java 2000/09/09 23:15:34 1.4
+++ IISConfig.java 2000/09/29 07:01:45 1.5
@@ -60,7 +60,7 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import java.io.*;
import java.net.*;
import java.util.*;
@@ -82,7 +82,7 @@
{
}
- Logger.Helper loghelper = new Logger.Helper("tc_log", "IISConfig");
+ Log loghelper = new Log("tc_log", "IISConfig");
public void execute(ContextManager cm) throws TomcatException
{
1.5 +2 -2 jakarta-tomcat/src/share/org/apache/tomcat/task/NSConfig.java
Index: NSConfig.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/NSConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NSConfig.java 2000/09/09 23:15:34 1.4
+++ NSConfig.java 2000/09/29 07:01:46 1.5
@@ -60,7 +60,7 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import java.io.*;
import java.net.*;
import java.util.*;
@@ -77,7 +77,7 @@
public static final String NS_CONFIG = "/conf/jk/obj.conf";
public static final String JK_LOG_LOCATION = "/logs/netscape_redirect.log";
- Logger.Helper loghelper = new Logger.Helper("tc_log", this);
+ Log loghelper = new Log("tc_log", this);
public NSConfig()
{
1.6 +2 -2 jakarta-tomcat/src/share/org/apache/tomcat/task/StartTomcat.java
Index: StartTomcat.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/StartTomcat.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StartTomcat.java 2000/09/26 04:58:28 1.5
+++ StartTomcat.java 2000/09/29 07:01:46 1.6
@@ -69,7 +69,7 @@
import org.apache.tomcat.helper.*;
import org.apache.tomcat.util.xml.*;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import org.xml.sax.*;
/**
@@ -88,7 +88,7 @@
private static StringManager sm =
StringManager.getManager("org.apache.tomcat.resources");
- Logger.Helper loghelper = new Logger.Helper("tc_log", "StartTomcat");
+ Log loghelper = new Log("tc_log", "StartTomcat");
public StartTomcat() {
}
1.10 +2 -2 jakarta-tomcat/src/share/org/apache/tomcat/task/StopTomcat.java
Index: StopTomcat.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/StopTomcat.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StopTomcat.java 2000/09/26 05:17:11 1.9
+++ StopTomcat.java 2000/09/29 07:01:47 1.10
@@ -62,7 +62,7 @@
import org.apache.tomcat.util.*;
import org.apache.tomcat.helper.*;
import org.apache.tomcat.util.xml.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import java.io.*;
import java.net.*;
import java.util.*;
@@ -84,7 +84,7 @@
String configFile;
String tomcatHome;
- Logger.Helper loghelper = new Logger.Helper("tc_log", "StopTomcat");
+ Log loghelper = new Log("tc_log", "StopTomcat");
public StopTomcat()
{
1.13 +5 -5 jakarta-tomcat/src/share/org/apache/tomcat/util/FileUtil.java
Index: FileUtil.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/FileUtil.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FileUtil.java 2000/07/25 04:19:29 1.12
+++ FileUtil.java 2000/09/29 07:01:51 1.13
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/FileUtil.java,v 1.12 2000/07/25 04:19:29 craigmcc Exp $
- * $Revision: 1.12 $
- * $Date: 2000/07/25 04:19:29 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/FileUtil.java,v 1.13 2000/09/29 07:01:51 costin Exp $
+ * $Revision: 1.13 $
+ * $Date: 2000/09/29 07:01:51 $
*
* ====================================================================
*
@@ -67,7 +67,7 @@
import java.io.File;
import java.io.IOException;
-import org.apache.tomcat.logging.Logger;
+import org.apache.tomcat.util.log.*;
/*
* FileUtil contains utils for dealing with Files. Some of these are
@@ -126,7 +126,7 @@
return lookupPath + "/" + path;
}
- static Logger.Helper loghelper = new Logger.Helper("tc_log", "FileUtil");
+ static Log loghelper = new Log("tc_log", "FileUtil");
/** All the safety checks from getRealPath() and
DefaultServlet.
1.5 +28 -7 jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java
Index: PoolTcpEndpoint.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PoolTcpEndpoint.java 2000/09/24 17:33:44 1.4
+++ PoolTcpEndpoint.java 2000/09/29 07:01:53 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v 1.4 2000/09/24 17:33:44 costin Exp $
- * $Revision: 1.4 $
- * $Date: 2000/09/24 17:33:44 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v 1.5 2000/09/29 07:01:53 costin Exp $
+ * $Revision: 1.5 $
+ * $Date: 2000/09/29 07:01:53 $
*
* ====================================================================
*
@@ -66,7 +66,7 @@
import org.apache.tomcat.util.*;
import org.apache.tomcat.util.threads.*;
-import org.apache.tomcat.logging.*;
+import org.apache.tomcat.util.log.*;
import java.io.*;
import java.net.*;
import java.util.*;
@@ -93,7 +93,7 @@
* @author Costin@eng.sun.com
* @author Gal Shachor [shachor@il.ibm.com]
*/
-public class PoolTcpEndpoint extends Logger.Helper { // implements Endpoint {
+public class PoolTcpEndpoint { // implements Endpoint {
private StringManager sm = StringManager.getManager("org.apache.tomcat.resources");
@@ -118,9 +118,10 @@
static final int debug=0;
ThreadPool tp;
-
+ protected Log _log=new Log("tc_log");
+
public PoolTcpEndpoint() {
- super("tc_log"); // initialize default logger
+ // super("tc_log"); // initialize default logger
tp = new ThreadPool();
}
@@ -330,6 +331,26 @@
return accepted;
}
+
+ public void log(String msg)
+ {
+ _log.log(msg, null, Logger.INFORMATION);
+ }
+
+ public void log(String msg, Throwable t)
+ {
+ _log.log(msg, t, Logger.ERROR);
+ }
+
+ public void log(String msg, int level)
+ {
+ _log.log(msg, null, level);
+ }
+
+ public void log(String msg, Throwable t, int level) {
+ _log.log( msg, t, level );
+ }
+
}
// -------------------- Threads --------------------
1.2 +5 -6 jakarta-tomcat/src/share/org/apache/tomcat/util/threads/ThreadPool.java
Index: ThreadPool.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/threads/ThreadPool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ThreadPool.java 2000/08/28 03:14:09 1.1
+++ ThreadPool.java 2000/09/29 07:01:55 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/threads/ThreadPool.java,v 1.1 2000/08/28 03:14:09 costin Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/28 03:14:09 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/threads/ThreadPool.java,v 1.2 2000/09/29 07:01:55 costin Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/09/29 07:01:55 $
*
* ====================================================================
*
@@ -67,9 +67,8 @@
import java.net.*;
import java.util.*;
import java.io.*;
+import org.apache.tomcat.util.log.*;
-import org.apache.tomcat.logging.*;
-
/**
* A thread pool that is trying to copy the apache process management.
*
@@ -131,7 +130,7 @@
/**
* Helper object for logging
**/
- Logger.Helper loghelper = new Logger.Helper("tc_log", "ThreadPool");
+ Log loghelper = new Log("tc_log", "ThreadPool");
public ThreadPool() {
maxThreads = MAX_THREADS;
BUILD BROKEN - Missing org.apache.tomcat.util.log classes
Posted by Jorgen Thelin <nj...@sw-technologies.com>.
This breaks the build, as the org.apache.tomcat.util.log classes are not
present in the jakarta-tomcat CVS repository :-(
In article <20...@locus.apache.org>,
costin@locus.apache.org writes
>costin 00/09/29 00:01:57
>
> Modified: src/facade22/org/apache/tomcat/facade
> Servlet22Interceptor.java ServletWrapper.java
> WebXmlReader.java
> src/facade22/org/apache/tomcat/modules/facade22
> JspInterceptor.java
> src/facade23/org/apache/tomcat/facade23 ServletWrapper.java
> src/share/org/apache/jasper Constants.java
> EmbededServletOptions.java JspC.java
> JspEngineContext.java
> src/share/org/apache/jasper/compiler Compiler.java
> JspCompiler.java JspParseEventListener.java
> JspReader.java Parser.java TagLibraryInfoImpl.java
> src/share/org/apache/jasper/runtime JspFactoryImpl.java
> JspLoader.java PageContextImpl.java
> src/share/org/apache/jasper/servlet JasperLoader.java
> JasperLoader12.java JspServlet.java
> src/share/org/apache/tomcat/context DefaultCMSetter.java
> LoadOnStartupInterceptor.java
> PolicyInterceptor.java
> src/share/org/apache/tomcat/core BaseInterceptor.java
> Context.java ContextManager.java Handler.java
> OutputBuffer.java Request.java
> src/share/org/apache/tomcat/helper ServerXmlHelper.java
> src/share/org/apache/tomcat/modules/server
> Ajp13Interceptor.java Http10.java
> Http10Interceptor.java
> src/share/org/apache/tomcat/request InvokerInterceptor.java
> SimpleMapper1.java
> src/share/org/apache/tomcat/service
> JNIEndpointConnector.java PoolTcpConnector.java
> src/share/org/apache/tomcat/service/connector
> Ajp12ConnectionHandler.java
> Ajp13ConnectionHandler.java
> src/share/org/apache/tomcat/service/http
> HttpConnectionHandler.java HttpInterceptor.java
> HttpRequestAdapter.java HttpResponseAdapter.java
> src/share/org/apache/tomcat/session
> ServerSessionManager.java
> src/share/org/apache/tomcat/startup EmbededTomcat.java
> Tomcat.java
> src/share/org/apache/tomcat/task ApacheConfig.java
> Expand.java IISConfig.java NSConfig.java
> StartTomcat.java StopTomcat.java
> src/share/org/apache/tomcat/util FileUtil.java
> src/share/org/apache/tomcat/util/net PoolTcpEndpoint.java
> src/share/org/apache/tomcat/util/threads ThreadPool.java
> Removed: src/share/org/apache/tomcat/logging DefaultLogger.java
> LogAware.java Logger.java TomcatLogger.java
> Log:
> As proposed (long time ago), moved tomcat.logging to tomcat.util.log
>
<SNIP>
------------------------------------------------------------
| Software Technologies ----:---- http://www.SwTech.com/ |
| -----------> One-stop Developer Reference <----------- |
| Technical reference for professional software developers |
------------------------------------------------------------