login -> authenticate

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@782249 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/javax/servlet/http/HttpServletRequest.java b/java/javax/servlet/http/HttpServletRequest.java
index 1558466..6f7f1cd 100644 (file)
--- a/java/javax/servlet/http/HttpServletRequest.java
+++ b/java/javax/servlet/http/HttpServletRequest.java
@@ -667,8 +667,9 @@ public interface HttpServletRequest extends ServletRequest {
      * @throws IOException
      * @throws ServletException
      * @since Servlet 3.0
+     * TODO SERVLET3 - Add comments
      */
-    public boolean login(HttpServletResponse response)
+    public boolean authenticate(HttpServletResponse response)
     throws IOException, ServletException;
     
     
@@ -678,6 +679,7 @@ public interface HttpServletRequest extends ServletRequest {
      * @param password
      * @throws ServletException
      * @since Servlet 3.0
+     * TODO SERVLET3 - Add comments
      */
     public void login(java.lang.String username, String password)
     throws ServletException;
@@ -687,6 +689,7 @@ public interface HttpServletRequest extends ServletRequest {
      * 
      * @throws ServletException
      * @since Servlet 3.0
+     * TODO SERVLET3 - Add comments
      */
     public void logout() throws ServletException;
     
@@ -695,6 +698,7 @@ public interface HttpServletRequest extends ServletRequest {
      * 
      * @return
      * @since Servlet 3.0
+     * TODO SERVLET3 - Add comments
      */
     public Iterable<Part> getParts();
     
@@ -705,6 +709,7 @@ public interface HttpServletRequest extends ServletRequest {
      * @return
      * @throws IllegalArgumentException
      * @since Servlet 3.0
+     * TODO SERVLET3 - Add comments
      */
     public Part getPart(java.lang.String name);
 }

diff --git a/java/javax/servlet/http/HttpServletRequestWrapper.java b/java/javax/servlet/http/HttpServletRequestWrapper.java
index 0839f20..8d466d7 100644 (file)
--- a/java/javax/servlet/http/HttpServletRequestWrapper.java
+++ b/java/javax/servlet/http/HttpServletRequestWrapper.java
@@ -264,14 +264,16 @@ public class HttpServletRequestWrapper extends ServletRequestWrapper implements
 
     /**
      * @since Servlet 3.0
+     * TODO SERVLET3 - Add comments
      */
-    public boolean login(HttpServletResponse response)
+    public boolean authenticate(HttpServletResponse response)
     throws IOException, ServletException {
-        return this._getHttpServletRequest().login(response);
+        return this._getHttpServletRequest().authenticate(response);
     }
 
     /**
      * @since Servlet 3.0
+     * TODO SERVLET3 - Add comments
      */
     public void login(String username, String password) throws ServletException {
         this._getHttpServletRequest().login(username, password);
@@ -279,6 +281,7 @@ public class HttpServletRequestWrapper extends ServletRequestWrapper implements
 
     /**
      * @since Servlet 3.0
+     * TODO SERVLET3 - Add comments
      */
     public void logout() throws ServletException {
         this._getHttpServletRequest().logout();
@@ -287,6 +290,7 @@ public class HttpServletRequestWrapper extends ServletRequestWrapper implements
 
     /**
      * @since Servlet 3.0
+     * TODO SERVLET3 - Add comments
      */
     public Iterable<Part> getParts() {
         return this._getHttpServletRequest().getParts();
@@ -294,6 +298,7 @@ public class HttpServletRequestWrapper extends ServletRequestWrapper implements
 
     /**
      * @since Servlet 3.0
+     * TODO SERVLET3 - Add comments
      */
     public Part getPart(String name) {
         return this._getHttpServletRequest().getPart(name);

diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java
index ca00530..f8dba58 100644 (file)
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2239,7 +2239,7 @@ public class Request
         return requestedSessionSSL;
     }
     
-    public boolean login(HttpServletResponse response) throws IOException {
+    public boolean authenticate(HttpServletResponse response) throws IOException {
         // TODO Servlet 3
         return false;
     }

diff --git a/java/org/apache/catalina/connector/RequestFacade.java b/java/org/apache/catalina/connector/RequestFacade.java
index 8768cac..edd2afa 100644 (file)
--- a/java/org/apache/catalina/connector/RequestFacade.java
+++ b/java/org/apache/catalina/connector/RequestFacade.java
@@ -998,8 +998,8 @@ public class RequestFacade implements HttpServletRequest {
         return request.getDispatcherType();
     }
     
-    public boolean login(HttpServletResponse response) throws IOException {
-        return request.login(response);
+    public boolean authenticate(HttpServletResponse response) throws IOException {
+        return request.authenticate(response);
     }
 
     public void login(String username, String password)

diff --git a/java/org/apache/catalina/core/DummyRequest.java b/java/org/apache/catalina/core/DummyRequest.java
index 4443403..ebc5113 100644 (file)
--- a/java/org/apache/catalina/core/DummyRequest.java
+++ b/java/org/apache/catalina/core/DummyRequest.java
@@ -292,7 +292,7 @@ public class DummyRequest
     }
     public Part getPart(String name) { return null; }
     public Iterable<Part> getParts() { return null; }
-    public boolean login(HttpServletResponse response)
+    public boolean authenticate(HttpServletResponse response)
     throws IOException, ServletException { return false; }
     public void login(String username, String password)
     throws ServletException {}