costin 01/02/19 19:34:11
Modified: src/facade22/org/apache/tomcat/facade
HttpServletRequestFacade.java
HttpServletResponseFacade.java
HttpSessionFacade.java JspInterceptor.java
LoadOnStartupInterceptor.java
RequestDispatcherImpl.java
ServletContextFacade.java ServletWriterFacade.java
WebXmlReader.java
Log:
Package and import changes.
Only one code change: JspInterceptor is now using only Log interface
( changes in jasper will follow ).
That will allow to plug a different logger ( if anyone wants log4j or
any other logger - jasper was the last piece that need to be changed )
Revision Changes Path
1.18 +3 -1
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletRequestFacade.java
Index: HttpServletRequestFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletRequestFacade.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- HttpServletRequestFacade.java 2001/02/06 06:33:35 1.17
+++ HttpServletRequestFacade.java 2001/02/20 03:34:10 1.18
@@ -60,7 +60,9 @@
package org.apache.tomcat.facade;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.io.FileUtil;
+import org.apache.tomcat.util.buf.DateTool;
import org.apache.tomcat.util.http.*;
import org.apache.tomcat.core.*;
import org.apache.tomcat.facade.*;
1.17 +1 -1
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java
Index: HttpServletResponseFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- HttpServletResponseFacade.java 2001/02/12 16:58:28 1.16
+++ HttpServletResponseFacade.java 2001/02/20 03:34:10 1.17
@@ -60,7 +60,7 @@
package org.apache.tomcat.facade;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.http.*;
import org.apache.tomcat.core.*;
import java.io.*;
1.7 +1 -1
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpSessionFacade.java
Index: HttpSessionFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpSessionFacade.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HttpSessionFacade.java 2001/01/01 00:17:22 1.6
+++ HttpSessionFacade.java 2001/02/20 03:34:11 1.7
@@ -61,7 +61,7 @@
package org.apache.tomcat.facade;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.StringManager;
+import org.apache.tomcat.util.res.StringManager;
import java.io.*;
import java.net.*;
import java.util.*;
1.15 +6 -6
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/JspInterceptor.java
Index: JspInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/JspInterceptor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JspInterceptor.java 2001/02/11 02:24:26 1.14
+++ JspInterceptor.java 2001/02/20 03:34:11 1.15
@@ -64,8 +64,8 @@
import java.io.*;
import java.net.*;
-import org.apache.tomcat.util.log.*;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.log.Log;
+import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.depend.*;
import org.apache.tomcat.util.compat.*;
@@ -273,9 +273,9 @@
//enable jasperServlet logging
log( "Seetting debug on jsp servlet");
org.apache.jasper.Constants.jasperLog=
- org.apache.tomcat.util.log.Logger.getDefaultLogger();
- org.apache.jasper.Constants.jasperLog.
- setVerbosityLevel("debug");
+ loghelper;
+ // org.apache.jasper.Constants.jasperLog.
+ // setVerbosityLevel("debug");
}
jspServlet.setServletClassName(jspServletCN);
@@ -700,7 +700,7 @@
} catch (Exception ex) {
Constants.message("jsp.warning.compiler.class.cantcreate",
new Object[] { jspCompilerPlugin, ex },
- Logger.FATAL);
+ Log.FATAL);
javac = new SunJavaCompiler();
}
} else {
1.2 +3 -4
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/LoadOnStartupInterceptor.java
Index: LoadOnStartupInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/LoadOnStartupInterceptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoadOnStartupInterceptor.java 2000/12/27 17:15:03 1.1
+++ LoadOnStartupInterceptor.java 2001/02/20 03:34:11 1.2
@@ -60,9 +60,8 @@
package org.apache.tomcat.facade;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.facade.*;
-import org.apache.tomcat.util.log.*;
+import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.log.Log;
import java.io.*;
import java.net.*;
import java.util.*;
@@ -124,7 +123,7 @@
ctx.log("Loading " + key + " " + servletName );
if(result==null)
log("Warning: we try to load an undefined servlet " +
- servletName, Logger.WARNING);
+ servletName, Log.WARNING);
else {
try {
// special case for JSP - should be dealed with in
1.17 +1 -1
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/RequestDispatcherImpl.java
Index: RequestDispatcherImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/RequestDispatcherImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- RequestDispatcherImpl.java 2001/02/10 19:01:57 1.16
+++ RequestDispatcherImpl.java 2001/02/20 03:34:11 1.17
@@ -61,7 +61,7 @@
package org.apache.tomcat.facade;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.StringManager;
+import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.compat.*;
import org.apache.tomcat.util.http.*;
import java.io.*;
1.5 +2 -1
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletContextFacade.java
Index: ServletContextFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletContextFacade.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletContextFacade.java 2000/09/30 04:03:33 1.4
+++ ServletContextFacade.java 2001/02/20 03:34:11 1.5
@@ -61,7 +61,8 @@
package org.apache.tomcat.facade;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.io.FileUtil;
import java.io.*;
import java.net.*;
import java.util.*;
1.3 +1 -1
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletWriterFacade.java
Index: ServletWriterFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletWriterFacade.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServletWriterFacade.java 2000/12/27 17:15:05 1.2
+++ ServletWriterFacade.java 2001/02/20 03:34:11 1.3
@@ -61,7 +61,7 @@
package org.apache.tomcat.facade;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.StringManager;
+import org.apache.tomcat.util.res.StringManager;
import java.io.*;
import javax.servlet.ServletOutputStream;
1.11 +2 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- WebXmlReader.java 2000/12/26 22:58:50 1.10
+++ WebXmlReader.java 2001/02/20 03:34:11 1.11
@@ -1,7 +1,8 @@
package org.apache.tomcat.facade;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.io.FileUtil;
import org.apache.tomcat.util.xml.*;
import java.beans.*;
import java.io.*;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
