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/servlets DefaultServlet.java LocalStrings.properties LocalStrings_es.properties TomcatInternalServlet.java
Date Thu, 22 Jun 2000 23:59:37 GMT
costin      00/06/22 16:59:35

  Modified:    src/share/org/apache/tomcat/context DefaultCMSetter.java
               src/share/org/apache/tomcat/core Handler.java
                        ServletWrapper.java
               src/share/org/apache/tomcat/request StaticInterceptor.java
  Added:       src/share/org/apache/tomcat/resources
                        LocalStrings.properties LocalStrings_es.properties
  Removed:     src/share/org/apache/tomcat/servlets DefaultServlet.java
                        LocalStrings.properties LocalStrings_es.properties
                        TomcatInternalServlet.java
  Log:
  - removed unused files ( DefaultServlet was replaced with StaticInterceptor, the
  hack in TomcatInternalServlet is no longer needed)
  
  - moved LocalStrings to resources - follow the same pattern as in Jasper and other
  apache projects ( xml, etc).
  
  Revision  Changes    Path
  1.43      +4 -4      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.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- DefaultCMSetter.java	2000/06/22 00:14:59	1.42
  +++ DefaultCMSetter.java	2000/06/22 23:59:19	1.43
  @@ -137,7 +137,7 @@
   
   class NotFoundHandler extends ServletWrapper {
       static StringManager sm=StringManager.
  -	getManager("org.apache.tomcat.servlets");
  +	getManager("org.apache.tomcat.resources");
   
       NotFoundHandler() {
   	initialized=true;
  @@ -186,7 +186,7 @@
   
   class ExceptionHandler extends ServletWrapper {
       static StringManager sm=StringManager.
  -	getManager("org.apache.tomcat.servlets");
  +	getManager("org.apache.tomcat.resources");
   
       ExceptionHandler() {
   	initialized=true;
  @@ -272,7 +272,7 @@
   
   class StatusHandler extends ServletWrapper {
       static StringManager sm=StringManager.
  -	getManager("org.apache.tomcat.servlets");
  +	getManager("org.apache.tomcat.resources");
   
       StatusHandler() {
   	initialized=true;
  @@ -325,7 +325,7 @@
   	
   class RedirectHandler extends ServletWrapper {
       static StringManager sm=StringManager.
  -	getManager("org.apache.tomcat.servlets");
  +	getManager("org.apache.tomcat.resources");
   
       RedirectHandler() {
   	initialized=true;
  
  
  
  1.6       +3 -4      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Handler.java	2000/06/22 19:49:35	1.5
  +++ Handler.java	2000/06/22 23:59:23	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Handler.java,v 1.5
2000/06/22 19:49:35 costin Exp $
  - * $Revision: 1.5 $
  - * $Date: 2000/06/22 19:49:35 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Handler.java,v 1.6
2000/06/22 23:59:23 costin Exp $
  + * $Revision: 1.6 $
  + * $Date: 2000/06/22 23:59:23 $
    *
    * ====================================================================
    *
  @@ -64,7 +64,6 @@
   
   import org.apache.tomcat.facade.*;
   import org.apache.tomcat.util.*;
  -import org.apache.tomcat.servlets.TomcatInternalServlet;
   import java.io.*;
   import java.net.*;
   import java.util.*;
  
  
  
  1.58      +0 -5      jakarta-tomcat/src/share/org/apache/tomcat/core/ServletWrapper.java
  
  Index: ServletWrapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServletWrapper.java,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- ServletWrapper.java	2000/06/20 19:22:33	1.57
  +++ ServletWrapper.java	2000/06/22 23:59:23	1.58
  @@ -60,7 +60,6 @@
   
   import org.apache.tomcat.facade.*;
   import org.apache.tomcat.util.*;
  -import org.apache.tomcat.servlets.TomcatInternalServlet;
   import java.io.*;
   import java.net.*;
   import java.util.*;
  @@ -253,10 +252,6 @@
   
   	// hack for internal servlets
   	if( ! servletClassName.startsWith("org.apache.tomcat") ) return;
  -	if( servlet instanceof TomcatInternalServlet ) {
  -	    ((TomcatInternalServlet)servlet).setFacadeManager( context.
  -							 getFacadeManager());
  -	}
       }
   
       /** Override Handler's init - load the servlet before calling
  
  
  
  1.3       +1 -1      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StaticInterceptor.java	2000/06/22 19:49:39	1.2
  +++ StaticInterceptor.java	2000/06/22 23:59:27	1.3
  @@ -359,7 +359,7 @@
   	// the next round of optimizations
   	Locale locale=RequestUtil.getLocale(req);
   	StringManager sm=StringManager.
  -	    getManager("org.apache.tomcat.servlets",locale);
  +	    getManager("org.apache.tomcat.resources",locale);
   	DateFormat dateFormat =
   	    new SimpleDateFormat(datePattern,locale );
   
  
  
  
  1.1                  jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===================================================================
  # $Id: LocalStrings.properties,v 1.1 2000/06/22 23:59:30 costin Exp $
  #
  
  # Localized strings for package org.apache.tomcat.core
  # This is the default locale and is en_US
  
  # StaticInterceptor
  defaultservlet.directorylistingfor=Directory Listing for:
  defaultservlet.upto=Up to:
  defaultservlet.subdirectories=Subdirectories:
  defaultservlet.files=Files:
  
  #DefaultCMSetter / error handlers
  defaulterrorpage.originalrequest=Original request
  defaulterrorpage.includedservlet=Included servlet error:
  defaulterrorpage.location=Location:
  defaulterrorpage.notfound404=Not Found (404)
  defaulterrorpage.rootcause=Root cause:
  defaulterrorpage.documentmoved=Document moved
  defaulterrorpage.thisdocumenthasmoved=This document has moved
  defaulterrorpage.internalservleterror=Internal Servlet Error:
  
  
  
  1.1                  jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings_es.properties
  
  Index: LocalStrings_es.properties
  ===================================================================
  # $Id: LocalStrings_es.properties,v 1.1 2000/06/22 23:59:31 costin Exp $
  #
  
  # Localized strings for package org.apache.tomcat.core
  # This is the Spanish locale and is es
  
  defaultservlet.directorylistingfor=Contenido del Directorio:
  defaultservlet.upto=Ir a:
  defaultservlet.subdirectories=Subdirectorios:
  defaultservlet.files=Archivos:
  
  
  defaulterrorpage.originalrequest=Request original:
  defaulterrorpage.Includedservlet=Error en el Servlet Incluido:
  defaulterrorpage.location=Localizacion:
  defaulterrorpage.notfound404=No se encuentra (404)
  defaulterrorpage.rootcause=Causa Raiz:
  defaulterrorpage.documentmoved=Documento trasladado
  defaulterrorpage.thisdocumenthasmoved=Este Documento ha sido trasladado
  defaulterrorpage.internalservleterror=Error interno del servlet:
  
  
  

Mime
View raw message