You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/08/25 01:57:04 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session Constants.java StandardManager.java
craigmcc 00/08/24 16:57:04
Modified: catalina/src/share/org/apache/catalina/connector
Constants.java HttpResponseBase.java
catalina/src/share/org/apache/catalina/connector/http
Constants.java HttpProcessor.java
catalina/src/share/org/apache/catalina/connector/test
Constants.java HttpProcessor.java
catalina/src/share/org/apache/catalina/core
ApplicationContext.java Constants.java
StandardContext.java StandardEngine.java
StandardWrapperValve.java
catalina/src/share/org/apache/catalina/loader Constants.java
StandardLoader.java
catalina/src/share/org/apache/catalina/servlets
Constants.java DefaultServlet.java
catalina/src/share/org/apache/catalina/session
Constants.java StandardManager.java
Added: catalina/src/share/org/apache/catalina Globals.java
Log:
Display the server's current version identification ("Apache Tomcat
4.0-dev") when it first starts up.
Take this opportunity to migrate commonly used constants from the various
packages to a top level org.apache.catalina.Globals class.
PR: #16, #34
Submitted by: James Cook <ji...@iname.com>
Revision Changes Path
1.1 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Globals.java
Index: Globals.java
===================================================================
/*
* $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Globals.java,v 1.1 2000/08/24 23:56:55 craigmcc Exp $
* $Revision: 1.1 $
* $Date: 2000/08/24 23:56:55 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* [Additional notices, if required by prior licensing conditions]
*
*/
package org.apache.catalina;
/**
* Global constants that are applicable to multiple packages within Catalina.
*
* @author Craig R. McClanahan
* @version $Revision: 1.1 $ $Date: 2000/08/24 23:56:55 $
*/
public final class Globals {
/**
* The servlet context attribute under which we store the class loader
* used for loading servlets (as an object of type java.lang.ClassLoader).
*/
public static final String CLASS_LOADER_ATTR =
"org.apache.catalina.classloader";
/**
* The servlet context attribute under which we store the class path
* for our application class loader (as an object of type String),
* delimited with the appropriate path delimiter for this platform.
*/
public static final String CLASS_PATH_ATTR =
"org.apache.catalina.jsp.classpath";
/**
* The request attribute under which we forward a Java exception type
* (as an object of type Class) to an error page.
*/
public static final String EXCEPTION_TYPE_ATTR =
"javax.servlet.error.exception_type";
/**
* The request attribute under which we forward an HTTP status message
* (as an object of type STring) to an error page.
*/
public static final String ERROR_MESSAGE_ATTR =
"javax.servlet.error.message";
/**
* The descriptive information about this server and version.
*/
public static final String SERVER_INFO = "Apache Tomcat 4.0-dev";
/**
* The name of the cookie used to pass the session identifier back
* and forth with the client.
*/
public static final String SESSION_COOKIE_NAME = "JSESSSIONID";
/**
* The name of the path parameter used to pass the session identifier
* back and forth with the client.
*/
public static final String SESSION_PARAMETER_NAME = "jsessionid";
/**
* The request attribute under which we forward an HTTP status code
* (as an object of type Integer) to an error page.
*/
public static final String STATUS_CODE_ATTR =
"javax.servlet.error.status_code";
/**
* The servlet context attribute under which we record the set of
* welcome files (as an object of type String[]) for this application.
*/
public static final String WELCOME_FILES_ATTR =
"org.apache.catalina.WELCOME_FILES";
/**
* The servlet context attribute under which we store a temporary
* working directory (as an object of type File) for use by servlets
* within this web application.
*/
public static final String WORK_DIR_ATTR =
"javax.servlet.context.tempdir";
}
1.2 +3 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/Constants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Constants.java 2000/08/11 22:40:18 1.1
+++ Constants.java 2000/08/24 23:56:56 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/Constants.java,v 1.1 2000/08/11 22:40:18 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/11 22:40:18 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/Constants.java,v 1.2 2000/08/24 23:56:56 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/08/24 23:56:56 $
*
* ====================================================================
*
@@ -72,7 +72,5 @@
public final class Constants {
public static final String Package = "org.apache.catalina.connector";
- public static final String SessionCookie = "JSESSIONID";
- public static final String SessionParameter = "jsessionid";
}
1.5 +6 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java
Index: HttpResponseBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HttpResponseBase.java 2000/08/19 20:19:26 1.4
+++ HttpResponseBase.java 2000/08/24 23:56:56 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v 1.4 2000/08/19 20:19:26 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2000/08/19 20:19:26 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v 1.5 2000/08/24 23:56:56 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2000/08/24 23:56:56 $
*
* ====================================================================
*
@@ -83,6 +83,7 @@
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpUtils;
import org.apache.catalina.HttpResponse;
+import org.apache.catalina.Globals;
import org.apache.catalina.Logger;
import org.apache.catalina.util.CookieTools;
import org.apache.catalina.util.RequestUtil;
@@ -95,7 +96,7 @@
* methods need to be implemented.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2000/08/19 20:19:26 $
+ * @version $Revision: 1.5 $ $Date: 2000/08/24 23:56:56 $
*/
public class HttpResponseBase
@@ -476,7 +477,7 @@
if ((session != null) && session.isNew() &&
getContext().getCookies()) {
- Cookie cookie = new Cookie(Constants.SessionCookie,
+ Cookie cookie = new Cookie(Globals.SESSION_COOKIE_NAME,
session.getId());
cookie.setMaxAge(-1);
String contextPath = context.getPath();
1.2 +7 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/Constants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Constants.java 2000/08/11 22:40:52 1.1
+++ Constants.java 2000/08/24 23:56:58 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/Constants.java,v 1.1 2000/08/11 22:40:52 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/11 22:40:52 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/Constants.java,v 1.2 2000/08/24 23:56:58 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/08/24 23:56:58 $
*
* ====================================================================
*
@@ -65,6 +65,9 @@
package org.apache.catalina.connector.http;
+import org.apache.catalina.Globals;
+
+
/**
* Static constants for this package.
*/
@@ -73,6 +76,6 @@
public static final String Package = "org.apache.catalina.connector.http";
public static final String ServerInfo =
- "Catalina 4.0-dev (HTTP/1.1 Connector)";
+ Globals.SERVER_INFO + " (HTTP/1.1 Connector)";
}
1.3 +8 -6 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java
Index: HttpProcessor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HttpProcessor.java 2000/08/19 05:29:16 1.2
+++ HttpProcessor.java 2000/08/24 23:56:58 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v 1.2 2000/08/19 05:29:16 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2000/08/19 05:29:16 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v 1.3 2000/08/24 23:56:58 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2000/08/24 23:56:58 $
*
* ====================================================================
*
@@ -83,6 +83,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Connector;
import org.apache.catalina.Container;
+import org.apache.catalina.Globals;
import org.apache.catalina.HttpRequest;
import org.apache.catalina.HttpResponse;
import org.apache.catalina.Lifecycle;
@@ -105,7 +106,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.2 $ $Date: 2000/08/19 05:29:16 $
+ * @version $Revision: 1.3 $ $Date: 2000/08/24 23:56:58 $
*/
final class HttpProcessor
@@ -172,7 +173,7 @@
* The match string for identifying a session ID parameter.
*/
private static final String match =
- ";" + org.apache.catalina.connector.Constants.SessionParameter + "=";
+ ";" + Globals.SESSION_PARAMETER_NAME + "=";
/**
@@ -525,7 +526,8 @@
Cookie cookies[] = RequestUtil.parseCookieHeader(value);
for (int i = 0; i < cookies.length; i++) {
if (cookies[i].getName().equals
- (org.apache.catalina.connector.Constants.SessionCookie)) {
+ (Globals.SESSION_COOKIE_NAME)) {
+
// Override anything requested in the URL
request.setRequestedSessionId(cookies[i].getValue());
request.setRequestedSessionCookie(true);
1.2 +6 -3 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/test/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/test/Constants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Constants.java 2000/08/11 22:41:24 1.1
+++ Constants.java 2000/08/24 23:56:58 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/test/Constants.java,v 1.1 2000/08/11 22:41:24 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/11 22:41:24 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/test/Constants.java,v 1.2 2000/08/24 23:56:58 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/08/24 23:56:58 $
*
* ====================================================================
*
@@ -65,6 +65,9 @@
package org.apache.catalina.connector.test;
+import org.apache.catalina.Globals;
+
+
/**
* Static constants for this package.
*/
@@ -73,6 +76,6 @@
public static final String Package = "org.apache.catalina.connector.test";
public static final String ServerInfo =
- "Catalina 4.0-dev (Test Connector)";
+ Globals.SERVER_INFO + " (Test Connector)";
}
1.2 +8 -6 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/test/HttpProcessor.java
Index: HttpProcessor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/test/HttpProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpProcessor.java 2000/08/11 22:41:24 1.1
+++ HttpProcessor.java 2000/08/24 23:56:58 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/test/HttpProcessor.java,v 1.1 2000/08/11 22:41:24 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/11 22:41:24 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/test/HttpProcessor.java,v 1.2 2000/08/24 23:56:58 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/08/24 23:56:58 $
*
* ====================================================================
*
@@ -83,6 +83,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Connector;
import org.apache.catalina.Container;
+import org.apache.catalina.Globals;
import org.apache.catalina.HttpRequest;
import org.apache.catalina.HttpResponse;
import org.apache.catalina.Lifecycle;
@@ -103,7 +104,7 @@
* the request. When the processor is completed, it will recycle itself.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/08/11 22:41:24 $
+ * @version $Revision: 1.2 $ $Date: 2000/08/24 23:56:58 $
*/
final class HttpProcessor
@@ -170,7 +171,7 @@
* The match string for identifying a session ID parameter.
*/
private static final String match =
- ";" + org.apache.catalina.connector.Constants.SessionParameter + "=";
+ ";" + Globals.SESSION_PARAMETER_NAME + "=";
/**
@@ -436,7 +437,8 @@
Cookie cookies[] = RequestUtil.parseCookieHeader(value);
for (int i = 0; i < cookies.length; i++) {
if (cookies[i].getName().equals
- (org.apache.catalina.connector.Constants.SessionCookie)) {
+ (Globals.SESSION_COOKIE_NAME)) {
+
// Override anything requested in the URL
request.setRequestedSessionId(cookies[i].getValue());
request.setRequestedSessionCookie(true);
1.4 +6 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
Index: ApplicationContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApplicationContext.java 2000/08/17 18:41:31 1.3
+++ ApplicationContext.java 2000/08/24 23:56:59 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v 1.3 2000/08/17 18:41:31 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2000/08/17 18:41:31 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v 1.4 2000/08/24 23:56:59 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2000/08/24 23:56:59 $
*
* ====================================================================
*
@@ -80,6 +80,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
+import org.apache.catalina.Globals;
import org.apache.catalina.Host;
import org.apache.catalina.Logger;
import org.apache.catalina.Resources;
@@ -95,7 +96,7 @@
* associated with each instance of <code>StandardContext</code>.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2000/08/17 18:41:31 $
+ * @version $Revision: 1.4 $ $Date: 2000/08/24 23:56:59 $
*/
public final class ApplicationContext
@@ -431,7 +432,7 @@
*/
public String getServerInfo() {
- return (Constants.SERVER_INFO);
+ return (Globals.SERVER_INFO);
}
1.3 +3 -36 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/Constants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Constants.java 2000/08/22 00:10:47 1.2
+++ Constants.java 2000/08/24 23:56:59 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/Constants.java,v 1.2 2000/08/22 00:10:47 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2000/08/22 00:10:47 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/Constants.java,v 1.3 2000/08/24 23:56:59 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2000/08/24 23:56:59 $
*
* ====================================================================
*
@@ -70,39 +70,6 @@
public static final String Package = "org.apache.catalina.core";
public static final int MAJOR_VERSION = 2;
public static final int MINOR_VERSION = 3;
- public static final String SERVER_INFO = "Apache Tomcat 4.0dev";
- /**
- * The request attribute under which we forward a Java exception type
- * (as an object of type Class) to an error page.
- */
- public static final String EXCEPTION_TYPE =
- "javax.servlet.error.exception_type";
-
-
- /**
- * The request attribute under which we forward an HTTP status message
- * (as an object of type String) to an error page.
- */
- public static final String MESSAGE =
- "javax.servlet.error.message";
-
-
- /**
- * The request attribute under which we forward an HTTP status code
- * (as an object of type Integer) to an error page.
- */
- public static final String STATUS_CODE =
- "javax.servlet.error.status_code";
-
-
- /**
- * The servlet context attribute under which a temporary working directory
- * is stored (object type is java.io.File).
- */
- public static final String WORKDIR_ATTR =
- "javax.servlet.context.tempdir";
-
}
-
1.11 +6 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StandardContext.java 2000/08/24 22:37:08 1.10
+++ StandardContext.java 2000/08/24 23:56:59 1.11
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v 1.10 2000/08/24 22:37:08 craigmcc Exp $
- * $Revision: 1.10 $
- * $Date: 2000/08/24 22:37:08 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v 1.11 2000/08/24 23:56:59 craigmcc Exp $
+ * $Revision: 1.11 $
+ * $Date: 2000/08/24 23:56:59 $
*
* ====================================================================
*
@@ -78,6 +78,7 @@
import org.apache.catalina.Container;
import org.apache.catalina.ContainerListener;
import org.apache.catalina.Context;
+import org.apache.catalina.Globals;
import org.apache.catalina.HttpRequest;
import org.apache.catalina.InstanceListener;
import org.apache.catalina.Lifecycle;
@@ -103,7 +104,7 @@
* requests directed to a particular servlet.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.10 $ $Date: 2000/08/24 22:37:08 $
+ * @version $Revision: 1.11 $ $Date: 2000/08/24 23:56:59 $
*/
public final class StandardContext
@@ -2269,7 +2270,7 @@
dir.mkdirs();
// Set the appropriate servlet context attribute
- getServletContext().setAttribute(Constants.WORKDIR_ATTR, dir);
+ getServletContext().setAttribute(Globals.WORK_DIR_ATTR, dir);
}
1.2 +22 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StandardEngine.java 2000/08/11 23:40:45 1.1
+++ StandardEngine.java 2000/08/24 23:56:59 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v 1.1 2000/08/11 23:40:45 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/11 23:40:45 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v 1.2 2000/08/24 23:56:59 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/08/24 23:56:59 $
*
* ====================================================================
*
@@ -71,7 +71,9 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Container;
import org.apache.catalina.Engine;
+import org.apache.catalina.Globals;
import org.apache.catalina.Host;
+import org.apache.catalina.LifecycleException;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
@@ -82,7 +84,7 @@
* fully qualified host name of that virtual host.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/08/11 23:40:45 $
+ * @version $Revision: 1.2 $ $Date: 2000/08/24 23:56:59 $
*/
public final class StandardEngine
@@ -197,6 +199,22 @@
throw new IllegalArgumentException
(sm.getString("standardEngine.notParent"));
+
+ }
+
+
+ /**
+ * Start this Engine component.
+ *
+ * @exception LifecycleException if a startup error occurs
+ */
+ public void start() throws LifecycleException {
+
+ // Log our server identification information
+ System.out.println(Globals.SERVER_INFO);
+
+ // Standard container startup
+ super.start();
}
1.6 +8 -7 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
Index: StandardWrapperValve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StandardWrapperValve.java 2000/08/23 01:07:12 1.5
+++ StandardWrapperValve.java 2000/08/24 23:57:00 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v 1.5 2000/08/23 01:07:12 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2000/08/23 01:07:12 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v 1.6 2000/08/24 23:57:00 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/08/24 23:57:00 $
*
* ====================================================================
*
@@ -82,6 +82,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
+import org.apache.catalina.Globals;
import org.apache.catalina.HttpRequest;
import org.apache.catalina.HttpResponse;
import org.apache.catalina.InstanceEvent;
@@ -102,7 +103,7 @@
* <code>StandardWrapper</code> container implementation.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2000/08/23 01:07:12 $
+ * @version $Revision: 1.6 $ $Date: 2000/08/24 23:57:00 $
*/
final class StandardWrapperValve
@@ -505,7 +506,7 @@
ErrorPage errorPage =
context.findErrorPage(realError.getClass().getName());
if (errorPage != null) {
- request.getRequest().setAttribute(Constants.EXCEPTION_TYPE,
+ request.getRequest().setAttribute(Globals.EXCEPTION_TYPE_ATTR,
realError.getClass());
if (custom(request, response, errorPage))
return;
@@ -771,9 +772,9 @@
Context context = (Context) container.getParent();
ErrorPage errorPage = context.findErrorPage(statusCode);
if (errorPage != null) {
- request.getRequest().setAttribute(Constants.STATUS_CODE,
+ request.getRequest().setAttribute(Globals.STATUS_CODE_ATTR,
new Integer(statusCode));
- request.getRequest().setAttribute(Constants.MESSAGE,
+ request.getRequest().setAttribute(Globals.ERROR_MESSAGE_ATTR,
message);
if (custom(request, response, errorPage))
return;
1.2 +3 -22 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/Constants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Constants.java 2000/08/11 22:42:02 1.1
+++ Constants.java 2000/08/24 23:57:02 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/Constants.java,v 1.1 2000/08/11 22:42:02 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/11 22:42:02 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/Constants.java,v 1.2 2000/08/24 23:57:02 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/08/24 23:57:02 $
*
* ====================================================================
*
@@ -69,23 +69,4 @@
public static final String Package = "org.apache.catalina.loader";
- /**
- * The servlet context attribute under which the class loader we use for
- * loading servlets is stored (object type is java.lang.ClassLoader).
- */
- public static final String CLASSLOADER_ATTR =
- "org.apache.catalina.classloader";
-
-
- /**
- * The servlet context attribute under which the class path for our class
- * loader is stored (object type is java.lang.String). The class path
- * consists of a list of directories and JAR/ZIP files, delimited by the
- * appropriate path delimiter for this platform.
- */
- public static final String CLASSPATH_ATTR =
- "org.apache.catalina.jsp_classpath";
-
-
}
-
1.2 +9 -8 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java
Index: StandardLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StandardLoader.java 2000/08/11 22:42:04 1.1
+++ StandardLoader.java 2000/08/24 23:57:02 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v 1.1 2000/08/11 22:42:04 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/11 22:42:04 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v 1.2 2000/08/24 23:57:02 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/08/24 23:57:02 $
*
* ====================================================================
*
@@ -73,6 +73,7 @@
import javax.servlet.ServletContext;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
+import org.apache.catalina.Globals;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
@@ -96,7 +97,7 @@
* is not present, the system class loader will be used instead.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/08/11 22:42:04 $
+ * @version $Revision: 1.2 $ $Date: 2000/08/24 23:57:02 $
*/
public final class StandardLoader
@@ -589,8 +590,8 @@
if (container instanceof Context) {
ServletContext servletContext =
((Context) container).getServletContext();
- servletContext.removeAttribute(Constants.CLASSLOADER_ATTR);
- servletContext.removeAttribute(Constants.CLASSPATH_ATTR);
+ servletContext.removeAttribute(Globals.CLASS_LOADER_ATTR);
+ servletContext.removeAttribute(Globals.CLASS_PATH_ATTR);
}
// Throw away our current class loader
@@ -707,7 +708,7 @@
((Context) container).getServletContext();
if (servletContext == null)
return;
- servletContext.setAttribute(Constants.CLASSLOADER_ATTR,
+ servletContext.setAttribute(Globals.CLASS_LOADER_ATTR,
getClassLoader());
}
@@ -732,7 +733,7 @@
classpath.append(File.pathSeparator);
classpath.append(repositories[i]);
}
- servletContext.setAttribute(Constants.CLASSPATH_ATTR,
+ servletContext.setAttribute(Globals.CLASS_PATH_ATTR,
classpath.toString());
}
1.2 +2 -6 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/Constants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Constants.java 2000/08/11 23:39:51 1.1
+++ Constants.java 2000/08/24 23:57:03 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/Constants.java,v 1.1 2000/08/11 23:39:51 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/11 23:39:51 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/Constants.java,v 1.2 2000/08/24 23:57:03 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/08/24 23:57:03 $
*
* ====================================================================
*
@@ -68,10 +68,6 @@
public class Constants {
public static final String Package = "org.apache.catalina.servlets";
-
- public static final String CATALINA_NAME = "Tomcat Catalina";
-
- public static final String CATALINA_VERSION = "4.0";
}
1.5 +7 -6 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultServlet.java 2000/08/24 18:35:36 1.4
+++ DefaultServlet.java 2000/08/24 23:57:03 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v 1.4 2000/08/24 18:35:36 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2000/08/24 18:35:36 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v 1.5 2000/08/24 23:57:03 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2000/08/24 23:57:03 $
*
* ====================================================================
*
@@ -91,6 +91,7 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.catalina.Globals;
import org.apache.catalina.Resources;
import org.apache.catalina.core.ApplicationContext;
import org.apache.catalina.resources.ResourceBean;
@@ -108,7 +109,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.4 $ $Date: 2000/08/24 18:35:36 $
+ * @version $Revision: 1.5 $ $Date: 2000/08/24 23:57:03 $
*/
public class DefaultServlet
@@ -248,7 +249,7 @@
// Initialize the set of welcome files for this application
welcomes = (String[]) getServletContext().getAttribute
- ("org.apache.catalina.WELCOME_FILES");
+ (Globals.WELCOME_FILES_ATTR);
if (welcomes == null)
welcomes = new String[0];
@@ -893,7 +894,7 @@
// Refresh our currently defined set of welcome files
synchronized (welcomes) {
welcomes = (String[]) getServletContext().getAttribute
- ("org.apache.catalina.WELCOME_FILES");
+ (Globals.WELCOME_FILES_ATTR);
if (welcomes == null)
welcomes = new String[0];
}
1.2 +0 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/Constants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Constants.java 2000/08/11 23:39:15 1.1
+++ Constants.java 2000/08/24 23:57:04 1.2
@@ -71,9 +71,4 @@
public static final String Package = "org.apache.catalina.session";
- public static final String SESSION_COOKIE_NAME = "JSESSIONID";
- public static final String SESSION_PARAMETER_NAME = "jsessionid";
- public static final String WORKDIR_ATTR =
- "javax.servlet.context.tempdir";
-
}
1.2 +6 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java
Index: StandardManager.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StandardManager.java 2000/08/11 23:39:15 1.1
+++ StandardManager.java 2000/08/24 23:57:04 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java,v 1.1 2000/08/11 23:39:15 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/11 23:39:15 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java,v 1.2 2000/08/24 23:57:04 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/08/24 23:57:04 $
*
* ====================================================================
*
@@ -82,6 +82,7 @@
import javax.servlet.ServletContext;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
+import org.apache.catalina.Globals;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
@@ -103,7 +104,7 @@
* <code>stop()</code> methods of this class at the correct times.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/08/11 23:39:15 $
+ * @version $Revision: 1.2 $ $Date: 2000/08/24 23:57:04 $
*/
public final class StandardManager
@@ -459,7 +460,7 @@
ServletContext servletContext =
((Context) container).getServletContext();
File tempdir = (File)
- servletContext.getAttribute(Constants.WORKDIR_ATTR);
+ servletContext.getAttribute(Globals.WORK_DIR_ATTR);
if (tempdir != null)
file = new File(tempdir, pathname);
}