This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new 5479b5b Polish. Align with 9.0.x/7.0.x 5479b5b is described below commit 5479b5bb922459cd1c4fc59b19ca0b0bc0f0edf2 Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Nov 12 12:13:22 2019 +0000 Polish. Align with 9.0.x/7.0.x --- java/org/apache/catalina/ContainerEvent.java | 5 ++--- java/org/apache/catalina/Context.java | 6 +++++- java/org/apache/catalina/UserDatabase.java | 32 +++++++++++----------------- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/java/org/apache/catalina/ContainerEvent.java b/java/org/apache/catalina/ContainerEvent.java index 31be8a8..b651356 100644 --- a/java/org/apache/catalina/ContainerEvent.java +++ b/java/org/apache/catalina/ContainerEvent.java @@ -16,7 +16,6 @@ */ package org.apache.catalina; - import java.util.EventObject; /** @@ -91,7 +90,7 @@ public final class ContainerEvent extends EventObject { */ @Override public String toString() { - return ("ContainerEvent['" + getContainer() + "','" + - getType() + "','" + getData() + "']"); + return "ContainerEvent['" + getContainer() + "','" + + getType() + "','" + getData() + "']"; } } diff --git a/java/org/apache/catalina/Context.java b/java/org/apache/catalina/Context.java index 8471fa4..329fd2e 100644 --- a/java/org/apache/catalina/Context.java +++ b/java/org/apache/catalina/Context.java @@ -1415,6 +1415,7 @@ public interface Context extends Container, ContextBind { */ public JspConfigDescriptor getJspConfigDescriptor(); + /** * Set the JspConfigDescriptor for this context. * A null value indicates there is not JSP configuration. @@ -1423,6 +1424,7 @@ public interface Context extends Container, ContextBind { */ public void setJspConfigDescriptor(JspConfigDescriptor descriptor); + /** * Add a ServletContainerInitializer instance to this web application. * @@ -1433,6 +1435,7 @@ public interface Context extends Container, ContextBind { public void addServletContainerInitializer( ServletContainerInitializer sci, Set<Class<?>> classes); + /** * Is this Context paused whilst it is reloaded? * @@ -1448,6 +1451,7 @@ public interface Context extends Container, ContextBind { */ boolean isServlet22(); + /** * Notification that Servlet security has been dynamically set in a * {@link javax.servlet.ServletRegistration.Dynamic} @@ -1503,7 +1507,7 @@ public interface Context extends Container, ContextBind { /** * @return The version of this web application, used to differentiate * different versions of the same web application when using parallel - * deployment. + * deployment. If not specified, defaults to the empty string. */ public String getWebappVersion(); diff --git a/java/org/apache/catalina/UserDatabase.java b/java/org/apache/catalina/UserDatabase.java index 9a1a932..a76cfeb 100644 --- a/java/org/apache/catalina/UserDatabase.java +++ b/java/org/apache/catalina/UserDatabase.java @@ -14,29 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.catalina; - import java.util.Iterator; - /** - * <p>Abstract representation of a database of {@link User}s and - * {@link Group}s that can be maintained by an application, - * along with definitions of corresponding {@link Role}s, and - * referenced by a {@link Realm} for authentication and access control.</p> + * Abstract representation of a database of {@link User}s and {@link Group}s + * that can be maintained by an application, along with definitions of + * corresponding {@link Role}s, and referenced by a {@link Realm} for + * authentication and access control. * * @author Craig R. McClanahan * @since 4.1 */ public interface UserDatabase { - // ------------------------------------------------------------- Properties - /** * @return the set of {@link Group}s defined in this user database. */ @@ -63,7 +57,6 @@ public interface UserDatabase { // --------------------------------------------------------- Public Methods - /** * Finalize access to this user database. * @@ -100,13 +93,12 @@ public interface UserDatabase { * @param fullName The full name of the new user * @return The new user */ - public User createUser(String username, String password, - String fullName); + public User createUser(String username, String password, String fullName); /** * @return the {@link Group} with the specified group name, if any; - * otherwise return <code>null</code>. + * otherwise return <code>null</code>. * * @param groupname Name of the group to return */ @@ -114,8 +106,8 @@ public interface UserDatabase { /** - * @return the {@link Role} with the specified role name, if any; - * otherwise return <code>null</code>. + * @return the {@link Role} with the specified role name, if any; otherwise + * return <code>null</code>. * * @param rolename Name of the role to return */ @@ -123,8 +115,8 @@ public interface UserDatabase { /** - * @return the {@link User} with the specified user name, if any; - * otherwise return <code>null</code>. + * @return the {@link User} with the specified user name, if any; otherwise + * return <code>null</code>. * * @param username Name of the user to return */ @@ -164,8 +156,8 @@ public interface UserDatabase { /** - * Save any updated information to the persistent storage location for - * this user database. + * Save any updated information to the persistent storage location for this + * user database. * * @exception Exception if any exception is thrown during saving */ --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org