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 HexUtils.java MimeHeaderField.java MimeHeaders.java LocalStrings.properties LocalStrings_es.properties
Date Fri, 11 Aug 2000 21:21:01 GMT
costin      00/08/11 14:21:00

  Modified:    src/share/org/apache/tomcat/context DefaultCMSetter.java
                        LoadOnStartupInterceptor.java
               src/share/org/apache/tomcat/core Context.java
                        ContextManager.java RequestImpl.java Response.java
                        ResponseImpl.java
               src/share/org/apache/tomcat/facade
                        HttpServletRequestFacade.java
                        HttpServletResponseFacade.java
                        ServletContextFacade.java
               src/share/org/apache/tomcat/request JDBCRealm.java
               src/share/org/apache/tomcat/resources
                        LocalStrings.properties LocalStrings_es.properties
               src/share/org/apache/tomcat/service JNIEndpoint.java
                        PoolTcpEndpoint.java
               src/share/org/apache/tomcat/service/connector
                        Ajp12ConnectionHandler.java
                        JNIConnectionHandler.java
               src/share/org/apache/tomcat/service/http
                        HttpRequestAdapter.java
               src/share/org/apache/tomcat/session StandardManager.java
                        StandardSession.java
               src/share/org/apache/tomcat/startup Tomcat.java
               src/share/org/apache/tomcat/util HexUtils.java
                        MimeHeaderField.java MimeHeaders.java
  Removed:     src/share/org/apache/tomcat/core LocalStrings.properties
                        LocalStrings_es.properties
                        LocalStrings_se.properties
               src/share/org/apache/tomcat/request LocalStrings.properties
               src/share/org/apache/tomcat/resources
                        LocalStrings_en.properties
               src/share/org/apache/tomcat/service LocalStrings.properties
                        LocalStrings_es.properties
               src/share/org/apache/tomcat/session LocalStrings.properties
                        LocalStrings_es.properties
               src/share/org/apache/tomcat/util LocalStrings.properties
                        LocalStrings_es.properties
  Log:
  Big cleanup in LocalStrings. All messages are now in tomcat/resources - some
  of them are used from more than one package, and it's easier to translate them
  if you have only one place. That also removes a lot of duplications.
  
  All components that are part of tomcat distribution should use resources/.
  For non-standard components or external you should use local strings.
  
  Revision  Changes    Path
  1.49      +19 -2     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.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- DefaultCMSetter.java	2000/08/11 06:14:04	1.48
  +++ DefaultCMSetter.java	2000/08/11 21:19:50	1.49
  @@ -385,8 +385,7 @@
   	    // Throws an exception if the location is relative
               url = new URL(location);
   	} catch (MalformedURLException e) {
  -	    String requrl = HttpUtils.getRequestURL(req.getFacade()).
  -		toString();
  +	    String requrl = getRequestURL(req);
   	    try {
   	        url = new URL(new URL(requrl), location);
   	    }
  @@ -396,5 +395,23 @@
   	    }
   	}
           return url.toString();
  +    }
  +
  +    static String getRequestURL( Request req )  {
  + 	StringBuffer url = new StringBuffer ();
  +	String scheme = req.getScheme ();
  +	int port = req.getServerPort ();
  +	String urlPath = req.getRequestURI();
  +	
  +	url.append (scheme);		// http, https
  +	url.append ("://");
  +	url.append (req.getServerName ());
  +	if ((scheme.equals ("http") && port != 80)
  +		|| (scheme.equals ("https") && port != 443)) {
  +	    url.append (':');
  +	    url.append (req.getServerPort ());
  +	}
  +	url.append(urlPath);
  +	return url.toString();
       }
   }
  
  
  
  1.19      +0 -5      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- LoadOnStartupInterceptor.java	2000/08/02 03:50:30	1.18
  +++ LoadOnStartupInterceptor.java	2000/08/11 21:19:51	1.19
  @@ -169,11 +169,6 @@
   	request.getSession(true);
   
   	cm.service( request, response );
  -// 	    RequestDispatcher rd = context.getFacade().getRequestDispatcher(requestURI);
  -	
  -// 	    rd.forward(request.getFacade(), response.getFacade());
  -// 	} catch (IOException ioe) {
  -// 	}
       }
       // -------------------- 
       // Old logic from Context - probably something cleaner can replace it.
  
  
  
  1.107     +0 -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.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- Context.java	2000/08/02 02:17:09	1.106
  +++ Context.java	2000/08/11 21:19:57	1.107
  @@ -99,8 +99,6 @@
    * @author Gal Shachor shachor@il.ibm.com
    */
   public class Context implements LogAware {
  -    private static StringManager sm =StringManager.getManager("org.apache.tomcat.core");
  -
       // -------------------- internal properties
       // context "id"
       private String path = "";
  
  
  
  1.112     +0 -6      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.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- ContextManager.java	2000/08/11 16:24:20	1.111
  +++ ContextManager.java	2000/08/11 21:19:58	1.112
  @@ -118,12 +118,6 @@
    * @author Hans Bergsten [hans@gefionsoftware.com]
    */
   public class ContextManager implements LogAware {
  -
  -    /**
  -     * The string constants for this ContextManager.
  -     */
  -    private StringManager sm = StringManager.getManager("org.apache.tomcat.core");
  -
       /** Global interceptors - all requests that will be served by this
   	engine will pass those filters
       */
  
  
  
  1.58      +0 -4      jakarta-tomcat/src/share/org/apache/tomcat/core/RequestImpl.java
  
  Index: RequestImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestImpl.java,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- RequestImpl.java	2000/08/11 06:14:07	1.57
  +++ RequestImpl.java	2000/08/11 21:20:02	1.58
  @@ -158,10 +158,6 @@
       Request parent;
       Request child;
   
  -    // ResourceBundle
  -    protected static StringManager sm =
  -        StringManager.getManager("org.apache.tomcat.core");
  -
       // @deprecated
       protected String method;
       protected String requestURI;
  
  
  
  1.26      +1 -1      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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- Response.java	2000/08/11 06:14:07	1.25
  +++ Response.java	2000/08/11 21:20:03	1.26
  @@ -128,7 +128,7 @@
        */
   //     public ServletOutputStream getOutputStream() throws IOException;
   
  -    public void setServletOutputStream(ServletOutputStream s );
  +    //    public void setServletOutputStream(ServletOutputStream s );
   //     public void setWriter( PrintWriter w );
       
       public void doWrite( byte buffer[], int pos, int count) throws IOException;
  
  
  
  1.39      +18 -18    jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java
  
  Index: ResponseImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- ResponseImpl.java	2000/08/11 06:14:07	1.38
  +++ ResponseImpl.java	2000/08/11 21:20:04	1.39
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java,v
1.38 2000/08/11 06:14:07 costin Exp $
  - * $Revision: 1.38 $
  - * $Date: 2000/08/11 06:14:07 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java,v
1.39 2000/08/11 21:20:04 costin Exp $
  + * $Revision: 1.39 $
  + * $Date: 2000/08/11 21:20:04 $
    *
    * ====================================================================
    *
  @@ -83,7 +83,7 @@
    */
   public class ResponseImpl implements Response {
       protected static StringManager sm =
  -        StringManager.getManager("org.apache.tomcat.core");
  +        StringManager.getManager("org.apache.tomcat.resources");
       static final Locale DEFAULT_LOCALE=new Locale(Constants.LOCALE_DEFAULT, "");
   
       protected Request request;
  @@ -105,7 +105,7 @@
       // usingStream== ( sos!=null && writer ==null)
       // usingWriter== ( writer != null )
       // started == ( sos!=null )
  -    protected ServletOutputStream sos;
  +    //    protected ServletOutputStream sos;
       protected PrintWriter writer;
   
       protected boolean commited = false;
  @@ -196,7 +196,7 @@
   	usingStream = false;
   	sessionId=null;
   	writer=null;
  -	sos=null;
  +	//	sos=null;
   	started = false;
   	commited = false;
   	notIncluded=true;
  @@ -327,20 +327,20 @@
   	and implement doWrite();
   	@deprecated 
        */
  -    public ServletOutputStream getOutputStream() throws IOException {
  -	started = true;
  -// 	if( out!=null)
  -// 	    return out;
  -	// neither writer or output stream used
  -	if( sos == null )
  -	    sos=getFacade().getOutputStream();
  +//     public ServletOutputStream getOutputStream() throws IOException {
  +// 	started = true;
  +// // 	if( out!=null)
  +// // 	    return out;
  +// 	// neither writer or output stream used
  +// 	if( sos == null )
  +// 	    sos=getFacade().getOutputStream();
   
  -	return sos;
  -    }
  +// 	return sos;
  +//     }
   
  -    public void setServletOutputStream( ServletOutputStream s ) {
  -	sos=s;
  -    }
  +//     public void setServletOutputStream( ServletOutputStream s ) {
  +// 	sos=s;
  +//     }
   
       // -------------------- Headers --------------------
       public MimeHeaders getMimeHeaders() {
  
  
  
  1.9       +1 -1      jakarta-tomcat/src/share/org/apache/tomcat/facade/HttpServletRequestFacade.java
  
  Index: HttpServletRequestFacade.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/facade/HttpServletRequestFacade.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- HttpServletRequestFacade.java	2000/07/29 18:43:59	1.8
  +++ HttpServletRequestFacade.java	2000/08/11 21:20:08	1.9
  @@ -83,7 +83,7 @@
    */
   final class HttpServletRequestFacade implements HttpServletRequest {
       // Use the strings from core
  -    private static StringManager sm = StringManager.getManager("org.apache.tomcat.core");
  +    private static StringManager sm = StringManager.getManager("org.apache.tomcat.resources");
   
       private Request request;
   
  
  
  
  1.13      +4 -4      jakarta-tomcat/src/share/org/apache/tomcat/facade/HttpServletResponseFacade.java
  
  Index: HttpServletResponseFacade.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/facade/HttpServletResponseFacade.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- HttpServletResponseFacade.java	2000/08/11 06:14:09	1.12
  +++ HttpServletResponseFacade.java	2000/08/11 21:20:09	1.13
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/facade/HttpServletResponseFacade.java,v
1.12 2000/08/11 06:14:09 costin Exp $
  - * $Revision: 1.12 $
  - * $Date: 2000/08/11 06:14:09 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/facade/HttpServletResponseFacade.java,v
1.13 2000/08/11 21:20:09 costin Exp $
  + * $Revision: 1.13 $
  + * $Date: 2000/08/11 21:20:09 $
    *
    * ====================================================================
    *
  @@ -84,7 +84,7 @@
   final class HttpServletResponseFacade  implements HttpServletResponse
   {
       // Use the strings from core
  -    private static StringManager sm =  StringManager.getManager("org.apache.tomcat.core");
  +    private static StringManager sm =  StringManager.getManager("org.apache.tomcat.resources");
   
       private Response response;
       private boolean usingStream = false;
  
  
  
  1.5       +1 -1      jakarta-tomcat/src/share/org/apache/tomcat/facade/ServletContextFacade.java
  
  Index: ServletContextFacade.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/facade/ServletContextFacade.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServletContextFacade.java	2000/08/02 02:17:26	1.4
  +++ ServletContextFacade.java	2000/08/11 21:20:10	1.5
  @@ -81,7 +81,7 @@
    */
   final class ServletContextFacade implements ServletContext {
       // Use the strings from core
  -    private StringManager sm = StringManager.getManager("org.apache.tomcat.core");
  +    private StringManager sm = StringManager.getManager("org.apache.tomcat.resources");
       private ContextManager contextM;
       private Context context;
   
  
  
  
  1.13      +1 -1      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- JDBCRealm.java	2000/08/10 19:27:02	1.12
  +++ JDBCRealm.java	2000/08/11 21:20:13	1.13
  @@ -167,7 +167,7 @@
        * The string manager for this package.
        */
       private static StringManager sm =
  -        StringManager.getManager("org.apache.tomcat.request");
  +        StringManager.getManager("org.apache.tomcat.resources");
   
   
       /**
  
  
  
  1.7       +140 -1    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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LocalStrings.properties	2000/07/11 07:29:18	1.6
  +++ LocalStrings.properties	2000/08/11 21:20:17	1.7
  @@ -1,4 +1,4 @@
  -# $Id: LocalStrings.properties,v 1.6 2000/07/11 07:29:18 alex Exp $
  +# $Id: LocalStrings.properties,v 1.7 2000/08/11 21:20:17 costin Exp $
   #
   
   # Localized strings for package org.apache.tomcat.core
  @@ -38,3 +38,142 @@
   
   #WebXmlReader
   context.getConfig.e=cannot process configuration web service using "{0}"
  +
  +# Core/facade
  +scfacade.getresource.npe=Given path is null
  +scfacade.getresource.iae=Given path {0} is not absolute to the base of this context.
  +scfacade.context.iae=Servlet context paths must begin with /: {0}
  +scfacade.dispatcher.iae=Request dispatcher paths must begin with /: {0}
  +scfacade.dispatcher.iae2=Request dispatcher name is not valid:{0}
  +scfacade.dispatcher.ndnfe=Named request dispatcher not found:{0}
  +
  +context.init.alreadyinit=Context was already initialized
  +context.init.nodocbase=No docbase defined for context
  +context.init.mue=Cannot load properties files from docbase {0}
  +context.init.ioe=Cannot load properties from docbase {0} due to {1}
  +
  +context.init.propfile.url.error=Cannot load property file {0} from docbase {1}
  +context.init.propfile.file.error=Cannot load property file {0} from docbase {1}
  +context.init.propfile.servlet.format=Malformed servlet prop: {0}
  +context.getConfig.msg=Configuring web service using "{0}"
  +context.getConfig.e=cannot process configuration web service using "{0}"
  +context.props.iae=no class for servlet name: {0}
  +
  +context.dd.dropServlet=removing servlet: {0}
  +context.dd.dropMapping=removing mapping: {0}
  +context.dd.ignoreMapping=ignoring mapping: {0}
  +
  +wrapper.load.noclassname=No class name for servlet to be loaded
  +
  +reqfac.getinstream.ise=Reader already obtained for this request.
  +reqfac.getreader.ise=InputStream already obtained for this request.
  +resfac.getoutstream.ise=Writer already obtained for this request.
  +resfac.getwriter.ise=OutputStream already obtained for this request.
  +
  +hsrf.encodeRedirect.iae=urls must be absolute
  +hsrf.redirect.iae=specified url redirect is null
  +hsrf.dispatcher.iae=Request dispatcher paths can't be null: {0}
  +hsrf.error.ise=Response has already been committed
  +
  +rdi.forward.ise=Cannot forward as OutputStream or Writer has already been obtained
  +
  +serverResponse.outputStream.ise=getWriter() has already been called
  +serverResponse.ise.writer.ise=getOutputStream() has already been called
  +
  +sc.100=Continue
  +sc.101=Switching Protocols
  +sc.200=OK
  +sc.201=Created
  +sc.202=Accepted
  +sc.203=Non-Authoritative Information
  +sc.204=No Content
  +sc.205=Reset Content
  +sc.206=Partial Content
  +sc.207=Multi-Status
  +sc.300=Multiple Choices
  +sc.301=Moved Permanently
  +sc.302=Found
  +sc.303=See Other
  +sc.304=Not Modified
  +sc.305=Use Proxy
  +sc.307=Temporary Redirect
  +sc.400=Bad Request
  +sc.401=Unauthorized
  +sc.402=Payment Required
  +sc.403=Forbidden
  +sc.404=Not Found
  +sc.405=Method Not Allowed
  +sc.406=Not Acceptable
  +sc.407=Proxy Authentication Required
  +sc.408=Request Timeout
  +sc.409=Conflict
  +sc.410=Gone
  +sc.411=Length Required
  +sc.412=Precondition Failed
  +sc.413=Request Entity Too Large
  +sc.414=Request-URI Too Long
  +sc.415=Unsupported Media Type
  +sc.416=Requested Range Not Satisfiable
  +sc.417=Expectation Failed
  +sc.422=Unprocessable Entity
  +sc.424=Failed Dependency
  +sc.500=Internal Server Error
  +sc.501=Not Implemented
  +sc.502=Bad Gateway
  +sc.503=Service Unavailable
  +sc.504=Gateway Timeout
  +sc.505=HTTP Version Not Supported
  +sc.507=Insufficient Storage
  +
  +servletOutputStreamImpl.reset.ise=can't reset buffer after writing to client
  +servletOutputStreamImpl.setbuffer.ise=setting buffer after writing to the writer
  +
  +
  +
  +# JDBC realm
  +jdbcRealm.alreadyStarted=This Realm has already been started
  +jdbcRealm.authenticateFailure=Authentication unsuccessful for user {0}
  +jdbcRealm.authenticateSuccess=Authentication successful for user {0}
  +jdbcRealm.authenticateSQLException=There was an SQLException while in authenticate: {0}
  +jdbcRealm.getUserRolesSQLException=There was an SQLException while in getUserRoles: {0}
  +jdbcRealm.notStarted=This Realm has not yet been started
  +jdbcRealm.authDBClosed=The database connection is null or was found to be closed. Trying
to re-open it.
  +jdbcRealm.authDBReOpenFail=The re-open on the database failed. The database could be down.
  +jdbcRealm.getUserRolesDBClosed=The database connection is null or was found to be closed.
Trying to re-open it.
  +jdbcRealm.getUserRolesDBReOpenFail=The re-open on the database failed. The database could
be down.
  +
  +
  +# Session
  +standardManager.createSession.ise=createSession: Too many active sessions
  +standardSession.invalidate.ise=invalidate: Session already invalidated
  +standardSession.isNew.ise=isNew: Session already invalidated
  +standardSession.getAttribute.ise=getAttribute: Session already invalidated
  +standardSession.getAttributeNames.ise=getAttributeNames: Session already invalidated
  +standardSession.getCreationTime.ise=getCreationTime: Session already invalidated
  +standardSession.getMaxInactiveInterval.ise=getMaxInactiveInterval: Session already invalidated
  +standardSession.getValueNames.ise=getAttributeNames: Session already invalidated
  +standardSession.removeAttribute.ise=removeAttribute: Session already invalidated
  +standardSession.setAttribute.ise=setAttribute: Non-serializable attribute
  +standardSession.setAttribute.ise=setAttribute: Session already invalidated
  +
  +
  +# Utils
  +ascii.parseInit.nfe=number formatting error {0}
  +hexUtil.bad=Bad hexadecimal digit
  +hexUtil.odd=Odd number of hexadecimal digits
  +httpDate.pe=invalid date format: {0}
  +httpDate.iae=array too small: {0}
  +messageBytes.iae=invalid date format: {0}
  +mimeHeaderField.int.nfe=number formatting error
  +mimeHeaderField.date.iae=invalid date format
  +mimeHeaderField.header.iae=invalid header format
  +mimeHeader.connection.ioe=connection reset
  +mimeHeaderEnumerator.next.nse=MimeHeadersEnumerator
  +xml.parse=SAXParseException
  +
  +
  +# service/Endpoint
  +endpoint.run.ioe=An IOException occured while accepting connections on:\n\tinet: {0}\n\tport:
{1}\n\t Exception: {2}
  +endpoint.err.fatal=Endpoint {0} shutdown due to exception: {1}
  +endpoint.err.nonfatal=Endpoint {0} ignored exception: {1}
  +
  
  
  
  1.7       +130 -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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LocalStrings_es.properties	2000/07/17 23:48:26	1.6
  +++ LocalStrings_es.properties	2000/08/11 21:20:19	1.7
  @@ -1,4 +1,4 @@
  -# $Id: LocalStrings_es.properties,v 1.6 2000/07/17 23:48:26 nacho Exp $
  +# $Id: LocalStrings_es.properties,v 1.7 2000/08/11 21:20:19 costin Exp $
   #
   
   # Localized strings for package org.apache.tomcat.core
  @@ -37,4 +37,132 @@
   context.loadServlet.e=no se puede cargar el servlet: {0}
   
   #WebXmlReader
  -context.getConfig.e=No se puede configurar el servicio web usando "{0}"
  \ No newline at end of file
  +context.getConfig.e=No se puede configurar el servicio web usando "{0}"
  +
  +# Core / Facade 
  +scfacade.getresource.npe=La ruta de acceso no existe
  +scfacade.getresource.iae=La ruta de acceso {0} no es absoluta para la base de este contexto.
  +scfacade.context.iae=La rutas de acceso de Servlet deben comenzar con /: {0}
  +scfacade.dispatcher.iae=La ruta de accesso al Request dispatcher debe empezar con /: {0}
  +scfacade.dispatcher.iae2=el nombre del Request dispatcher no es valido:{0}
  +scfacade.dispatcher.ndnfe=El request dispatcher nombrado no se encontro:{0}
  +
  +context.init.alreadyinit=El Contexto ya fue inicializado
  +context.init.nodocbase=No se definio docbase para el contexto
  +context.init.mue=No se pueden cargar archivos de propiedades desde docbase {0}
  +context.init.ioe=No se pueden cargar propiedades desde docbase {0} debido a {1}
  +
  +context.init.propfile.url.error=No se puede cargar el archivos de propiedades {0} desde
docbase {1}
  +context.init.propfile.file.error=No se puede cargar el archivos de propiedades {0} desde
docbase {1}
  +context.init.propfile.servlet.format=Propiedad de servlet mal escrita: {0}
  +context.getConfig.msg=Configurando el servicio web usando "{0}"
  +context.getConfig.e=No se puede configurar el servicio web usando "{0}"
  +context.props.iae=No existe la clase para el servlet: {0}
  +
  +context.dd.dropServlet=Quitando servlet: {0}
  +context.dd.dropMapping=Quitando mapeado: {0}
  +context.dd.ignoreMapping=Ignorando mapeado: {0}
  +
  +wrapper.load.noclassname=No hay nombre de clase para cargar el servlet
  +
  +reqfac.getinstream.ise=Reader ya obtenido para este request.
  +reqfac.getreader.ise=InputStream ya obtenido para este request.
  +resfac.getoutstream.ise=Writer ya obtenido para este request.
  +resfac.getwriter.ise=OutputStream ya obtenido para este request.
  +
  +hsrf.encodeRedirect.iae=urls deben ser absolutas
  +hsrf.redirect.iae=la url de redireccion especificada es nula
  +hsrf.dispatcher.iae=Las rutas de acceso al Request dispatcher no pueden ser nulas: {0}
  +
  +rdi.forward.ise=No puedo reenviar como OutputStream o el  Writer ha sido ya obtenido
  +
  +serverResponse.outputStream.ise=getWriter() ha sido ya llamado
  +serverResponse.ise.writer.ise=getOutputStream() ha sido ya llamado
  +
  +serverRequest.inputStream.npe=input stream es nulo
  +serverRequest.urlDecode.nfe=formato de numeros incorrecto: {0}
  +serverResponse.outputStream.ise=Writer ya esta siendo usado para este request
  +serverResponse.writer.ise=OutputStream ya esta siendo usado para este request
  +
  +servletLoader.load.mfue=problema resolviendo la clase: {0}
  +servletLoader.load.ioe=problema leyendo el archivo de clase: {0}
  +servletLoader.load.cnfe=problema leyendo el archivo de clase: {0}
  +
  +sc.100=Continuar
  +sc.101=Cambiando Protocolos
  +sc.200=OK
  +sc.201=Creado
  +sc.202=Aceptado
  +sc.203=Informacion No-Autorizativa 
  +sc.204=Sin Contenido
  +sc.205=Reset Contenido
  +sc.206=Contenido Parcial
  +sc.300=Multiples Elecciones
  +sc.301=Movido permanentemente
  +sc.302=Encontrado
  +sc.303=Mirar Otro
  +sc.304=No Modificado
  +sc.305=Usar Proxy
  +sc.307=Redireccion Temporal
  +sc.400=Mal Request
  +sc.401=No Autorizado
  +sc.402=Pago requerido
  +sc.403=Prohibido
  +sc.404=No Encontrado
  +sc.405=Metodo No Permitido
  +sc.406=No Aceptable
  +sc.407=Autentificacion Proxy Requerida
  +sc.408=Request Caducada
  +sc.409=Conflicto
  +sc.410=Gone
  +sc.411=Longitud Requerida
  +sc.412=Precondicion Fallada
  +sc.413=Entidad de Request Demasiado Grande
  +sc.414=Request-URI Demasiado Larga
  +sc.415=Tipo de Medio No Soportado
  +sc.416=El Rango Pedido No Ser Satifecho
  +sc.417=Expectativa Fallada
  +sc.500=Error Interno del Servidor
  +sc.501=No Implementado
  +sc.502=Gateway Incorrecto
  +sc.503=Servicio no Disponible
  +sc.504=Gateway Caducado
  +sc.505=Version de HTTP No Soportada
  +
  +servletOutputStreamImpl.write.iae=longitud de escritura incorrecta: {0}
  +servletOutputStreamImpl.fmt.not_iso8859_1=No es un caracter ISO 8859_1:{0}
  +servletOutputStreamImpl.reset.ise=No puedo reiniciar el buffer despues de escribirlo hacia
el cliente
  +servletOutputStreamImpl.setbuffer.ise=especificando el buffer despues de escrbirlo al writer
  +
  +
  +# Session 
  +standardManager.createSession.ise=createSession: Demasiadas sesiones activas
  +standardSession.invalidate.ise=invalidate: Sesion ya invalidada
  +standardSession.isNew.ise=isNew: Sesion ya invalidada
  +standardSession.getAttribute.ise=getAttribute: Sesion ya invalidada
  +standardSession.getAttributeNames.ise=getAttributeNames: Sesion ya invalidada
  +standardSession.getCreationTime.ise=getCreationTime: Sesion ya invalidada
  +standardSession.getMaxInactiveInterval.ise=getMaxInactiveInterval: Sesion ya invalidada
  +standardSession.getValueNames.ise=getAttributeNames: Sesion ya invalidada
  +standardSession.removeAttribute.ise=removeAttribute: Sesion ya invalidada
  +standardSession.setAttribute.ise=setAttribute: Atributo no serializable
  +standardSession.setAttribute.ise=setAttribute: Sesion ya invalidada
  +
  +
  +# Utils
  +ascii.parseInit.nfe=error formateando numero {0}
  +hexUtil.bad=Digito hexadecimal incorrecto
  +hexUtil.odd=Numero de dígitos hexadecimales incorrecto
  +httpDate.pe=formato de fecha no valido: {0}
  +httpDate.iae=array demasiado pequeño: {0}
  +messageBytes.iae=formato de fecha no valido: {0}
  +mimeHeaderField.int.nfe=error formateando numero
  +mimeHeaderField.date.iae=formato de fecha no valido
  +mimeHeaderField.header.iae=formato de header no valido
  +mimeHeader.connection.ioe= conexión reseteada
  +mimeHeaderEnumerator.next.nse=MimeHeadersEnumerator
  +xml.parse=SAXParseException
  +
  +# service/Endpoint
  +endpoint.run.ioe=Una IOException ocurrio mientras se aceptaban conexiones en:\n\tinet:
{0}\n\tpuerto: {1}\n\t Excepcion: {2}
  +endpoint.err.fatal=El Endpoint {0} fue apagado debido a una excepcion; {1}
  
  
  
  1.5       +4 -4      jakarta-tomcat/src/share/org/apache/tomcat/service/JNIEndpoint.java
  
  Index: JNIEndpoint.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/JNIEndpoint.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JNIEndpoint.java	2000/07/11 03:48:54	1.4
  +++ JNIEndpoint.java	2000/08/11 21:20:25	1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/JNIEndpoint.java,v
1.4 2000/07/11 03:48:54 alex Exp $
  - * $Revision: 1.4 $
  - * $Date: 2000/07/11 03:48:54 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/JNIEndpoint.java,v
1.5 2000/08/11 21:20:25 costin Exp $
  + * $Revision: 1.5 $
  + * $Date: 2000/08/11 21:20:25 $
    *
    * ====================================================================
    *
  @@ -80,7 +80,7 @@
    */
   public class JNIEndpoint {
   
  -    private StringManager sm =StringManager.getManager("org.apache.tomcat.service");
  +    private StringManager sm =StringManager.getManager("org.apache.tomcat.resources");
   
       JNIConnectionHandler handler;
   
  
  
  
  1.13      +4 -4      jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpEndpoint.java
  
  Index: PoolTcpEndpoint.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpEndpoint.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- PoolTcpEndpoint.java	2000/08/10 20:44:49	1.12
  +++ PoolTcpEndpoint.java	2000/08/11 21:20:27	1.13
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpEndpoint.java,v
1.12 2000/08/10 20:44:49 glenn Exp $
  - * $Revision: 1.12 $
  - * $Date: 2000/08/10 20:44:49 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpEndpoint.java,v
1.13 2000/08/11 21:20:27 costin Exp $
  + * $Revision: 1.13 $
  + * $Date: 2000/08/11 21:20:27 $
    *
    * ====================================================================
    *
  @@ -95,7 +95,7 @@
    */
   public class PoolTcpEndpoint extends Logger.Helper  { // implements Endpoint {
   
  -    private StringManager sm = StringManager.getManager("org.apache.tomcat.service");
  +    private StringManager sm = StringManager.getManager("org.apache.tomcat.resources");
   
       private static final int BACKLOG = 100;
       private static final int TIMEOUT = 1000;
  
  
  
  1.32      +2 -2      jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp12ConnectionHandler.java
  
  Index: Ajp12ConnectionHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp12ConnectionHandler.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- Ajp12ConnectionHandler.java	2000/08/11 06:14:13	1.31
  +++ Ajp12ConnectionHandler.java	2000/08/11 21:20:31	1.32
  @@ -81,7 +81,7 @@
   /* Deprecated - must be rewriten to the connector model.
    */
   public class Ajp12ConnectionHandler implements  TcpConnectionHandler {
  -    StringManager sm = StringManager.getManager("org.apache.tomcat.service");
  +    static StringManager sm = StringManager.getManager("org.apache.tomcat.resources");
   
       ContextManager contextM;
   
  @@ -173,7 +173,7 @@
   }
   
   class AJP12RequestAdapter extends RequestImpl {
  -    StringManager sm = StringManager.getManager("org.apache.tomcat.service");
  +    static StringManager sm = StringManager.getManager("org.apache.tomcat.resources");
       Socket socket;
       InputStream sin;
       BufferedInputStream ajpin;
  
  
  
  1.13      +4 -4      jakarta-tomcat/src/share/org/apache/tomcat/service/connector/JNIConnectionHandler.java
  
  Index: JNIConnectionHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/JNIConnectionHandler.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- JNIConnectionHandler.java	2000/08/11 06:14:13	1.12
  +++ JNIConnectionHandler.java	2000/08/11 21:20:33	1.13
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/JNIConnectionHandler.java,v
1.12 2000/08/11 06:14:13 costin Exp $
  - * $Revision: 1.12 $
  - * $Date: 2000/08/11 06:14:13 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/JNIConnectionHandler.java,v
1.13 2000/08/11 21:20:33 costin Exp $
  + * $Revision: 1.13 $
  + * $Date: 2000/08/11 21:20:33 $
    *
    * ====================================================================
    *
  @@ -203,7 +203,7 @@
   }
   
   class JNIRequestAdapter extends RequestImpl {
  -    StringManager sm = StringManager.getManager("org.apache.tomcat.service");
  +    static StringManager sm = StringManager.getManager("org.apache.tomcat.resources");
       ContextManager contextM;
       boolean shutdown=false;
   
  
  
  
  1.24      +4 -3      jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpRequestAdapter.java
  
  Index: HttpRequestAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpRequestAdapter.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- HttpRequestAdapter.java	2000/08/11 16:24:26	1.23
  +++ HttpRequestAdapter.java	2000/08/11 21:20:36	1.24
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpRequestAdapter.java,v
1.23 2000/08/11 16:24:26 costin Exp $
  - * $Revision: 1.23 $
  - * $Date: 2000/08/11 16:24:26 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpRequestAdapter.java,v
1.24 2000/08/11 21:20:36 costin Exp $
  + * $Revision: 1.24 $
  + * $Date: 2000/08/11 21:20:36 $
    *
    * ====================================================================
    *
  @@ -74,6 +74,7 @@
   import javax.servlet.http.*;
   
   public class HttpRequestAdapter extends RequestImpl {
  +    static StringManager sm = StringManager.getManager("org.apache.tomcat.resources");
       private Socket socket;
       private boolean moreRequests = false;
       RecycleBufferedInputStream sin;
  
  
  
  1.12      +5 -5      jakarta-tomcat/src/share/org/apache/tomcat/session/StandardManager.java
  
  Index: StandardManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/session/StandardManager.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- StandardManager.java	2000/06/18 20:14:13	1.11
  +++ StandardManager.java	2000/08/11 21:20:41	1.12
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/session/StandardManager.java,v
1.11 2000/06/18 20:14:13 jon Exp $
  - * $Revision: 1.11 $
  - * $Date: 2000/06/18 20:14:13 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/session/StandardManager.java,v
1.12 2000/08/11 21:20:41 costin Exp $
  + * $Revision: 1.12 $
  + * $Date: 2000/08/11 21:20:41 $
    *
    * ====================================================================
    *
  @@ -102,7 +102,7 @@
    * @author Craig R. McClanahan
    * @author costin@eng.sun.com
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
  - * @version $Revision: 1.11 $ $Date: 2000/06/18 20:14:13 $
  + * @version $Revision: 1.12 $ $Date: 2000/08/11 21:20:41 $
    */
   public final class StandardManager implements Runnable  {
       // ----------------------------------------------------- Instance Variables
  @@ -144,7 +144,7 @@
        * The string manager for this package.
        */
       private static StringManager sm =
  -        StringManager.getManager("org.apache.tomcat.session");
  +        StringManager.getManager("org.apache.tomcat.resources");
   
       /**
        * The background thread.
  
  
  
  1.16      +5 -5      jakarta-tomcat/src/share/org/apache/tomcat/session/StandardSession.java
  
  Index: StandardSession.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/session/StandardSession.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- StandardSession.java	2000/06/18 22:21:49	1.15
  +++ StandardSession.java	2000/08/11 21:20:42	1.16
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/session/StandardSession.java,v
1.15 2000/06/18 22:21:49 jon Exp $
  - * $Revision: 1.15 $
  - * $Date: 2000/06/18 22:21:49 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/session/StandardSession.java,v
1.16 2000/08/11 21:20:42 costin Exp $
  + * $Revision: 1.16 $
  + * $Date: 2000/08/11 21:20:42 $
    *
    * ====================================================================
    *
  @@ -97,7 +97,7 @@
    *
    * @author Craig R. McClanahan
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
  - * @version $Revision: 1.15 $ $Date: 2000/06/18 22:21:49 $
  + * @version $Revision: 1.16 $ $Date: 2000/08/11 21:20:42 $
    */
   
   final class StandardSession
  @@ -184,7 +184,7 @@
        * The string manager for this package.
        */
       private static StringManager sm =
  -        StringManager.getManager("org.apache.tomcat.session");
  +        StringManager.getManager("org.apache.tomcat.resources");
   
   
       /**
  
  
  
  1.37      +0 -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.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- Tomcat.java	2000/08/11 16:24:27	1.36
  +++ Tomcat.java	2000/08/11 21:20:46	1.37
  @@ -187,7 +187,6 @@
   
       public void execute(String args[] ) throws Exception {
   	if( ! processArgs( args ) ) {
  -	    // System.out.println(sm.getString("tomcat.wrongargs"));	    
   	    printUsage();
   	    return;
   	}
  
  
  
  1.5       +4 -4      jakarta-tomcat/src/share/org/apache/tomcat/util/HexUtils.java
  
  Index: HexUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/HexUtils.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HexUtils.java	2000/02/14 04:59:42	1.4
  +++ HexUtils.java	2000/08/11 21:20:49	1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/HexUtils.java,v 1.4
2000/02/14 04:59:42 costin Exp $
  - * $Revision: 1.4 $
  - * $Date: 2000/02/14 04:59:42 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/HexUtils.java,v 1.5
2000/08/11 21:20:49 costin Exp $
  + * $Revision: 1.5 $
  + * $Date: 2000/08/11 21:20:49 $
    *
    * ====================================================================
    *
  @@ -102,7 +102,7 @@
        * The string manager for this package.
        */
       private static StringManager sm =
  -	StringManager.getManager("org.apache.tomcat.util");
  +	StringManager.getManager("org.apache.tomcat.resources");
   
   
       /**
  
  
  
  1.12      +4 -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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- MimeHeaderField.java	2000/08/11 06:14:19	1.11
  +++ MimeHeaderField.java	2000/08/11 21:20:55	1.12
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MimeHeaderField.java,v
1.11 2000/08/11 06:14:19 costin Exp $
  - * $Revision: 1.11 $
  - * $Date: 2000/08/11 06:14:19 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MimeHeaderField.java,v
1.12 2000/08/11 21:20:55 costin Exp $
  + * $Revision: 1.12 $
  + * $Date: 2000/08/11 21:20:55 $
    *
    * ====================================================================
    *
  @@ -85,7 +85,7 @@
       };
   
       private StringManager sm =
  -        StringManager.getManager("org.apache.tomcat.util");
  +        StringManager.getManager("org.apache.tomcat.resources");
   
       /**
        * The header field name.
  
  
  
  1.10      +7 -7      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MimeHeaders.java	2000/06/23 02:16:30	1.9
  +++ MimeHeaders.java	2000/08/11 21:20:55	1.10
  @@ -1,7 +1,7 @@
   /*
  - * $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 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MimeHeaders.java,v
1.10 2000/08/11 21:20:55 costin Exp $
  + * $Revision: 1.10 $
  + * $Date: 2000/08/11 21:20:55 $
    *
    * ====================================================================
    *
  @@ -209,8 +209,8 @@
       // Please avoid using any of the methods following this line. 
       // ( most of them will generate GC, or are http sepecific )
       // ------------------------------------------------------------
  -    private StringManager sm =
  -        StringManager.getManager("org.apache.tomcat.util");
  +    private static StringManager sm =
  +        StringManager.getManager("org.apache.tomcat.resources");
       int bufSize=512; // default
       /**
        * A buffer used when parsing headers.
  @@ -489,8 +489,8 @@
   }
   
   class MimeHeadersEnumerator implements Enumeration {
  -    private StringManager sm =
  -        StringManager.getManager("org.apache.tomcat.util");
  +    private static StringManager sm =
  +        StringManager.getManager("org.apache.tomcat.resources");
       private Hashtable hash;
       private Enumeration delegate;
   
  
  
  

Mime
View raw message