remm 2004/06/24 08:28:28
Modified: catalina/src/share/org/apache/catalina/core
ContainerBase.java StandardContext.java
catalina/src/share/org/apache/catalina/authenticator
FormAuthenticator.java DigestAuthenticator.java
BasicAuthenticator.java SSLAuthenticator.java
AuthenticatorBase.java
catalina/src/share/org/apache/catalina/connector
Response.java Request.java
Log:
- More casting removals.
- Remove logger conflicts between ContainerBase and StandardContext.
- Redo ContainerBase.logName(), with new category names.
Revision Changes Path
1.36 +21 -15
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java
Index: ContainerBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ContainerBase.java 23 Jun 2004 16:59:40 -0000 1.35
+++ ContainerBase.java 24 Jun 2004 15:28:27 -0000 1.36
@@ -187,6 +187,12 @@
/**
+ * Associated logger name.
+ */
+ protected String logName = null;
+
+
+ /**
* The Manager implementation with which this Container is associated.
*/
protected Manager manager = null;
@@ -197,7 +203,7 @@
*/
protected Cluster cluster = null;
-
+
/**
* The human-readable name of this Container.
*/
@@ -371,14 +377,7 @@
if (logger != null)
return (logger);
- String loggerName = null;
- Container current = this;
- while (current != null) {
- loggerName = "[" + current.getName() + "]"
- + ((loggerName != null) ? ("." + loggerName) : "");
- current = current.getParent();
- }
- logger = LogFactory.getLog("Tomcat." + loggerName);
+ logger = LogFactory.getLog(logName());
return (logger);
}
@@ -1284,12 +1283,19 @@
*/
protected String logName() {
- String className = this.getClass().getName();
- int period = className.lastIndexOf(".");
- if (period >= 0)
- className = className.substring(period + 1);
- return (className + "[" + getName() + "]");
-
+ if (logName != null) {
+ return logName;
+ }
+ String loggerName = null;
+ Container current = this;
+ while (current != null) {
+ loggerName = "[" + current.getName() + "]"
+ + ((loggerName != null) ? ("." + loggerName) : "");
+ current = current.getParent();
+ }
+ logName = ContainerBase.class.getName() + "." + loggerName;
+ return logName;
+
}
1.132 +3 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- StandardContext.java 23 Jun 2004 13:51:35 -0000 1.131
+++ StandardContext.java 24 Jun 2004 15:28:27 -0000 1.132
@@ -117,7 +117,7 @@
extends ContainerBase
implements Context, Serializable
{
- private transient Log log = LogFactory.getLog(StandardContext.class);
+ private static transient Log log = LogFactory.getLog(StandardContext.class);
// ----------------------------------------------------------- Constructors
@@ -4043,12 +4043,8 @@
throw new LifecycleException("Error initializaing ", ex);
}
}
-
- String logName = "tomcat." + getParent().getName() + "." +
- ("".equals(getName()) ? "ROOT" : getName()) + ".Context";
- log = org.apache.commons.logging.LogFactory.getLog(logName);
- log.debug("Starting " + logName);
+ log.debug("Starting " + ("".equals(getName()) ? "ROOT" : getName()));
// Set JMX object name for proper pipeline registration
preRegisterJMX();
1.12 +11 -14
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java
Index: FormAuthenticator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FormAuthenticator.java 23 Jun 2004 13:51:36 -0000 1.11
+++ FormAuthenticator.java 24 Jun 2004 15:28:28 -0000 1.12
@@ -27,7 +27,6 @@
import javax.servlet.RequestDispatcher;
import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Realm;
@@ -299,11 +298,10 @@
return (false);
// Does the request URI match?
- HttpServletRequest hreq = (HttpServletRequest) request.getRequest();
- String requestURI = hreq.getRequestURI();
+ String requestURI = request.getRequestURI();
if (requestURI == null)
return (false);
- return (requestURI.equals(sreq.getRequestURI()));
+ return (requestURI.equals(request.getRequestURI()));
}
@@ -374,37 +372,36 @@
private void saveRequest(Request request, Session session) {
// Create and populate a SavedRequest object for this request
- HttpServletRequest hreq = (HttpServletRequest) request.getRequest();
SavedRequest saved = new SavedRequest();
- Cookie cookies[] = hreq.getCookies();
+ Cookie cookies[] = request.getCookies();
if (cookies != null) {
for (int i = 0; i < cookies.length; i++)
saved.addCookie(cookies[i]);
}
- Enumeration names = hreq.getHeaderNames();
+ Enumeration names = request.getHeaderNames();
while (names.hasMoreElements()) {
String name = (String) names.nextElement();
- Enumeration values = hreq.getHeaders(name);
+ Enumeration values = request.getHeaders(name);
while (values.hasMoreElements()) {
String value = (String) values.nextElement();
saved.addHeader(name, value);
}
}
- Enumeration locales = hreq.getLocales();
+ Enumeration locales = request.getLocales();
while (locales.hasMoreElements()) {
Locale locale = (Locale) locales.nextElement();
saved.addLocale(locale);
}
- Map parameters = hreq.getParameterMap();
+ Map parameters = request.getParameterMap();
Iterator paramNames = parameters.keySet().iterator();
while (paramNames.hasNext()) {
String paramName = (String) paramNames.next();
String paramValues[] = (String[]) parameters.get(paramName);
saved.addParameter(paramName, paramValues);
}
- saved.setMethod(hreq.getMethod());
- saved.setQueryString(hreq.getQueryString());
- saved.setRequestURI(hreq.getRequestURI());
+ saved.setMethod(request.getMethod());
+ saved.setQueryString(request.getQueryString());
+ saved.setRequestURI(request.getRequestURI());
// Stash the SavedRequest in our session for later use
session.setNote(Constants.FORM_REQUEST_NOTE, saved);
1.8 +10 -16
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/DigestAuthenticator.java
Index: DigestAuthenticator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/DigestAuthenticator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DigestAuthenticator.java 23 Jun 2004 08:25:02 -0000 1.7
+++ DigestAuthenticator.java 24 Jun 2004 15:28:28 -0000 1.8
@@ -25,7 +25,6 @@
import java.util.Hashtable;
import java.util.StringTokenizer;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
@@ -174,8 +173,7 @@
throws IOException {
// Have we already authenticated someone?
- Principal principal =
- ((HttpServletRequest) request.getRequest()).getUserPrincipal();
+ Principal principal = request.getUserPrincipal();
//String ssoId = (String) request.getNote(Constants.REQ_SSOID_NOTE);
if (principal != null) {
if (log.isDebugEnabled())
@@ -214,13 +212,9 @@
*/
// Validate any credentials already included with this request
- HttpServletRequest hreq =
- (HttpServletRequest) request.getRequest();
- HttpServletResponse hres =
- (HttpServletResponse) response.getResponse();
String authorization = request.getAuthorization();
if (authorization != null) {
- principal = findPrincipal(hreq, authorization, context.getRealm());
+ principal = findPrincipal(request, authorization, context.getRealm());
if (principal != null) {
String username = parseUsername(authorization);
register(request, response, principal,
@@ -234,10 +228,10 @@
// Next, generate a nOnce token (that is a token which is supposed
// to be unique).
- String nOnce = generateNOnce(hreq);
+ String nOnce = generateNOnce(request);
- setAuthenticateHeader(hreq, hres, config, nOnce);
- hres.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ setAuthenticateHeader(request, response, config, nOnce);
+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
// hres.flushBuffer();
return (false);
@@ -257,7 +251,7 @@
* @param authorization Authorization credentials from this request
* @param realm Realm used to authenticate Principals
*/
- protected static Principal findPrincipal(HttpServletRequest request,
+ protected static Principal findPrincipal(Request request,
String authorization,
Realm realm) {
@@ -395,7 +389,7 @@
*
* @param request HTTP Servlet request
*/
- protected String generateNOnce(HttpServletRequest request) {
+ protected String generateNOnce(Request request) {
long currentTime = System.currentTimeMillis();
@@ -439,8 +433,8 @@
* should be performed
* @param nOnce nonce token
*/
- protected void setAuthenticateHeader(HttpServletRequest request,
- HttpServletResponse response,
+ protected void setAuthenticateHeader(Request request,
+ Response response,
LoginConfig config,
String nOnce) {
1.8 +3 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/BasicAuthenticator.java
Index: BasicAuthenticator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/BasicAuthenticator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BasicAuthenticator.java 23 Jun 2004 08:25:02 -0000 1.7
+++ BasicAuthenticator.java 24 Jun 2004 15:28:28 -0000 1.8
@@ -20,7 +20,7 @@
import java.io.IOException;
import java.security.Principal;
-import javax.servlet.http.HttpServletRequest;
+
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.connector.Request;
@@ -92,8 +92,7 @@
throws IOException {
// Have we already authenticated someone?
- Principal principal =
- ((HttpServletRequest) request.getRequest()).getUserPrincipal();
+ Principal principal = request.getUserPrincipal();
String ssoId = (String) request.getNote(Constants.REQ_SSOID_NOTE);
if (principal != null) {
if (log.isDebugEnabled())
1.15 +2 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java
Index: SSLAuthenticator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SSLAuthenticator.java 23 Jun 2004 13:51:36 -0000 1.14
+++ SSLAuthenticator.java 24 Jun 2004 15:28:28 -0000 1.15
@@ -22,7 +22,6 @@
import java.security.Principal;
import java.security.cert.X509Certificate;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Globals;
@@ -86,8 +85,7 @@
throws IOException {
// Have we already authenticated someone?
- Principal principal =
- ((HttpServletRequest) request.getRequest()).getUserPrincipal();
+ Principal principal = request.getUserPrincipal();
//String ssoId = (String) request.getNote(Constants.REQ_SSOID_NOTE);
if (principal != null) {
if (container.getLogger().isDebugEnabled())
1.22 +7 -17
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java
Index: AuthenticatorBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- AuthenticatorBase.java 23 Jun 2004 13:51:36 -0000 1.21
+++ AuthenticatorBase.java 24 Jun 2004 15:28:28 -0000 1.22
@@ -29,8 +29,6 @@
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.catalina.Authenticator;
@@ -364,14 +362,12 @@
if (log.isDebugEnabled())
log.debug("Security checking request " +
- ((HttpServletRequest) request.getRequest()).getMethod() + " " +
- ((HttpServletRequest) request.getRequest()).getRequestURI());
+ request.getMethod() + " " + request.getRequestURI());
LoginConfig config = this.context.getLoginConfig();
// Have we got a cached authenticated Principal to record?
if (cache) {
- Principal principal =
- ((HttpServletRequest) request.getRequest()).getUserPrincipal();
+ Principal principal = request.getUserPrincipal();
if (principal == null) {
Session session = getSession(request);
if (session != null) {
@@ -637,9 +633,7 @@
*/
protected Session getSession(Request request, boolean create) {
- HttpServletRequest hreq =
- (HttpServletRequest) request.getRequest();
- HttpSession hses = hreq.getSession(create);
+ HttpSession hses = request.getSession(create);
if (hses == null)
return (null);
Manager manager = context.getManager();
@@ -683,11 +677,9 @@
associate(ssoId, getSession(request, true));
if (log.isDebugEnabled()) {
- HttpServletRequest hreq =
- (HttpServletRequest) request.getRequest();
log.debug(" Reauthenticated cached principal '" +
- hreq.getUserPrincipal().getName() +
- "' with auth type '" + hreq.getAuthType() + "'");
+ request.getUserPrincipal().getName() +
+ "' with auth type '" + request.getAuthType() + "'");
}
}
@@ -747,13 +739,11 @@
String ssoId = (String) request.getNote(Constants.REQ_SSOID_NOTE);
if (ssoId == null) {
// Construct a cookie to be returned to the client
- HttpServletResponse hres =
- (HttpServletResponse) response.getResponse();
ssoId = generateSessionId();
Cookie cookie = new Cookie(Constants.SINGLE_SIGN_ON_COOKIE, ssoId);
cookie.setMaxAge(-1);
cookie.setPath("/");
- hres.addCookie(cookie);
+ response.addCookie(cookie);
// Register this principal with our SSO valve
sso.register(ssoId, principal, authType, username, password);
1.2 +4 -10
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Response.java
Index: Response.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Response.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Response.java 23 Jun 2004 08:24:57 -0000 1.1
+++ Response.java 24 Jun 2004 15:28:28 -0000 1.2
@@ -1029,9 +1029,7 @@
public String encodeRedirectURL(String url) {
if (isEncodeable(toAbsolute(url))) {
- HttpServletRequest hreq =
- (HttpServletRequest) request.getRequest();
- return (toEncoded(url, hreq.getSession().getId()));
+ return (toEncoded(url, request.getSession().getId()));
} else {
return (url);
}
@@ -1063,14 +1061,11 @@
String absolute = toAbsolute(url);
if (isEncodeable(absolute)) {
- HttpServletRequest hreq =
- (HttpServletRequest) request.getRequest();
-
// W3c spec clearly said
if (url.equalsIgnoreCase("")){
url = absolute;
}
- return (toEncoded(url, hreq.getSession().getId()));
+ return (toEncoded(url, request.getSession().getId()));
} else {
return (url);
}
@@ -1334,8 +1329,7 @@
return (false);
// Are we in a valid session that is not using cookies?
- final HttpServletRequest hreq =
- (HttpServletRequest) request.getRequest();
+ final HttpServletRequest hreq = request;
final HttpSession session = hreq.getSession(false);
if (session == null)
return (false);
1.3 +2 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java
Index: Request.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Request.java 23 Jun 2004 13:51:35 -0000 1.2
+++ Request.java 24 Jun 2004 15:28:28 -0000 1.3
@@ -2073,7 +2073,7 @@
* if necessary.
*/
public HttpSession getSession() {
- return (getSession(true));
+ return doGetSession(true);
}
@@ -2084,9 +2084,7 @@
* @param create Create a new session if one does not exist
*/
public HttpSession getSession(boolean create) {
-
return doGetSession(create);
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
