hgomez 2003/09/22 02:17:48
Modified: src/share/org/apache/jasper JspC.java
CommandLineContext.java Constants.java Options.java
JspEngineContext.java JasperEngineContext.java
JspCompilationContext.java JasperOptionsImpl.java
src/share/org/apache/jasper/servlet JasperLoader.java
JasperLoader12.java TomcatServletEngine.java
JspServlet.java ServletEngine.java
src/share/org/apache/jasper/compiler
JspParseEventListener.java JasperMangler.java
GetPropertyGenerator.java BeanRepository.java
CommandLineCompiler.java CommentGenerator.java
TagBeginGenerator.java IncludeGenerator.java
ParseEventListener.java TagEndGenerator.java
JakartaCommentGenerator.java
TagLibraryInfoImpl.java JspCompiler.java
JspReader.java TagLibraries.java BeanGenerator.java
SetPropertyGenerator.java BaseJspListener.java
JspUtil.java DelegatingListener.java
src/share/org/apache/jasper/runtime JspLoader.java
BodyContentImpl.java TagHandlerPoolImpl.java
PageContextImpl.java JspRuntimeLibrary.java
HttpJspBase.java
Log:
First batch of imports cleanup in TC 3.3.2-dev (jasper)
Revision Changes Path
1.26 +12 -11 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- JspC.java 13 Mar 2002 03:44:36 -0000 1.25
+++ JspC.java 22 Sep 2003 09:17:46 -0000 1.26
@@ -57,20 +57,21 @@
package org.apache.jasper;
-import java.io.*;
-import java.util.*;
+import java.io.CharArrayWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.Writer;
+import java.util.Enumeration;
+import java.util.Stack;
+import java.util.Vector;
-import org.apache.jasper.compiler.JspReader;
-import org.apache.jasper.compiler.ServletWriter;
-import org.apache.jasper.compiler.TagLibraries;
-import org.apache.jasper.compiler.Compiler;
import org.apache.jasper.compiler.CommandLineCompiler;
-
-//import org.apache.jasper.runtime.JspLoader;
import org.apache.jasper.servlet.JasperLoader;
-
-import org.apache.tomcat.util.log.*;
-import org.apache.tomcat.util.compat.*;
+import org.apache.tomcat.util.compat.Jdk11Compat;
+import org.apache.tomcat.util.log.Log;
/**
* Shell for the jspc compiler. Handles all options associated with the
1.9 +6 -7
jakarta-tomcat/src/share/org/apache/jasper/CommandLineContext.java
Index: CommandLineContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/CommandLineContext.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CommandLineContext.java 27 Jun 2002 08:08:39 -0000 1.8
+++ CommandLineContext.java 22 Sep 2003 09:17:46 -0000 1.9
@@ -61,16 +61,15 @@
package org.apache.jasper;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
-import org.apache.jasper.compiler.JspReader;
-import org.apache.jasper.compiler.ServletWriter;
-import org.apache.jasper.compiler.TagLibraries;
import org.apache.jasper.compiler.CommandLineCompiler;
import org.apache.jasper.compiler.Compiler;
-
-//import org.apache.jasper.runtime.JspLoader;
-// Use the jasper loader - the only function used is to add a jar
+import org.apache.jasper.compiler.JspReader;
+import org.apache.jasper.compiler.ServletWriter;
import org.apache.jasper.servlet.JasperLoader;
/**
1.25 +0 -4 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Constants.java 21 Jun 2001 21:40:22 -0000 1.24
+++ Constants.java 22 Sep 2003 09:17:46 -0000 1.25
@@ -57,10 +57,6 @@
package org.apache.jasper;
-import java.util.ResourceBundle;
-import java.util.MissingResourceException;
-import java.text.MessageFormat;
-
import org.apache.tomcat.util.log.Log;
import org.apache.tomcat.util.res.StringManager;
1.14 +3 -6 jakarta-tomcat/src/share/org/apache/jasper/Options.java
Index: Options.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Options.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Options.java 14 Jan 2001 20:45:40 -0000 1.13
+++ Options.java 22 Sep 2003 09:17:46 -0000 1.14
@@ -63,9 +63,6 @@
import java.io.File;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-
/**
* A class to hold all init parameters specific to the JSP engine.
*
1.13 +7 -9 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JspEngineContext.java 2 Mar 2001 04:51:26 -0000 1.12
+++ JspEngineContext.java 22 Sep 2003 09:17:46 -0000 1.13
@@ -62,23 +62,21 @@
package org.apache.jasper;
+import java.io.IOException;
+
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-import org.apache.jasper.compiler.JspReader;
-import org.apache.jasper.compiler.ServletWriter;
-//import org.apache.jasper.runtime.JspLoader;
-import org.apache.jasper.servlet.JasperLoader;
-import org.apache.jasper.compiler.TagLibraries;
import org.apache.jasper.compiler.Compiler;
+import org.apache.jasper.compiler.JavaCompiler;
import org.apache.jasper.compiler.JspCompiler;
+import org.apache.jasper.compiler.JspReader;
+import org.apache.jasper.compiler.ServletWriter;
import org.apache.jasper.compiler.SunJavaCompiler;
-import org.apache.jasper.compiler.JavaCompiler;
+import org.apache.jasper.servlet.JasperLoader;
+import org.apache.tomcat.util.log.Log;
-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.3 +5 -9
jakarta-tomcat/src/share/org/apache/jasper/JasperEngineContext.java
Index: JasperEngineContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JasperEngineContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JasperEngineContext.java 21 Mar 2001 03:05:25 -0000 1.2
+++ JasperEngineContext.java 22 Sep 2003 09:17:46 -0000 1.3
@@ -54,17 +54,13 @@
*/
package org.apache.jasper;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.apache.jasper.compiler.JspReader;
-import org.apache.jasper.compiler.ServletWriter;
-import org.apache.jasper.compiler.Compiler;
+import java.io.IOException;
-import java.util.*;
-import java.io.*;
-import java.net.*;
+import javax.servlet.ServletContext;
-import org.apache.jasper.JspCompilationContext;
+import org.apache.jasper.compiler.Compiler;
+import org.apache.jasper.compiler.JspReader;
+import org.apache.jasper.compiler.ServletWriter;
/** Alternative implementation of JspCompilationContext ( in addition
to the servlet and standalone ). Used by JspInterceptor - but
1.4 +6 -7
jakarta-tomcat/src/share/org/apache/jasper/JspCompilationContext.java
Index: JspCompilationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspCompilationContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JspCompilationContext.java 27 Jun 2000 20:59:39 -0000 1.3
+++ JspCompilationContext.java 22 Sep 2003 09:17:46 -0000 1.4
@@ -65,12 +65,11 @@
package org.apache.jasper;
-import org.apache.jasper.compiler.JspReader;
-import org.apache.jasper.compiler.ServletWriter;
-//import org.apache.jasper.runtime.JspLoader;
-import org.apache.jasper.compiler.TagLibraries;
import java.io.IOException;
+
import org.apache.jasper.compiler.Compiler;
+import org.apache.jasper.compiler.JspReader;
+import org.apache.jasper.compiler.ServletWriter;
/**
* A place holder for various things that are used through out the JSP
1.2 +2 -5
jakarta-tomcat/src/share/org/apache/jasper/JasperOptionsImpl.java
Index: JasperOptionsImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JasperOptionsImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JasperOptionsImpl.java 28 Jan 2001 05:54:34 -0000 1.1
+++ JasperOptionsImpl.java 22 Sep 2003 09:17:46 -0000 1.2
@@ -54,11 +54,8 @@
*/
package org.apache.jasper;
-import java.util.*;
-import java.io.*;
-import java.net.*;
-
-import org.apache.jasper.Options;
+import java.io.File;
+import java.util.Properties;
/** Another implementation of Options, backed by a Properties file
1.4 +7 -15
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JasperLoader.java 19 Mar 2001 15:49:29 -0000 1.3
+++ JasperLoader.java 22 Sep 2003 09:17:46 -0000 1.4
@@ -57,30 +57,22 @@
package org.apache.jasper.servlet;
-import java.io.FileInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.InputStream;
import java.io.IOException;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipEntry;
+import java.io.InputStream;
import java.net.URL;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
-import java.security.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
-import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
-import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.JspEngineContext;
-import org.apache.jasper.Options;
-import org.apache.jasper.compiler.Compiler;
+import org.apache.jasper.JasperException;
-import org.apache.tomcat.util.log.*;
-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
1.4 +7 -19
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JasperLoader12.java 29 Sep 2000 07:00:48 -0000 1.3
+++ JasperLoader12.java 22 Sep 2003 09:17:46 -0000 1.4
@@ -57,30 +57,18 @@
package org.apache.jasper.servlet;
-import java.io.FileInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.IOException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.security.ProtectionDomain;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipEntry;
-import java.net.URL;
-
-import java.security.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.apache.jasper.JasperException;
-import org.apache.jasper.Constants;
-import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.JspEngineContext;
-import org.apache.jasper.Options;
-import org.apache.jasper.compiler.Compiler;
-import org.apache.tomcat.util.log.*;
-import javax.servlet.http.*;
/**
* 1.2 version of the JspLoader
*
1.2 +3 -4
jakarta-tomcat/src/share/org/apache/jasper/servlet/TomcatServletEngine.java
Index: TomcatServletEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/servlet/TomcatServletEngine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TomcatServletEngine.java 23 Jun 2000 21:37:33 -0000 1.1
+++ TomcatServletEngine.java 22 Sep 2003 09:17:46 -0000 1.2
@@ -60,7 +60,6 @@
*/
package org.apache.jasper.servlet;
-import java.io.File;
import javax.servlet.ServletContext;
/**
1.12 +12 -15
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JspServlet.java 2 Oct 2001 21:53:10 -0000 1.11
+++ JspServlet.java 22 Sep 2003 09:17:46 -0000 1.12
@@ -55,35 +55,32 @@
package org.apache.jasper.servlet;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.SingleThreadModel;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.HttpJspPage;
import javax.servlet.jsp.JspFactory;
-import java.util.Hashtable;
-import java.util.Enumeration;
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-
-import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
-import org.apache.jasper.Options;
import org.apache.jasper.EmbededServletOptions;
+import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.JspEngineContext;
-import org.apache.jasper.compiler.Mangler;
-import org.apache.jasper.runtime.*;
-
+import org.apache.jasper.Options;
import org.apache.jasper.compiler.Compiler;
-
+import org.apache.jasper.compiler.Mangler;
+import org.apache.jasper.runtime.HttpJspBase;
+import org.apache.jasper.runtime.JspFactoryImpl;
import org.apache.tomcat.util.log.Log;
/**
1.2 +3 -5
jakarta-tomcat/src/share/org/apache/jasper/servlet/ServletEngine.java
Index: ServletEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/servlet/ServletEngine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletEngine.java 23 Jun 2000 21:37:32 -0000 1.1
+++ ServletEngine.java 22 Sep 2003 09:17:46 -0000 1.2
@@ -60,8 +60,6 @@
*/
package org.apache.jasper.servlet;
-import java.io.File;
-
import javax.servlet.ServletContext;
/**
1.32 +9 -12
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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- JspParseEventListener.java 4 Dec 2001 02:21:04 -0000 1.31
+++ JspParseEventListener.java 22 Sep 2003 09:17:46 -0000 1.32
@@ -58,27 +58,24 @@
package org.apache.jasper.compiler;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Stack;
-import java.util.Vector;
-import java.util.Enumeration;
import java.util.StringTokenizer;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.io.File;
-import java.io.ObjectOutputStream;
-import java.io.FileOutputStream;
-import java.net.URL;
-import java.net.MalformedURLException;
+import java.util.Vector;
import javax.servlet.jsp.tagext.TagInfo;
import javax.servlet.jsp.tagext.TagLibraryInfo;
-import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
+import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
-
-import org.apache.tomcat.util.log.*;
+import org.apache.tomcat.util.log.Log;
/**
* JSP code generator "backend".
1.11 +1 -6
jakarta-tomcat/src/share/org/apache/jasper/compiler/JasperMangler.java
Index: JasperMangler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JasperMangler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JasperMangler.java 14 Sep 2003 04:18:12 -0000 1.10
+++ JasperMangler.java 22 Sep 2003 09:17:46 -0000 1.11
@@ -54,13 +54,8 @@
*/
package org.apache.jasper.compiler;
-import java.util.*;
-import java.io.*;
-import java.net.*;
+import java.io.File;
-import org.apache.jasper.compiler.Mangler;
-
-// utils - can be moved here if needed
import org.apache.tomcat.util.JavaGeneratorTool;
import org.apache.tomcat.util.io.FileUtil;
1.7 +5 -6
jakarta-tomcat/src/share/org/apache/jasper/compiler/GetPropertyGenerator.java
Index: GetPropertyGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/GetPropertyGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GetPropertyGenerator.java 4 May 2001 00:57:11 -0000 1.6
+++ GetPropertyGenerator.java 22 Sep 2003 09:17:46 -0000 1.7
@@ -61,11 +61,10 @@
package org.apache.jasper.compiler;
import java.util.Hashtable;
-import org.apache.jasper.JasperException;
-import org.apache.jasper.runtime.JspRuntimeLibrary;
-import java.lang.reflect.Method;
import org.apache.jasper.Constants;
+import org.apache.jasper.JasperException;
+import org.apache.jasper.runtime.JspRuntimeLibrary;
/**
* Generator for <jsp:getProperty.../>
1.2 +5 -9
jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanRepository.java
Index: BeanRepository.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BeanRepository.java 9 Oct 1999 00:20:34 -0000 1.1
+++ BeanRepository.java 22 Sep 2003 09:17:46 -0000 1.2
@@ -61,15 +61,11 @@
package org.apache.jasper.compiler;
-import java.util.Vector;
+import java.beans.Beans;
import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.Vector;
-import java.beans.Beans;
-import java.beans.BeanInfo;
-import java.beans.PropertyDescriptor;
-
-import javax.servlet.ServletException;
import org.apache.jasper.JasperException;
/**
1.8 +4 -6
jakarta-tomcat/src/share/org/apache/jasper/compiler/CommandLineCompiler.java
Index: CommandLineCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CommandLineCompiler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CommandLineCompiler.java 22 Feb 2002 03:16:09 -0000 1.7
+++ CommandLineCompiler.java 22 Sep 2003 09:17:46 -0000 1.8
@@ -60,11 +60,9 @@
package org.apache.jasper.compiler;
import java.io.File;
-import java.io.IOException;
-import org.apache.jasper.Constants;
-import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.CommandLineContext;
+import org.apache.jasper.Constants;
/**
* Overrides some methods so that we get the desired effects.
1.2 +0 -17
jakarta-tomcat/src/share/org/apache/jasper/compiler/CommentGenerator.java
Index: CommentGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CommentGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommentGenerator.java 25 Feb 2000 19:45:38 -0000 1.1
+++ CommentGenerator.java 22 Sep 2003 09:17:46 -0000 1.2
@@ -58,24 +58,7 @@
package org.apache.jasper.compiler;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.util.StringTokenizer;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.io.File;
-import java.io.ObjectOutputStream;
-import java.io.FileOutputStream;
-import java.net.URL;
-import java.net.MalformedURLException;
-
-import javax.servlet.jsp.tagext.TagInfo;
-import javax.servlet.jsp.tagext.TagLibraryInfo;
-
import org.apache.jasper.JasperException;
-import org.apache.jasper.Constants;
-import org.apache.jasper.JspCompilationContext;
public interface CommentGenerator {
1.22 +7 -10
jakarta-tomcat/src/share/org/apache/jasper/compiler/TagBeginGenerator.java
Index: TagBeginGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagBeginGenerator.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TagBeginGenerator.java 10 Sep 2001 13:04:30 -0000 1.21
+++ TagBeginGenerator.java 22 Sep 2003 09:17:46 -0000 1.22
@@ -55,24 +55,21 @@
*/
package org.apache.jasper.compiler;
+import java.lang.reflect.Method;
+import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Stack;
-import java.util.Enumeration;
-import java.lang.reflect.Method;
-import javax.servlet.jsp.tagext.TagLibraryInfo;
-import javax.servlet.jsp.tagext.TagInfo;
+import javax.servlet.jsp.tagext.BodyTag;
import javax.servlet.jsp.tagext.TagAttributeInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.BodyTag;
+import javax.servlet.jsp.tagext.TagInfo;
+import javax.servlet.jsp.tagext.TagLibraryInfo;
+import javax.servlet.jsp.tagext.VariableInfo;
+import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.Constants;
-
-import org.apache.jasper.compiler.ServletWriter;
/**
* Custom tag support.
1.9 +2 -3
jakarta-tomcat/src/share/org/apache/jasper/compiler/IncludeGenerator.java
Index: IncludeGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- IncludeGenerator.java 26 Aug 2001 01:49:02 -0000 1.8
+++ IncludeGenerator.java 22 Sep 2003 09:17:46 -0000 1.9
@@ -57,12 +57,11 @@
package org.apache.jasper.compiler;
-import java.util.Hashtable;
import java.util.Enumeration;
-import java.io.File;
+import java.util.Hashtable;
-import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
+import org.apache.jasper.JasperException;
1.7 +3 -4
jakarta-tomcat/src/share/org/apache/jasper/compiler/ParseEventListener.java
Index: ParseEventListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/ParseEventListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ParseEventListener.java 14 Jun 2000 22:51:51 -0000 1.6
+++ ParseEventListener.java 22 Sep 2003 09:17:46 -0000 1.7
@@ -61,7 +61,6 @@
package org.apache.jasper.compiler;
import java.util.Hashtable;
-import java.util.Vector;
import javax.servlet.jsp.tagext.TagInfo;
import javax.servlet.jsp.tagext.TagLibraryInfo;
1.11 +3 -4
jakarta-tomcat/src/share/org/apache/jasper/compiler/TagEndGenerator.java
Index: TagEndGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagEndGenerator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TagEndGenerator.java 24 Mar 2001 06:49:29 -0000 1.10
+++ TagEndGenerator.java 22 Sep 2003 09:17:46 -0000 1.11
@@ -58,12 +58,11 @@
import java.util.Hashtable;
import java.util.Stack;
-import javax.servlet.jsp.tagext.TagLibraryInfo;
+import javax.servlet.jsp.tagext.BodyTag;
+import javax.servlet.jsp.tagext.TagData;
import javax.servlet.jsp.tagext.TagInfo;
+import javax.servlet.jsp.tagext.TagLibraryInfo;
import javax.servlet.jsp.tagext.VariableInfo;
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.BodyTag;
/**
1.3 +0 -17
jakarta-tomcat/src/share/org/apache/jasper/compiler/JakartaCommentGenerator.java
Index: JakartaCommentGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JakartaCommentGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JakartaCommentGenerator.java 24 Mar 2000 01:09:32 -0000 1.2
+++ JakartaCommentGenerator.java 22 Sep 2003 09:17:46 -0000 1.3
@@ -58,24 +58,7 @@
package org.apache.jasper.compiler;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.util.StringTokenizer;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.io.File;
-import java.io.ObjectOutputStream;
-import java.io.FileOutputStream;
-import java.net.URL;
-import java.net.MalformedURLException;
-
-import javax.servlet.jsp.tagext.TagInfo;
-import javax.servlet.jsp.tagext.TagLibraryInfo;
-
import org.apache.jasper.JasperException;
-import org.apache.jasper.Constants;
-import org.apache.jasper.JspCompilationContext;
/**
* Generates original "Jakarta"-style comments
1.32 +17 -18
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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TagLibraryInfoImpl.java 2 Mar 2001 04:51:35 -0000 1.31
+++ TagLibraryInfoImpl.java 22 Sep 2003 09:17:46 -0000 1.32
@@ -55,36 +55,35 @@
package org.apache.jasper.compiler;
-import java.net.URL;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipEntry;
-import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.io.IOException;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.Vector;
+import java.net.URL;
import java.util.Hashtable;
+import java.util.Vector;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
-import javax.servlet.jsp.tagext.TagLibraryInfo;
-import javax.servlet.jsp.tagext.TagInfo;
import javax.servlet.jsp.tagext.TagAttributeInfo;
import javax.servlet.jsp.tagext.TagExtraInfo;
+import javax.servlet.jsp.tagext.TagInfo;
+import javax.servlet.jsp.tagext.TagLibraryInfo;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-
-import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
-//import org.apache.jasper.runtime.JspLoader;
-
-import org.apache.tomcat.util.log.*;
+import org.apache.jasper.JasperException;
+import org.apache.jasper.JspCompilationContext;
+import org.apache.tomcat.util.log.Log;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
/**
* Implementation of the TagLibraryInfo class from the JSP spec.
1.21 +2 -4
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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JspCompiler.java 22 Feb 2002 03:16:09 -0000 1.20
+++ JspCompiler.java 22 Sep 2003 09:17:46 -0000 1.21
@@ -56,13 +56,11 @@
package org.apache.jasper.compiler;
import java.io.File;
-import java.io.FileNotFoundException;
-import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
-
-import org.apache.tomcat.util.log.*;
+import org.apache.jasper.JspCompilationContext;
+import org.apache.tomcat.util.log.Log;
/**
* JspCompiler is an implementation of Compiler with a funky code
1.26 +5 -8
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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- JspReader.java 22 Jan 2002 04:18:38 -0000 1.25
+++ JspReader.java 22 Sep 2003 09:17:46 -0000 1.26
@@ -56,21 +56,18 @@
package org.apache.jasper.compiler;
-import java.io.InputStreamReader;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.Reader;
import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.io.FileNotFoundException;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.util.Hashtable;
import java.util.Vector;
-import java.util.Stack;
import org.apache.jasper.Constants;
import org.apache.jasper.JspCompilationContext;
-import org.apache.tomcat.util.log.*;
+import org.apache.tomcat.util.log.Log;
/**
* JspReader is an input buffer for the JSP parser. It should allow
1.8 +0 -4
jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraries.java
Index: TagLibraries.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraries.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TagLibraries.java 14 Jun 2000 22:51:53 -0000 1.7
+++ TagLibraries.java 22 Sep 2003 09:17:46 -0000 1.8
@@ -54,13 +54,9 @@
*/
package org.apache.jasper.compiler;
-import java.lang.reflect.Constructor;
-
import java.util.Hashtable;
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.10 +4 -7
jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanGenerator.java
Index: BeanGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanGenerator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BeanGenerator.java 9 Mar 2001 22:26:13 -0000 1.9
+++ BeanGenerator.java 22 Sep 2003 09:17:46 -0000 1.10
@@ -59,12 +59,9 @@
package org.apache.jasper.compiler;
import java.util.Hashtable;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.lang.reflect.Method;
-import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
+import org.apache.jasper.JasperException;
/**
* Generate code for useBean.
1.8 +4 -7
jakarta-tomcat/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java
Index: SetPropertyGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SetPropertyGenerator.java 28 Apr 2001 21:13:36 -0000 1.7
+++ SetPropertyGenerator.java 22 Sep 2003 09:17:46 -0000 1.8
@@ -61,12 +61,9 @@
package org.apache.jasper.compiler;
import java.util.Hashtable;
-import org.apache.jasper.JasperException;
-import java.lang.reflect.Method;
-import java.util.Enumeration;
-import java.beans.*;
import org.apache.jasper.Constants;
+import org.apache.jasper.JasperException;
/**
* Generator for <jsp:setProperty .../>
1.7 +4 -5
jakarta-tomcat/src/share/org/apache/jasper/compiler/BaseJspListener.java
Index: BaseJspListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BaseJspListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseJspListener.java 14 Jun 2000 22:51:49 -0000 1.6
+++ BaseJspListener.java 22 Sep 2003 09:17:47 -0000 1.7
@@ -61,13 +61,12 @@
package org.apache.jasper.compiler;
import java.util.Hashtable;
-import java.util.Vector;
import javax.servlet.jsp.tagext.TagInfo;
import javax.servlet.jsp.tagext.TagLibraryInfo;
-import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
+import org.apache.jasper.JasperException;
/**
* An abstract base class to make things easy during development.
1.22 +6 -9 jakarta-tomcat/src/share/org/apache/jasper/compiler/JspUtil.java
Index: JspUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspUtil.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JspUtil.java 17 Dec 2001 05:21:58 -0000 1.21
+++ JspUtil.java 22 Sep 2003 09:17:47 -0000 1.22
@@ -56,25 +56,22 @@
*/
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.Enumeration;
+import java.util.Hashtable;
-import org.apache.jasper.Constants;
-import org.apache.jasper.JasperException;
-
-import org.w3c.dom.*;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.jasper.Constants;
+import org.apache.jasper.JasperException;
+import org.w3c.dom.Document;
import org.xml.sax.EntityResolver;
-import org.xml.sax.SAXException;
import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
/**
* This class has all the utility method(s).
1.7 +3 -5
jakarta-tomcat/src/share/org/apache/jasper/compiler/DelegatingListener.java
Index: DelegatingListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/DelegatingListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DelegatingListener.java 14 Jun 2000 22:51:49 -0000 1.6
+++ DelegatingListener.java 22 Sep 2003 09:17:47 -0000 1.7
@@ -62,13 +62,11 @@
package org.apache.jasper.compiler;
import java.util.Hashtable;
-import java.util.Vector;
import javax.servlet.jsp.tagext.TagInfo;
import javax.servlet.jsp.tagext.TagLibraryInfo;
import org.apache.jasper.JasperException;
-import org.apache.jasper.Constants;
/**
1.17 +1 -15
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JspLoader.java 17 Dec 2001 05:21:58 -0000 1.16
+++ JspLoader.java 22 Sep 2003 09:17:47 -0000 1.17
@@ -57,27 +57,13 @@
package org.apache.jasper.runtime;
-import java.io.FileInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
import java.io.IOException;
-
-import java.util.Hashtable;
import java.util.Vector;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipEntry;
-import java.net.URL;
-
-import java.security.*;
-import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
import org.apache.jasper.Options;
+import org.apache.tomcat.util.log.Log;
-import org.apache.tomcat.util.log.*;
-import javax.servlet.http.*;
/**
* Jsp compiler and runtime depends on special features from the
* ClassLoader.
1.12 +3 -4
jakarta-tomcat/src/share/org/apache/jasper/runtime/BodyContentImpl.java
Index: BodyContentImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/BodyContentImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BodyContentImpl.java 11 Jun 2001 03:42:29 -0000 1.11
+++ BodyContentImpl.java 22 Sep 2003 09:17:47 -0000 1.12
@@ -55,13 +55,12 @@
package org.apache.jasper.runtime;
-import java.io.IOException;
-import java.io.Writer;
-import java.io.Reader;
import java.io.CharArrayReader;
+import java.io.IOException;
import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.Writer;
-import javax.servlet.ServletResponse;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.BodyContent;
1.3 +5 -4
jakarta-tomcat/src/share/org/apache/jasper/runtime/TagHandlerPoolImpl.java
Index: TagHandlerPoolImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/TagHandlerPoolImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TagHandlerPoolImpl.java 11 May 2001 18:43:18 -0000 1.2
+++ TagHandlerPoolImpl.java 22 Sep 2003 09:17:47 -0000 1.3
@@ -59,10 +59,11 @@
package org.apache.jasper.runtime;
-import javax.servlet.jsp.tagext.Tag;
-import java.util.Stack;
-import java.util.EmptyStackException;
import java.util.Enumeration;
+import java.util.Stack;
+
+import javax.servlet.jsp.tagext.Tag;
+
import org.apache.tomcat.util.log.Log;
/**
1.24 +3 -12
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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- PageContextImpl.java 6 Aug 2002 05:22:16 -0000 1.23
+++ PageContextImpl.java 22 Sep 2003 09:17:47 -0000 1.24
@@ -58,8 +58,6 @@
package org.apache.jasper.runtime;
import java.io.IOException;
-import java.io.InputStreamReader;
-
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.NoSuchElementException;
@@ -68,22 +66,15 @@
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import javax.servlet.ServletException;
-
-import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-
-import javax.servlet.jsp.PageContext;
+import javax.servlet.http.HttpSession;
import javax.servlet.jsp.JspFactory;
import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyContent;
-
-import org.apache.jasper.Constants;
-import org.apache.tomcat.util.log.*;
/**
* Implementation of the PageContext class from the JSP spec.
1.9 +2 -16
jakarta-tomcat/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JspRuntimeLibrary.java 7 Jan 2001 19:24:27 -0000 1.8
+++ JspRuntimeLibrary.java 22 Sep 2003 09:17:47 -0000 1.9
@@ -58,27 +58,13 @@
package org.apache.jasper.runtime;
-import java.io.IOException;
-import java.util.Enumeration;
-
import java.lang.reflect.Method;
+import java.util.Enumeration;
-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 javax.servlet.ServletException;
import javax.servlet.ServletRequest;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
+import org.apache.jasper.JasperException;
/**
1.6 +7 -9
jakarta-tomcat/src/share/org/apache/jasper/runtime/HttpJspBase.java
Index: HttpJspBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/HttpJspBase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HttpJspBase.java 6 Jul 2000 14:30:09 -0000 1.5
+++ HttpJspBase.java 22 Sep 2003 09:17:47 -0000 1.6
@@ -56,17 +56,15 @@
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 javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.HttpJspPage;
+import javax.servlet.jsp.PageContext;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
