You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2003/09/02 23:40:00 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/tagplugin TagPluginContext.java
remm 2003/09/02 14:40:00
Modified: jasper2/src/share/org/apache/jasper/compiler
JspRuntimeContext.java JspConfig.java
Localizer.java ErrorDispatcher.java JspReader.java
Validator.java TagFileProcessor.java
ServletWriter.java Parser.java
TldLocationsCache.java BeanRepository.java
TagLibraryInfoImpl.java Node.java
ParserController.java
jasper2/src/share/org/apache/jasper/servlet
JspServletWrapper.java JasperLoader.java
JspCServletContext.java JspServlet.java
jasper2/src/share/org/apache/jasper/runtime
JspContextWrapper.java PageContextImpl.java
HttpJspBase.java JspFragmentHelper.java
JspRuntimeLibrary.java
ServletResponseWrapperInclude.java
BodyContentImpl.java PerThreadTagHandlerPool.java
jasper2/src/share/org/apache/jasper/xmlparser
ParserUtils.java
jasper2/src/share/org/apache/jasper Constants.java JspC.java
Options.java
jasper2/src/share/org/apache/jasper/util
SystemLogHandler.java
jasper2/src/share/org/apache/jasper/compiler/tagplugin
TagPluginContext.java
Log:
- Fix bad imports (thanks to Eclipse). Let me know if I broke something.
Revision Changes Path
1.16 +8 -12 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JspRuntimeContext.java 23 Jun 2003 19:35:59 -0000 1.15
+++ JspRuntimeContext.java 2 Sep 2003 21:39:58 -0000 1.16
@@ -64,31 +64,27 @@
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.security.Policy;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.jsp.JspFactory;
-import org.apache.jasper.JasperException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.jasper.Constants;
import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.Options;
import org.apache.jasper.runtime.JspFactoryImpl;
import org.apache.jasper.security.SecurityClassLoad;
import org.apache.jasper.servlet.JspServletWrapper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* Class for tracking JSP compile time file dependencies when the
1.13 +6 -7 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspConfig.java
Index: JspConfig.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspConfig.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JspConfig.java 27 Aug 2003 00:47:19 -0000 1.12
+++ JspConfig.java 2 Sep 2003 21:39:58 -0000 1.13
@@ -61,18 +61,17 @@
package org.apache.jasper.compiler;
-import java.util.Vector;
import java.io.InputStream;
import java.util.Iterator;
+import java.util.Vector;
import javax.servlet.ServletContext;
-import org.apache.jasper.Constants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.jasper.JasperException;
import org.apache.jasper.xmlparser.ParserUtils;
import org.apache.jasper.xmlparser.TreeNode;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* Handles the jsp-config element in WEB_INF/web.xml. This is used
1.3 +5 -7 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Localizer.java
Index: Localizer.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Localizer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Localizer.java 6 Mar 2003 20:21:45 -0000 1.2
+++ Localizer.java 2 Sep 2003 21:39:58 -0000 1.3
@@ -60,11 +60,9 @@
*/
package org.apache.jasper.compiler;
-import java.util.*;
-import java.io.*;
import java.text.MessageFormat;
-import org.xml.sax.*;
-import org.apache.jasper.JasperException;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
/**
* Class responsible for converting error codes to corresponding localized
1.15 +10 -7 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java
Index: ErrorDispatcher.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ErrorDispatcher.java 21 Aug 2003 23:10:49 -0000 1.14
+++ ErrorDispatcher.java 2 Sep 2003 21:39:58 -0000 1.15
@@ -60,11 +60,14 @@
*/
package org.apache.jasper.compiler;
-import java.util.*;
-import java.io.*;
-import java.text.MessageFormat;
-import org.xml.sax.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ResourceBundle;
+import java.util.Vector;
+
import org.apache.jasper.JasperException;
+import org.xml.sax.SAXException;
/**
* Class responsible for dispatching JSP parse and javac compilation errors
1.18 +5 -7 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JspReader.java 1 Jul 2003 19:33:39 -0000 1.17
+++ JspReader.java 2 Sep 2003 21:39:58 -0000 1.18
@@ -55,19 +55,17 @@
package org.apache.jasper.compiler;
-import java.io.*;
-import java.util.*;
+import java.io.CharArrayWriter;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Vector;
import java.util.jar.JarFile;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.helpers.AttributesImpl;
/**
* JspReader is an input buffer for the JSP parser. It should allow
1.114 +14 -9 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.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- Validator.java 14 Aug 2003 21:16:52 -0000 1.113
+++ Validator.java 2 Sep 2003 21:39:58 -0000 1.114
@@ -61,20 +61,25 @@
package org.apache.jasper.compiler;
import java.lang.reflect.Method;
-
import java.util.ArrayList;
-import java.util.Hashtable;
import java.util.HashMap;
-import java.util.Enumeration;
+import java.util.Hashtable;
import java.util.Iterator;
-import javax.servlet.jsp.tagext.*;
import javax.servlet.jsp.el.FunctionMapper;
+import javax.servlet.jsp.tagext.FunctionInfo;
+import javax.servlet.jsp.tagext.JspFragment;
+import javax.servlet.jsp.tagext.PageData;
+import javax.servlet.jsp.tagext.TagAttributeInfo;
+import javax.servlet.jsp.tagext.TagData;
+import javax.servlet.jsp.tagext.TagExtraInfo;
+import javax.servlet.jsp.tagext.TagInfo;
+import javax.servlet.jsp.tagext.TagLibraryInfo;
+import javax.servlet.jsp.tagext.ValidationMessage;
+import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.Constants;
-
import org.xml.sax.Attributes;
/**
1.52 +15 -9 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java
Index: TagFileProcessor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- TagFileProcessor.java 21 May 2003 18:09:33 -0000 1.51
+++ TagFileProcessor.java 2 Sep 2003 21:39:59 -0000 1.52
@@ -62,15 +62,21 @@
package org.apache.jasper.compiler;
-import java.util.*;
-import java.util.jar.JarFile;
-import java.io.*;
-import java.net.*;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Iterator;
+import java.util.Vector;
-import javax.servlet.ServletException;
-import javax.servlet.jsp.tagext.*;
+import javax.servlet.jsp.tagext.TagAttributeInfo;
+import javax.servlet.jsp.tagext.TagExtraInfo;
+import javax.servlet.jsp.tagext.TagFileInfo;
+import javax.servlet.jsp.tagext.TagInfo;
+import javax.servlet.jsp.tagext.TagLibraryInfo;
+import javax.servlet.jsp.tagext.TagVariableInfo;
+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.servlet.JspServletWrapper;
1.4 +4 -6 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServletWriter.java 26 Apr 2003 01:31:42 -0000 1.3
+++ ServletWriter.java 2 Sep 2003 21:39:59 -0000 1.4
@@ -60,10 +60,8 @@
*/
package org.apache.jasper.compiler;
-import java.io.PrintWriter;
-import java.io.BufferedReader;
-import java.io.StringReader;
import java.io.IOException;
+import java.io.PrintWriter;
/**
* This is what is used to generate servlets.
1.80 +14 -15 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- Parser.java 11 Aug 2003 21:11:07 -0000 1.79
+++ Parser.java 2 Sep 2003 21:39:59 -0000 1.80
@@ -60,23 +60,22 @@
*/
package org.apache.jasper.compiler;
-import java.io.FileNotFoundException;
import java.io.CharArrayWriter;
-import java.util.Hashtable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Iterator;
-import java.util.jar.JarFile;
+import java.io.FileNotFoundException;
import java.net.URL;
-import javax.servlet.jsp.tagext.TagLibraryInfo;
-import javax.servlet.jsp.tagext.TagInfo;
-import javax.servlet.jsp.tagext.TagFileInfo;
+import java.util.Iterator;
+import java.util.List;
+
import javax.servlet.jsp.tagext.TagAttributeInfo;
-import org.xml.sax.Attributes;
-import org.xml.sax.helpers.AttributesImpl;
+import javax.servlet.jsp.tagext.TagFileInfo;
+import javax.servlet.jsp.tagext.TagInfo;
+import javax.servlet.jsp.tagext.TagLibraryInfo;
+
import org.apache.jasper.Constants;
-import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.JasperException;
+import org.apache.jasper.JspCompilationContext;
+import org.xml.sax.Attributes;
+import org.xml.sax.helpers.AttributesImpl;
/**
* This class implements a parser for a JSP page (non-xml view).
1.20 +9 -16 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TldLocationsCache.java 13 Jun 2003 16:50:41 -0000 1.19
+++ TldLocationsCache.java 2 Sep 2003 21:39:59 -0000 1.20
@@ -55,31 +55,24 @@
package org.apache.jasper.compiler;
import java.io.InputStream;
-import java.io.FileNotFoundException;
-import java.io.File;
-import java.io.IOException;
-import java.io.DataInputStream;
-import java.util.Hashtable;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.jar.*;
import java.net.JarURLConnection;
+import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLConnection;
-import java.net.URL;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
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.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.jasper.JasperException;
import org.apache.jasper.xmlparser.ParserUtils;
import org.apache.jasper.xmlparser.TreeNode;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* A container for all tag libraries that are defined "globally"
1.3 +3 -9 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BeanRepository.java 21 Oct 2002 20:13:32 -0000 1.2
+++ BeanRepository.java 2 Sep 2003 21:39:59 -0000 1.3
@@ -62,14 +62,8 @@
import java.util.Vector;
-import java.util.Enumeration;
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.47 +33 -13 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- TagLibraryInfoImpl.java 26 Aug 2003 00:08:32 -0000 1.46
+++ TagLibraryInfoImpl.java 2 Sep 2003 21:39:59 -0000 1.47
@@ -59,19 +59,39 @@
package org.apache.jasper.compiler;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.util.zip.*;
-import java.util.jar.*;
-import javax.servlet.jsp.tagext.*;
-import org.apache.jasper.JspCompilationContext;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.JarURLConnection;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Vector;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
+
+import javax.servlet.jsp.tagext.FunctionInfo;
+import javax.servlet.jsp.tagext.PageData;
+import javax.servlet.jsp.tagext.TagAttributeInfo;
+import javax.servlet.jsp.tagext.TagExtraInfo;
+import javax.servlet.jsp.tagext.TagFileInfo;
+import javax.servlet.jsp.tagext.TagInfo;
+import javax.servlet.jsp.tagext.TagLibraryInfo;
+import javax.servlet.jsp.tagext.TagLibraryValidator;
+import javax.servlet.jsp.tagext.TagVariableInfo;
+import javax.servlet.jsp.tagext.ValidationMessage;
+import javax.servlet.jsp.tagext.VariableInfo;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.jasper.JasperException;
-import org.apache.jasper.Constants;
+import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.xmlparser.ParserUtils;
import org.apache.jasper.xmlparser.TreeNode;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* Implementation of the TagLibraryInfo class from the JSP spec.
1.76 +20 -7 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java
Index: Node.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- Node.java 19 Aug 2003 00:36:35 -0000 1.75
+++ Node.java 2 Sep 2003 21:39:59 -0000 1.76
@@ -60,12 +60,25 @@
*/
package org.apache.jasper.compiler;
-import java.util.*;
-import java.io.CharArrayWriter;
-import javax.servlet.jsp.tagext.*;
-import org.xml.sax.Attributes;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+import javax.servlet.jsp.tagext.BodyTag;
+import javax.servlet.jsp.tagext.DynamicAttributes;
+import javax.servlet.jsp.tagext.IterationTag;
+import javax.servlet.jsp.tagext.SimpleTag;
+import javax.servlet.jsp.tagext.TagAttributeInfo;
+import javax.servlet.jsp.tagext.TagData;
+import javax.servlet.jsp.tagext.TagFileInfo;
+import javax.servlet.jsp.tagext.TagInfo;
+import javax.servlet.jsp.tagext.TagVariableInfo;
+import javax.servlet.jsp.tagext.TryCatchFinally;
+import javax.servlet.jsp.tagext.VariableInfo;
+
import org.apache.jasper.JasperException;
import org.apache.jasper.compiler.tagplugin.TagPluginContext;
+import org.xml.sax.Attributes;
/**
1.46 +12 -9 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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ParserController.java 29 Aug 2003 19:31:22 -0000 1.45
+++ ParserController.java 2 Sep 2003 21:39:59 -0000 1.46
@@ -54,16 +54,19 @@
*/
package org.apache.jasper.compiler;
-import java.io.*;
-import java.util.*;
-import java.util.zip.*;
-import java.util.jar.*;
-import java.net.*;
-import javax.servlet.jsp.tagext.*;
-import org.xml.sax.InputSource;
-import org.xml.sax.Attributes;
-import org.apache.jasper.*;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.JarURLConnection;
+import java.net.URL;
+import java.util.Stack;
+import java.util.jar.JarFile;
+
+import org.apache.jasper.JasperException;
+import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.xmlparser.XMLEncodingDetector;
+import org.xml.sax.Attributes;
/**
* Controller for the parsing of a JSP page.
1.31 +8 -17 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- JspServletWrapper.java 21 May 2003 18:09:33 -0000 1.30
+++ JspServletWrapper.java 2 Sep 2003 21:39:59 -0000 1.31
@@ -59,37 +59,28 @@
package org.apache.jasper.servlet;
-import java.io.IOException;
-import java.io.File;
import java.io.FileNotFoundException;
-import java.util.Hashtable;
-import java.util.jar.JarFile;
+import java.io.IOException;
import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.MalformedURLException;
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.UnavailableException;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.tagext.TagInfo;
-import javax.servlet.jsp.tagext.TagData;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.jasper.JasperException;
-import org.apache.jasper.Constants;
-import org.apache.jasper.Options;
import org.apache.jasper.JspCompilationContext;
+import org.apache.jasper.Options;
import org.apache.jasper.compiler.JspRuntimeContext;
-import org.apache.jasper.compiler.JspUtil;
import org.apache.jasper.compiler.Localizer;
import org.apache.jasper.runtime.JspSourceDependent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* The JSP engine (a.k.a Jasper).
1.11 +0 -4 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JasperLoader.java 30 Jul 2003 09:20:47 -0000 1.10
+++ JasperLoader.java 2 Sep 2003 21:39:59 -0000 1.11
@@ -65,11 +65,7 @@
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import java.security.ProtectionDomain;
-import javax.servlet.http.*;
-
-import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
/**
1.2 +1 -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
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspCServletContext.java 28 Mar 2002 18:46:20 -0000 1.1
+++ JspCServletContext.java 2 Sep 2003 21:39:59 -0000 1.2
@@ -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,7 @@
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.30 +11 -19 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- JspServlet.java 4 Aug 2003 20:14:36 -0000 1.29
+++ JspServlet.java 2 Sep 2003 21:39:59 -0000 1.30
@@ -59,32 +59,24 @@
package org.apache.jasper.servlet;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+
import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-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.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.jasper.Constants;
-import org.apache.jasper.Options;
import org.apache.jasper.EmbeddedServletOptions;
-
+import org.apache.jasper.Options;
import org.apache.jasper.compiler.JspRuntimeContext;
import org.apache.jasper.compiler.Localizer;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* The JSP engine (a.k.a Jasper).
1.20 +8 -12 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspContextWrapper.java
Index: JspContextWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspContextWrapper.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- JspContextWrapper.java 31 Mar 2003 21:38:46 -0000 1.19
+++ JspContextWrapper.java 2 Sep 2003 21:39:59 -0000 1.20
@@ -63,33 +63,29 @@
import java.io.IOException;
import java.io.Writer;
-
+import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map;
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.jsp.JspContext;
-import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.VariableInfo;
-import javax.servlet.jsp.tagext.BodyContent;
+import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.el.ELException;
import javax.servlet.jsp.el.ExpressionEvaluator;
import javax.servlet.jsp.el.VariableResolver;
+import javax.servlet.jsp.tagext.BodyContent;
+import javax.servlet.jsp.tagext.VariableInfo;
import org.apache.commons.el.VariableResolverImpl;
-
import org.apache.jasper.compiler.Localizer;
/**
1.52 +14 -23 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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- PageContextImpl.java 4 Aug 2003 12:26:33 -0000 1.51
+++ PageContextImpl.java 2 Sep 2003 21:39:59 -0000 1.52
@@ -61,47 +61,38 @@
package org.apache.jasper.runtime;
-import java.io.*;
+import java.io.IOException;
+import java.io.Writer;
import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedActionException;
-import java.util.EmptyStackException;
+import java.security.PrivilegedExceptionAction;
import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Stack;
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.http.HttpServletResponseWrapper;
-
-import javax.servlet.jsp.PageContext;
+import javax.servlet.http.HttpSession;
+import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspFactory;
import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.BodyContent;
-import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.el.ELException;
import javax.servlet.jsp.el.ExpressionEvaluator;
import javax.servlet.jsp.el.VariableResolver;
+import javax.servlet.jsp.tagext.BodyContent;
-import org.apache.jasper.Constants;
-import org.apache.jasper.compiler.Localizer;
-
-import org.apache.commons.el.VariableResolverImpl;
import org.apache.commons.el.ExpressionEvaluatorImpl;
-
+import org.apache.commons.el.VariableResolverImpl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.jasper.Constants;
+import org.apache.jasper.compiler.Localizer;
/**
* Implementation of the PageContext class from the JSP spec.
1.13 +7 -10 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HttpJspBase.java 21 Jul 2003 21:02:58 -0000 1.12
+++ HttpJspBase.java 2 Sep 2003 21:39:59 -0000 1.13
@@ -56,18 +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 java.util.List;
+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.JspFactory;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-import org.apache.jasper.JasperException;
import org.apache.jasper.compiler.Localizer;
/**
1.7 +4 -9 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspFragmentHelper.java
Index: JspFragmentHelper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspFragmentHelper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JspFragmentHelper.java 8 Aug 2003 23:25:11 -0000 1.6
+++ JspFragmentHelper.java 2 Sep 2003 21:39:59 -0000 1.7
@@ -63,13 +63,8 @@
import javax.servlet.jsp.JspContext;
import javax.servlet.jsp.PageContext;
-
-import javax.servlet.jsp.tagext.JspTag;
import javax.servlet.jsp.tagext.JspFragment;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import javax.servlet.jsp.tagext.JspTag;
/**
* Helper class from which all Jsp Fragment helper classes extend.
1.24 +13 -15 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JspRuntimeLibrary.java 11 Jul 2003 01:27:46 -0000 1.23
+++ JspRuntimeLibrary.java 2 Sep 2003 21:39:59 -0000 1.24
@@ -62,30 +62,28 @@
package org.apache.jasper.runtime;
-import java.util.*;
-import java.io.*;
-import java.beans.*;
-import java.security.*;
+import java.beans.PropertyEditor;
+import java.beans.PropertyEditorManager;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Enumeration;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.el.VariableResolver;
-import javax.servlet.jsp.el.FunctionMapper;
import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyContent;
import org.apache.jasper.JasperException;
import org.apache.jasper.compiler.Localizer;
-
-// for JSTL expression interpreter
-import javax.servlet.jsp.PageContext;
/**
* Bunch of util methods that are used by code generated for useBean,
1.4 +8 -8 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/ServletResponseWrapperInclude.java
Index: ServletResponseWrapperInclude.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/ServletResponseWrapperInclude.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServletResponseWrapperInclude.java 11 Jul 2003 01:27:46 -0000 1.3
+++ ServletResponseWrapperInclude.java 2 Sep 2003 21:39:59 -0000 1.4
@@ -61,13 +61,13 @@
package org.apache.jasper.runtime;
-import java.lang.IllegalStateException;
-import java.io.Writer;
-import java.io.PrintWriter;
import java.io.IOException;
+import java.io.PrintWriter;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
import javax.servlet.jsp.JspWriter;
/**
1.10 +7 -2 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BodyContentImpl.java 14 Aug 2003 22:11:12 -0000 1.9
+++ BodyContentImpl.java 2 Sep 2003 21:39:59 -0000 1.10
@@ -55,10 +55,15 @@
package org.apache.jasper.runtime;
-import java.io.*;
-import javax.servlet.ServletResponse;
+import java.io.CharArrayReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.Writer;
+
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.BodyContent;
+
import org.apache.jasper.Constants;
/**
1.3 +7 -7 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PerThreadTagHandlerPool.java
Index: PerThreadTagHandlerPool.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PerThreadTagHandlerPool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PerThreadTagHandlerPool.java 31 Jan 2003 18:56:25 -0000 1.2
+++ PerThreadTagHandlerPool.java 2 Sep 2003 21:39:59 -0000 1.3
@@ -61,12 +61,12 @@
package org.apache.jasper.runtime;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import javax.servlet.Servlet;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.Servlet;
-import org.apache.jasper.Constants;
-import java.util.Hashtable;
-import java.util.Enumeration;
/**
* Pool of tag handlers that can be reused.
1.9 +4 -8 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ParserUtils.java 22 Jan 2003 21:13:51 -0000 1.8
+++ ParserUtils.java 2 Sep 2003 21:40:00 -0000 1.9
@@ -54,28 +54,24 @@
*/
package org.apache.jasper.xmlparser;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.compiler.Localizer;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
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;
import org.w3c.dom.Text;
-
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
1.15 +0 -3 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Constants.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Constants.java 26 Apr 2003 01:14:40 -0000 1.14
+++ Constants.java 2 Sep 2003 21:40:00 -0000 1.15
@@ -56,9 +56,6 @@
package org.apache.jasper;
-import java.util.ResourceBundle;
-import java.util.MissingResourceException;
-import java.text.MessageFormat;
/**
* Some constants and other global data that are used by the compiler and the runtime.
1.59 +28 -24 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.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- JspC.java 27 Aug 2003 00:47:19 -0000 1.58
+++ JspC.java 2 Sep 2003 21:40:00 -0000 1.59
@@ -61,34 +61,38 @@
package org.apache.jasper;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.BufferedReader;
+import java.io.CharArrayWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Stack;
+import java.util.StringTokenizer;
+import java.util.Vector;
import javax.servlet.ServletException;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Element;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-
-import org.apache.tools.ant.AntClassLoader;
-
-import org.apache.jasper.compiler.ServletWriter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.jasper.compiler.Compiler;
-import org.apache.jasper.compiler.TldLocationsCache;
import org.apache.jasper.compiler.JspConfig;
-import org.apache.jasper.compiler.TagPluginManager;
-import org.apache.jasper.compiler.Localizer;
import org.apache.jasper.compiler.JspRuntimeContext;
+import org.apache.jasper.compiler.Localizer;
+import org.apache.jasper.compiler.TagPluginManager;
+import org.apache.jasper.compiler.TldLocationsCache;
import org.apache.jasper.servlet.JspCServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.tools.ant.AntClassLoader;
/**
* Shell for the jspc compiler. Handles all options associated with the
1.17 +4 -7 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Options.java 6 Aug 2003 20:04:05 -0000 1.16
+++ Options.java 2 Sep 2003 21:40:00 -0000 1.17
@@ -63,12 +63,9 @@
import java.io.File;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-
-import org.apache.jasper.compiler.TldLocationsCache;
import org.apache.jasper.compiler.JspConfig;
import org.apache.jasper.compiler.TagPluginManager;
+import org.apache.jasper.compiler.TldLocationsCache;
/**
* A class to hold all init parameters specific to the JSP engine.
1.2 +1 -8 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.2
diff -u -r1.1 -r1.2
--- SystemLogHandler.java 23 May 2002 06:53:23 -0000 1.1
+++ SystemLogHandler.java 2 Sep 2003 21:40:00 -0000 1.2
@@ -57,15 +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.io.PrintStream;
import java.util.Hashtable;
1.12 +3 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
Index: TagPluginContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/tagplugin/TagPluginContext.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TagPluginContext.java 4 Mar 2003 22:23:48 -0000 1.11
+++ TagPluginContext.java 2 Sep 2003 21:40:00 -0000 1.12
@@ -61,7 +61,6 @@
package org.apache.jasper.compiler.tagplugin;
-import org.apache.jasper.compiler.ServletWriter;
/**
* This interface allows the plugin author to make inqueries about the