tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util BuffTool.java MessageChars.java MessageString.java MimeHeaderField.java MimeHeaders.java RecycleBufferedInputStream.java RequestUtil.java SecurityTools.java
Date Fri, 23 Jun 2000 02:16:34 GMT
costin      00/06/22 19:16:33

  Modified:    src/share/org/apache/tomcat/adapter AdapterHandler.java
                        HttpAdapter.java
               src/share/org/apache/tomcat/context AutoSetup.java
                        DefaultCMSetter.java LoadOnStartupInterceptor.java
                        LoaderInterceptor.java LogEvents.java
                        PolicyInterceptor.java WorkDirInterceptor.java
               src/share/org/apache/tomcat/core BaseInterceptor.java
                        Container.java
               src/share/org/apache/tomcat/request
                        AccountingInterceptor.java JDBCRealm.java
                        Jdk12Interceptor.java SessionInterceptor.java
                        SimpleMapper1.java SimpleRealm.java
                        StaticInterceptor.java
               src/share/org/apache/tomcat/resources
                        LocalStrings.properties LocalStrings_es.properties
               src/share/org/apache/tomcat/session SessionSerializer.java
               src/share/org/apache/tomcat/startup EmbededTomcat.java
               src/share/org/apache/tomcat/task ApacheConfig.java
                        IISConfig.java NSConfig.java StopTomcat.java
               src/share/org/apache/tomcat/util BuffTool.java
                        MessageChars.java MessageString.java
                        MimeHeaderField.java MimeHeaders.java
                        RecycleBufferedInputStream.java RequestUtil.java
                        SecurityTools.java
  Removed:     src/share/org/apache/tomcat/context LocalStrings.properties
                        LocalStrings_es.properties
  Log:
  Cosmetic changes - added explicit imports and removed unused imports.
  Moved the 2 strings from context/LocalProperties to resources.
  ( the idea is to provide a better handling for all resources - not for this release )
  
  Regarding javax.servlet imports - it's important to have a clear image about the
  facade<->core communication. For this release we can't support the complete
  separation that would allow untrusted applications.
  
  Revision  Changes    Path
  1.2       +3 -6      jakarta-tomcat/src/share/org/apache/tomcat/adapter/AdapterHandler.java
  
  Index: AdapterHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/adapter/AdapterHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AdapterHandler.java	2000/05/30 06:16:45	1.1
  +++ AdapterHandler.java	2000/06/23 02:16:13	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/adapter/AdapterHandler.java,v
1.1 2000/05/30 06:16:45 costin Exp $
  - * $Revision: 1.1 $
  - * $Date: 2000/05/30 06:16:45 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/adapter/AdapterHandler.java,v
1.2 2000/06/23 02:16:13 costin Exp $
  + * $Revision: 1.2 $
  + * $Date: 2000/06/23 02:16:13 $
    *
    * ====================================================================
    *
  @@ -68,9 +68,6 @@
   import java.util.*;
   import org.apache.tomcat.core.*;
   import org.apache.tomcat.util.*;
  -import javax.servlet.*;
  -import javax.servlet.http.*;
  -
   
   public class AdapterHandler  implements  TcpConnectionHandler {
       
  
  
  
  1.4       +1 -1      jakarta-tomcat/src/share/org/apache/tomcat/adapter/HttpAdapter.java
  
  Index: HttpAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/adapter/HttpAdapter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HttpAdapter.java	2000/05/31 20:58:36	1.3
  +++ HttpAdapter.java	2000/06/23 02:16:14	1.4
  @@ -63,8 +63,8 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.*;
   import javax.servlet.http.*;
  +
   
   // We implement Response part of the adapter first, Request will be next
   
  
  
  
  1.13      +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/context/AutoSetup.java
  
  Index: AutoSetup.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/context/AutoSetup.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- AutoSetup.java	2000/06/16 21:02:19	1.12
  +++ AutoSetup.java	2000/06/23 02:16:16	1.13
  @@ -66,7 +66,6 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.http.*;
   
   import org.apache.tomcat.task.Expand;
   
  
  
  
  1.44      +2 -3      jakarta-tomcat/src/share/org/apache/tomcat/context/DefaultCMSetter.java
  
  Index: DefaultCMSetter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/context/DefaultCMSetter.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- DefaultCMSetter.java	2000/06/22 23:59:19	1.43
  +++ DefaultCMSetter.java	2000/06/23 02:16:16	1.44
  @@ -68,11 +68,10 @@
   import java.net.*;
   import java.util.*;
   import java.security.*;
  -import javax.servlet.http.*;
  -import javax.servlet.*;
   
   import org.apache.tomcat.logging.*;
  -
  +import javax.servlet.*;
  +import javax.servlet.http.*;
   
   /**
    * Check ContextManager and set defaults for non-set properties
  
  
  
  1.14      +10 -13    jakarta-tomcat/src/share/org/apache/tomcat/context/LoadOnStartupInterceptor.java
  
  Index: LoadOnStartupInterceptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/context/LoadOnStartupInterceptor.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- LoadOnStartupInterceptor.java	2000/06/16 21:02:39	1.13
  +++ LoadOnStartupInterceptor.java	2000/06/23 02:16:17	1.14
  @@ -66,17 +66,15 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.http.*;
  -import javax.servlet.*;
   
  -
   /**
    * Interceptor that loads the "load-on-startup" servlets
    *
    * @author costin@dnt.ro
    */
   public class LoadOnStartupInterceptor extends BaseInterceptor {
  -    private static StringManager sm =StringManager.getManager("org.apache.tomcat.context");
  +    private static StringManager sm =
  +	StringManager.getManager("org.apache.tomcat.context");
       
       public LoadOnStartupInterceptor() {
       }
  @@ -149,11 +147,11 @@
   	System.out.println("Initializing JSP with JspWrapper");
   	
   	// Ugly code to trick JSPServlet into loading this.
  -
  +	ContextManager cm=context.getContextManager();
   	String path=result.getPath();
   	RequestImpl request = new RequestImpl();
   	ResponseImpl response = new ResponseImpl();
  -	request.setContextManager( context.getContextManager());
  +	request.setContextManager( cm );
   	request.recycle();
   	response.recycle();
   	
  @@ -167,14 +165,13 @@
   	
   	request.setContext(context);
   	request.getSession(true);
  -	
  -	RequestDispatcher rd = context.getFacade().getRequestDispatcher(requestURI);
  +
  +	cm.service( request, response );
  +// 	    RequestDispatcher rd = context.getFacade().getRequestDispatcher(requestURI);
   	
  -	try {
  -	    rd.forward(request.getFacade(), response.getFacade());
  -	} catch (ServletException se) {
  -	} catch (IOException ioe) {
  -	}
  +// 	    rd.forward(request.getFacade(), response.getFacade());
  +// 	} catch (IOException ioe) {
  +// 	}
       }
       // -------------------- 
       // Old logic from Context - probably something cleaner can replace it.
  
  
  
  1.2       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/context/LoaderInterceptor.java
  
  Index: LoaderInterceptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/context/LoaderInterceptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LoaderInterceptor.java	2000/06/10 17:54:24	1.1
  +++ LoaderInterceptor.java	2000/06/23 02:16:17	1.2
  @@ -68,7 +68,6 @@
   import java.net.*;
   import java.util.*;
   import java.security.*;
  -import javax.servlet.http.*;
   
   import org.apache.tomcat.logging.*;
   import org.apache.tomcat.loader.*;
  
  
  
  1.4       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/context/LogEvents.java
  
  Index: LogEvents.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/context/LogEvents.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LogEvents.java	2000/02/16 05:53:32	1.3
  +++ LogEvents.java	2000/06/23 02:16:18	1.4
  @@ -65,7 +65,6 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.http.*;
   
   /** Log all Context events
    */
  
  
  
  1.3       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/context/PolicyInterceptor.java
  
  Index: PolicyInterceptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/context/PolicyInterceptor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PolicyInterceptor.java	2000/06/15 18:50:14	1.2
  +++ PolicyInterceptor.java	2000/06/23 02:16:18	1.3
  @@ -68,7 +68,6 @@
   import java.net.*;
   import java.util.*;
   import java.security.*;
  -import javax.servlet.http.*;
   
   import org.apache.tomcat.logging.*;
   
  
  
  
  1.8       +0 -2      jakarta-tomcat/src/share/org/apache/tomcat/context/WorkDirInterceptor.java
  
  Index: WorkDirInterceptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/context/WorkDirInterceptor.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- WorkDirInterceptor.java	2000/06/16 17:08:08	1.7
  +++ WorkDirInterceptor.java	2000/06/23 02:16:18	1.8
  @@ -66,8 +66,6 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.http.*;
  -
   
   /**
    * Handles work dir setup/removal
  
  
  
  1.14      +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java
  
  Index: BaseInterceptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- BaseInterceptor.java	2000/06/22 19:49:31	1.13
  +++ BaseInterceptor.java	2000/06/23 02:16:20	1.14
  @@ -65,7 +65,6 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.http.*;
   
   /**
    */
  
  
  
  1.22      +0 -2      jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java
  
  Index: Container.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Container.java	2000/06/22 19:49:33	1.21
  +++ Container.java	2000/06/23 02:16:20	1.22
  @@ -65,8 +65,6 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.http.*;
  -import javax.servlet.*;
   
   /**
    * A group of resources, with some common properties.
  
  
  
  1.2       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/request/AccountingInterceptor.java
  
  Index: AccountingInterceptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/AccountingInterceptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AccountingInterceptor.java	2000/04/17 21:03:37	1.1
  +++ AccountingInterceptor.java	2000/06/23 02:16:21	1.2
  @@ -65,7 +65,6 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.http.*;
   
   /**
    * Time counting. 
  
  
  
  1.8       +2 -3      jakarta-tomcat/src/share/org/apache/tomcat/request/JDBCRealm.java
  
  Index: JDBCRealm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/JDBCRealm.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JDBCRealm.java	2000/06/22 19:49:38	1.7
  +++ JDBCRealm.java	2000/06/23 02:16:21	1.8
  @@ -73,7 +73,6 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.http.*;
   
   import java.sql.*;
   
  @@ -457,7 +456,7 @@
   
   	String user=req.getRemoteUser();
   	if( user==null ) 
  -            return HttpServletResponse.SC_UNAUTHORIZED;
  +            return 401; //HttpServletResponse.SC_UNAUTHORIZED
   	
   	if( debug > 0 )
               log( "Controled access for " + user + " " + req + " "
  @@ -472,7 +471,7 @@
               return 0;
   
           if( debug > 0 ) log( "UnAuthorized " + roles[0] );
  -	return HttpServletResponse.SC_UNAUTHORIZED;
  +	return 401; //HttpServletResponse.SC_UNAUTHORIZED
           // XXX check transport
       }
   
  
  
  
  1.8       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/request/Jdk12Interceptor.java
  
  Index: Jdk12Interceptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/Jdk12Interceptor.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Jdk12Interceptor.java	2000/06/16 17:08:38	1.7
  +++ Jdk12Interceptor.java	2000/06/23 02:16:21	1.8
  @@ -65,7 +65,6 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.http.*;
   
   /**
    *  JDK1.2 specific options. Fix the class loader, etc.
  
  
  
  1.23      +5 -3      jakarta-tomcat/src/share/org/apache/tomcat/request/SessionInterceptor.java
  
  Index: SessionInterceptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/SessionInterceptor.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- SessionInterceptor.java	2000/06/10 21:55:30	1.22
  +++ SessionInterceptor.java	2000/06/23 02:16:21	1.23
  @@ -65,7 +65,7 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.http.*;
  +import javax.servlet.http.Cookie;
   
   /**
    * Will process the request and determine the session Id, and set it
  @@ -76,7 +76,8 @@
    * add new interceptors for other methods.
    *
    */
  -public class SessionInterceptor extends  BaseInterceptor implements RequestInterceptor
{
  +public class SessionInterceptor extends  BaseInterceptor
  +{
   
       // GS, separates the session id from the jvm route
       static final char SESSIONID_ROUTE_SEP = '.';
  @@ -116,7 +117,8 @@
   	String sessionId;
   	
   	if ((foundAt=uri.indexOf(sig))!=-1){
  -	    sessionId=uri.substring(foundAt+sig.length()); // I hope the optimizer does it's job:-)
  +	    sessionId=uri.substring(foundAt+sig.length());
  +	    // I hope the optimizer does it's job:-)
   	    sessionId = fixSessionId( request, sessionId );
   	    
   	    // rewrite URL, do I need to do anything more?
  
  
  
  1.11      +1 -2      jakarta-tomcat/src/share/org/apache/tomcat/request/SimpleMapper1.java
  
  Index: SimpleMapper1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/SimpleMapper1.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SimpleMapper1.java	2000/06/22 19:49:38	1.10
  +++ SimpleMapper1.java	2000/06/23 02:16:21	1.11
  @@ -63,7 +63,6 @@
   import org.apache.tomcat.core.*;
   import org.apache.tomcat.core.Constants;
   import org.apache.tomcat.util.*;
  -import javax.servlet.http.*;
   import java.util.*;
   
   /**
  @@ -286,7 +285,7 @@
   	
   	} catch(Exception ex ) {
   	    ex.printStackTrace();
  -	    return HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
  +	    return 500;
   	}
   	return OK;
       }
  
  
  
  1.5       +2 -3      jakarta-tomcat/src/share/org/apache/tomcat/request/SimpleRealm.java
  
  Index: SimpleRealm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/SimpleRealm.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SimpleRealm.java	2000/06/22 19:49:39	1.4
  +++ SimpleRealm.java	2000/06/23 02:16:21	1.5
  @@ -66,7 +66,6 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.http.*;
   import org.xml.sax.*;
   
   /**
  @@ -150,7 +149,7 @@
   	String userRoles[]=null;
   	String user=req.getRemoteUser(); 
   	if( user==null )
  -	    return HttpServletResponse.SC_UNAUTHORIZED;
  +	    return 401;
   
   	if( debug > 0 ) log( "Controled access for " + user + " " +
   			     req + " " + req.getContainer() );
  @@ -162,7 +161,7 @@
   	    return 0;
   	
   	if( debug > 0 ) log( "UnAuthorized " + roles[0] );
  - 	return HttpServletResponse.SC_UNAUTHORIZED;
  + 	return 401;
       }
   }
   
  
  
  
  1.4       +1 -2      jakarta-tomcat/src/share/org/apache/tomcat/request/StaticInterceptor.java
  
  Index: StaticInterceptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/StaticInterceptor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StaticInterceptor.java	2000/06/22 23:59:27	1.3
  +++ StaticInterceptor.java	2000/06/23 02:16:21	1.4
  @@ -67,8 +67,7 @@
   import java.text.*;
   import java.util.*;
   import java.security.*;
  -import javax.servlet.http.*;
  -import javax.servlet.*;
  +import javax.servlet.ServletOutputStream;
   
   import org.apache.tomcat.logging.*;
   
  
  
  
  1.3       +5 -2      jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LocalStrings.properties	2000/06/23 01:21:54	1.2
  +++ LocalStrings.properties	2000/06/23 02:16:23	1.3
  @@ -1,4 +1,4 @@
  -# $Id: LocalStrings.properties,v 1.2 2000/06/23 01:21:54 costin Exp $
  +# $Id: LocalStrings.properties,v 1.3 2000/06/23 02:16:23 costin Exp $
   #
   
   # Localized strings for package org.apache.tomcat.core
  @@ -27,4 +27,7 @@
   tomcat.nohome=No tomcat.home property, you need to set TOMCAT_HOME or add -Dtomcat.home
   tomcat.wrongargs=Wrong arguments
   tomcat.stop=Stop tomcat
  -tomcat.fatal=FATAL:
  \ No newline at end of file
  +tomcat.fatal=FATAL:
  +
  +# LoadOnStartupInterceptor
  +context.loadServlet.e=cannot load servlet name: {0}
  
  
  
  1.3       +4 -2      jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings_es.properties
  
  Index: LocalStrings_es.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings_es.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LocalStrings_es.properties	2000/06/23 01:21:56	1.2
  +++ LocalStrings_es.properties	2000/06/23 02:16:24	1.3
  @@ -1,4 +1,4 @@
  -# $Id: LocalStrings_es.properties,v 1.2 2000/06/23 01:21:56 costin Exp $
  +# $Id: LocalStrings_es.properties,v 1.3 2000/06/23 02:16:24 costin Exp $
   #
   
   # Localized strings for package org.apache.tomcat.core
  @@ -25,4 +25,6 @@
   tomcat.nohome=No existe la propiedad tomcat.home, necesitas crear la variable del entorno
TOMCAT_HOME o usar -Dtomcat.home=/ruta/a/tomcat
   tomcat.wrongargs=Argumentos no validos
   tomcat.stop=Parando tomcat
  -tomcat.fatal=FATAL:
  \ No newline at end of file
  +tomcat.fatal=FATAL:
  +
  +context.loadServlet.e=no se puede cargar el servlet: {0}
  
  
  
  1.5       +1 -1      jakarta-tomcat/src/share/org/apache/tomcat/session/SessionSerializer.java
  
  Index: SessionSerializer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/session/SessionSerializer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SessionSerializer.java	2000/06/18 20:14:13	1.4
  +++ SessionSerializer.java	2000/06/23 02:16:25	1.5
  @@ -61,7 +61,7 @@
   
   import java.io.*;
   import java.util.*;
  -import javax.servlet.http.*;
  +import javax.servlet.http.HttpSession;
   import org.apache.tomcat.core.Request;
   
   /**
  
  
  
  1.10      +1 -1      jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java
  
  Index: EmbededTomcat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- EmbededTomcat.java	2000/06/22 19:49:40	1.9
  +++ EmbededTomcat.java	2000/06/23 02:16:26	1.10
  @@ -10,7 +10,7 @@
   import org.apache.tomcat.session.StandardSessionInterceptor;
   import org.apache.tomcat.context.*;
   import java.security.*;
  -import javax.servlet.*;
  +import javax.servlet.ServletContext;
   import java.util.*;
   
   /**
  
  
  
  1.12      +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/task/ApacheConfig.java
  
  Index: ApacheConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/ApacheConfig.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ApacheConfig.java	2000/06/15 10:17:33	1.11
  +++ ApacheConfig.java	2000/06/23 02:16:26	1.12
  @@ -63,7 +63,6 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.http.*;
   
   
   /**
  
  
  
  1.2       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/task/IISConfig.java
  
  Index: IISConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/IISConfig.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IISConfig.java	2000/06/02 11:12:34	1.1
  +++ IISConfig.java	2000/06/23 02:16:27	1.2
  @@ -63,7 +63,6 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.http.*;
   
   
   /**
  
  
  
  1.2       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/task/NSConfig.java
  
  Index: NSConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/NSConfig.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NSConfig.java	2000/06/02 11:12:34	1.1
  +++ NSConfig.java	2000/06/23 02:16:27	1.2
  @@ -63,7 +63,6 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.http.*;
   
   
   /**
  
  
  
  1.2       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/task/StopTomcat.java
  
  Index: StopTomcat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/StopTomcat.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StopTomcat.java	2000/06/23 01:21:59	1.1
  +++ StopTomcat.java	2000/06/23 02:16:27	1.2
  @@ -63,7 +63,6 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.http.*;
   
   // Used to stop tomcat
   import org.apache.tomcat.service.PoolTcpConnector;
  
  
  
  1.7       +0 -5      jakarta-tomcat/src/share/org/apache/tomcat/util/BuffTool.java
  
  Index: BuffTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/BuffTool.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BuffTool.java	2000/05/30 06:16:54	1.6
  +++ BuffTool.java	2000/06/23 02:16:29	1.7
  @@ -1,8 +1,4 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/BuffTool.java,v 1.6
2000/05/30 06:16:54 costin Exp $
  - * $Revision: 1.6 $
  - * $Date: 2000/05/30 06:16:54 $
  - *
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
  @@ -67,7 +63,6 @@
   import org.apache.tomcat.util.StringManager;
   import org.apache.tomcat.core.Constants;
   import java.io.*;
  -import javax.servlet.ServletOutputStream;
   
   /**
    *
  
  
  
  1.2       +0 -2      jakarta-tomcat/src/share/org/apache/tomcat/util/MessageChars.java
  
  Index: MessageChars.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MessageChars.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MessageChars.java	2000/05/24 18:57:10	1.1
  +++ MessageChars.java	2000/06/23 02:16:29	1.2
  @@ -63,8 +63,6 @@
   import java.io.OutputStream;
   import java.io.IOException;
   
  -import javax.servlet.ServletOutputStream;
  -
   /**
    * This class is used to represent a char region in an HTTP message.
    *
  
  
  
  1.5       +3 -5      jakarta-tomcat/src/share/org/apache/tomcat/util/MessageString.java
  
  Index: MessageString.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MessageString.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MessageString.java	2000/05/24 18:57:10	1.4
  +++ MessageString.java	2000/06/23 02:16:29	1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MessageString.java,v
1.4 2000/05/24 18:57:10 costin Exp $
  - * $Revision: 1.4 $
  - * $Date: 2000/05/24 18:57:10 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MessageString.java,v
1.5 2000/06/23 02:16:29 costin Exp $
  + * $Revision: 1.5 $
  + * $Date: 2000/06/23 02:16:29 $
    *
    * ====================================================================
    *
  @@ -66,8 +66,6 @@
   
   import java.io.OutputStream;
   import java.io.IOException;
  -
  -import javax.servlet.ServletOutputStream;
   
   /**
    * This class is used to represent a string in an HTTP message.
  
  
  
  1.10      +3 -4      jakarta-tomcat/src/share/org/apache/tomcat/util/MimeHeaderField.java
  
  Index: MimeHeaderField.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MimeHeaderField.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MimeHeaderField.java	2000/05/24 18:57:10	1.9
  +++ MimeHeaderField.java	2000/06/23 02:16:29	1.10
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MimeHeaderField.java,v
1.9 2000/05/24 18:57:10 costin Exp $
  - * $Revision: 1.9 $
  - * $Date: 2000/05/24 18:57:10 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MimeHeaderField.java,v
1.10 2000/06/23 02:16:29 costin Exp $
  + * $Revision: 1.10 $
  + * $Date: 2000/06/23 02:16:29 $
    *
    * ====================================================================
    *
  @@ -64,7 +64,6 @@
   
   package org.apache.tomcat.util;
   
  -import javax.servlet.*;
   import java.io.IOException;
   import java.io.OutputStream;
   import java.util.*;
  
  
  
  1.9       +3 -4      jakarta-tomcat/src/share/org/apache/tomcat/util/MimeHeaders.java
  
  Index: MimeHeaders.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MimeHeaders.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- MimeHeaders.java	2000/05/24 17:19:56	1.8
  +++ MimeHeaders.java	2000/06/23 02:16:30	1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MimeHeaders.java,v
1.8 2000/05/24 17:19:56 costin Exp $
  - * $Revision: 1.8 $
  - * $Date: 2000/05/24 17:19:56 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MimeHeaders.java,v
1.9 2000/06/23 02:16:30 costin Exp $
  + * $Revision: 1.9 $
  + * $Date: 2000/06/23 02:16:30 $
    *
    * ====================================================================
    *
  @@ -64,7 +64,6 @@
   
   package org.apache.tomcat.util;
   
  -import javax.servlet.*;
   import java.io.IOException;
   import java.io.OutputStream;
   import java.io.PrintStream;
  
  
  
  1.2       +0 -2      jakarta-tomcat/src/share/org/apache/tomcat/util/RecycleBufferedInputStream.java
  
  Index: RecycleBufferedInputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/RecycleBufferedInputStream.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RecycleBufferedInputStream.java	2000/05/30 06:16:55	1.1
  +++ RecycleBufferedInputStream.java	2000/06/23 02:16:30	1.2
  @@ -63,8 +63,6 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.*;
  -import javax.servlet.http.*;
   import java.text.*;
   
   public class RecycleBufferedInputStream extends BufferedInputStream {
  
  
  
  1.14      +4 -2      jakarta-tomcat/src/share/org/apache/tomcat/util/RequestUtil.java
  
  Index: RequestUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/RequestUtil.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- RequestUtil.java	2000/06/22 00:15:06	1.13
  +++ RequestUtil.java	2000/06/23 02:16:30	1.14
  @@ -65,8 +65,10 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.*;
  -import javax.servlet.http.*;
  +import javax.servlet.ServletInputStream;
  +import javax.servlet.http.HttpServletRequest;
  +import javax.servlet.http.HttpUtils;
  +import javax.servlet.http.Cookie;
   import java.text.*;
   
   /**
  
  
  
  1.5       +1 -1      jakarta-tomcat/src/share/org/apache/tomcat/util/SecurityTools.java
  
  Index: SecurityTools.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/SecurityTools.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SecurityTools.java	2000/06/16 21:03:39	1.4
  +++ SecurityTools.java	2000/06/23 02:16:30	1.5
  @@ -61,10 +61,10 @@
   import org.apache.tomcat.core.*;
   import org.apache.tomcat.util.*;
   import org.apache.tomcat.util.xml.*;
  +import javax.servlet.http.HttpSession;
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import javax.servlet.http.*;
   import org.xml.sax.*;
   
   /**
  
  
  

Mime
View raw message