You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2001/02/20 04:17:57 UTC

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util LocaleToCharsetMap.java

costin      01/02/19 19:17:57

  Modified:    src/share/org/apache/tomcat/core BaseInterceptor.java
                        Container.java Context.java ContextManager.java
                        Handler.java Request.java Response.java
                        ServerSession.java package.html
               src/share/org/apache/tomcat/startup StopTomcat.java
                        Tomcat.java
  Removed:     src/share/org/apache/tomcat/util LocaleToCharsetMap.java
  Log:
  Package move, explicit imports.
  
  Revision  Changes    Path
  1.42      +2 -2      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.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- BaseInterceptor.java	2001/02/06 06:40:06	1.41
  +++ BaseInterceptor.java	2001/02/20 03:17:56	1.42
  @@ -60,8 +60,8 @@
   
   package org.apache.tomcat.core;
   
  -import org.apache.tomcat.util.log.*;
  -import org.apache.tomcat.util.hooks.*;
  +import org.apache.tomcat.util.log.Log;
  +import org.apache.tomcat.util.hooks.Hooks;
   
   /** Implement "Chain of Responsiblity" pattern ( == hooks ).
    *
  
  
  
  1.47      +1 -1      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.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- Container.java	2001/02/06 06:40:06	1.46
  +++ Container.java	2001/02/20 03:17:56	1.47
  @@ -59,7 +59,7 @@
   
   package org.apache.tomcat.core;
   
  -import org.apache.tomcat.util.hooks.*;
  +import org.apache.tomcat.util.hooks.Hooks;
   import java.util.Hashtable;
   import java.util.Enumeration;
   
  
  
  
  1.139     +2 -2      jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java
  
  Index: Context.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java,v
  retrieving revision 1.138
  retrieving revision 1.139
  diff -u -r1.138 -r1.139
  --- Context.java	2001/02/06 06:41:07	1.138
  +++ Context.java	2001/02/20 03:17:56	1.139
  @@ -61,8 +61,8 @@
   package org.apache.tomcat.core;
   
   import org.apache.tomcat.util.depend.*;
  -import org.apache.tomcat.util.MimeMap;
  -import org.apache.tomcat.util.log.*;
  +import org.apache.tomcat.util.http.MimeMap;
  +import org.apache.tomcat.util.log.Log;
   
   import java.io.File;
   import java.net.FileNameMap;
  
  
  
  1.169     +1 -1      jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
  
  Index: ContextManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
  retrieving revision 1.168
  retrieving revision 1.169
  diff -u -r1.168 -r1.169
  --- ContextManager.java	2001/02/13 16:05:31	1.168
  +++ ContextManager.java	2001/02/20 03:17:56	1.169
  @@ -59,7 +59,7 @@
   
   package org.apache.tomcat.core;
   
  -import org.apache.tomcat.util.log.*;
  +import org.apache.tomcat.util.log.Log;
   
   import java.util.Hashtable;
   import java.util.Vector;
  
  
  
  1.38      +1 -1      jakarta-tomcat/src/share/org/apache/tomcat/core/Handler.java
  
  Index: Handler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Handler.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- Handler.java	2001/02/19 20:22:36	1.37
  +++ Handler.java	2001/02/20 03:17:56	1.38
  @@ -59,7 +59,7 @@
   package org.apache.tomcat.core;
   
   import org.apache.tomcat.util.Counters;
  -import org.apache.tomcat.util.log.*;
  +import org.apache.tomcat.util.log.Log;
   
   /**
    * The class that will generate the actual response or response fragment.
  
  
  
  1.91      +7 -4      jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java
  
  Index: Request.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -r1.90 -r1.91
  --- Request.java	2001/02/09 07:47:48	1.90
  +++ Request.java	2001/02/20 03:17:56	1.91
  @@ -60,14 +60,17 @@
   
   package org.apache.tomcat.core;
   
  -import org.apache.tomcat.util.MimeHeaders;
  +import org.apache.tomcat.util.http.MimeHeaders;
  +import org.apache.tomcat.util.http.Parameters;
  +import org.apache.tomcat.util.http.ContentType;
  +import org.apache.tomcat.util.http.Cookies;
  +
   import org.apache.tomcat.util.Counters;
   import org.apache.tomcat.util.SimplePrincipal;
  -import org.apache.tomcat.util.MessageBytes;
  +import org.apache.tomcat.util.buf.MessageBytes;
   
  -import org.apache.tomcat.util.http.ContentType;
   
  -import org.apache.tomcat.util.http.*;
  +//import org.apache.tomcat.util.http.*;
   
   import java.security.Principal;
   import java.io.IOException;
  
  
  
  1.49      +2 -3      jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java
  
  Index: Response.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- Response.java	2001/02/10 23:28:15	1.48
  +++ Response.java	2001/02/20 03:17:56	1.49
  @@ -63,10 +63,9 @@
   import java.io.IOException;
   import java.util.Locale;
   
  -import org.apache.tomcat.util.StringManager;
  -import org.apache.tomcat.util.MimeHeaders;
  +import org.apache.tomcat.util.res.StringManager;
   
  -// XXX 
  +import org.apache.tomcat.util.http.MimeHeaders;
   import org.apache.tomcat.util.http.ContentType;
   
   /**
  
  
  
  1.5       +4 -1      jakarta-tomcat/src/share/org/apache/tomcat/core/ServerSession.java
  
  Index: ServerSession.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServerSession.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServerSession.java	2001/02/19 20:22:38	1.4
  +++ ServerSession.java	2001/02/20 03:17:56	1.5
  @@ -65,8 +65,11 @@
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Vector;
  -import org.apache.tomcat.util.MessageBytes;
  +
  +import org.apache.tomcat.util.buf.MessageBytes;
  +
   import org.apache.tomcat.util.Counters;
  +
   import org.apache.tomcat.util.threads.TimeStamp;
   
   /**
  
  
  
  1.6       +13 -9     jakarta-tomcat/src/share/org/apache/tomcat/core/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/package.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- package.html	2001/02/19 20:22:38	1.5
  +++ package.html	2001/02/20 03:17:56	1.6
  @@ -89,21 +89,25 @@
       <h2>Dependencies</h2>
   
       <ul>
  -       <li>org.apache.tomcat.util.log.*</li>
  -       <li>org.apache.tomcat.util.hooks.*</li>
  +       <li>org.apache.tomcat.util.log.Log</li>
  +       <li>org.apache.tomcat.util.hooks.Hooks</li>
          <li>org.apache.tomcat.util.http.*</li>
  -       <li>org.apache.tomcat.util.StringManager; -> res</li>
  +       <li>org.apache.tomcat.util.res.StringManager</li>
  +       <li>org.apache.tomcat.util.buf.MessageBytes;</li>
   
  -       <li>org.apache.tomcat.util.depend.*: Context/rm </li> 
  +
          <li>org.apache.tomcat.util.threads.TimeStamp: ServerSession/rm </li>
   
  -       <li>org.apache.tomcat.util.MessageBytes;</li>
  +       <li>org.apache.tomcat.util.SimplePrincipal - Request/->facade</li>
  +       <li>org.apache.tomcat.util.depend.*: Context/rm </li> 
  +       <li>org.apache.tomcat.util.Counters - Handler/rm</li>
   
  -       <li>org.apache.tomcat.util.MimeMap -> http </li>
  -       <li>org.apache.tomcat.util.MimeHeaders -> http </li>
  +    </ul>
   
  -       <li>org.apache.tomcat.util.Counters - Handler/rm</li>
  -       <li>org.apache.tomcat.util.SimplePrincipal - Request/->facade</li>
  +    Indirect dependencies:
  +    <ul>
  +      <li>FastDateFormat, collections.Queue ( Log implementation )</li>
  +      <li>collections.MultipMap ( http )
   
       </ul>
     </body>
  
  
  
  1.5       +1 -1      jakarta-tomcat/src/share/org/apache/tomcat/startup/StopTomcat.java
  
  Index: StopTomcat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/StopTomcat.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StopTomcat.java	2001/02/19 19:48:50	1.4
  +++ StopTomcat.java	2001/02/20 03:17:57	1.5
  @@ -58,7 +58,7 @@
    */
   package org.apache.tomcat.startup;
   
  -import org.apache.tomcat.util.StringManager;
  +import org.apache.tomcat.util.res.StringManager;
   import org.apache.tomcat.util.IntrospectionUtils;
   import java.io.*;
   import java.net.*;
  
  
  
  1.57      +1 -1      jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java
  
  Index: Tomcat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- Tomcat.java	2001/02/12 03:26:38	1.56
  +++ Tomcat.java	2001/02/20 03:17:57	1.57
  @@ -7,7 +7,7 @@
   import java.util.Hashtable;
   import java.util.*;
   import java.net.*;
  -import org.apache.tomcat.util.*;
  +import org.apache.tomcat.util.res.StringManager;
   import org.apache.tomcat.modules.config.*;
   import org.apache.tomcat.util.xml.*;
   import org.apache.tomcat.core.*;