cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator FormAuthenticator.java NonLoginAuthenticator.java SSLAuthenticator.java SingleSignOn.java

2005-02-18 Thread luehe 
luehe   2005/02/18 15:35:18

  Modified:catalina/src/share/org/apache/catalina/authenticator
FormAuthenticator.java NonLoginAuthenticator.java
SSLAuthenticator.java SingleSignOn.java
  Log:
  Undid previous commit
  
  Revision  ChangesPath
  1.17  +2 -2  
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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- FormAuthenticator.java18 Feb 2005 18:00:22 -  1.16
  +++ FormAuthenticator.java18 Feb 2005 23:35:18 -  1.17
  @@ -272,8 +272,8 @@
   if (session == null)
   session = request.getSessionInternal(false);
   if (session == null) {
  -if (log.isDebugEnabled())
  -log.debug("User took so long to log on the session expired");
  +if (container.getLogger().isDebugEnabled())
  +container.getLogger().debug("User took so long to log on the 
session expired");
   response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT,
  sm.getString("authenticator.sessionExpired"));
   return (false);
  
  
  
  1.9   +3 -7  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/NonLoginAuthenticator.java
  
  Index: NonLoginAuthenticator.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/NonLoginAuthenticator.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- NonLoginAuthenticator.java18 Feb 2005 18:00:22 -  1.8
  +++ NonLoginAuthenticator.java18 Feb 2005 23:35:18 -  1.9
  @@ -23,8 +23,7 @@
   import org.apache.catalina.connector.Request;
   import org.apache.catalina.connector.Response;
   import org.apache.catalina.deploy.LoginConfig;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  +
   
   
   /**
  @@ -39,9 +38,6 @@
   extends AuthenticatorBase {
   
   
  -private static Log log = LogFactory.getLog(NonLoginAuthenticator.class);
  -
  -
   // - Instance 
Variables
   
   
  @@ -95,8 +91,8 @@
   associate(ssoId, getSession(request, true));
   */
   
  -if (log.isDebugEnabled())
  -log.debug("User authentication is not required");
  +if (container.getLogger().isDebugEnabled())
  +container.getLogger().debug("User authentication is not 
required");
   return (true);
   
   
  
  
  
  1.20  +9 -13 
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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- SSLAuthenticator.java 18 Feb 2005 18:00:22 -  1.19
  +++ SSLAuthenticator.java 18 Feb 2005 23:35:18 -  1.20
  @@ -30,8 +30,7 @@
   import org.apache.catalina.connector.Request;
   import org.apache.catalina.connector.Response;
   import org.apache.catalina.deploy.LoginConfig;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  +
   
   
   /**
  @@ -46,9 +45,6 @@
   extends AuthenticatorBase {
   
   
  -private static Log log = LogFactory.getLog(SSLAuthenticator.class);
  -
  -
   // - 
Properties
   
   
  @@ -93,8 +89,8 @@
   Principal principal = request.getUserPrincipal();
   //String ssoId = (String) request.getNote(Constants.REQ_SSOID_NOTE);
   if (principal != null) {
  -if (log.isDebugEnabled())
  -log.debug("Already authenticated '" + principal.getName() + 
"'");
  +if (container.getLogger().isDebugEnabled())
  +container.getLogger().debug("Already authenticated '" + 
principal.getName() + "'");
   // Associate the session with any existing SSO session in order
   // to get coordinated session invalidation at logout
   String ssoId = (String) 
request.getNote(Constants.REQ_SSOID_NOTE);
  @@ -129,8 +125,8 @@
   */
   
   // Retrieve the certificate chain for this client
  -if (log.isDebugEnabled())
  -log.debug(" Looking up certificates");
  +

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator FormAuthenticator.java NonLoginAuthenticator.java SSLAuthenticator.java SingleSignOn.java mbeans-descriptors.xml

2005-02-18 Thread luehe 
luehe   2005/02/18 10:00:22

  Modified:catalina/src/share/org/apache/catalina/authenticator
FormAuthenticator.java NonLoginAuthenticator.java
SSLAuthenticator.java SingleSignOn.java
mbeans-descriptors.xml
  Log:
  - Made logging more consistent:
  
In some classes, we used to invoke logging methods on
container.getLogger(), in others, we were invoking them on Log
instance created by LogFactory (in some classes, we were using both!).
  
We now use Log instance created by LogFactory consistently.
  
  - Removed obsolete "debug" property from "NonLoginAuthenticator" MBean
descriptor
  
  Revision  ChangesPath
  1.16  +3 -3  
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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- FormAuthenticator.java7 Jan 2005 10:06:38 -   1.15
  +++ FormAuthenticator.java18 Feb 2005 18:00:22 -  1.16
  @@ -272,8 +272,8 @@
   if (session == null)
   session = request.getSessionInternal(false);
   if (session == null) {
  -if (container.getLogger().isDebugEnabled())
  -container.getLogger().debug("User took so long to log on the 
session expired");
  +if (log.isDebugEnabled())
  +log.debug("User took so long to log on the session expired");
   response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT,
  sm.getString("authenticator.sessionExpired"));
   return (false);
  
  
  
  1.8   +8 -4  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/NonLoginAuthenticator.java
  
  Index: NonLoginAuthenticator.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/NonLoginAuthenticator.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- NonLoginAuthenticator.java23 Jun 2004 13:51:36 -  1.7
  +++ NonLoginAuthenticator.java18 Feb 2005 18:00:22 -  1.8
  @@ -23,7 +23,8 @@
   import org.apache.catalina.connector.Request;
   import org.apache.catalina.connector.Response;
   import org.apache.catalina.deploy.LoginConfig;
  -
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   
   
   /**
  @@ -38,6 +39,9 @@
   extends AuthenticatorBase {
   
   
  +private static Log log = LogFactory.getLog(NonLoginAuthenticator.class);
  +
  +
   // - Instance 
Variables
   
   
  @@ -91,8 +95,8 @@
   associate(ssoId, getSession(request, true));
   */
   
  -if (container.getLogger().isDebugEnabled())
  -container.getLogger().debug("User authentication is not 
required");
  +if (log.isDebugEnabled())
  +log.debug("User authentication is not required");
   return (true);
   
   
  
  
  
  1.19  +14 -10
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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- SSLAuthenticator.java 16 Jul 2004 05:47:22 -  1.18
  +++ SSLAuthenticator.java 18 Feb 2005 18:00:22 -  1.19
  @@ -30,7 +30,8 @@
   import org.apache.catalina.connector.Request;
   import org.apache.catalina.connector.Response;
   import org.apache.catalina.deploy.LoginConfig;
  -
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   
   
   /**
  @@ -45,6 +46,9 @@
   extends AuthenticatorBase {
   
   
  +private static Log log = LogFactory.getLog(SSLAuthenticator.class);
  +
  +
   // - 
Properties
   
   
  @@ -89,8 +93,8 @@
   Principal principal = request.getUserPrincipal();
   //String ssoId = (String) request.getNote(Constants.REQ_SSOID_NOTE);
   if (principal != null) {
  -if (container.getLogger().isDebugEnabled())
  -container.getLogger().debug("Already authenticated '" + 
principal.getName() + "'");
  +if (log.isDebugEnabled())
  +log.debug("Already authenticated '" + principal.getName() + 
"'");