tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/jasper/runtime JspFactoryImpl.java JspLoader.java JspWriterImpl.java PageContextImpl.java
Date Fri, 02 Mar 2001 04:51:47 GMT
costin      01/03/01 20:51:47

  Modified:    src/share/org/apache/jasper 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 JspWriterImpl.java
                        PageContextImpl.java
  Log:
  Same thing - use only Log, and Log.getLog instead of new Log().
  
  Revision  Changes    Path
  1.8       +12 -12    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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- EmbededServletOptions.java	2001/01/14 20:45:39	1.7
  +++ EmbededServletOptions.java	2001/03/02 04:51:24	1.8
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java,v
1.7 2001/01/14 20:45:39 larryi Exp $
  - * $Revision: 1.7 $
  - * $Date: 2001/01/14 20:45:39 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java,v
1.8 2001/03/02 04:51:24 costin Exp $
  + * $Revision: 1.8 $
  + * $Date: 2001/03/02 04:51:24 $
    *
    * ====================================================================
    * 
  @@ -239,7 +239,7 @@
                   this.keepGenerated = true;
               else if (keepgen.equalsIgnoreCase("false"))
                   this.keepGenerated = false;
  -            else Constants.message ("jsp.warning.keepgen", Logger.WARNING);
  +            else Constants.message ("jsp.warning.keepgen", Log.WARNING);
           }
               
   
  @@ -249,7 +249,7 @@
                   this.largeFile = true;
               else if (largeFile.equalsIgnoreCase("false"))
                   this.largeFile = false;
  -            else Constants.message ("jsp.warning.largeFile", Logger.WARNING);
  +            else Constants.message ("jsp.warning.largeFile", Log.WARNING);
           }
   	
           String mapFile = config.getInitParameter("mappedfile"); 
  @@ -258,7 +258,7 @@
                   this.mappedFile = true;
               else if (mapFile.equalsIgnoreCase("false"))
                   this.mappedFile = false;
  -            else Constants.message ("jsp.warning.mappedFile", Logger.WARNING);
  +            else Constants.message ("jsp.warning.mappedFile", Log.WARNING);
           }
   	
           String senderr = config.getInitParameter("sendErrToClient");
  @@ -267,7 +267,7 @@
                   this.sendErrorToClient = true;
               else if (senderr.equalsIgnoreCase("false"))
                   this.sendErrorToClient = false;
  -            else Constants.message ("jsp.warning.sendErrToClient", Logger.WARNING);
  +            else Constants.message ("jsp.warning.sendErrToClient", Log.WARNING);
           }
   
           String debugInfo = config.getInitParameter("classdebuginfo");
  @@ -276,7 +276,7 @@
                   this.classDebugInfo  = true;
               else if (debugInfo.equalsIgnoreCase("false"))
                   this.classDebugInfo  = false;
  -            else Constants.message ("jsp.warning.classDebugInfo", Logger.WARNING);
  +            else Constants.message ("jsp.warning.classDebugInfo", Log.WARNING);
           }
   
           String ieClassId = config.getInitParameter("ieClassId");
  @@ -307,7 +307,7 @@
           // we are using a SecurityManager
           protectionDomain = context.getAttribute(Constants.ATTRIB_JSP_ProtectionDomain);
           if (this.scratchDir == null) {
  -            Constants.message("jsp.error.no.scratch.dir", Logger.FATAL);
  +            Constants.message("jsp.error.no.scratch.dir", Log.FATAL);
               return;
           }
               
  @@ -316,7 +316,7 @@
               Constants.message("jsp.error.bad.scratch.dir",
                                 new Object[] {
                                     scratchDir.getAbsolutePath()
  -                              }, Logger.FATAL);
  +                              }, Log.FATAL);
                                     
           String jspCompilerPath = config.getInitParameter("jspCompilerPath");
           if (jspCompilerPath != null) {
  @@ -325,7 +325,7 @@
               } else { 
                   Constants.message("jsp.warning.compiler.path.notfound",
                                     new Object[] { jspCompilerPath }, 
  -                                  Logger.FATAL);
  +                                  Log.FATAL);
               }
           }
   
  @@ -336,7 +336,7 @@
               } catch (ClassNotFoundException cnfe) {
                   Constants.message("jsp.warning.compiler.class.notfound",
                                     new Object[] { jspCompilerPlugin },
  -                                  Logger.FATAL);
  +                                  Log.FATAL);
               }
           }
   
  
  
  
  1.21      +6 -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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- JspC.java	2001/02/20 03:36:00	1.20
  +++ JspC.java	2001/03/02 04:51:25	1.21
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v 1.20 2001/02/20
03:36:00 costin Exp $
  - * $Revision: 1.20 $
  - * $Date: 2001/02/20 03:36:00 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v 1.21 2001/03/02
04:51:25 costin Exp $
  + * $Revision: 1.21 $
  + * $Date: 2001/03/02 04:51:25 $
    *
    * ====================================================================
    * 
  @@ -322,10 +322,10 @@
               }
           }
   
  -	QueueLogger ql = new QueueLogger();
  -	ql.setVerbosityLevel(verbosityLevel);
  +// 	QueueLogger ql = new QueueLogger();
  +// 	ql.setVerbosityLevel(verbosityLevel);
           Constants.jasperLog = Log.getLog("JASPER_LOG", this );
  -        Constants.jasperLog.setLogger( ql );
  +//         Constants.jasperLog.setLogger( ql );
   
       }
       
  
  
  
  1.12      +1 -1      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- JspEngineContext.java	2001/01/07 19:24:13	1.11
  +++ JspEngineContext.java	2001/03/02 04:51:26	1.12
  @@ -301,7 +301,7 @@
               } catch (Exception ex) {
   		Constants.message("jsp.warning.compiler.class.cantcreate",
   				  new Object[] { jspCompilerPlugin, ex }, 
  -				  Logger.FATAL);
  +				  Log.FATAL);
                   javac = new SunJavaCompiler();
   	    }
   	} else {
  
  
  
  1.23      +9 -9      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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Compiler.java	2001/01/14 20:45:40	1.22
  +++ Compiler.java	2001/03/02 04:51:30	1.23
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java,v
1.22 2001/01/14 20:45:40 larryi Exp $
  - * $Revision: 1.22 $
  - * $Date: 2001/01/14 20:45:40 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java,v
1.23 2001/03/02 04:51:30 costin Exp $
  + * $Revision: 1.23 $
  + * $Date: 2001/03/02 04:51:30 $
    *
    * ====================================================================
    * 
  @@ -111,10 +111,10 @@
           Constants.message("jsp.message.package_name_is",
                             new Object[] { (pkgName==null)?
                                             "[default package]":pkgName },
  -                          Logger.DEBUG);
  +                          Log.DEBUG);
           Constants.message("jsp.message.class_file_name_is",
                             new Object[] { classFileName },
  -                          Logger.DEBUG);
  +                          Log.DEBUG);
   
   	if (!isOutDated())
               return false;
  @@ -127,13 +127,13 @@
   
           Constants.message("jsp.message.java_file_name_is",
                             new Object[] { javaFileName },
  -                          Logger.DEBUG);
  +                          Log.DEBUG);
   
   	String className = mangler.getClassName();
           ctxt.setServletClassName(className);
           Constants.message("jsp.message.class_name_is",
                             new Object[] { className },
  -                          Logger.DEBUG);
  +                          Log.DEBUG);
   
           
           
  @@ -241,7 +241,7 @@
   
           Constants.message("jsp.message.compiling_with",
                             new Object[] { b.toString() },
  -                          Logger.DEBUG);
  +                          Log.DEBUG);
   
           /**
            * 256 chosen randomly. The default is 32 if you don't pass
  @@ -313,7 +313,7 @@
           ctxt.setServletClassName(className);
           Constants.message("jsp.message.class_name_is",
                             new Object[] { className },
  -                          Logger.DEBUG);
  +                          Log.DEBUG);
       }
       
       /**
  
  
  
  1.19      +1 -1      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- JspCompiler.java	2001/01/07 19:24:17	1.18
  +++ JspCompiler.java	2001/03/02 04:51:32	1.19
  @@ -88,7 +88,7 @@
       boolean outDated;
       static final int JSP_TOKEN_LEN= Constants.JSP_TOKEN.length();
   
  -    Log loghelper = new Log("JASPER_LOG", "JspCompiler");
  +    Log loghelper = Log.getLog("JASPER_LOG", "JspCompiler");
       
       public JspCompiler(JspCompilationContext ctxt) throws JasperException {
           super(ctxt);
  
  
  
  1.22      +9 -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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- JspParseEventListener.java	2001/01/07 19:24:18	1.21
  +++ JspParseEventListener.java	2001/03/02 04:51:33	1.22
  @@ -355,7 +355,12 @@
   	writer.pushIndent();
   	/* Do stuff here for finally actions... */
           //writer.println("out.close();");
  -	writer.println("if (out != null) out.flush();");
  +	//	writer.println("System.out.println(JspWriterImpl.class.getClassLoader());");
  +	//	writer.println("System.out.println(out.getClass().getClassLoader());");
  +	//writer.println("if (out instanceof JspWriterImpl) { ");
  +        //writer.println("    ((JspWriterImpl)out).flushBuffer();");
  +	//writer.println("}");
  +	writer.println("out.flush();");
   	writer.println("if (_jspxFactory != null) _jspxFactory.releasePageContext(pageContext);");
   	writer.popIndent();
   	writer.println("}");
  @@ -372,7 +377,7 @@
       public void handleComment(Mark start, Mark stop) throws JasperException {
           Constants.message("jsp.message.htmlcomment",
                             new Object[] { reader.getChars(start, stop) },
  -                          Logger.DEBUG);
  +                          Log.DEBUG);
       }
   
       interface PageDirectiveHandler {
  @@ -673,7 +678,7 @@
       {
           Constants.message("jsp.message.handling_directive",
                             new Object[] { directive, attrs },
  -                          Logger.DEBUG);
  +                          Log.DEBUG);
   
   	if (directive.equals("page")) {
   	    Enumeration e = attrs.keys();
  @@ -847,7 +852,7 @@
       {
           Constants.message("jsp.message.handling_plugin",
                             new Object[] { attrs },
  -                          Logger.DEBUG);
  +                          Log.DEBUG);
   
   	Generator gen = new GeneratorWrapper (new PluginGenerator (start, attrs,
   					      param, fallback), start, stop);
  
  
  
  1.23      +1 -1      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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- JspReader.java	2001/01/07 19:24:18	1.22
  +++ JspReader.java	2001/03/02 04:51:33	1.23
  @@ -93,7 +93,7 @@
       
       private JspCompilationContext context;
   
  -    Log loghelper = new Log("JASPER_LOG", "JspReader");
  +    Log loghelper = Log.getLog("JASPER_LOG", "JspReader");
       //    LogHelper loghelper = new LogHelper("JASPER_LOG", "JspReader");
       
       /*
  
  
  
  1.28      +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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- Parser.java	2001/01/07 19:24:19	1.27
  +++ Parser.java	2001/03/02 04:51:34	1.28
  @@ -1077,7 +1077,7 @@
   		if (c.accept(listener, reader, this)) {
                       Constants.message("jsp.message.accepted",
                                         new Object[] { c.getClass().getName(), m },
  -                                      Logger.DEBUG);
  +                                      Log.DEBUG);
   		    accepted = true;
   		    noJspElement = false;
   		    break;
  
  
  
  1.31      +7 -7      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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- TagLibraryInfoImpl.java	2001/01/07 19:24:21	1.30
  +++ TagLibraryInfoImpl.java	2001/03/02 04:51:35	1.31
  @@ -267,7 +267,7 @@
   	    
   		Constants.message("jsp.message.copyinguri", 
   	                          new Object[] { uri, jarFileName },
  -				  Logger.DEBUG);
  +				  Log.DEBUG);
   	    
   		if (relativeURL)
   		    copy(getResourceAsStream(uri),
  @@ -384,7 +384,7 @@
                                     new Object[] {
                                         e.getTagName()
                                     },
  -                                  Logger.WARNING
  +                                  Log.WARNING
                                     );
           }
   
  @@ -431,7 +431,7 @@
                                     new Object[] {
                                         e.getTagName()
                                     },
  -                                  Logger.WARNING
  +                                  Log.WARNING
                                     );
           }
   	TagAttributeInfo[] tagAttributeInfo 
  @@ -449,21 +449,21 @@
                                     new Object[] {
                                         teiclass, cex.getMessage()
                                     },
  -                                  Logger.WARNING
  +                                  Log.WARNING
                                     );
               } catch (IllegalAccessException iae) {
                   Constants.message("jsp.warning.teiclass.is.null",
                                     new Object[] {
                                         teiclass, iae.getMessage()
                                     },
  -                                  Logger.WARNING
  +                                  Log.WARNING
                                     );
               } catch (InstantiationException ie) {
                   Constants.message("jsp.warning.teiclass.is.null",
                                     new Object[] {
                                         teiclass, ie.getMessage()
                                     },
  -                                  Logger.WARNING
  +                                  Log.WARNING
                                     );
               }
   
  @@ -512,7 +512,7 @@
                                     new Object[] {
                                         e.getTagName()
                                     },
  -                                  Logger.WARNING
  +                                  Log.WARNING
                                     );
           }
           
  
  
  
  1.9       +4 -4      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JspFactoryImpl.java	2001/02/11 06:33:49	1.8
  +++ JspFactoryImpl.java	2001/03/02 04:51:40	1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspFactoryImpl.java,v
1.8 2001/02/11 06:33:49 costin Exp $
  - * $Revision: 1.8 $
  - * $Date: 2001/02/11 06:33:49 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspFactoryImpl.java,v
1.9 2001/03/02 04:51:40 costin Exp $
  + * $Revision: 1.9 $
  + * $Date: 2001/03/02 04:51:40 $
    *
    * ====================================================================
    * 
  @@ -81,7 +81,7 @@
       private SimplePool pool=new SimplePool( 100 );
       private static final boolean usePool=true;
       
  -    Log loghelper = new Log("JASPER_LOG", "JspFactoryImpl");
  +    Log loghelper = Log.getLog("JASPER_LOG", "JspFactoryImpl");
       
       public PageContext getPageContext(Servlet servlet, ServletRequest request,
                                         ServletResponse response, 
  
  
  
  1.15      +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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- JspLoader.java	2000/09/29 07:00:39	1.14
  +++ JspLoader.java	2001/03/02 04:51:40	1.15
  @@ -119,7 +119,7 @@
           if (!jars.contains(jarFileName)) {
               Constants.message("jsp.message.adding_jar",
                                 new Object[] { jarFileName },
  -                              Logger.INFORMATION);
  +                              Log.INFORMATION);
               
               jars.addElement(jarFileName);
           }
  
  
  
  1.6       +4 -4      jakarta-tomcat/src/share/org/apache/jasper/runtime/JspWriterImpl.java
  
  Index: JspWriterImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspWriterImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JspWriterImpl.java	2001/02/11 19:27:32	1.5
  +++ JspWriterImpl.java	2001/03/02 04:51:41	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspWriterImpl.java,v
1.5 2001/02/11 19:27:32 costin Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/02/11 19:27:32 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspWriterImpl.java,v
1.6 2001/03/02 04:51:41 costin Exp $
  + * $Revision: 1.6 $
  + * $Date: 2001/03/02 04:51:41 $
    *
    * ====================================================================
    * 
  @@ -148,7 +148,7 @@
        * flushing the stream itself.  This method is non-private only so that it
        * may be invoked by PrintStream.
        */
  -    protected final void flushBuffer() throws IOException {
  +    public final void flushBuffer() throws IOException {
   	synchronized (lock) {
               if (bufferSize == 0)
                   return;
  
  
  
  1.19      +1 -1      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- PageContextImpl.java	2001/01/07 19:24:27	1.18
  +++ PageContextImpl.java	2001/03/02 04:51:42	1.19
  @@ -94,7 +94,7 @@
    */
   public class PageContextImpl extends PageContext {
   
  -    Log loghelper = new Log("JASPER_LOG", "JspFactoryImpl");
  +    Log loghelper = Log.getLog("JASPER_LOG", "JspFactoryImpl");
   
       PageContextImpl(JspFactory factory) {
           this.factory = factory;
  
  
  

Mime
View raw message