tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1188402 - in /tomcat/trunk/java/org/apache/catalina: authenticator/ connector/ realm/
Date Mon, 24 Oct 2011 21:53:37 GMT
Author: markt
Date: Mon Oct 24 21:53:36 2011
New Revision: 1188402

URL: http://svn.apache.org/viewvc?rev=1188402&view=rev
Log:
Remove code that was deprecated in r1188399

Modified:
    tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
    tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java
    tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
    tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
    tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
    tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
    tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
    tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
    tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
    tomcat/trunk/java/org/apache/catalina/connector/Request.java
    tomcat/trunk/java/org/apache/catalina/connector/Response.java
    tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
    tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
    tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java?rev=1188402&r1=1188401&r2=1188402&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java Mon Oct 24
21:53:36 2011
@@ -22,6 +22,7 @@ package org.apache.catalina.authenticato
 import java.io.IOException;
 import java.security.Principal;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.catalina.connector.Request;
@@ -136,8 +137,8 @@ public class BasicAuthenticator
 
             principal = context.getRealm().authenticate(username, password);
             if (principal != null) {
-                register(request, response, principal, Constants.BASIC_METHOD,
-                         username, password);
+                register(request, response, principal,
+                        HttpServletRequest.BASIC_AUTH, username, password);
                 return (true);
             }
         }
@@ -159,6 +160,6 @@ public class BasicAuthenticator
 
     @Override
     protected String getAuthMethod() {
-        return Constants.BASIC_METHOD;
+        return HttpServletRequest.BASIC_AUTH;
     }
 }

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java?rev=1188402&r1=1188401&r2=1188402&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java Mon Oct 24 21:53:36
2011
@@ -24,15 +24,7 @@ public class Constants {
     public static final String Package = "org.apache.catalina.authenticator";
 
     // Authentication methods for login configuration
-    // Servlet spec schemes
-    @Deprecated
-    public static final String BASIC_METHOD = "BASIC";
-    @Deprecated
-    public static final String CERT_METHOD = "CLIENT_CERT";
-    @Deprecated
-    public static final String DIGEST_METHOD = "DIGEST";
-    @Deprecated
-    public static final String FORM_METHOD = "FORM";
+    // Servlet spec schemes are defined in HttpServletRequest
     // Vendor specific schemes
     public static final String SPNEGO_METHOD = "SPNEGO";
 

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1188402&r1=1188401&r2=1188402&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java Mon Oct 24
21:53:36 2011
@@ -257,8 +257,7 @@ public class DigestAuthenticator extends
             if (principal != null) {
                 String username = parseUsername(authorization);
                 register(request, response, principal,
-                         Constants.DIGEST_METHOD,
-                         username, null);
+                        HttpServletRequest.DIGEST_AUTH, username, null);
                 return (true);
             }
         }
@@ -280,7 +279,7 @@ public class DigestAuthenticator extends
 
     @Override
     protected String getAuthMethod() {
-        return Constants.DIGEST_METHOD;
+        return HttpServletRequest.DIGEST_AUTH;
     }
 
 

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1188402&r1=1188401&r2=1188402&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java Mon Oct 24
21:53:36 2011
@@ -28,6 +28,7 @@ import java.util.Locale;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.catalina.Realm;
@@ -187,8 +188,8 @@ public class FormAuthenticator
                     session.setNote(Constants.FORM_PRINCIPAL_NOTE, principal);
                     if (!matchRequest(request)) {
                         register(request, response, principal,
-                                 Constants.FORM_METHOD,
-                                 username, password);
+                                HttpServletRequest.FORM_AUTH,
+                                username, password);
                         return (true);
                     }
                 }
@@ -209,7 +210,7 @@ public class FormAuthenticator
             }
             principal = (Principal)
                 session.getNote(Constants.FORM_PRINCIPAL_NOTE);
-            register(request, response, principal, Constants.FORM_METHOD,
+            register(request, response, principal, HttpServletRequest.FORM_AUTH,
                      (String) session.getNote(Constants.SESS_USERNAME_NOTE),
                      (String) session.getNote(Constants.SESS_PASSWORD_NOTE));
             // If we're caching principals we no longer need the username
@@ -346,7 +347,7 @@ public class FormAuthenticator
 
     @Override
     protected String getAuthMethod() {
-        return Constants.FORM_METHOD;
+        return HttpServletRequest.FORM_AUTH;
     }
 
 

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java?rev=1188402&r1=1188401&r2=1188402&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java Mon Oct 24 21:53:36
2011
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.security.Principal;
 import java.security.cert.X509Certificate;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.catalina.Globals;
@@ -138,8 +139,8 @@ public class SSLAuthenticator extends Au
         }
 
         // Cache the principal (if requested) and record this authentication
-        register(request, response, principal, Constants.CERT_METHOD,
-                 null, null);
+        register(request, response, principal,
+                HttpServletRequest.CLIENT_CERT_AUTH, null, null);
         return (true);
 
     }
@@ -147,6 +148,6 @@ public class SSLAuthenticator extends Au
 
     @Override
     protected String getAuthMethod() {
-        return Constants.CERT_METHOD;
+        return HttpServletRequest.CLIENT_CERT_AUTH;
     }
 }

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java?rev=1188402&r1=1188401&r2=1188402&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java Mon Oct 24
21:53:36 2011
@@ -18,6 +18,8 @@ package org.apache.catalina.authenticato
 
 import java.security.Principal;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.catalina.Session;
 
 /**
@@ -179,8 +181,8 @@ public class SingleSignOnEntry
         this.username = username;
         this.password = password;
         this.canReauthenticate =
-            (Constants.BASIC_METHOD.equals(authType)
-                || Constants.FORM_METHOD.equals(authType));
+            (HttpServletRequest.BASIC_AUTH.equals(authType)
+                || HttpServletRequest.FORM_AUTH.equals(authType));
     }
 
 }

Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1188402&r1=1188401&r2=1188402&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Mon Oct 24 21:53:36 2011
@@ -180,20 +180,8 @@ public class InputBuffer extends Reader
     }
 
 
-    /**
-     * Get associated Coyote request.
-     *
-     * @return the associated Coyote request
-     */
-    @Deprecated
-    public Request getRequest() {
-        return this.coyoteRequest;
-    }
-
-
     // --------------------------------------------------------- Public Methods
 
-
     /**
      * Recycle the output buffer.
      */

Modified: tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=1188402&r1=1188401&r2=1188402&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java Mon Oct 24 21:53:36
2011
@@ -83,14 +83,6 @@ public class MapperListener extends Life
     }
 
 
-    // --------------------------------------------------------- Public Methods
-
-    @Deprecated
-    public String getConnectorName() {
-        return this.connector.toString();
-    }
-
-
     // ------------------------------------------------------- Lifecycle Methods
 
     @Override

Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1188402&r1=1188401&r2=1188402&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Mon Oct 24 21:53:36
2011
@@ -174,17 +174,6 @@ public class OutputBuffer extends Writer
 
 
     /**
-     * Get associated Coyote response.
-     *
-     * @return the associated Coyote response
-     */
-    @Deprecated
-    public Response getResponse() {
-        return this.coyoteResponse;
-    }
-
-
-    /**
      * Is the response output suspended ?
      *
      * @return suspended flag value

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1188402&r1=1188401&r2=1188402&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Mon Oct 24 21:53:36 2011
@@ -278,13 +278,6 @@ public class Request
 
 
     /**
-     * Session parsed flag.
-     */
-    @Deprecated
-    protected boolean sessionParsed = false;
-
-
-    /**
      * Request parameters parsed flag.
      */
     protected boolean parametersParsed = false;
@@ -466,7 +459,6 @@ public class Request
         usingReader = false;
         userPrincipal = null;
         subject = null;
-        sessionParsed = false;
         parametersParsed = false;
         parts = null;
         partsParseException = null;
@@ -532,11 +524,6 @@ public class Request
         pathParameters.clear();
     }
 
-    @Deprecated
-    protected boolean isProcessing() {
-        return coyoteRequest.isProcessing();
-    }
-
     /**
      * Clear cached encoders (to save memory for Comet requests).
      */
@@ -636,19 +623,6 @@ public class Request
 
 
     /**
-     * Set the Host within which this Request is being processed.  This
-     * must be called as soon as the appropriate Host is identified, and
-     * before the Request is passed to a context.
-     *
-     * @param host The newly associated Host
-     */
-    @Deprecated
-    public void setHost(Host host) {
-        mappingData.host = host;
-    }
-
-
-    /**
      * Mapping data.
      */
     protected MappingData mappingData = new MappingData();
@@ -802,16 +776,6 @@ public class Request
 
 
     /**
-     * Return an Iterator containing the String names of all notes bindings
-     * that exist for this request.
-     */
-    @Deprecated
-    public Iterator<String> getNoteNames() {
-        return notes.keySet().iterator();
-    }
-
-
-    /**
      * Remove any object bound to the specified name in the internal notes
      * for this request.
      *
@@ -876,17 +840,6 @@ public class Request
 
 
     /**
-     * Set the name of the server (virtual host) to process this request.
-     *
-     * @param name The server name
-     */
-    @Deprecated
-    public void setServerName(String name) {
-        coyoteRequest.serverName().setString(name);
-    }
-
-
-    /**
      * Set the port number of the server to process this request.
      *
      * @param port The server port
@@ -1755,20 +1708,6 @@ public class Request
 
 
     /**
-     * Add a parameter name and corresponding set of values to this Request.
-     * (This is used when restoring the original request on a form based
-     * login).
-     *
-     * @param name Name of this request parameter
-     * @param values Corresponding values for this request parameter
-     */
-    @Deprecated
-    public void addParameter(String name, String values[]) {
-        coyoteRequest.getParameters().addParameterValues(name, values);
-    }
-
-
-    /**
      * Clear the collection of Cookies associated with this Request.
      */
     public void clearCookies() {
@@ -1778,15 +1717,6 @@ public class Request
 
 
     /**
-     * Clear the collection of Headers associated with this Request.
-     */
-    @Deprecated
-    public void clearHeaders() {
-        // Not used
-    }
-
-
-    /**
      * Clear the collection of Locales associated with this Request.
      */
     public void clearLocales() {
@@ -1795,15 +1725,6 @@ public class Request
 
 
     /**
-     * Clear the collection of parameters associated with this Request.
-     */
-    @Deprecated
-    public void clearParameters() {
-        // Not used
-    }
-
-
-    /**
      * Set the authentication type used for this request, if any; otherwise
      * set the type to <code>null</code>.  Typical values are "BASIC",
      * "DIGEST", or "SSL".
@@ -1816,25 +1737,6 @@ public class Request
 
 
     /**
-     * Set the context path for this Request.  This will normally be called
-     * when the associated Context is mapping the Request to a particular
-     * Wrapper.
-     *
-     * @param path The context path
-     */
-    @Deprecated
-    public void setContextPath(String path) {
-
-        if (path == null) {
-            mappingData.contextPath.setString("");
-        } else {
-            mappingData.contextPath.setString(path);
-        }
-
-    }
-
-
-    /**
      * Set the path information for this Request.  This will normally be called
      * when the associated Context is mapping the Request to a particular
      * Wrapper.
@@ -1912,32 +1814,6 @@ public class Request
 
 
     /**
-     * Get the decoded request URI.
-     *
-     * @return the URL decoded request URI
-     */
-    @Deprecated
-    public MessageBytes getDecodedRequestURIMB() {
-        return coyoteRequest.decodedURI();
-    }
-
-
-    /**
-     * Set the servlet path for this Request.  This will normally be called
-     * when the associated Context is mapping the Request to a particular
-     * Wrapper.
-     *
-     * @param path The servlet path
-     */
-    @Deprecated
-    public void setServletPath(String path) {
-        if (path != null) {
-            mappingData.wrapperPath.setString(path);
-        }
-    }
-
-
-    /**
      * Set the Principal who has been authenticated for this Request.  This
      * value is also used to calculate the value to be returned by the
      * <code>getRemoteUser()</code> method.
@@ -1988,17 +1864,6 @@ public class Request
 
 
     /**
-     * Get the context path.
-     *
-     * @return the context path
-     */
-    @Deprecated
-    public MessageBytes getContextPathMB() {
-        return mappingData.contextPath;
-    }
-
-
-    /**
      * Return the set of Cookies received with this Request.
      */
     @Override
@@ -2014,17 +1879,6 @@ public class Request
 
 
     /**
-     * Set the set of cookies received with this Request.
-     */
-    @Deprecated
-    public void setCookies(Cookie[] cookies) {
-
-        this.cookies = cookies;
-
-    }
-
-
-    /**
      * Return the value of the specified date header, if any; otherwise
      * return -1.
      *
@@ -2124,17 +1978,6 @@ public class Request
 
 
     /**
-     * Get the path info.
-     *
-     * @return the path info
-     */
-    @Deprecated
-    public MessageBytes getPathInfoMB() {
-        return mappingData.pathInfo;
-    }
-
-
-    /**
      * Return the extra path information for this request, translated
      * to a real path.
      */
@@ -2257,17 +2100,6 @@ public class Request
 
 
     /**
-     * Get the servlet path.
-     *
-     * @return the servlet path
-     */
-    @Deprecated
-    public MessageBytes getServletPathMB() {
-        return mappingData.wrapperPath;
-    }
-
-
-    /**
      * Return the session associated with this Request, creating one
      * if necessary.
      */
@@ -2555,15 +2387,6 @@ public class Request
     }
 
     /**
-     * Not part of Servlet 3 spec but probably should be.
-     * @return true if the requested session ID was obtained from the SSL session
-     */
-    @Deprecated
-    public boolean isRequestedSessionIdFromSSL() {
-        return requestedSessionSSL;
-    }
-
-    /**
      * @throws IOException If an I/O error occurs
      * @throws IllegalStateException If the response has been committed
      * @throws ServletException If the caller is responsible for handling the

Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1188402&r1=1188401&r2=1188402&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Mon Oct 24 21:53:36 2011
@@ -18,7 +18,6 @@ package org.apache.catalina.connector;
 
 
 import java.io.IOException;
-import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.net.MalformedURLException;
 import java.security.AccessController;
@@ -117,13 +116,6 @@ public class Response
      */
     protected Connector connector;
 
-    /**
-     * Return the Connector through which this Request was received.
-     */
-    @Deprecated
-    public Connector getConnector() {
-        return (this.connector);
-    }
 
     /**
      * Set the Connector through which this Request was received.
@@ -158,14 +150,6 @@ public class Response
         outputBuffer.setResponse(coyoteResponse);
     }
 
-    /**
-     * Get the Coyote response.
-     */
-    @Deprecated
-    public org.apache.coyote.Response getCoyoteResponse() {
-        return (coyoteResponse);
-    }
-
 
     /**
      * Return the Context within which this Request is being processed.
@@ -174,19 +158,6 @@ public class Response
         return (request.getContext());
     }
 
-    /**
-     * Set the Context within which this Request is being processed.  This
-     * must be called as soon as the appropriate Context is identified, because
-     * it identifies the value to be returned by <code>getContextPath()</code>,
-     * and thus enables parsing of the request URI.
-     *
-     * @param context The newly associated Context
-     */
-    @Deprecated
-    public void setContext(Context context) {
-        request.setContext(context);
-    }
-
 
     /**
      * The associated output buffer.
@@ -347,27 +318,6 @@ public class Response
 
 
     /**
-     * Return the "processing inside an include" flag.
-     */
-    @Deprecated
-    public boolean getIncluded() {
-        return included;
-    }
-
-
-    /**
-     * Set the "processing inside an include" flag.
-     *
-     * @param included <code>true</code> if we are currently inside a
-     *  RequestDispatcher.include(), else <code>false</code>
-     */
-    @Deprecated
-    public void setIncluded(boolean included) {
-        this.included = included;
-    }
-
-
-    /**
      * The request with which this response is associated.
      */
     protected Request request = null;
@@ -407,18 +357,6 @@ public class Response
 
 
     /**
-     * Return the output stream associated with this Response.
-     */
-    @Deprecated
-    public OutputStream getStream() {
-        if (outputStream == null) {
-            outputStream = new CoyoteOutputStream(outputBuffer);
-        }
-        return outputStream;
-    }
-
-
-    /**
      * Set the suspended flag.
      *
      * @param suspended The new suspended flag value
@@ -461,23 +399,6 @@ public class Response
 
 
     /**
-     * Create and return a ServletOutputStream to write the content
-     * associated with this Response.
-     *
-     * @exception IOException if an input/output error occurs
-     */
-    @Deprecated
-    public ServletOutputStream createOutputStream()
-        throws IOException {
-        // Probably useless
-        if (outputStream == null) {
-            outputStream = new CoyoteOutputStream(outputBuffer);
-        }
-        return outputStream;
-    }
-
-
-    /**
      * Perform whatever actions are required to flush and close the output
      * stream or writer, in a single operation.
      *
@@ -953,23 +874,8 @@ public class Response
     }
 
 
-    /**
-     * Reset this response, and specify the values for the HTTP status code
-     * and corresponding message.
-     *
-     * @exception IllegalStateException if this response has already been
-     *  committed
-     */
-    @Deprecated
-    public void reset(int status, String message) {
-        reset();
-        setStatus(status, message);
-    }
-
-
     // -------------------------------------------- HttpServletResponse Methods
 
-
     /**
      * Add the specified Cookie to those that will be included with
      * this Response.

Modified: tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml?rev=1188402&r1=1188401&r2=1188402&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml Mon Oct 24 21:53:36
2011
@@ -196,9 +196,17 @@
           group="Mapper"
            type="org.apache.catalina.connector.MapperListener">
 
-    <attribute name="connectorName"
-        description="Name of the associated connector"
-               type="java.lang.String"
-          writeable="false"/>
+    <attribute   name="stateName"
+          description="The name of the LifecycleState that this component is currently in"
+                 type="java.lang.String"
+                 writeable="false"/>
+
+    <operation name="start" description="Start" impact="ACTION" returnType="void" />
+    <operation name="stop" description="Stop" impact="ACTION" returnType="void" />
+    <operation name="pause" description="Start" impact="ACTION" returnType="void" />
+    <operation name="resume" description="Stop" impact="ACTION" returnType="void" />
+    <operation name="init" description="Init" impact="ACTION" returnType="void" />
+    <operation name="destroy" description="Destroy" impact="ACTION" returnType="void"
/>
+
   </mbean>
 </mbeans-descriptors>

Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?rev=1188402&r1=1188401&r2=1188402&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java Mon Oct 24 21:53:36
2011
@@ -34,9 +34,9 @@ import javax.security.auth.callback.Unsu
 import javax.security.auth.login.FailedLoginException;
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
+import javax.servlet.http.HttpServletRequest;
 
 import org.apache.catalina.Globals;
-import org.apache.catalina.authenticator.Constants;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.digester.Digester;
@@ -292,10 +292,10 @@ public class JAASMemoryLoginModule exten
         if (authMethod == null) {
             // BASIC or FORM
             principal = super.authenticate(username, password);
-        } else if (authMethod.equals(Constants.DIGEST_METHOD)) {
+        } else if (authMethod.equals(HttpServletRequest.DIGEST_AUTH)) {
             principal = super.authenticate(username, password, nonce, nc,
                     cnonce, qop, realmName, md5a2);
-        } else if (authMethod.equals(Constants.CERT_METHOD)) {
+        } else if (authMethod.equals(HttpServletRequest.CLIENT_CERT_AUTH)) {
             principal = super.getPrincipal(username);
         } else {
             throw new LoginException("Unknown authentication method");

Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1188402&r1=1188401&r2=1188402&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Mon Oct 24 21:53:36 2011
@@ -31,10 +31,10 @@ import javax.security.auth.login.Credent
 import javax.security.auth.login.FailedLoginException;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
+import javax.servlet.http.HttpServletRequest;
 
 import org.apache.catalina.Container;
 import org.apache.catalina.LifecycleException;
-import org.apache.catalina.authenticator.Constants;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.ExceptionUtils;
@@ -337,7 +337,7 @@ public class JAASRealm
         return authenticate(username,
                 new JAASCallbackHandler(this, username, clientDigest, nonce,
                         nc, cnonce, qop, realmName, md5a2,
-                        Constants.DIGEST_METHOD));
+                        HttpServletRequest.DIGEST_AUTH));
     }
 
 
@@ -468,7 +468,7 @@ public class JAASRealm
 
         return authenticate(username,
                 new JAASCallbackHandler(this, username, null, null, null, null,
-                        null, null, null, Constants.CERT_METHOD));
+                        null, null, null, HttpServletRequest.CLIENT_CERT_AUTH));
 
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message