You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2004/02/05 23:19:08 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser ParserUtils.java
markt 2004/02/05 14:19:08
Modified: jasper2/src/share/org/apache/jasper Tag: tomcat_4_branch
EmbededServletOptions.java JspC.java
JspCompilationContext.java Options.java
jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch BeanRepository.java Compiler.java
ErrorHandler.java Generator.java
JspDocumentParser.java JspReader.java
JspRuntimeContext.java JspUtil.java
ParserController.java ServletWriter.java
TldLocationsCache.java Validator.java
jasper2/src/share/org/apache/jasper/logging Tag:
tomcat_4_branch DefaultLogger.java
JasperLogger.java Logger.java
jasper2/src/share/org/apache/jasper/runtime Tag:
tomcat_4_branch BodyContentImpl.java
HttpJspBase.java JspRuntimeLibrary.java
PageContextImpl.java
jasper2/src/share/org/apache/jasper/servlet Tag:
tomcat_4_branch JasperLoader.java
JspCServletContext.java JspServlet.java
JspServletWrapper.java ServletEngine.java
TomcatServletEngine.java
jasper2/src/share/org/apache/jasper/util Tag:
tomcat_4_branch SystemLogHandler.java
jasper2/src/share/org/apache/jasper/xmlparser Tag:
tomcat_4_branch ParserUtils.java
Log:
- Fix bugs 13960, 13961. Edit javadoc comments to prevent warnings during compile. A minor issue but enables a couple of bugs to be closed.
- Reported by David Medinets.
- Also took the opportunity to remove any unused imports reported by Eclipse.
Revision Changes Path
No revision
No revision
1.8.2.4 +24 -22 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Attic/EmbededServletOptions.java
Index: EmbededServletOptions.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Attic/EmbededServletOptions.java,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- EmbededServletOptions.java 3 Jan 2003 13:24:59 -0000 1.8.2.3
+++ EmbededServletOptions.java 5 Feb 2004 22:19:06 -0000 1.8.2.4
@@ -99,7 +99,7 @@
public boolean keepGenerated = true;
/**
- * Do you want support for "large" files? What this essentially
+ * Indicates if "large" files should be supported. What this essentially
* means is that we generated code so that the HTML data in a JSP
* file is stored separately as opposed to those constant string
* data being used literally in the generated servlet.
@@ -112,21 +112,21 @@
public boolean poolingEnabled = true;
/**
- * Do you want support for "mapped" files? This will generate
+ * Indicates if "mapped" files should be supported. This will generate
* servlet that has a print statement per line of the JSP file.
* This seems like a really nice feature to have for debugging.
*/
public boolean mappedFile = false;
/**
- * Do you want stack traces and such displayed in the client's
- * browser? If this is false, such messages go to the standard
+ * Indicates if you want stack traces and such displayed in the client's
+ * browser. If this is false, such messages go to the standard
* error or a log file if the standard error is redirected.
*/
public boolean sendErrorToClient = false;
/**
- * Do we want to include debugging information in the class file?
+ * Indicates if debugging information should be included in the class file.
*/
public boolean classDebugInfo = true;
@@ -136,7 +136,7 @@
public int checkInterval = 300;
/**
- * JSP reloading check ?
+ * Indicates status of JSP reloading.
*/
public boolean reloading = true;
@@ -154,7 +154,7 @@
public String ieClassId = "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93";
/**
- * What classpath should I use while compiling generated servlets?
+ * Classpath to use while compiling generated servlets.
*/
public String classpath = null;
@@ -164,7 +164,7 @@
public String compiler = null;
/**
- * Cache for the TLD locations
+ * Cache for the TLD locations.
*/
private TldLocationsCache tldLocationsCache = null;
@@ -183,14 +183,14 @@
}
/**
- * Are we keeping generated code around?
+ * Getter method to see if generated code is kept.
*/
public boolean getKeepGenerated() {
return keepGenerated;
}
/**
- * Are we supporting large files?
+ * Getter method to determine large file support.
*/
public boolean getLargeFile() {
return largeFile;
@@ -201,42 +201,44 @@
}
/**
- * Are we supporting HTML mapped servlets?
+ * Getter method to determine HTML mapped servlets support.
*/
public boolean getMappedFile() {
return mappedFile;
}
/**
- * Should errors be sent to client or thrown into stderr?
+ * Getter method to determine if errors should be sent to client or thrown
+ * into stderr.
*/
public boolean getSendErrorToClient() {
return sendErrorToClient;
}
/**
- * Should class files be compiled with debug information?
+ * Getter method to determine if class files should be compiled with debug
+ * information.
*/
public boolean getClassDebugInfo() {
return classDebugInfo;
}
/**
- * Background JSP compile thread check intervall
+ * Background JSP compile thread check interval.
*/
public int getCheckInterval() {
return checkInterval;
}
/**
- * Is Jasper being used in development mode?
+ * Getter method to determine if Jasper being used in development mode.
*/
public boolean getDevelopment() {
return development;
}
/**
- * JSP reloading check ?
+ * Getter method for JSP reloading check.
*/
public boolean getReloading() {
return reloading;
@@ -250,15 +252,15 @@
}
/**
- * What is my scratch dir?
+ * Getter method for scratch dir.
*/
public File getScratchDir() {
return scratchDir;
}
/**
- * What classpath should I use while compiling the servlets
- * generated from JSP files?
+ * Getter method for classpath used when compiling the servlets
+ * generated from JSP files.
*/
public String getClassPath() {
return classpath;
1.12.2.7 +3 -6 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.12.2.6
retrieving revision 1.12.2.7
diff -u -r1.12.2.6 -r1.12.2.7
--- JspC.java 17 Mar 2003 20:53:39 -0000 1.12.2.6
+++ JspC.java 5 Feb 2004 22:19:06 -0000 1.12.2.7
@@ -65,12 +65,9 @@
import java.net.*;
import java.util.*;
-import org.apache.jasper.compiler.JspReader;
-import org.apache.jasper.compiler.ServletWriter;
import org.apache.jasper.compiler.Compiler;
import org.apache.jasper.compiler.TldLocationsCache;
-import org.apache.jasper.servlet.JasperLoader;
import org.apache.jasper.servlet.JspCServletContext;
import org.apache.jasper.logging.Logger;
1.6.2.9 +3 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java
Index: JspCompilationContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -u -r1.6.2.8 -r1.6.2.9
--- JspCompilationContext.java 12 Feb 2003 16:35:20 -0000 1.6.2.8
+++ JspCompilationContext.java 5 Feb 2004 22:19:06 -0000 1.6.2.9
@@ -63,7 +63,6 @@
import org.apache.jasper.compiler.JspReader;
import org.apache.jasper.compiler.ServletWriter;
-import java.io.IOException;
import java.io.File;
import java.io.FileNotFoundException;
import java.net.URL;
1.6.2.2 +3 -6 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java
Index: Options.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- Options.java 31 Dec 2002 14:00:36 -0000 1.6.2.1
+++ Options.java 5 Feb 2004 22:19:06 -0000 1.6.2.2
@@ -63,9 +63,6 @@
import java.io.File;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-
import org.apache.jasper.compiler.TldLocationsCache;
/**
No revision
No revision
1.1.1.1.2.1 +3 -6 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/BeanRepository.java
Index: BeanRepository.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/BeanRepository.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- BeanRepository.java 28 Mar 2002 18:46:18 -0000 1.1.1.1
+++ BeanRepository.java 5 Feb 2004 22:19:07 -0000 1.1.1.1.2.1
@@ -66,10 +66,7 @@
import java.util.Hashtable;
import java.beans.Beans;
-import java.beans.BeanInfo;
-import java.beans.PropertyDescriptor;
-import javax.servlet.ServletException;
import org.apache.jasper.JasperException;
/**
1.18.2.14 +3 -9 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
Index: Compiler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
retrieving revision 1.18.2.13
retrieving revision 1.18.2.14
diff -u -r1.18.2.13 -r1.18.2.14
--- Compiler.java 17 Mar 2003 09:16:32 -0000 1.18.2.13
+++ Compiler.java 5 Feb 2004 22:19:07 -0000 1.18.2.14
@@ -63,16 +63,10 @@
import java.util.*;
import java.io.*;
import java.net.URL;
-import javax.servlet.jsp.tagext.TagInfo;
import javax.servlet.ServletException;
import javax.servlet.Servlet;
-import org.xml.sax.Attributes;
-
-import org.apache.tools.ant.BuildEvent;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.BuildListener;
-import org.apache.tools.ant.BuildLogger;
import org.apache.tools.ant.DefaultLogger;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Javac;
1.1.1.1.2.2 +5 -5 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorHandler.java
Index: ErrorHandler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorHandler.java,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- ErrorHandler.java 5 Nov 2002 20:30:25 -0000 1.1.1.1.2.1
+++ ErrorHandler.java 5 Feb 2004 22:19:07 -0000 1.1.1.1.2.2
@@ -81,7 +81,7 @@
* @param fname Name of the JSP file in which the parse error occurred
* @param line Parse error line number
* @param column Parse error column number
- * @param errMsg Parse error message
+ * @param msg Parse error message
* @param exception Parse exception
*/
public void jspError(String fname, int line, int column, String msg,
@@ -90,7 +90,7 @@
/**
* Processes the given JSP parse error.
*
- * @param errMsg Parse error message
+ * @param msg Parse error message
* @param exception Parse exception
*/
public void jspError(String msg, Exception exception)
1.35.2.21 +3 -5 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.35.2.20
retrieving revision 1.35.2.21
diff -u -r1.35.2.20 -r1.35.2.21
--- Generator.java 24 Feb 2003 16:38:41 -0000 1.35.2.20
+++ Generator.java 5 Feb 2004 22:19:07 -0000 1.35.2.21
@@ -63,8 +63,6 @@
import java.util.*;
import java.beans.*;
import java.net.URLEncoder;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
import java.lang.reflect.Method;
import javax.servlet.jsp.tagext.*;
import org.xml.sax.Attributes;
1.4.2.4 +3 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Index: JspDocumentParser.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- JspDocumentParser.java 13 Feb 2003 18:15:45 -0000 1.4.2.3
+++ JspDocumentParser.java 5 Feb 2004 22:19:07 -0000 1.4.2.4
@@ -64,7 +64,6 @@
import java.util.Hashtable;
import javax.servlet.jsp.tagext.*;
import javax.xml.parsers.SAXParserFactory;
-import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import org.xml.sax.*;
import org.xml.sax.ext.LexicalHandler;
1.5.2.3 +2 -5 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspReader.java
Index: JspReader.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspReader.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- JspReader.java 28 Aug 2002 23:58:18 -0000 1.5.2.2
+++ JspReader.java 5 Feb 2004 22:19:07 -0000 1.5.2.3
@@ -57,12 +57,9 @@
import java.io.*;
import java.util.*;
-import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.logging.*;
-import org.xml.sax.Attributes;
-import org.xml.sax.helpers.AttributesImpl;
/**
* JspReader is an input buffer for the JSP parser. It should allow
@@ -358,7 +355,7 @@
/**
* Skip until the given string is matched in the stream.
* When returned, the context is positioned past the end of the match.
- * @param s The String to match.
+ * @param limit The String to match.
* @return A non-null <code>Mark</code> instance (positioned immediately
* before the search string) if found, <strong>null</strong>
* otherwise.
@@ -391,7 +388,7 @@
* Skip until the given string is matched in the stream, but ignoring
* chars initially escaped by a '\'.
* When returned, the context is positioned past the end of the match.
- * @param s The String to match.
+ * @param limit The String to match.
* @return A non-null <code>Mark</code> instance (positioned immediately
* before the search string) if found, <strong>null</strong>
* otherwise.
1.4.2.6 +10 -14 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
Index: JspRuntimeContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -r1.4.2.5 -r1.4.2.6
--- JspRuntimeContext.java 8 Mar 2003 14:19:48 -0000 1.4.2.5
+++ JspRuntimeContext.java 5 Feb 2004 22:19:07 -0000 1.4.2.6
@@ -64,15 +64,12 @@
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FilePermission;
-import java.io.IOException;
-import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.security.CodeSource;
import java.security.Policy;
import java.security.PermissionCollection;
import java.util.Iterator;
-import java.util.List;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -80,7 +77,6 @@
import javax.servlet.ServletContext;
import javax.servlet.jsp.JspFactory;
-import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.Options;
@@ -90,7 +86,7 @@
/**
* Class for tracking JSP compile time file dependencies when the
- * <%@include file="..."%> directive is used.
+ * &060;%@include file="..."&062; directive is used.
*
* A background thread periodically checks the files a JSP page
* is dependent upon. If a dpendent file changes the JSP page
@@ -142,7 +138,7 @@
*
* Loads in any previously generated dependencies from file.
*
- * @param ServletContext for web application
+ * @param context for web application
*/
public JspRuntimeContext(ServletContext context, Options options) {
@@ -227,8 +223,8 @@
/**
* Add a new JspServletWrapper.
*
- * @param String uri of JSP
- * @param JspServletWrapper for JSP
+ * @param jspUri Uri of JSP
+ * @param jsw Servlet wrapper for JSP
*/
public void addWrapper(String jspUri, JspServletWrapper jsw) {
jsps.remove(jspUri);
@@ -238,7 +234,7 @@
/**
* Get an already existing JspServletWrapper.
*
- * @param String JSP URI
+ * @param jspUri JSP URI
* @return JspServletWrapper for JSP
*/
public JspServletWrapper getWrapper(String jspUri) {
@@ -248,7 +244,7 @@
/**
* Remove a JspServletWrapper.
*
- * @param String JSP URI of JspServletWrapper to remove
+ * @param jspUri JSP URI of JspServletWrapper to remove
*/
public void removeWrapper(String jspUri) {
jsps.remove(jspUri);
1.4.2.1 +3 -8 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspUtil.java
Index: JspUtil.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspUtil.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- JspUtil.java 8 Jun 2002 00:14:35 -0000 1.4
+++ JspUtil.java 5 Feb 2004 22:19:07 -0000 1.4.2.1
@@ -60,15 +60,11 @@
*/
package org.apache.jasper.compiler;
-import java.net.URL;
-
import java.io.CharArrayWriter;
import java.io.IOException;
import java.io.InputStream;
-import java.io.FileInputStream;
import java.util.Hashtable;
import java.util.Vector;
-import java.util.Enumeration;
import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
@@ -84,7 +80,6 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.InputSource;
-import org.xml.sax.helpers.AttributesImpl;
/**
* This class has all the utility method(s).
1.4.2.2 +0 -3 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ParserController.java
Index: ParserController.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ParserController.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- ParserController.java 18 Jul 2002 18:04:24 -0000 1.4.2.1
+++ ParserController.java 5 Feb 2004 22:19:07 -0000 1.4.2.2
@@ -56,11 +56,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.jsp.tagext.*;
-import org.xml.sax.InputSource;
import org.xml.sax.Attributes;
import org.apache.jasper.*;
-import org.apache.jasper.logging.Logger;
/**
* Controller for the parsing of a JSP page.
1.1.1.1.2.1 +3 -5 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ServletWriter.java
Index: ServletWriter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ServletWriter.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- ServletWriter.java 28 Mar 2002 18:46:16 -0000 1.1.1.1
+++ ServletWriter.java 5 Feb 2004 22:19:07 -0000 1.1.1.1.2.1
@@ -61,8 +61,6 @@
package org.apache.jasper.compiler;
import java.io.PrintWriter;
-import java.io.BufferedReader;
-import java.io.StringReader;
import java.io.IOException;
/**
1.4.2.3 +0 -5 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TldLocationsCache.java
Index: TldLocationsCache.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TldLocationsCache.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- TldLocationsCache.java 5 Mar 2003 18:05:19 -0000 1.4.2.2
+++ TldLocationsCache.java 5 Feb 2004 22:19:07 -0000 1.4.2.3
@@ -55,9 +55,6 @@
package org.apache.jasper.compiler;
import java.io.InputStream;
-import java.io.FileNotFoundException;
-import java.io.File;
-import java.io.IOException;
import java.util.Hashtable;
import java.util.Enumeration;
import java.util.Iterator;
@@ -68,8 +65,6 @@
import javax.servlet.ServletContext;
import javax.servlet.jsp.tagext.TagLibraryInfo;
-import javax.servlet.jsp.tagext.TagInfo;
-import javax.servlet.jsp.tagext.Tag;
import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
1.11.2.3 +3 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
Index: Validator.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -r1.11.2.2 -r1.11.2.3
--- Validator.java 10 Feb 2003 17:06:11 -0000 1.11.2.2
+++ Validator.java 5 Feb 2004 22:19:07 -0000 1.11.2.3
@@ -67,7 +67,6 @@
import javax.servlet.jsp.tagext.TagInfo;
import javax.servlet.jsp.tagext.TagAttributeInfo;
import javax.servlet.jsp.tagext.TagLibraryInfo;
-import javax.servlet.jsp.tagext.TagLibraryInfo;
import javax.servlet.jsp.tagext.ValidationMessage;
import org.apache.jasper.JasperException;
import org.xml.sax.Attributes;
No revision
No revision
1.1.1.1.2.1 +0 -1 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/logging/Attic/DefaultLogger.java
Index: DefaultLogger.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/logging/Attic/DefaultLogger.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- DefaultLogger.java 28 Mar 2002 18:46:18 -0000 1.1.1.1
+++ DefaultLogger.java 5 Feb 2004 22:19:07 -0000 1.1.1.1.2.1
@@ -56,7 +56,6 @@
*/
package org.apache.jasper.logging;
-import java.io.Writer;
import java.io.IOException;
import javax.servlet.ServletContext;
1.2.2.1 +0 -6 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/logging/Attic/JasperLogger.java
Index: JasperLogger.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/logging/Attic/JasperLogger.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- JasperLogger.java 6 Jun 2002 00:19:48 -0000 1.2
+++ JasperLogger.java 5 Feb 2004 22:19:07 -0000 1.2.2.1
@@ -57,12 +57,6 @@
package org.apache.jasper.logging;
import java.io.Writer;
-import java.io.StringWriter;
-import java.io.PrintWriter;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Date;
-import javax.servlet.ServletException;
import javax.servlet.ServletContext;
import org.apache.jasper.util.Queue;
1.2.2.1 +2 -2 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/logging/Attic/Logger.java
Index: Logger.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/logging/Attic/Logger.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- Logger.java 6 Jun 2002 00:19:48 -0000 1.2
+++ Logger.java 5 Feb 2004 22:19:07 -0000 1.2.2.1
@@ -502,8 +502,8 @@
}
/**
- * If we are timestamping at all, what format do we use to print
- * the timestamp? See java.text.SimpleDateFormat.
+ * Set the format to be used for the timestamp, assuming that timestamping
+ * is enabled. @see java.text.SimpleDateFormat.
*
* Default = "yyyy-MM-dd hh:mm:ss". Special case: "msec" => raw
* number of msec since epoch, very efficient but not
No revision
No revision
1.4.2.2 +0 -1 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/BodyContentImpl.java
Index: BodyContentImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/BodyContentImpl.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- BodyContentImpl.java 6 Nov 2002 23:39:18 -0000 1.4.2.1
+++ BodyContentImpl.java 5 Feb 2004 22:19:07 -0000 1.4.2.2
@@ -61,7 +61,6 @@
import java.io.CharArrayReader;
import java.io.PrintWriter;
-import javax.servlet.ServletResponse;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.BodyContent;
1.3.2.2 +0 -6 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/HttpJspBase.java
Index: HttpJspBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/HttpJspBase.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- HttpJspBase.java 4 Nov 2002 21:24:43 -0000 1.3.2.1
+++ HttpJspBase.java 5 Feb 2004 22:19:08 -0000 1.3.2.2
@@ -56,11 +56,6 @@
package org.apache.jasper.runtime;
import java.io.IOException;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-
-import java.net.URL;
-import java.net.MalformedURLException;
import java.util.List;
@@ -68,7 +63,6 @@
import javax.servlet.http.*;
import javax.servlet.jsp.*;
-import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
/**
1.1.1.1.2.2 +4 -13 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- JspRuntimeLibrary.java 9 Oct 2002 21:59:08 -0000 1.1.1.1.2.1
+++ JspRuntimeLibrary.java 5 Feb 2004 22:19:08 -0000 1.1.1.1.2.2
@@ -67,13 +67,6 @@
import java.lang.reflect.Method;
-import java.io.Writer;
-import java.io.Reader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import java.beans.PropertyDescriptor;
-import java.beans.IndexedPropertyDescriptor;
import java.beans.PropertyEditor;
import java.beans.PropertyEditorManager;
@@ -84,10 +77,8 @@
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.BodyContent;
@@ -468,7 +459,7 @@
/**
* Decode an URL formatted string.
- * @param s The string to decode.
+ * @param encoded The string to decode.
* @return The decoded string.
*/
1.11.2.6 +3 -5 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
Index: PageContextImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -r1.11.2.5 -r1.11.2.6
--- PageContextImpl.java 15 Jan 2003 00:20:46 -0000 1.11.2.5
+++ PageContextImpl.java 5 Feb 2004 22:19:08 -0000 1.11.2.6
@@ -62,7 +62,6 @@
package org.apache.jasper.runtime;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.util.Enumeration;
import java.util.Hashtable;
@@ -78,7 +77,6 @@
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.JspFactory;
No revision
No revision
1.3.2.1 +1 -8 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JasperLoader.java
Index: JasperLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JasperLoader.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- JasperLoader.java 14 Jun 2002 20:47:01 -0000 1.3
+++ JasperLoader.java 5 Feb 2004 22:19:08 -0000 1.3.2.1
@@ -59,7 +59,6 @@
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
import java.security.AccessController;
@@ -68,14 +67,8 @@
import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
-import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
-import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.Options;
-import org.apache.jasper.compiler.Compiler;
-import org.apache.jasper.logging.Logger;
-import javax.servlet.http.*;
/**
* This is a class loader that loads JSP files as though they were
* Java classes. It calls the compiler to compile the JSP file into a
@@ -231,7 +224,7 @@
* a web application context, we just return our preset
* PermissionCollection for the web app context.
*
- * @param CodeSource where the code was loaded from
+ * @param codeSource where the code was loaded from
* @return PermissionCollection for CodeSource
*/
protected final PermissionCollection getPermissions(CodeSource codeSource) {
1.1.1.1.2.1 +0 -2 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspCServletContext.java
Index: JspCServletContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspCServletContext.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- JspCServletContext.java 28 Mar 2002 18:46:20 -0000 1.1.1.1
+++ JspCServletContext.java 5 Feb 2004 22:19:08 -0000 1.1.1.1.2.1
@@ -60,7 +60,6 @@
import java.io.File;
import java.io.InputStream;
-import java.io.IOException;
import java.io.PrintWriter;
import java.net.MalformedURLException;
import java.net.URL;
@@ -69,7 +68,6 @@
import java.util.Hashtable;
import java.util.Set;
import java.util.Vector;
-import java.net.URL;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
1.12.2.2 +3 -10 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServlet.java
Index: JspServlet.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServlet.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -r1.12.2.1 -r1.12.2.2
--- JspServlet.java 22 Oct 2002 11:17:56 -0000 1.12.2.1
+++ JspServlet.java 5 Feb 2004 22:19:08 -0000 1.12.2.2
@@ -59,7 +59,6 @@
package org.apache.jasper.servlet;
-import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -69,13 +68,8 @@
import java.io.InputStream;
import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.MalformedURLException;
import java.util.Enumeration;
-import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
import org.apache.jasper.Options;
import org.apache.jasper.EmbededServletOptions;
@@ -84,7 +78,6 @@
import org.apache.jasper.logging.Logger;
import org.apache.jasper.logging.DefaultLogger;
-import org.apache.jasper.logging.JasperLogger;
/**
* The JSP engine (a.k.a Jasper).
1.6.2.5 +3 -8 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java
Index: JspServletWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -r1.6.2.4 -r1.6.2.5
--- JspServletWrapper.java 12 Feb 2003 16:35:21 -0000 1.6.2.4
+++ JspServletWrapper.java 5 Feb 2004 22:19:08 -0000 1.6.2.5
@@ -65,22 +65,17 @@
import javax.servlet.ServletException;
import javax.servlet.SingleThreadModel;
import javax.servlet.UnavailableException;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.FileNotFoundException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.MalformedURLException;
import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
import org.apache.jasper.Options;
import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.compiler.JspRuntimeContext;
-import org.apache.jasper.runtime.HttpJspBase;
import org.apache.jasper.logging.Logger;
1.1.1.1.2.1 +2 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/Attic/ServletEngine.java
Index: ServletEngine.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/Attic/ServletEngine.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- ServletEngine.java 28 Mar 2002 18:46:20 -0000 1.1.1.1
+++ ServletEngine.java 5 Feb 2004 22:19:08 -0000 1.1.1.1.2.1
@@ -60,8 +60,6 @@
*/
package org.apache.jasper.servlet;
-import java.io.File;
-
import javax.servlet.ServletContext;
/**
1.1.1.1.2.1 +2 -3 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/Attic/TomcatServletEngine.java
Index: TomcatServletEngine.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/Attic/TomcatServletEngine.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- TomcatServletEngine.java 28 Mar 2002 18:46:20 -0000 1.1.1.1
+++ TomcatServletEngine.java 5 Feb 2004 22:19:08 -0000 1.1.1.1.2.1
@@ -60,7 +60,6 @@
*/
package org.apache.jasper.servlet;
-import java.io.File;
import javax.servlet.ServletContext;
/**
No revision
No revision
1.1.2.1 +0 -6 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/util/SystemLogHandler.java
Index: SystemLogHandler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/util/SystemLogHandler.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- SystemLogHandler.java 23 May 2002 06:53:23 -0000 1.1
+++ SystemLogHandler.java 5 Feb 2004 22:19:08 -0000 1.1.2.1
@@ -57,14 +57,8 @@
package org.apache.jasper.util;
import java.io.ByteArrayOutputStream;
-import java.io.Writer;
import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.FileWriter;
-import java.io.File;
-import java.io.OutputStreamWriter;
import java.io.IOException;
-import java.io.StringWriter;
import java.util.Hashtable;
No revision
No revision
1.3.2.1 +1 -11 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/ParserUtils.java
Index: ParserUtils.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/ParserUtils.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- ParserUtils.java 20 Jun 2002 22:31:23 -0000 1.3
+++ ParserUtils.java 5 Feb 2004 22:19:08 -0000 1.3.2.1
@@ -58,15 +58,6 @@
import java.io.InputStream;
import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import java.util.HashMap;
-
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -77,7 +68,6 @@
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
-import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org