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 2005/03/30 23:53:05 UTC

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi ByteArrayServletOutputStream.java ResponseIncludeWrapper.java SSICommand.java SSIConditional.java SSIConfig.java SSIEcho.java SSIExec.java SSIExternalResolver.java SSIFlastmod.java SSIInclude.java SSIMediator.java SSIProcessor.java SSIServlet.java SSIServletExternalResolver.java

markt       2005/03/30 13:53:05

  Modified:    catalina/src/share/org/apache/catalina/ssi
                        ByteArrayServletOutputStream.java
                        ResponseIncludeWrapper.java SSICommand.java
                        SSIConditional.java SSIConfig.java SSIEcho.java
                        SSIExec.java SSIExternalResolver.java
                        SSIFlastmod.java SSIInclude.java SSIMediator.java
                        SSIProcessor.java SSIServlet.java
                        SSIServletExternalResolver.java
  Log:
  Remove unused imports from o.a.c.ssi package
   - Identified by Eclipse
  
  Revision  Changes    Path
  1.3       +1 -2      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
  
  Index: ByteArrayServletOutputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ByteArrayServletOutputStream.java	26 Aug 2004 21:39:40 -0000	1.2
  +++ ByteArrayServletOutputStream.java	30 Mar 2005 21:53:05 -0000	1.3
  @@ -16,7 +16,6 @@
   
   package org.apache.catalina.ssi;
   
  -import java.io.OutputStream;
   import java.io.IOException;
   import java.io.ByteArrayOutputStream;
   import javax.servlet.ServletOutputStream;
  
  
  
  1.3       +1 -2      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java
  
  Index: ResponseIncludeWrapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ResponseIncludeWrapper.java	26 Aug 2004 21:39:40 -0000	1.2
  +++ ResponseIncludeWrapper.java	30 Mar 2005 21:53:05 -0000	1.3
  @@ -17,7 +17,6 @@
   package org.apache.catalina.ssi;
   
   import java.io.IOException;
  -import java.io.OutputStream;
   import java.io.PrintWriter;
   import javax.servlet.ServletOutputStream;
   import javax.servlet.http.HttpServletResponse;
  
  
  
  1.4       +1 -2      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSICommand.java
  
  Index: SSICommand.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSICommand.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SSICommand.java	26 Aug 2004 21:39:40 -0000	1.3
  +++ SSICommand.java	30 Mar 2005 21:53:05 -0000	1.4
  @@ -15,7 +15,6 @@
    */
   package org.apache.catalina.ssi;
   
  -import java.io.IOException;
   import java.io.PrintWriter;
   
   /**
  
  
  
  1.3       +1 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIConditional.java
  
  Index: SSIConditional.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIConditional.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SSIConditional.java	26 Aug 2004 21:39:40 -0000	1.2
  +++ SSIConditional.java	30 Mar 2005 21:53:05 -0000	1.3
  @@ -18,10 +18,6 @@
   
   import java.io.PrintWriter;
   import java.text.ParseException;
  -import java.util.LinkedList;
  -import java.util.List;
  -
  -import javax.servlet.ServletOutputStream;
   
   /**
    *  SSI command that handles all conditional directives.
  
  
  
  1.5       +1 -3      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIConfig.java
  
  Index: SSIConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIConfig.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SSIConfig.java	26 Aug 2004 21:39:40 -0000	1.4
  +++ SSIConfig.java	30 Mar 2005 21:53:05 -0000	1.5
  @@ -16,9 +16,7 @@
   
   package org.apache.catalina.ssi;
   
  -import java.io.IOException;
   import java.io.PrintWriter;
  -import java.util.Properties;
   
   /**
    * Implements the Server-side #exec command
  
  
  
  1.4       +1 -2      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIEcho.java
  
  Index: SSIEcho.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIEcho.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SSIEcho.java	26 Aug 2004 21:39:40 -0000	1.3
  +++ SSIEcho.java	30 Mar 2005 21:53:05 -0000	1.4
  @@ -16,7 +16,6 @@
   
   package org.apache.catalina.ssi;
   
  -
   import java.io.PrintWriter;
   
   /**
  
  
  
  1.5       +2 -15     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIExec.java
  
  Index: SSIExec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIExec.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SSIExec.java	26 Aug 2004 21:39:40 -0000	1.4
  +++ SSIExec.java	30 Mar 2005 21:53:05 -0000	1.5
  @@ -16,24 +16,11 @@
   
   package org.apache.catalina.ssi;
   
  -import java.io.BufferedInputStream;
  -import java.io.BufferedOutputStream;
   import java.io.BufferedReader;
  -import java.io.BufferedWriter;
   import java.io.IOException;
  -import java.io.InputStream;
   import java.io.InputStreamReader;
  -import java.io.OutputStreamWriter;
   import java.io.PrintWriter;
  -import java.io.Reader;
  -import java.io.StringWriter;
  -import java.io.Writer;
  -import java.net.MalformedURLException;
  -import java.net.URL;
  -import javax.servlet.ServletException;
  -import javax.servlet.ServletContext;
  -import javax.servlet.ServletOutputStream;
  -import javax.servlet.RequestDispatcher;
  +
   import org.apache.catalina.util.IOTools;
   
   /**
  
  
  
  1.3       +1 -2      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIExternalResolver.java
  
  Index: SSIExternalResolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIExternalResolver.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SSIExternalResolver.java	26 Aug 2004 21:39:40 -0000	1.2
  +++ SSIExternalResolver.java	30 Mar 2005 21:53:05 -0000	1.3
  @@ -16,7 +16,6 @@
   package org.apache.catalina.ssi;
   
   import java.io.IOException;
  -import java.io.PrintWriter;
   import java.util.Collection;
   import java.util.Date;
   
  
  
  
  1.5       +1 -2      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIFlastmod.java
  
  Index: SSIFlastmod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIFlastmod.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SSIFlastmod.java	26 Aug 2004 21:40:03 -0000	1.4
  +++ SSIFlastmod.java	30 Mar 2005 21:53:05 -0000	1.5
  @@ -18,7 +18,6 @@
   
   import java.io.IOException;
   import java.io.PrintWriter;
  -import java.text.SimpleDateFormat;
   import java.util.Date;
   import org.apache.catalina.util.DateTool;
   import org.apache.catalina.util.Strftime;
  
  
  
  1.5       +1 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIInclude.java
  
  Index: SSIInclude.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIInclude.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SSIInclude.java	26 Aug 2004 21:40:03 -0000	1.4
  +++ SSIInclude.java	30 Mar 2005 21:53:05 -0000	1.5
  @@ -18,10 +18,6 @@
   
   import java.io.IOException;
   import java.io.PrintWriter;
  -import javax.servlet.ServletException;
  -import javax.servlet.ServletContext;
  -import javax.servlet.ServletOutputStream;
  -import javax.servlet.RequestDispatcher;
   
   /**
    * Implements the Server-side #include command
  
  
  
  1.5       +1 -8      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIMediator.java
  
  Index: SSIMediator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIMediator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SSIMediator.java	26 Aug 2004 21:40:03 -0000	1.4
  +++ SSIMediator.java	30 Mar 2005 21:53:05 -0000	1.5
  @@ -16,17 +16,10 @@
   package org.apache.catalina.ssi;
   
   import java.io.IOException;
  -import java.io.PrintWriter;
  -import java.io.StringWriter;
  -import java.text.DateFormat;
  -import java.text.SimpleDateFormat;
  -import java.util.ArrayList;
   import java.util.Collection;
   import java.util.Date;
  -import java.util.HashMap;
   import java.util.HashSet;
   import java.util.Iterator;
  -import java.util.List;
   import java.util.Set;
   import java.util.TimeZone;
   import org.apache.catalina.util.DateTool;
  
  
  
  1.4       +1 -2      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIProcessor.java
  
  Index: SSIProcessor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIProcessor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SSIProcessor.java	26 Aug 2004 21:40:03 -0000	1.3
  +++ SSIProcessor.java	30 Mar 2005 21:53:05 -0000	1.4
  @@ -19,7 +19,6 @@
   import java.io.PrintWriter;
   import java.io.Reader;
   import java.io.StringWriter;
  -import java.io.Writer;
   import java.util.Date;
   import java.util.HashMap;
   import java.util.StringTokenizer;
  
  
  
  1.4       +1 -18     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java
  
  Index: SSIServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SSIServlet.java	26 Aug 2004 21:40:03 -0000	1.3
  +++ SSIServlet.java	30 Mar 2005 21:53:05 -0000	1.4
  @@ -19,31 +19,14 @@
   import java.io.IOException;
   import java.io.InputStream;
   import java.io.InputStreamReader;
  -import java.io.OutputStream;
  -import java.io.OutputStreamWriter;
  -import java.io.BufferedInputStream;
   import java.io.BufferedReader;
  -import java.io.ByteArrayOutputStream;
   import java.io.PrintWriter;
  -import java.io.Reader;
   import java.io.StringWriter;
  -import java.io.Writer;
   import java.net.URL;
   import java.net.URLConnection;
  -import java.net.URLDecoder;
  -import java.util.ArrayList;
  -import java.util.Collection;
   import java.util.Date;
  -import java.util.Enumeration;
  -import java.util.HashMap;
  -import java.util.Locale;
  -import java.text.SimpleDateFormat;
  -import java.util.StringTokenizer;
  -import java.util.TimeZone;
  -import javax.servlet.RequestDispatcher;
   import javax.servlet.ServletException;
   import javax.servlet.ServletContext;
  -import javax.servlet.ServletOutputStream;
   import javax.servlet.http.HttpServlet;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  
  
  
  1.4       +4 -19     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIServletExternalResolver.java
  
  Index: SSIServletExternalResolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIServletExternalResolver.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SSIServletExternalResolver.java	26 Aug 2004 21:40:03 -0000	1.3
  +++ SSIServletExternalResolver.java	30 Mar 2005 21:53:05 -0000	1.4
  @@ -17,33 +17,18 @@
   package org.apache.catalina.ssi;
   
   import java.io.IOException;
  -import java.io.InputStream;
  -import java.io.InputStreamReader;
  -import java.io.OutputStream;
  -import java.io.OutputStreamWriter;
  -import java.io.BufferedInputStream;
  -import java.io.BufferedReader;
  -import java.io.ByteArrayOutputStream;
  -import java.io.PrintWriter;
  -import java.io.Reader;
  -import java.io.StringWriter;
  -import java.io.Writer;
  +
   import java.net.URL;
   import java.net.URLConnection;
   import java.net.URLDecoder;
  -import java.util.ArrayList;
  +
   import java.util.Collection;
   import java.util.Date;
   import java.util.Enumeration;
  -import java.util.HashMap;
  -import java.util.Locale;
  -import java.text.SimpleDateFormat;
  -import java.util.StringTokenizer;
  -import java.util.TimeZone;
  +
   import javax.servlet.RequestDispatcher;
   import javax.servlet.ServletException;
   import javax.servlet.ServletContext;
  -import javax.servlet.ServletOutputStream;
   import javax.servlet.http.HttpServlet;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org